diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 981ed156b34..3482ae16e26 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -9,7 +9,7 @@ on non-NixOS) - Built on platform(s) - [ ] NixOS - - [ ] OS X + - [ ] macOS - [ ] Linux - [ ] 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/`) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 6ff64599540..28ff28fba71 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -187,7 +187,6 @@ hbunke = "Hendrik Bunke "; hce = "Hans-Christian Esperer "; henrytill = "Henry Till "; - hiberno = "Christian Lask "; hinton = "Tom Hinton "; hrdinka = "Christoph Hrdinka "; iand675 = "Ian Duncan "; @@ -270,12 +269,14 @@ mbe = "Brandon Edens "; mboes = "Mathieu Boespflug "; mcmtroffaes = "Matthias C. M. Troffaes "; + mdaiter = "Matthew S. Daiter "; meditans = "Carlo Nucera "; meisternu = "Matt Miemiec "; mic92 = "Jörg Thalheim "; michaelpj = "Michael Peyton Jones "; michalrus = "Michal Rus "; michelk = "Michel Kuhlmann "; + mikefaille = "Michaël Faille "; mimadrid = "Miguel Madrid "; mingchuan = "Ming Chuan "; mirdhyn = "Merlin Gaillard "; @@ -317,6 +318,7 @@ offline = "Jaka Hudoklin "; olcai = "Erik Timan "; olejorgenb = "Ole Jørgen Brønner "; + orbekk = "KJ Ørbekk "; orbitz = "Malcolm Matalka "; osener = "Ozan Sener "; otwieracz = "Slawomir Gonet "; @@ -360,6 +362,7 @@ rardiol = "Ricardo Ardissone "; rasendubi = "Alexey Shmalko "; raskin = "Michael Raskin <7c6f434c@mail.ru>"; + rbasso = "Rafael Basso "; redbaron = "Maxim Ivanov "; redvers = "Redvers Davies "; refnil = "Martin Lavoie "; diff --git a/lib/modules.nix b/lib/modules.nix index 8db17c60579..e66d6a6926c 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -231,12 +231,20 @@ rec { correspond to the definition of 'loc' in 'opt.file'. */ mergeOptionDecls = loc: opts: foldl' (res: opt: - if opt.options ? default && res ? default || - opt.options ? example && res ? example || - opt.options ? description && res ? description || - opt.options ? apply && res ? apply || - # Accept to merge options which have identical types. - opt.options ? type && res ? type && opt.options.type.name != res.type.name + let t = res.type; + t' = opt.options.type; + mergedType = t.typeMerge t'.functor; + typesMergeable = mergedType != null; + typeSet = if (bothHave "type") && typesMergeable + then { type = mergedType; } + else {}; + bothHave = k: opt.options ? ${k} && res ? ${k}; + in + if bothHave "default" || + bothHave "example" || + bothHave "description" || + bothHave "apply" || + (bothHave "type" && (! typesMergeable)) then throw "The option `${showOption loc}' in `${opt.file}' is already declared in ${showFiles res.declarations}." else @@ -258,7 +266,7 @@ rec { in opt.options // res // { declarations = res.declarations ++ [opt.file]; options = submodules; - } + } // typeSet ) { inherit loc; declarations = []; options = []; } opts; /* Merge all the definitions of an option to produce the final @@ -422,12 +430,14 @@ rec { options = opt.options or (throw "Option `${showOption loc'}' has type optionSet but has no option attribute, in ${showFiles opt.declarations}."); f = tp: + let optionSetIn = type: (tp.name == type) && (tp.functor.wrapped.name == "optionSet"); + in if tp.name == "option set" || tp.name == "submodule" then throw "The option ${showOption loc} uses submodules without a wrapping type, in ${showFiles opt.declarations}." - else if tp.name == "attribute set of option sets" then types.attrsOf (types.submodule options) - else if tp.name == "list or attribute set of option sets" then types.loaOf (types.submodule options) - else if tp.name == "list of option sets" then types.listOf (types.submodule options) - else if tp.name == "null or option set" then types.nullOr (types.submodule options) + else if optionSetIn "attrsOf" then types.attrsOf (types.submodule options) + else if optionSetIn "loaOf" then types.loaOf (types.submodule options) + else if optionSetIn "listOf" then types.listOf (types.submodule options) + else if optionSetIn "nullOr" then types.nullOr (types.submodule options) else tp; in if opt.type.getSubModules or null == null diff --git a/lib/options.nix b/lib/options.nix index 444ec37e6ea..2092b65bbc3 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -92,7 +92,7 @@ rec { internal = opt.internal or false; visible = opt.visible or true; readOnly = opt.readOnly or false; - type = opt.type.name or null; + type = opt.type.description or null; } // (if opt ? example then { example = scrubOptionValue opt.example; } else {}) // (if opt ? default then { default = scrubOptionValue opt.default; } else {}) diff --git a/lib/types.nix b/lib/types.nix index 991fa0e5c29..26523f59f25 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -17,10 +17,43 @@ rec { }; + # Default type merging function + # takes two type functors and return the merged type + defaultTypeMerge = f: f': + let wrapped = f.wrapped.typeMerge f'.wrapped.functor; + payload = f.binOp f.payload f'.payload; + in + # cannot merge different types + if f.name != f'.name + then null + # simple types + else if (f.wrapped == null && f'.wrapped == null) + && (f.payload == null && f'.payload == null) + then f.type + # composed types + else if (f.wrapped != null && f'.wrapped != null) && (wrapped != null) + then f.type wrapped + # value types + else if (f.payload != null && f'.payload != null) && (payload != null) + then f.type payload + else null; + + # Default type functor + defaultFunctor = name: { + inherit name; + type = types."${name}" or null; + wrapped = null; + payload = null; + binOp = a: b: null; + }; + isOptionType = isType "option-type"; mkOptionType = - { # Human-readable representation of the type. + { # Human-readable representation of the type, should be equivalent to + # the type function name. name + , # Description of the type, defined recursively by embedding the the wrapped type if any. + description ? null , # Function applied to each definition that should return true if # its type-correct, false otherwise. check ? (x: true) @@ -36,12 +69,26 @@ rec { getSubOptions ? prefix: {} , # List of modules if any, or null if none. getSubModules ? null - , # Function for building the same option type with a different list of + , # Function for building the same option type with a different list of # modules. substSubModules ? m: null + , # Function that merge type declarations. + # internal, takes a functor as argument and returns the merged type. + # returning null means the type is not mergeable + typeMerge ? defaultTypeMerge functor + , # The type functor. + # internal, representation of the type as an attribute set. + # name: name of the type + # type: type function. + # wrapped: the type wrapped in case of compound types. + # payload: values of the type, two payloads of the same type must be + # combinable with the binOp binary operation. + # binOp: binary operation that merge two payloads of the same type. + functor ? defaultFunctor name }: { _type = "option-type"; - inherit name check merge getSubOptions getSubModules substSubModules; + inherit name check merge getSubOptions getSubModules substSubModules typeMerge functor; + description = if description == null then name else description; }; @@ -52,29 +99,39 @@ rec { }; bool = mkOptionType { - name = "boolean"; + name = "bool"; + description = "boolean"; check = isBool; merge = mergeEqualOption; }; - int = mkOptionType { - name = "integer"; + int = mkOptionType rec { + name = "int"; + description = "integer"; check = isInt; merge = mergeOneOption; }; str = mkOptionType { - name = "string"; + name = "str"; + description = "string"; check = isString; merge = mergeOneOption; }; # Merge multiple definitions by concatenating them (with the given # separator between the values). - separatedString = sep: mkOptionType { - name = "string"; + separatedString = sep: mkOptionType rec { + name = "separatedString"; + description = "string"; check = isString; merge = loc: defs: concatStringsSep sep (getValues defs); + functor = (defaultFunctor name) // { + payload = sep; + binOp = sepLhs: sepRhs: + if sepLhs == sepRhs then sepLhs + else null; + }; }; lines = separatedString "\n"; @@ -86,7 +143,8 @@ rec { string = separatedString ""; attrs = mkOptionType { - name = "attribute set"; + name = "attrs"; + description = "attribute set"; check = isAttrs; merge = loc: foldl' (res: def: mergeAttrs res def.value) {}; }; @@ -114,8 +172,9 @@ rec { # drop this in the future: list = builtins.trace "`types.list' is deprecated; use `types.listOf' instead" types.listOf; - listOf = elemType: mkOptionType { - name = "list of ${elemType.name}s"; + listOf = elemType: mkOptionType rec { + name = "listOf"; + description = "list of ${elemType.description}s"; check = isList; merge = loc: defs: map (x: x.value) (filter (x: x ? value) (concatLists (imap (n: def: @@ -132,10 +191,12 @@ rec { getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*"]); getSubModules = elemType.getSubModules; substSubModules = m: listOf (elemType.substSubModules m); + functor = (defaultFunctor name) // { wrapped = elemType; }; }; - attrsOf = elemType: mkOptionType { - name = "attribute set of ${elemType.name}s"; + attrsOf = elemType: mkOptionType rec { + name = "attrsOf"; + description = "attribute set of ${elemType.description}s"; check = isAttrs; merge = loc: defs: mapAttrs (n: v: v.value) (filterAttrs (n: v: v ? value) (zipAttrsWith (name: defs: @@ -147,6 +208,7 @@ rec { getSubOptions = prefix: elemType.getSubOptions (prefix ++ [""]); getSubModules = elemType.getSubModules; substSubModules = m: attrsOf (elemType.substSubModules m); + functor = (defaultFunctor name) // { wrapped = elemType; }; }; # List or attribute set of ... @@ -165,18 +227,21 @@ rec { def; listOnly = listOf elemType; attrOnly = attrsOf elemType; - in mkOptionType { - name = "list or attribute set of ${elemType.name}s"; + in mkOptionType rec { + name = "loaOf"; + description = "list or attribute set of ${elemType.description}s"; check = x: isList x || isAttrs x; merge = loc: defs: attrOnly.merge loc (imap convertIfList defs); getSubOptions = prefix: elemType.getSubOptions (prefix ++ [""]); getSubModules = elemType.getSubModules; substSubModules = m: loaOf (elemType.substSubModules m); + functor = (defaultFunctor name) // { wrapped = elemType; }; }; # List or element of ... - loeOf = elemType: mkOptionType { - name = "element or list of ${elemType.name}s"; + loeOf = elemType: mkOptionType rec { + name = "loeOf"; + description = "element or list of ${elemType.description}s"; check = x: isList x || elemType.check x; merge = loc: defs: let @@ -189,18 +254,22 @@ rec { else if !isString res then throw "The option `${showOption loc}' does not have a string value, in ${showFiles (getFiles defs)}." else res; + functor = (defaultFunctor name) // { wrapped = elemType; }; }; - uniq = elemType: mkOptionType { - inherit (elemType) name check; + uniq = elemType: mkOptionType rec { + name = "uniq"; + inherit (elemType) description check; merge = mergeOneOption; getSubOptions = elemType.getSubOptions; getSubModules = elemType.getSubModules; substSubModules = m: uniq (elemType.substSubModules m); + functor = (defaultFunctor name) // { wrapped = elemType; }; }; - nullOr = elemType: mkOptionType { - name = "null or ${elemType.name}"; + nullOr = elemType: mkOptionType rec { + name = "nullOr"; + description = "null or ${elemType.description}"; check = x: x == null || elemType.check x; merge = loc: defs: let nrNulls = count (def: def.value == null) defs; in @@ -211,6 +280,7 @@ rec { getSubOptions = elemType.getSubOptions; getSubModules = elemType.getSubModules; substSubModules = m: nullOr (elemType.substSubModules m); + functor = (defaultFunctor name) // { wrapped = elemType; }; }; submodule = opts: @@ -236,6 +306,12 @@ rec { args = { name = ""; }; }).options; getSubModules = opts'; substSubModules = m: submodule m; + functor = (defaultFunctor name) // { + # Merging of submodules is done as part of mergeOptionDecls, as we have to annotate + # each submodule with its location. + payload = []; + binOp = lhs: rhs: []; + }; }; enum = values: @@ -245,23 +321,35 @@ rec { else if builtins.isInt v then builtins.toString v else ''<${builtins.typeOf v}>''; in - mkOptionType { - name = "one of ${concatMapStringsSep ", " show values}"; + mkOptionType rec { + name = "enum"; + description = "one of ${concatMapStringsSep ", " show values}"; check = flip elem values; merge = mergeOneOption; + functor = (defaultFunctor name) // { payload = values; binOp = a: b: unique (a ++ b); }; }; - either = t1: t2: mkOptionType { - name = "${t1.name} or ${t2.name}"; + either = t1: t2: mkOptionType rec { + name = "either"; + description = "${t1.description} or ${t2.description}"; check = x: t1.check x || t2.check x; merge = mergeOneOption; + typeMerge = f': + let mt1 = t1.typeMerge (elemAt f'.wrapped 0).functor; + mt2 = t2.typeMerge (elemAt f'.wrapped 1).functor; + in + if (name == f'.name) && (mt1 != null) && (mt2 != null) + then functor.type mt1 mt2 + else null; + functor = (defaultFunctor name) // { wrapped = [ t1 t2 ]; }; }; # Obsolete alternative to configOf. It takes its option # declarations from the ‘options’ attribute of containing option # declaration. optionSet = mkOptionType { - name = builtins.trace "types.optionSet is deprecated; use types.submodule instead" "option set"; + name = builtins.trace "types.optionSet is deprecated; use types.submodule instead" "optionSet"; + description = "option set"; }; # Augment the given type with an additional type check function. diff --git a/nixos/doc/manual/configuration/customizing-packages.xml b/nixos/doc/manual/configuration/customizing-packages.xml index 6ee7a95dc6f..8aa01fb57a0 100644 --- a/nixos/doc/manual/configuration/customizing-packages.xml +++ b/nixos/doc/manual/configuration/customizing-packages.xml @@ -42,29 +42,30 @@ construction, so without them, elements.) Even greater customisation is possible using the function -overrideDerivation. While the +overrideAttrs. While the override mechanism above overrides the arguments of -a package function, overrideDerivation allows -changing the result of the function. This -permits changing any aspect of the package, such as the source code. +a package function, overrideAttrs allows +changing the attributes passed to mkDerivation. +This permits changing any aspect of the package, such as the source code. For instance, if you want to override the source code of Emacs, you can say: -environment.systemPackages = - [ (pkgs.lib.overrideDerivation pkgs.emacs (attrs: { - name = "emacs-25.0-pre"; - src = /path/to/my/emacs/tree; - })) - ]; +environment.systemPackages = [ + (pkgs.emacs.overrideAttrs (oldAttrs: { + name = "emacs-25.0-pre"; + src = /path/to/my/emacs/tree; + })) +]; -Here, overrideDerivation takes the Nix derivation +Here, overrideAttrs takes the Nix derivation specified by pkgs.emacs and produces a new derivation in which the original’s name and src attribute have been replaced by the given -values. The original attributes are accessible via -attrs. +values by re-calling stdenv.mkDerivation. +The original attributes are accessible via the function argument, +which is conventionally named oldAttrs. The overrides shown above are not global. They do not affect the original package; other packages in Nixpkgs continue to depend on diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml index 7be5e9d51d4..ce432a7fa6c 100644 --- a/nixos/doc/manual/development/option-declarations.xml +++ b/nixos/doc/manual/development/option-declarations.xml @@ -65,4 +65,92 @@ options = { +
Extensible Option + Types + + Extensible option types is a feature that allow to extend certain types + declaration through multiple module files. + This feature only work with a restricted set of types, namely + enum and submodules and any composed + forms of them. + + Extensible option types can be used for enum options + that affects multiple modules, or as an alternative to related + enable options. + + As an example, we will take the case of display managers. There is a + central display manager module for generic display manager options and a + module file per display manager backend (slim, kdm, gdm ...). + + + There are two approach to this module structure: + + + Managing the display managers independently by adding an + enable option to every display manager module backend. (NixOS) + + Managing the display managers in the central module by + adding an option to select which display manager backend to use. + + + + + Both approachs have problems. + + Making backends independent can quickly become hard to manage. For + display managers, there can be only one enabled at a time, but the type + system can not enforce this restriction as there is no relation between + each backend enable option. As a result, this restriction + has to be done explicitely by adding assertions in each display manager + backend module. + + On the other hand, managing the display managers backends in the + central module will require to change the central module option every time + a new backend is added or removed. + + By using extensible option types, it is possible to create a placeholder + option in the central module (), and to extend it in each backend module (, ). + + As a result, displayManager.enable option values can + be added without changing the main service module file and the type system + automatically enforce that there can only be a single display manager + enabled. + +Extensible type + placeholder in the service module + +services.xserver.displayManager.enable = mkOption { + description = "Display manager to use"; + type = with types; nullOr (enum [ ]); +}; + +Extending + <literal>services.xserver.displayManager.enable</literal> in the + <literal>slim</literal> module + +services.xserver.displayManager.enable = mkOption { + type = with types; nullOr (enum [ "slim" ]); +}; + +Extending + <literal>services.foo.backend</literal> in the <literal>kdm</literal> + module + +services.xserver.displayManager.enable = mkOption { + type = with types; nullOr (enum [ "kdm" ]); +}; + +The placeholder declaration is a standard mkOption + declaration, but it is important that extensible option declarations only use + the type argument. + +Extensible option types work with any of the composed variants of + enum such as + with types; nullOr (enum [ "foo" "bar" ]) + or with types; listOf (enum [ "foo" "bar" ]). + +
diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index 8871b02cebf..8e6ac53ad48 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -62,23 +62,45 @@ A string. Multiple definitions are concatenated with a collon ":". - - types.separatedString - sep - A string with a custom separator - sep, e.g. types.separatedString - "|". - +
Value Types + + Value types are type that take a value parameter. The only value type + in the library is enum. + + + + types.enum l + One element of the list l, e.g. + types.enum [ "left" "right" ]. Multiple definitions + cannot be merged. + + + types.separatedString + sep + A string with a custom separator + sep, e.g. types.separatedString + "|". + + + types.submodule o + A set of sub options o. + o can be an attribute set or a function + returning an attribute set. Submodules are used in composed types to + create modular options. Submodule are detailed in . + + +
+
Composed Types - Composed types allow to create complex types by taking another type(s) - or value(s) as parameter(s). - It is possible to compose types multiple times, e.g. with types; - nullOr (enum [ "left" "right" ]). + Composed types are types that take a type as parameter. listOf + int and either int str are examples of + composed types. @@ -99,12 +121,6 @@ type. Multiple definitions are merged according to the value. - - types.loeOf t - A list or an element of t type. - Multiple definitions are merged according to the - values. - types.nullOr t null or type @@ -117,12 +133,6 @@ merged. It is used to ensure option definitions are declared only once. - - types.enum l - One element of the list l, e.g. - types.enum [ "left" "right" ]. Multiple definitions - cannot be merged - types.either t1 t2 @@ -131,14 +141,6 @@ str. Multiple definitions cannot be merged. - - types.submodule o - A set of sub options o. - o can be an attribute set or a function - returning an attribute set. Submodules are used in composed types to - create modular options. Submodule are detailed in . -
@@ -197,7 +199,6 @@ options.mod = mkOption { type = with types; listOf (submodule modOptions); }; -
Composed with <literal>listOf</literal> When composed with listOf, submodule allows multiple @@ -323,9 +324,13 @@ code before creating a new type. name - A string representation of the type function name, name - usually changes accordingly parameters passed to - types. + A string representation of the type function + name. + + + definition + Description of the type used in documentation. Give + information of the type and any of its arguments. check @@ -388,6 +393,53 @@ code before creating a new type. type parameter, this function should be defined as m: composedType (elemType.substSubModules m). + + typeMerge + A function to merge multiple type declarations. Takes the + type to merge functor as parameter. A + null return value means that type cannot be + merged. + + + f + The type to merge + functor. + + + Note: There is a generic defaultTypeMerge that + work with most of value and composed types. + + + + functor + An attribute set representing the type. It is used for type + operations and has the following keys: + + + type + The type function. + + + wrapped + Holds the type parameter for composed types. + + + + payload + Holds the value parameter for value types. + The types that have a payload are the + enum, separatedString and + submodule types. + + + binOp + A binary operation that can merge the payloads of two + same types. Defined as a function that take two payloads as + parameters and return the payloads merged. + + + +
diff --git a/nixos/doc/manual/installation/obtaining.xml b/nixos/doc/manual/installation/obtaining.xml index f6e8b218e2b..20a4838be88 100644 --- a/nixos/doc/manual/installation/obtaining.xml +++ b/nixos/doc/manual/installation/obtaining.xml @@ -32,7 +32,7 @@ running NixOS system through several other means: Using AMIs for Amazon’s EC2. To find one for your region and instance type, please refer to the list + xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/ec2-amis.nix">list of most recent AMIs. diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index efff8b895a1..743f3dce230 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -75,7 +75,10 @@ following incompatible changes: - + Module type system have a new extensible option types feature that + allow to extend certain types, such as enum, through multiple option + declarations of the same option across multiple modules. + diff --git a/nixos/modules/config/debug-info.nix b/nixos/modules/config/debug-info.nix index 671a59f52f6..49991d22a93 100644 --- a/nixos/modules/config/debug-info.nix +++ b/nixos/modules/config/debug-info.nix @@ -17,12 +17,10 @@ with lib; where tools such as gdb can find them. If you need debug symbols for a package that doesn't provide them by default, you can enable them as follows: - nixpkgs.config.packageOverrides = pkgs: { - hello = pkgs.lib.overrideDerivation pkgs.hello (attrs: { - outputs = attrs.outputs or ["out"] ++ ["debug"]; - buildInputs = attrs.buildInputs ++ [<nixpkgs/pkgs/build-support/setup-hooks/separate-debug-info.sh>]; + hello = pkgs.hello.overrideAttrs (oldAttrs: { + separateDebugInfo = true; }); }; diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index f458bc39ada..8147fed39d0 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -41,7 +41,7 @@ in strings. The latter is concatenated, interspersed with colon characters. ''; - type = types.attrsOf (types.loeOf types.str); + type = with types; attrsOf (either str (listOf str)); apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v); }; diff --git a/nixos/modules/config/system-environment.nix b/nixos/modules/config/system-environment.nix index 3362400326d..6011e354ece 100644 --- a/nixos/modules/config/system-environment.nix +++ b/nixos/modules/config/system-environment.nix @@ -23,7 +23,7 @@ in strings. The latter is concatenated, interspersed with colon characters. ''; - type = types.attrsOf (types.loeOf types.str); + type = with types; attrsOf (either str (listOf str)); apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v); }; diff --git a/nixos/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh index 17c17d05e28..27eacda48a8 100644 --- a/nixos/modules/installer/tools/nixos-option.sh +++ b/nixos/modules/installer/tools/nixos-option.sh @@ -256,7 +256,7 @@ if isOption opt then // optionalAttrs (opt ? default) { inherit (opt) default; } // optionalAttrs (opt ? example) { inherit (opt) example; } // optionalAttrs (opt ? description) { inherit (opt) description; } - // optionalAttrs (opt ? type) { typename = opt.type.name; } + // optionalAttrs (opt ? type) { typename = opt.type.description; } // optionalAttrs (opt ? options) { inherit (opt) options; } // { # to disambiguate the xml output. diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 8c0f0c2624b..80a9a520e24 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -277,6 +277,8 @@ gitlab-runner = 257; postgrey = 258; hound = 259; + leaps = 260; + ipfs = 261; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -524,6 +526,8 @@ gitlab-runner = 257; postgrey = 258; hound = 259; + leaps = 260; + ipfs = 261; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 61596265124..8254ada3ddf 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -61,6 +61,7 @@ ./misc/nixpkgs.nix ./misc/passthru.nix ./misc/version.nix + ./programs/adb.nix ./programs/atop.nix ./programs/bash/bash.nix ./programs/blcr.nix @@ -250,6 +251,7 @@ ./services/misc/gitolite.nix ./services/misc/gpsd.nix ./services/misc/ihaskell.nix + ./services/misc/leaps.nix ./services/misc/mantisbt.nix ./services/misc/mathics.nix ./services/misc/matrix-synapse.nix @@ -316,6 +318,7 @@ ./services/monitoring/zabbix-server.nix ./services/network-filesystems/cachefilesd.nix ./services/network-filesystems/drbd.nix + ./services/network-filesystems/ipfs.nix ./services/network-filesystems/netatalk.nix ./services/network-filesystems/nfsd.nix ./services/network-filesystems/openafs-client/default.nix diff --git a/nixos/modules/programs/adb.nix b/nixos/modules/programs/adb.nix new file mode 100644 index 00000000000..9ba81899e58 --- /dev/null +++ b/nixos/modules/programs/adb.nix @@ -0,0 +1,30 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + meta.maintainers = [ maintainers.mic92 ]; + + ###### interface + options = { + programs.adb = { + enable = mkOption { + default = false; + example = true; + type = types.bool; + description = '' + Whether to configure system to use Android Debug Bridge (adb). + To grant access to a user, it must be part of adbusers group: + users.extraUsers.alice.extraGroups = ["adbusers"]; + ''; + }; + }; + }; + + ###### implementation + config = mkIf config.programs.adb.enable { + services.udev.packages = [ pkgs.android-udev-rules ]; + environment.systemPackages = [ pkgs.androidenv.platformTools ]; + users.extraGroups.adbusers = {}; + }; +} diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index bcaa8b8df3d..e03f6046de8 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -356,14 +356,14 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides {} }: let - myEmacs = pkgs.lib.overrideDerivation (pkgs.emacs.override { + myEmacs = (pkgs.emacs.override { # Use gtk3 instead of the default gtk2 withGTK3 = true; withGTK2 = false; - }) (attrs: { + }).overrideAttrs (attrs: { # I don't want emacs.desktop file because I only use # emacsclient. - postInstall = attrs.postInstall + '' + postInstall = (attrs.postInstall or "") + '' rm $out/share/applications/emacs.desktop ''; }); diff --git a/nixos/modules/services/games/ghost-one.nix b/nixos/modules/services/games/ghost-one.nix index 5762148df2b..71ff6bb2f3f 100644 --- a/nixos/modules/services/games/ghost-one.nix +++ b/nixos/modules/services/games/ghost-one.nix @@ -21,8 +21,7 @@ in language = mkOption { default = "English"; - type = types.addCheck types.str - (lang: elem lang [ "English" "Spanish" "Russian" "Serbian" "Turkish" ]); + type = types.enum [ "English" "Spanish" "Russian" "Serbian" "Turkish" ]; description = "The language of bot messages: English, Spanish, Russian, Serbian or Turkish."; }; diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix index a8a214b2155..27ed5374f56 100644 --- a/nixos/modules/services/logging/logcheck.nix +++ b/nixos/modules/services/logging/logcheck.nix @@ -55,9 +55,9 @@ let levelOption = mkOption { default = "server"; - type = types.str; + type = types.enum [ "workstation" "server" "paranoid" ]; description = '' - Set the logcheck level. Either "workstation", "server", or "paranoid". + Set the logcheck level. ''; }; diff --git a/nixos/modules/services/misc/leaps.nix b/nixos/modules/services/misc/leaps.nix new file mode 100644 index 00000000000..b92cf27f58d --- /dev/null +++ b/nixos/modules/services/misc/leaps.nix @@ -0,0 +1,62 @@ +{ config, pkgs, lib, ... } @ args: + +with lib; + +let + cfg = config.services.leaps; + stateDir = "/var/lib/leaps/"; +in +{ + options = { + services.leaps = { + enable = mkEnableOption "leaps"; + port = mkOption { + type = types.int; + default = 8080; + description = "A port where leaps listens for incoming http requests"; + }; + address = mkOption { + default = ""; + type = types.str; + example = "127.0.0.1"; + description = "Hostname or IP-address to listen to. By default it will listen on all interfaces."; + }; + path = mkOption { + default = "/"; + type = types.path; + description = "Subdirectory used for reverse proxy setups"; + }; + }; + }; + + config = mkIf cfg.enable { + users = { + users.leaps = { + uid = config.ids.uids.leaps; + description = "Leaps server user"; + group = "leaps"; + home = stateDir; + createHome = true; + }; + + groups.leaps = { + gid = config.ids.gids.leaps; + }; + }; + + systemd.services.leaps = { + description = "leaps service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + User = "leaps"; + Group = "leaps"; + Restart = "on-failure"; + WorkingDirectory = stateDir; + PrivateTmp = true; + ExecStart = "${pkgs.leaps.bin}/bin/leaps -path ${toString cfg.path} -address ${cfg.address}:${toString cfg.port}"; + }; + }; + }; +} diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 4145f8fa957..277fc9a3902 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -9,11 +9,15 @@ let mkListener = l: ''{port: ${toString l.port}, bind_address: "${l.bind_address}", type: ${l.type}, tls: ${fromBool l.tls}, x_forwarded: ${fromBool l.x_forwarded}, resources: [${concatStringsSep "," (map mkResource l.resources)}]}''; fromBool = x: if x then "true" else "false"; configFile = pkgs.writeText "homeserver.yaml" '' +${optionalString (cfg.tls_certificate_path != null) '' tls_certificate_path: "${cfg.tls_certificate_path}" +''} ${optionalString (cfg.tls_private_key_path != null) '' tls_private_key_path: "${cfg.tls_private_key_path}" ''} +${optionalString (cfg.tls_dh_params_path != null) '' tls_dh_params_path: "${cfg.tls_dh_params_path}" +''} no_tls: ${fromBool cfg.no_tls} ${optionalString (cfg.bind_port != null) '' bind_port: ${toString cfg.bind_port} @@ -146,8 +150,9 @@ in { ''; }; tls_certificate_path = mkOption { - type = types.str; - default = "/var/lib/matrix-synapse/homeserver.tls.crt"; + type = types.nullOr types.str; + default = null; + example = "/var/lib/matrix-synapse/homeserver.tls.crt"; description = '' PEM encoded X509 certificate for TLS. You can replace the self-signed certificate that synapse @@ -158,16 +163,17 @@ in { }; tls_private_key_path = mkOption { type = types.nullOr types.str; - default = "/var/lib/matrix-synapse/homeserver.tls.key"; - example = null; + default = null; + example = "/var/lib/matrix-synapse/homeserver.tls.key"; description = '' PEM encoded private key for TLS. Specify null if synapse is not speaking TLS directly. ''; }; tls_dh_params_path = mkOption { - type = types.str; - default = "/var/lib/matrix-synapse/homeserver.tls.dh"; + type = types.nullOr types.str; + default = null; + example = "/var/lib/matrix-synapse/homeserver.tls.dh"; description = '' PEM dh parameters for ephemeral keys ''; @@ -557,12 +563,10 @@ in { after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; preStart = '' - if ! test -e /var/lib/matrix-synapse; then - mkdir -p /var/lib/matrix-synapse - chmod 700 /var/lib/matrix-synapse - chown -R matrix-synapse:matrix-synapse /var/lib/matrix-synapse - ${cfg.package}/bin/homeserver --config-path ${configFile} --keys-directory /var/lib/matrix-synapse/ --generate-keys - fi + ${cfg.package}/bin/homeserver \ + --config-path ${configFile} \ + --keys-directory /var/lib/matrix-synapse \ + --generate-keys ''; serviceConfig = { Type = "simple"; @@ -570,7 +574,7 @@ in { Group = "matrix-synapse"; WorkingDirectory = "/var/lib/matrix-synapse"; PermissionsStartOnly = true; - ExecStart = "${cfg.package}/bin/homeserver --config-path ${configFile}"; + ExecStart = "${cfg.package}/bin/homeserver --config-path ${configFile} --keys-directory /var/lib/matrix-synapse"; }; }; }; diff --git a/nixos/modules/services/misc/parsoid.nix b/nixos/modules/services/misc/parsoid.nix index 0844190a549..ab1b5406877 100644 --- a/nixos/modules/services/misc/parsoid.nix +++ b/nixos/modules/services/misc/parsoid.nix @@ -91,7 +91,8 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig = { - ExecStart = "${pkgs.nodePackages.parsoid}/lib/node_modules/parsoid/api/server.js -c ${confFile} -n ${toString cfg.workers}"; + User = "nobody"; + ExecStart = "${pkgs.nodePackages.parsoid}/lib/node_modules/parsoid/bin/server.js -c ${confFile} -n ${toString cfg.workers}"; }; }; diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index 233c47684b7..ca82a733f6f 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -292,7 +292,7 @@ in { }; allowedClientIDs = mkOption { - type = with types; loeOf (either (enum ["all" "none"]) str); + type = with types; either str (listOf str); default = []; example = [ "[Tt]ask [2-9]+" ]; description = '' @@ -306,7 +306,7 @@ in { }; disallowedClientIDs = mkOption { - type = with types; loeOf (either (enum ["all" "none"]) str); + type = with types; either str (listOf str); default = []; example = [ "[Tt]ask [2-9]+" ]; description = '' diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix new file mode 100644 index 00000000000..c26a7073703 --- /dev/null +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -0,0 +1,111 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + inherit (pkgs) ipfs; + + cfg = config.services.ipfs; + + ipfsFlags = ''${if cfg.autoMigrate then "--migrate" else ""} ${if cfg.enableGC then "--enable-gc" else ""} ${toString cfg.extraFlags}''; + +in + +{ + + ###### interface + + options = { + + services.ipfs = { + + enable = mkEnableOption "Interplanetary File System"; + + user = mkOption { + type = types.str; + default = "ipfs"; + description = "User under which the IPFS daemon runs"; + }; + + group = mkOption { + type = types.str; + default = "ipfs"; + description = "Group under which the IPFS daemon runs"; + }; + + dataDir = mkOption { + type = types.str; + default = "/var/lib/ipfs"; + description = "The data dir for IPFS"; + }; + + autoMigrate = mkOption { + type = types.bool; + default = false; + description = '' + Whether IPFS should try to migrate the file system automatically. + ''; + }; + + enableGC = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable automatic garbage collection. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + description = "Extra flags passed to the IPFS daemon"; + default = []; + }; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.ipfs ]; + + users.extraUsers = mkIf (cfg.user == "ipfs") { + ipfs = { + group = cfg.group; + home = cfg.dataDir; + createHome = false; + uid = config.ids.uids.ipfs; + description = "IPFS daemon user"; + }; + }; + + users.extraGroups = mkIf (cfg.group == "ipfs") { + ipfs = { + gid = config.ids.gids.ipfs; + }; + }; + + systemd.services.ipfs = { + description = "IPFS Daemon"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "local-fs.target" ]; + path = [ pkgs.ipfs pkgs.su pkgs.bash ]; + + preStart = + '' + install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.dataDir} + if [[ ! -d ${cfg.dataDir}/.ipfs ]]; then + cd ${cfg.dataDir} + ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c "${ipfs}/bin/ipfs init" + fi + ''; + + serviceConfig = { + ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags}"; + User = cfg.user; + Group = cfg.group; + PermissionsStartOnly = true; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix index 5e6847097a9..e72ea20ccce 100644 --- a/nixos/modules/services/networking/bitlbee.nix +++ b/nixos/modules/services/networking/bitlbee.nix @@ -7,11 +7,6 @@ let cfg = config.services.bitlbee; bitlbeeUid = config.ids.uids.bitlbee; - authModeCheck = v: - v == "Open" || - v == "Closed" || - v == "Registered"; - bitlbeeConfig = pkgs.writeText "bitlbee.conf" '' [settings] @@ -67,7 +62,7 @@ in authMode = mkOption { default = "Open"; - type = types.addCheck types.str authModeCheck; + type = types.enum [ "Open" "Closed" "Registered" ]; description = '' The following authentication modes are available: Open -- Accept connections from anyone, use NickServ for user authentication. diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix index 5e15e40ea0c..7e981183353 100644 --- a/nixos/modules/services/networking/cjdns.nix +++ b/nixos/modules/services/networking/cjdns.nix @@ -36,7 +36,7 @@ let echo \'\' ${concatStringsSep "\n" (mapAttrsToList (k: v: optionalString (v.hostname != "") - "echo $(${pkgs.cjdns}/bin/publictoip6 ${x.key}) ${x.host}") + "echo $(${pkgs.cjdns}/bin/publictoip6 ${v.publicKey}) ${v.hostname}") (cfg.ETHInterface.connectTo // cfg.UDPInterface.connectTo))} echo \'\' ''); @@ -245,7 +245,10 @@ in serviceConfig = { Type = "forking"; Restart = "on-failure"; - + CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW"; + AmbientCapabilities = "CAP_NET_ADMIN CAP_NET_RAW"; + ProtectSystem = "full"; + MemoryDenyWriteExecute = true; ProtectHome = true; PrivateTmp = true; }; diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index 5a24db8ccba..82bf178f4cb 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -5,15 +5,25 @@ let apparmorEnabled = config.security.apparmor.enable; dnscrypt-proxy = pkgs.dnscrypt-proxy; cfg = config.services.dnscrypt-proxy; + stateDirectory = "/var/lib/dnscrypt-proxy"; localAddress = "${cfg.localAddress}:${toString cfg.localPort}"; - daemonArgs = - [ "--local-address=${localAddress}" - (optionalString cfg.tcpOnly "--tcp-only") - (optionalString cfg.ephemeralKeys "-E") - ] - ++ resolverArgs; + # The minisign public key used to sign the upstream resolver list. + # This is somewhat more flexible than preloading the key as an + # embedded string. + upstreamResolverListPubKey = pkgs.fetchurl { + url = https://raw.githubusercontent.com/jedisct1/dnscrypt-proxy/master/minisign.pub; + sha256 = "18lnp8qr6ghfc2sd46nn1rhcpr324fqlvgsp4zaigw396cd7vnnh"; + }; + + # Internal flag indicating whether the upstream resolver list is used + useUpstreamResolverList = cfg.resolverList == null && cfg.customResolver == null; + + resolverList = + if (cfg.resolverList != null) + then cfg.resolverList + else "${stateDirectory}/dnscrypt-resolvers.csv"; resolverArgs = if (cfg.customResolver != null) then @@ -22,9 +32,16 @@ let "--provider-key=${cfg.customResolver.key}" ] else - [ "--resolvers-list=${cfg.resolverList}" - "--resolver-name=${toString cfg.resolverName}" + [ "--resolvers-list=${resolverList}" + "--resolver-name=${cfg.resolverName}" ]; + + # The final command line arguments passed to the daemon + daemonArgs = + [ "--local-address=${localAddress}" ] + ++ optional cfg.tcpOnly "--tcp-only" + ++ optional cfg.ephemeralKeys "-E" + ++ resolverArgs; in { @@ -66,24 +83,20 @@ in default = "dnscrypt.eu-nl"; type = types.nullOr types.str; description = '' - The name of the upstream DNSCrypt resolver to use, taken from the - list named in the resolverList option. - The default resolver is located in Holland, supports DNS security - extensions, and claims to not keep logs. + The name of the upstream DNSCrypt resolver to use, taken from + ${resolverList}. The default resolver is + located in Holland, supports DNS security extensions, and + claims to not keep logs. ''; }; resolverList = mkOption { + default = null; + type = types.nullOr types.path; description = '' - The list of upstream DNSCrypt resolvers. By default, we use the most - recent list published by upstream. + List of DNSCrypt resolvers. The default is to use the list of + public resolvers provided by upstream. ''; - example = literalExample "${pkgs.dnscrypt-proxy}/share/dnscrypt-proxy/dnscrypt-resolvers.csv"; - default = pkgs.fetchurl { - url = https://raw.githubusercontent.com/jedisct1/dnscrypt-proxy/master/dnscrypt-resolvers.csv; - sha256 = "1i9wzw4zl052h5nyp28bwl8d66cgj0awvjhw5wgwz0warkjl1g8g"; - }; - defaultText = "pkgs.fetchurl { url = ...; sha256 = ...; }"; }; customResolver = mkOption { @@ -150,7 +163,7 @@ in } ]; - security.apparmor.profiles = mkIf apparmorEnabled (singleton (pkgs.writeText "apparmor-dnscrypt-proxy" '' + security.apparmor.profiles = optional apparmorEnabled (pkgs.writeText "apparmor-dnscrypt-proxy" '' ${dnscrypt-proxy}/bin/dnscrypt-proxy { /dev/null rw, /dev/urandom r, @@ -177,9 +190,9 @@ in ${getLib pkgs.lz4}/lib/liblz4.so.* mr, ${getLib pkgs.attr}/lib/libattr.so.* mr, - ${cfg.resolverList} r, + ${resolverList} r, } - '')); + ''); users.users.dnscrypt-proxy = { description = "dnscrypt-proxy daemon user"; @@ -188,11 +201,61 @@ in }; users.groups.dnscrypt-proxy = {}; + systemd.services.init-dnscrypt-proxy-statedir = optionalAttrs useUpstreamResolverList { + description = "Initialize dnscrypt-proxy state directory"; + script = '' + mkdir -pv ${stateDirectory} + chown -c dnscrypt-proxy:dnscrypt-proxy ${stateDirectory} + cp --preserve=timestamps -uv \ + ${pkgs.dnscrypt-proxy}/share/dnscrypt-proxy/dnscrypt-resolvers.csv \ + ${stateDirectory} + ''; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + }; + + systemd.services.update-dnscrypt-resolvers = optionalAttrs useUpstreamResolverList { + description = "Update list of DNSCrypt resolvers"; + + requires = [ "init-dnscrypt-proxy-statedir.service" ]; + after = [ "init-dnscrypt-proxy-statedir.service" ]; + + path = with pkgs; [ curl minisign ]; + script = '' + cd ${stateDirectory} + curl -fSsL -o dnscrypt-resolvers.csv.tmp \ + https://download.dnscrypt.org/dnscrypt-proxy/dnscrypt-resolvers.csv + curl -fSsL -o dnscrypt-resolvers.csv.minisig.tmp \ + https://download.dnscrypt.org/dnscrypt-proxy/dnscrypt-resolvers.csv.minisig + mv dnscrypt-resolvers.csv.minisig{.tmp,} + minisign -q -V -p ${upstreamResolverListPubKey} \ + -m dnscrypt-resolvers.csv.tmp -x dnscrypt-resolvers.csv.minisig + mv dnscrypt-resolvers.csv{.tmp,} + ''; + + serviceConfig = { + PrivateTmp = true; + PrivateDevices = true; + ProtectHome = true; + ProtectSystem = true; + }; + }; + + systemd.timers.update-dnscrypt-resolvers = optionalAttrs useUpstreamResolverList { + timerConfig = { + OnBootSec = "5min"; + OnUnitActiveSec = "6h"; + }; + wantedBy = [ "timers.target" ]; + }; + systemd.sockets.dnscrypt-proxy = { description = "dnscrypt-proxy listening socket"; socketConfig = { - ListenStream = "${localAddress}"; - ListenDatagram = "${localAddress}"; + ListenStream = localAddress; + ListenDatagram = localAddress; }; wantedBy = [ "sockets.target" ]; }; @@ -200,8 +263,13 @@ in systemd.services.dnscrypt-proxy = { description = "dnscrypt-proxy daemon"; - after = [ "network.target" ] ++ optional apparmorEnabled "apparmor.service"; - requires = [ "dnscrypt-proxy.socket "] ++ optional apparmorEnabled "apparmor.service"; + after = [ "network.target" ] + ++ optional apparmorEnabled "apparmor.service" + ++ optional useUpstreamResolverList "init-dnscrypt-proxy-statedir.service"; + + requires = [ "dnscrypt-proxy.socket "] + ++ optional apparmorEnabled "apparmor.service" + ++ optional useUpstreamResolverList "init-dnscrypt-proxy-statedir.service"; serviceConfig = { Type = "simple"; diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 926857a0ff4..578376764eb 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -10,7 +10,7 @@ let extip = "EXTIP=\$(${pkgs.curl.bin}/bin/curl -sf \"http://jsonip.com\" | ${pkgs.gawk}/bin/awk -F'\"' '{print $4}')"; - toYesNo = b: if b then "yes" else "no"; + toYesNo = b: if b then "true" else "false"; mkEndpointOpt = name: addr: port: { enable = mkEnableOption name; @@ -31,6 +31,17 @@ let }; }; + mkKeyedEndpointOpt = name: addr: port: keyFile: + (mkEndpointOpt name addr port) // { + keys = mkOption { + type = types.str; + default = ""; + description = '' + File to persist ${lib.toUpper name} keys. + ''; + }; + }; + commonTunOpts = let i2cpOpts = { length = mkOption { @@ -63,19 +74,49 @@ let }; } // mkEndpointOpt name "127.0.0.1" 0; - i2pdConf = pkgs.writeText "i2pd.conf" '' - ipv6 = ${toYesNo cfg.enableIPv6} - notransit = ${toYesNo cfg.notransit} - floodfill = ${toYesNo cfg.floodfill} - ${if isNull cfg.port then "" else "port = ${toString cfg.port}"} - ${flip concatMapStrings - (collect (proto: proto ? port && proto ? address && proto ? name) cfg.proto) - (proto: let portStr = toString proto.port; in '' - [${proto.name}] - address = ${proto.address} - port = ${toString proto.port} - enabled = ${toYesNo proto.enable} - '') + i2pdConf = pkgs.writeText "i2pd.conf" + '' + ipv4 = ${toYesNo cfg.enableIPv4} + ipv6 = ${toYesNo cfg.enableIPv6} + notransit = ${toYesNo cfg.notransit} + floodfill = ${toYesNo cfg.floodfill} + netid = ${toString cfg.netid} + ${if isNull cfg.bandwidth then "" else "bandwidth = ${toString cfg.bandwidth}" } + ${if isNull cfg.port then "" else "port = ${toString cfg.port}"} + + [limits] + transittunnels = ${toString cfg.limits.transittunnels} + + [upnp] + enabled = ${toYesNo cfg.upnp.enable} + name = ${cfg.upnp.name} + + [precomputation] + elgamal = ${toYesNo cfg.precomputation.elgamal} + + [reseed] + verify = ${toYesNo cfg.reseed.verify} + file = ${cfg.reseed.file} + urls = ${builtins.concatStringsSep "," cfg.reseed.urls} + + [addressbook] + defaulturl = ${cfg.addressbook.defaulturl} + subscriptions = ${builtins.concatStringsSep "," cfg.addressbook.subscriptions} + ${flip concatMapStrings + (collect (proto: proto ? port && proto ? address && proto ? name) cfg.proto) + (proto: let portStr = toString proto.port; in + '' + [${proto.name}] + enabled = ${toYesNo proto.enable} + address = ${proto.address} + port = ${toString proto.port} + ${if proto ? keys then "keys = ${proto.keys}" else ""} + ${if proto ? auth then "auth = ${toYesNo proto.auth}" else ""} + ${if proto ? user then "user = ${proto.user}" else ""} + ${if proto ? pass then "pass = ${proto.pass}" else ""} + ${if proto ? outproxy then "outproxy = ${proto.outproxy}" else ""} + ${if proto ? outproxyPort then "outproxyport = ${toString proto.outproxyPort}" else ""} + '') } ''; @@ -114,7 +155,7 @@ let i2pdSh = pkgs.writeScriptBin "i2pd" '' #!/bin/sh ${if isNull cfg.extIp then extip else ""} - ${pkgs.i2pd}/bin/i2pd --log=1 \ + ${pkgs.i2pd}/bin/i2pd \ --host=${if isNull cfg.extIp then "$EXTIP" else cfg.extIp} \ --conf=${i2pdConf} \ --tunconf=${i2pdTunnelConf} @@ -135,6 +176,8 @@ in default = false; description = '' Enables I2Pd as a running service upon activation. + Please read http://i2pd.readthedocs.io/en/latest/ for further + configuration help. ''; }; @@ -162,6 +205,22 @@ in ''; }; + netid = mkOption { + type = types.int; + default = 2; + description = '' + I2P overlay netid. + ''; + }; + + bandwidth = mkOption { + type = with types; nullOr int; + default = null; + description = '' + Set a router bandwidth limit integer in kbps or letters: L (32), O (256), P (2048), X (>9000) + ''; + }; + port = mkOption { type = with types; nullOr int; default = null; @@ -170,6 +229,14 @@ in ''; }; + enableIPv4 = mkOption { + type = types.bool; + default = true; + description = '' + Enables IPv4 connectivity. Enabled by default. + ''; + }; + enableIPv6 = mkOption { type = types.bool; default = false; @@ -178,16 +245,141 @@ in ''; }; - proto.http = mkEndpointOpt "http" "127.0.0.1" 7070; + upnp = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enables UPnP. + ''; + }; + + name = mkOption { + type = types.str; + default = "I2Pd"; + description = '' + Name i2pd appears in UPnP forwardings list. + ''; + }; + }; + + precomputation.elgamal = mkOption { + type = types.bool; + default = false; + description = '' + Use ElGamal precomputated tables. + ''; + }; + + reseed = { + verify = mkOption { + type = types.bool; + default = false; + description = '' + Request SU3 signature verification + ''; + }; + + file = mkOption { + type = types.str; + default = ""; + description = '' + Full path to SU3 file to reseed from + ''; + }; + + urls = mkOption { + type = with types; listOf str; + default = [ + "https://reseed.i2p-project.de/" + "https://i2p.mooo.com/netDb/" + "https://netdb.i2p2.no/" + "https://us.reseed.i2p2.no:444/" + "https://uk.reseed.i2p2.no:444/" + "https://i2p.manas.ca:8443/" + ]; + description = '' + Reseed URLs + ''; + }; + }; + + addressbook = { + defaulturl = mkOption { + type = types.str; + default = "http://joajgazyztfssty4w2on5oaqksz6tqoxbduy553y34mf4byv6gpq.b32.i2p/export/alive-hosts.txt"; + description = '' + AddressBook subscription URL for initial setup + ''; + }; + subscriptions = mkOption { + type = with types; listOf str; + default = [ + "http://inr.i2p/export/alive-hosts.txt" + "http://i2p-projekt.i2p/hosts.txt" + "http://stats.i2p/cgi-bin/newhosts.txt" + ]; + description = '' + AddressBook subscription URLs + ''; + }; + }; + + limits.transittunnels = mkOption { + type = types.int; + default = 2500; + description = '' + Maximum number of active transit sessions + ''; + }; + + proto.http = (mkEndpointOpt "http" "127.0.0.1" 7070) // { + auth = mkOption { + type = types.bool; + default = false; + description = '' + Enable authentication for webconsole. + ''; + }; + user = mkOption { + type = types.str; + default = "i2pd"; + description = '' + Username for webconsole access + ''; + }; + pass = mkOption { + type = types.str; + default = "i2pd"; + description = '' + Password for webconsole access. + ''; + }; + }; + + proto.httpProxy = mkKeyedEndpointOpt "httpproxy" "127.0.0.1" 4446 ""; + proto.socksProxy = (mkKeyedEndpointOpt "socksproxy" "127.0.0.1" 4447 "") + // { + outproxy = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "Upstream outproxy bind address."; + }; + outproxyPort = mkOption { + type = types.int; + default = 4444; + description = "Upstream outproxy bind port."; + }; + }; + proto.sam = mkEndpointOpt "sam" "127.0.0.1" 7656; proto.bob = mkEndpointOpt "bob" "127.0.0.1" 2827; + proto.i2cp = mkEndpointOpt "i2cp" "127.0.0.1" 7654; proto.i2pControl = mkEndpointOpt "i2pcontrol" "127.0.0.1" 7650; - proto.httpProxy = mkEndpointOpt "httpproxy" "127.0.0.1" 4446; - proto.socksProxy = mkEndpointOpt "socksproxy" "127.0.0.1" 4447; outTunnels = mkOption { default = {}; - type = with types; loaOf (submodule ( + type = with types; loaOf (submodule ( { name, config, ... }: { options = commonTunOpts name; config = { diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix index 99269c49e8f..3f0906fdb80 100644 --- a/nixos/modules/services/networking/quassel.nix +++ b/nixos/modules/services/networking/quassel.nix @@ -3,8 +3,8 @@ with lib; let - quassel = pkgs.kde4.quasselDaemon; cfg = config.services.quassel; + quassel = cfg.package; user = if cfg.user != null then cfg.user else "quassel"; in @@ -23,6 +23,15 @@ in ''; }; + package = mkOption { + type = types.package; + default = pkgs.kde4.quasselDaemon; + description = '' + The package of the quassel daemon. + ''; + example = pkgs.quasselDaemon; + }; + interfaces = mkOption { default = [ "127.0.0.1" ]; description = '' diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index 0c1f8d8cdb9..005655f111a 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -221,7 +221,7 @@ in type = types.string; default = '' + FPing - binary = ${pkgs.fping}/bin/fping + binary = ${config.security.wrapperDir}/fping ''; description = "Probe configuration"; }; @@ -284,10 +284,10 @@ in mkdir -m 0755 -p ${smokepingHome}/cache ${smokepingHome}/data rm -f ${smokepingHome}/cropper ln -s ${cfg.package}/htdocs/cropper ${smokepingHome}/cropper - chown -R ${cfg.user} ${smokepingHome} cp ${cgiHome} ${smokepingHome}/smokeping.fcgi ${cfg.package}/bin/smokeping --check --config=${configPath} ${cfg.package}/bin/smokeping --static --config=${configPath} + chown -R ${cfg.user} ${smokepingHome} ''; script = ''${cfg.package}/bin/smokeping --config=${configPath} --nodaemon''; }; diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index b26d30597b1..f8e68fda7fc 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -68,7 +68,7 @@ in interfaceType = mkOption { default = "tun"; - type = types.addCheck types.str (n: n == "tun" || n == "tap"); + type = types.enum [ "tun" "tap" ]; description = '' The type of virtual interface used for the network connection ''; diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix index 7ec484941ed..deff645d9bf 100644 --- a/nixos/modules/services/networking/vsftpd.nix +++ b/nixos/modules/services/networking/vsftpd.nix @@ -100,6 +100,10 @@ let seccomp_sandbox=NO ''} anon_umask=${cfg.anonymousUmask} + ${optionalString cfg.anonymousUser '' + anon_root=${cfg.anonymousUserHome} + ''} + ${cfg.extraConfig} ''; in @@ -163,6 +167,13 @@ in description = "Anonymous write umask."; }; + extraConfig = mkOption { + type = types.lines; + default = ""; + example = "ftpd_banner=Hello"; + description = "Extra configuration to add at the bottom of the generated configuration file."; + }; + } // (listToAttrs (catAttrs "nixosOption" optionDescription)); }; diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix index 676e82aa893..76ba78ff366 100644 --- a/nixos/modules/services/networking/znc.nix +++ b/nixos/modules/services/networking/znc.nix @@ -208,11 +208,10 @@ in networks = mkOption { default = { }; - type = types.loaOf types.optionSet; + type = with types; loaOf (submodule networkOpts); description = '' IRC networks to connect the user to. ''; - options = [ networkOpts ]; example = { "freenode" = { server = "chat.freenode.net"; diff --git a/nixos/modules/services/web-servers/fcgiwrap.nix b/nixos/modules/services/web-servers/fcgiwrap.nix index 2c5e433003c..a64a187255a 100644 --- a/nixos/modules/services/web-servers/fcgiwrap.nix +++ b/nixos/modules/services/web-servers/fcgiwrap.nix @@ -21,7 +21,7 @@ in { }; socketType = mkOption { - type = types.addCheck types.str (t: t == "unix" || t == "tcp" || t == "tcp6"); + type = types.enum [ "unix" "tcp" "tcp6" ]; default = "unix"; description = "Socket type: 'unix', 'tcp' or 'tcp6'."; }; diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 31412ae7014..144e4aada27 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -19,7 +19,8 @@ in # E.g., if KDE is enabled, it supersedes xterm. imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./kde5.nix - ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix + ./lumina.nix ./lxqt.nix ./enlightenment.nix ./gnome3.nix + ./kodi.nix ]; options = { diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixos/modules/services/x11/desktop-managers/lumina.nix new file mode 100644 index 00000000000..f0b31a2acb0 --- /dev/null +++ b/nixos/modules/services/x11/desktop-managers/lumina.nix @@ -0,0 +1,52 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + xcfg = config.services.xserver; + cfg = xcfg.desktopManager.lumina; + +in + +{ + options = { + + services.xserver.desktopManager.lumina.enable = mkOption { + type = types.bool; + default = false; + description = "Enable the Lumina desktop manager"; + }; + + }; + + + config = mkIf (xcfg.enable && cfg.enable) { + + services.xserver.desktopManager.session = singleton { + name = "lumina"; + start = '' + exec ${pkgs.lumina}/bin/start-lumina-desktop + ''; + }; + + environment.systemPackages = [ + pkgs.fluxbox + pkgs.kde5.kwindowsystem + pkgs.kde5.oxygen-icons5 + pkgs.lumina + pkgs.numlockx + pkgs.qt5.qtsvg + pkgs.xscreensaver + ]; + + # Link some extra directories in /run/current-system/software/share + environment.pathsToLink = [ + "/share/desktop-directories" + "/share/icons" + "/share/lumina" + "/share" + ]; + + }; +} diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index c3be7407d59..17c842ddc53 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -324,8 +324,7 @@ in fsIdentifier = mkOption { default = "uuid"; - type = types.addCheck types.str - (type: type == "uuid" || type == "label" || type == "provided"); + type = types.enum [ "uuid" "label" "provided" ]; description = '' Determines how GRUB will identify devices when generating the configuration file. A value of uuid / label signifies that grub diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index aae4dc5fdad..1faa8abd5f7 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -245,7 +245,7 @@ let virtualType = mkOption { default = null; - type = types.nullOr (types.addCheck types.str (v: v == "tun" || v == "tap")); + type = with types; nullOr (enum [ "tun" "tap" ]); description = '' The explicit type of interface to create. Accepts tun or tap strings. Also accepts null to implicitly detect the type of device. diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index ea503a9526f..5f669dee754 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -123,7 +123,7 @@ in { # config file. But this path can unfortunately be garbage collected # while still being used by the virtual machine. So update the # emulator path on each startup to something valid (re-scan $PATH). - for file in /etc/libvirt/qemu/*.xml /etc/libvirt/lxc/*.xml; do + for file in /var/lib/libvirt/qemu/*.xml /var/lib/libvirt/lxc/*.xml; do test -f "$file" || continue # get (old) emulator path from config file emulator=$(grep "^[[:space:]]*" "$file" | sed 's,^[[:space:]]*\(.*\).*,\1,') diff --git a/nixos/release.nix b/nixos/release.nix index fbd3efd16ff..639ee45b38d 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -275,6 +275,7 @@ in rec { tests.networkingProxy = callTest tests/networking-proxy.nix {}; tests.nfs3 = callTest tests/nfs.nix { version = 3; }; tests.nfs4 = callTest tests/nfs.nix { version = 4; }; + tests.leaps = callTest tests/leaps.nix { }; tests.nsd = callTest tests/nsd.nix {}; tests.openssh = callTest tests/openssh.nix {}; #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix index f61c82b916a..1cedf168dcb 100644 --- a/nixos/tests/cjdns.nix +++ b/nixos/tests/cjdns.nix @@ -57,6 +57,7 @@ import ./make-test.nix ({ pkgs, ...} : { connectTo."192.168.0.1:1024}" = { password = carolPassword; publicKey = carolPubKey; + hostname = "carol"; }; }; }; diff --git a/nixos/tests/dnscrypt-proxy.nix b/nixos/tests/dnscrypt-proxy.nix index b686e9582a7..26409949ec6 100644 --- a/nixos/tests/dnscrypt-proxy.nix +++ b/nixos/tests/dnscrypt-proxy.nix @@ -22,8 +22,6 @@ import ./make-test.nix ({ pkgs, ... }: { }; testScript = '' - $client->start; - $client->waitForUnit("sockets.target"); $client->waitForUnit("dnsmasq"); # The daemon is socket activated; sending a single ping should activate it. diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix index 787929f8904..7616a75b021 100644 --- a/nixos/tests/hibernate.nix +++ b/nixos/tests/hibernate.nix @@ -13,7 +13,7 @@ import ./make-test.nix (pkgs: { networking.firewall.allowedTCPPorts = [ 4444 ]; - systemd.services.listener.serviceConfig.ExecStart = "${pkgs.netcat}/bin/nc -l -p 4444"; + systemd.services.listener.serviceConfig.ExecStart = "${pkgs.netcat}/bin/nc -l 4444"; }; probe = { config, lib, pkgs, ...}: { @@ -36,7 +36,7 @@ import ./make-test.nix (pkgs: { $machine->waitForShutdown; $machine->start; $probe->waitForUnit("network.target"); - $probe->waitUntilSucceeds("echo test | nc -c machine 4444"); + $probe->waitUntilSucceeds("echo test | nc machine 4444"); ''; }) diff --git a/nixos/tests/leaps.nix b/nixos/tests/leaps.nix new file mode 100644 index 00000000000..3c390e1a169 --- /dev/null +++ b/nixos/tests/leaps.nix @@ -0,0 +1,29 @@ +import ./make-test.nix ({ pkgs, ... }: + +{ + name = "leaps"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ qknight ]; + }; + + nodes = + { + client = { }; + + server = + { services.leaps = { + enable = true; + port = 6666; + path = "/leaps/"; + }; + networking.firewall.enable = false; + }; + }; + + testScript = + '' + startAll; + $server->waitForOpenPort(6666); + $client->succeed("curl http://server:6666/leaps/ | grep -i 'leaps'"); + ''; +}) diff --git a/nixos/tests/mpich.nix b/nixos/tests/mpich.nix deleted file mode 100644 index a28e41deb31..00000000000 --- a/nixos/tests/mpich.nix +++ /dev/null @@ -1,41 +0,0 @@ -# Simple example to showcase distributed tests using NixOS VMs. - -import ./make-test.nix ({ pkgs, ...} : { - name = "mpich"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco chaoflow ]; - }; - - nodes = { - master = - { config, pkgs, ... }: { - environment.systemPackages = [ gcc mpich2 ]; - #boot.kernelPackages = pkgs.kernelPackages_2_6_29; - }; - - slave = - { config, pkgs, ... }: { - environment.systemPackages = [ gcc mpich2 ]; - }; - }; - - # Start master/slave MPI daemons and compile/run a program that uses both - # nodes. - testScript = - '' - startAll; - - $master->succeed("echo 'MPD_SECRETWORD=secret' > /etc/mpd.conf"); - $master->succeed("chmod 600 /etc/mpd.conf"); - $master->succeed("mpd --daemon --ifhn=master --listenport=4444"); - - $slave->succeed("echo 'MPD_SECRETWORD=secret' > /etc/mpd.conf"); - $slave->succeed("chmod 600 /etc/mpd.conf"); - $slave->succeed("mpd --daemon --host=master --port=4444"); - - $master->succeed("mpicc -o example -Wall ${./mpich-example.c}"); - $slave->succeed("mpicc -o example -Wall ${./mpich-example.c}"); - - $master->succeed("mpiexec -n 2 ./example >&2"); - ''; -}) diff --git a/nixos/tests/test-config-examples.sh b/nixos/tests/test-config-examples.sh deleted file mode 100755 index 1ba2f841c41..00000000000 --- a/nixos/tests/test-config-examples.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -# This script try to evaluate all configurations which are stored in -# doc/config-examples. This script is useful to ensure that examples are -# working with the current system. - -pwd=$(pwd) -set -xe -for i in ../doc/config-examples/*.nix; do - NIXOS_CONFIG="$pwd/$i" nix-instantiate \ - --eval-only --xml --strict > /dev/null 2>&1 \ - ../default.nix -A system -done -set +xe diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 02a8fc68028..376c4f21dc0 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -299,9 +299,9 @@ let -pf /run/dhclient.pid \ -v eth0 eth1 - otherIP="$(${pkgs.netcat}/bin/netcat -clp 1234 || :)" + otherIP="$(${pkgs.netcat}/bin/nc -l 1234 || :)" ${pkgs.iputils}/bin/ping -I eth1 -c1 "$otherIP" - echo "$otherIP reachable" | ${pkgs.netcat}/bin/netcat -clp 5678 || : + echo "$otherIP reachable" | ${pkgs.netcat}/bin/nc -l 5678 || : ''; sysdDetectVirt = pkgs: '' @@ -461,11 +461,11 @@ in mapAttrs mkVBoxTest { my $test1IP = waitForIP_test1 1; my $test2IP = waitForIP_test2 1; - $machine->succeed("echo '$test2IP' | netcat -c '$test1IP' 1234"); - $machine->succeed("echo '$test1IP' | netcat -c '$test2IP' 1234"); + $machine->succeed("echo '$test2IP' | nc '$test1IP' 1234"); + $machine->succeed("echo '$test1IP' | nc '$test2IP' 1234"); - $machine->waitUntilSucceeds("netcat -c '$test1IP' 5678 >&2"); - $machine->waitUntilSucceeds("netcat -c '$test2IP' 5678 >&2"); + $machine->waitUntilSucceeds("nc '$test1IP' 5678 >&2"); + $machine->waitUntilSucceeds("nc '$test2IP' 5678 >&2"); shutdownVM_test1; shutdownVM_test2; diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index 40d82914bf7..c6490cf67df 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -6,14 +6,14 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version; - core_version = "0.13.0"; + core_version = "0.13.1"; version = core_version; src = fetchurl { urls = [ "https://bitcoin.org/bin/bitcoin-core-${core_version}/bitcoin-${version}.tar.gz" "mirror://sourceforge/bitcoin/Bitcoin/bitcoin-${core_version}/bitcoin-${version}.tar.gz" ]; - sha256 = "0c7d7049689bb17f4256f1e5ec20777f42acef61814d434b38e6c17091161cda"; + sha256 = "d8edbd797ff1c8266113e54d851a85def46ab82389abe7d7bd0d2827e74cecd7"; }; buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib diff --git a/pkgs/applications/audio/VoiceOfFaust/default.nix b/pkgs/applications/audio/VoiceOfFaust/default.nix deleted file mode 100644 index 17cb680c58c..00000000000 --- a/pkgs/applications/audio/VoiceOfFaust/default.nix +++ /dev/null @@ -1,65 +0,0 @@ - -{ stdenv, pkgs, callPackage, fetchFromGitHub, faust2jack, helmholtz, mrpeach, puredata-with-plugins }: -stdenv.mkDerivation rec { - name = "VoiceOfFaust-${version}"; - version = "0.7"; - - src = fetchFromGitHub { - owner = "magnetophon"; - repo = "VoiceOfFaust"; - rev = "v${version}"; - sha256 = "14jjs7cnhg20pzijgblr7caspcpx8p8lpkbvjzc656s9lqn6m9sn"; - }; - - plugins = [ helmholtz mrpeach ]; - - pitchTracker = puredata-with-plugins plugins; - - buildInputs = [ faust2jack ]; - - runtimeInputs = [ pitchTracker ]; - - patchPhase = '' - sed -i "s@pd -nodac@${pitchTracker}/bin/pd -nodac@g" launchers/synthWrapper - sed -i "s@../PureData/OscSendVoc.pd@$out/PureData/OscSendVoc.pd@g" launchers/synthWrapper - ''; - - buildPhase = '' - faust2jack -osc classicVocoder.dsp - faust2jack -osc CZringmod.dsp - faust2jack -osc FMsinger.dsp - faust2jack -osc FOFvocoder.dsp - faust2jack -osc Karplus-StrongSinger.dsp - faust2jack -osc -sch -t 99999 Karplus-StrongSingerMaxi.dsp - faust2jack -osc PAFvocoder.dsp - faust2jack -osc -sch -t 99999 stringSinger.dsp - faust2jack -osc subSinger.dsp - # doesn't compile on most systems, too big: - #faust2jack -osc -sch -t 99999 VocSynthFull.dsp - ''; - - installPhase = '' - mkdir -p $out/bin - cp launchers/* $out/bin/ - cp classicVocoder $out/bin/ - cp CZringmod $out/bin/ - cp FMsinger $out/bin/ - cp FOFvocoder $out/bin/ - cp Karplus-StrongSinger $out/bin/ - cp Karplus-StrongSingerMaxi $out/bin/ - cp PAFvocoder $out/bin/ - cp stringSinger $out/bin/ - cp subSinger $out/bin/ - #cp VocSynthFull $out/bin/ - mkdir $out/PureData/ - cp PureData/OscSendVoc.pd $out/PureData/OscSendVoc.pd - ''; - - meta = { - description = "Turn your voice into a synthesizer"; - homepage = https://github.com/magnetophon/VoiceOfFaust; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - }; -} - diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index 95f86ad60ad..39946fd5c7d 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/pkgs/applications/audio/airwave/default.nix @@ -4,13 +4,13 @@ let - version = "1.3.2"; + version = "1.3.3"; airwave-src = fetchFromGitHub { owner = "phantom-code"; repo = "airwave"; rev = version; - sha256 = "053kkx5yq1vas0qisidkgq0h6hzfwy3677jprjkcrwc4hp2i2v12"; + sha256 = "1ban59skw422mak3cp57lj27hgq5d3a4f6y79ysjnamf8rpz9x4s"; }; stdenv_multi = overrideCC stdenv gcc_multi; @@ -60,6 +60,9 @@ stdenv_multi.mkDerivation { # shrinking. dontPatchELF = true; + # Cf. https://github.com/phantom-code/airwave/issues/57 + hardeningDisable = [ "format" ]; + cmakeFlags = "-DVSTSDK_PATH=${vst-sdk}"; postInstall = '' diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index b7ea32cd1d4..ab228766e13 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { patchShebangs ./tools/ ''; - configurePhase = "${python2.interpreter} waf configure --optimize --docs --with-backends=jack,alsa --prefix=$out"; + configurePhase = "${python2.interpreter} waf configure --optimize --docs --with-backends=jack,alsa,dummy --prefix=$out"; buildPhase = "${python2.interpreter} waf"; diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index b31cecffbd1..cc96f6dbbb3 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, wxGTK30, pkgconfig, gettext, gtk2, glib, zlib, perl, intltool, - libogg, libvorbis, libmad, alsaLib, libsndfile, soxr, flac, lame, fetchpatch, + libogg, libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame, fetchpatch, expat, libid3tag, ffmpeg, soundtouch /*, portaudio - given up fighting their portaudio.patch */ }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gettext wxGTK30 expat alsaLib - libsndfile soxr libid3tag gtk2 + libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil gtk2 ffmpeg libmad lame libvorbis flac soundtouch ]; #ToDo: detach sbsms diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix index 3488d8fb38f..04f0f9d3025 100644 --- a/pkgs/applications/audio/caudec/default.nix +++ b/pkgs/applications/audio/caudec/default.nix @@ -34,6 +34,5 @@ stdenv.mkDerivation rec { description = "A multiprocess audio converter that supports many formats (FLAC, MP3, Ogg Vorbis, Windows codecs and many more)"; license = licenses.gpl3; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ hiberno ]; }; } diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix index 8749497c8ba..b9e98281a7c 100644 --- a/pkgs/applications/audio/faust/faust1.nix +++ b/pkgs/applications/audio/faust/faust1.nix @@ -9,11 +9,11 @@ with stdenv.lib.strings; let - version = "0.9.73"; + version = "0.9.90"; src = fetchurl { url = "mirror://sourceforge/project/faudiostream/faust-${version}.tgz"; - sha256 = "0x2scxkwvvjx7b7smj5xb8kr269qakf49z3fxpasd9g7025q44k5"; + sha256 = "0d1fqwymyfb73zkmpwv4zk4gsg4ji7qs20mfsr20skmnqx30xvna"; }; meta = with stdenv.lib; { @@ -167,7 +167,8 @@ let # export parts of the build environment for script in "$out"/bin/*; do wrapProgram "$script" \ - --set FAUST_LIB_PATH "${faust}/lib/faust" \ + --set FAUSTLIB "${faust}/lib/faust" \ + --set FAUSTINC "${faust}/include/faust" \ --prefix PATH : "$PATH" \ --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \ --set NIX_CFLAGS_COMPILE "$NIX_CFLAGS_COMPILE" \ diff --git a/pkgs/applications/audio/faust/faust1git.nix b/pkgs/applications/audio/faust/faust1git.nix deleted file mode 100644 index 94e58f22428..00000000000 --- a/pkgs/applications/audio/faust/faust1git.nix +++ /dev/null @@ -1,210 +0,0 @@ -{ stdenv -, coreutils -, fetchgit -, makeWrapper -, pkgconfig -}: - -with stdenv.lib.strings; - -let - - version = "2016-07-19"; - - src = fetchgit { - url = "git://git.code.sf.net/p/faudiostream/code"; - rev = "16c22dc0193c10521b1dc16f98443d9c206bb5dd"; - sha256 = "01rbcjfhpd5casi72ffi1j95f65ji60l629sgav93pvs0kpdacz5"; - }; - - meta = with stdenv.lib; { - homepage = http://faust.grame.fr/; - downloadPage = http://sourceforge.net/projects/faudiostream/files/; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ magnetophon pmahoney ]; - }; - - faust = stdenv.mkDerivation { - - name = "faust-${version}"; - - inherit src; - - buildInputs = [ makeWrapper ]; - - passthru = { - inherit wrap wrapWithBuildEnv; - }; - - preConfigure = '' - makeFlags="$makeFlags prefix=$out" - - # The faust makefiles use 'system ?= $(shell uname -s)' but nix - # defines 'system' env var, so undefine that so faust detects the - # correct system. - unset system - ''; - - # Remove most faust2appl scripts since they won't run properly - # without additional paths setup. See faust.wrap, - # faust.wrapWithBuildEnv. - postInstall = '' - # syntax error when eval'd directly - pattern="faust2!(svg)" - (shopt -s extglob; rm "$out"/bin/$pattern) - ''; - - postFixup = '' - # Set faustpath explicitly. - substituteInPlace "$out"/bin/faustpath \ - --replace "/usr/local /usr /opt /opt/local" "$out" - - # The 'faustoptflags' is 'source'd into other faust scripts and - # not used as an executable, so patch 'uname' usage directly - # rather than use makeWrapper. - substituteInPlace "$out"/bin/faustoptflags \ - --replace uname "${coreutils}/bin/uname" - - # wrapper for scripts that don't need faust.wrap* - for script in "$out"/bin/faust2*; do - wrapProgram "$script" \ - --prefix PATH : "$out"/bin - done - ''; - - meta = meta // { - description = "A functional programming language for realtime audio signal processing"; - longDescription = '' - FAUST (Functional Audio Stream) is a functional programming - language specifically designed for real-time signal processing - and synthesis. FAUST targets high-performance signal processing - applications and audio plug-ins for a variety of platforms and - standards. - The Faust compiler translates DSP specifications into very - efficient C++ code. Thanks to the notion of architecture, - FAUST programs can be easily deployed on a large variety of - audio platforms and plugin formats (jack, alsa, ladspa, maxmsp, - puredata, csound, supercollider, pure, vst, coreaudio) without - any change to the FAUST code. - - This package has just the compiler, libraries, and headers. - Install faust2* for specific faust2appl scripts. - ''; - }; - - }; - - # Default values for faust2appl. - faust2ApplBase = - { baseName - , dir ? "tools/faust2appls" - , scripts ? [ baseName ] - , ... - }@args: - - args // { - name = "${baseName}-${version}"; - - inherit src; - - configurePhase = ":"; - - buildPhase = ":"; - - installPhase = '' - runHook preInstall - - mkdir -p "$out/bin" - for script in ${concatStringsSep " " scripts}; do - cp "${dir}/$script" "$out/bin/" - done - - runHook postInstall - ''; - - postInstall = '' - # For the faust2appl script, change 'faustpath' and - # 'faustoptflags' to absolute paths. - for script in "$out"/bin/*; do - substituteInPlace "$script" \ - --replace ". faustpath" ". '${faust}/bin/faustpath'" \ - --replace ". faustoptflags" ". '${faust}/bin/faustoptflags'" - done - ''; - - meta = meta // { - description = "The ${baseName} script, part of faust functional programming language for realtime audio signal processing"; - }; - }; - - # Some 'faust2appl' scripts, such as faust2alsa, run faust to - # generate cpp code, then invoke the c++ compiler to build the code. - # This builder wraps these scripts in parts of the stdenv such that - # when the scripts are called outside any nix build, they behave as - # if they were running inside a nix build in terms of compilers and - # paths being configured (e.g. rpath is set so that compiled - # binaries link to the libs inside the nix store) - # - # The function takes two main args: the appl name (e.g. - # 'faust2alsa') and an optional list of propagatedBuildInputs. It - # returns a derivation that contains only the bin/${appl} script, - # wrapped up so that it will run as if it was inside a nix build - # with those build inputs. - # - # The build input 'faust' is automatically added to the - # propagatedBuildInputs. - wrapWithBuildEnv = - { baseName - , propagatedBuildInputs ? [ ] - , ... - }@args: - - stdenv.mkDerivation ((faust2ApplBase args) // { - - buildInputs = [ makeWrapper pkgconfig ]; - - propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; - - postFixup = '' - - # export parts of the build environment - for script in "$out"/bin/*; do - wrapProgram "$script" \ - --set FAUSTLIB "${faust}/lib/faust" \ - --set FAUSTINC "${faust}/include/faust" \ - --prefix PATH : "$PATH" \ - --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \ - --set NIX_CFLAGS_COMPILE "$NIX_CFLAGS_COMPILE" \ - --set NIX_LDFLAGS "$NIX_LDFLAGS" - done - ''; - }); - - # Builder for 'faust2appl' scripts, such as faust2firefox that - # simply need to be wrapped with some dependencies on PATH. - # - # The build input 'faust' is automatically added to the PATH. - wrap = - { baseName - , runtimeInputs ? [ ] - , ... - }@args: - - let - - runtimePath = concatStringsSep ":" (map (p: "${p}/bin") ([ faust ] ++ runtimeInputs)); - - in stdenv.mkDerivation ((faust2ApplBase args) // { - - buildInputs = [ makeWrapper ]; - - postFixup = '' - for script in "$out"/bin/*; do - wrapProgram "$script" --prefix PATH : "${runtimePath}" - done - ''; - - }); - -in faust diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 24cab4cdbcd..6289688c53c 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -16,11 +16,11 @@ with stdenv.lib.strings; let - version = "2.0-a41"; + version = "2.0.a51"; src = fetchurl { - url = "mirror://sourceforge/project/faudiostream/faust-2.0.a41.tgz"; - sha256 = "1cq4x1cax0lswrcqv0limx5mjdi3187zlmh7cj2pndr0xq6b96cm"; + url = "mirror://sourceforge/project/faudiostream/faust-${version}.tgz"; + sha256 = "1yryjqfqmxs7lxy95hjgmrncvl9kig3rcsmg0v49ghzz7vs7haxf"; }; meta = with stdenv.lib; { @@ -53,7 +53,7 @@ let # defines 'system' env var, so undefine that so faust detects the # correct system. unset system - sed -e "232s/LLVM_STATIC_LIBS/LLVMLIBS/" -i compiler/Makefile.unix + # sed -e "232s/LLVM_STATIC_LIBS/LLVMLIBS/" -i compiler/Makefile.unix # The makefile sets LLVM_ depending on the current llvm # version, but the detection code is quite brittle. @@ -67,7 +67,7 @@ let # # For now, fix this by 1) pinning the llvm version; 2) manually setting LLVM_VERSION # to something the makefile will recognize. - sed '52iLLVM_VERSION=3.7.0' -i compiler/Makefile.unix + sed '52iLLVM_VERSION=3.8.0' -i compiler/Makefile.unix ''; # Remove most faust2appl scripts since they won't run properly @@ -151,7 +151,8 @@ let for script in "$out"/bin/*; do substituteInPlace "$script" \ --replace ". faustpath" ". '${faust}/bin/faustpath'" \ - --replace ". faustoptflags" ". '${faust}/bin/faustoptflags'" + --replace ". faustoptflags" ". '${faust}/bin/faustoptflags'" \ + --replace " error " "echo" done ''; @@ -193,7 +194,9 @@ let # export parts of the build environment for script in "$out"/bin/*; do wrapProgram "$script" \ + --set FAUSTLIB "${faust}/lib/faust" \ --set FAUST_LIB_PATH "${faust}/lib/faust" \ + --set FAUSTINC "${faust}/include/faust" \ --prefix PATH : "$PATH" \ --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \ --set NIX_CFLAGS_COMPILE "$NIX_CFLAGS_COMPILE" \ diff --git a/pkgs/applications/audio/faust/faust2lv2.nix b/pkgs/applications/audio/faust/faust2lv2.nix index 4d11395e738..3472ce5047e 100644 --- a/pkgs/applications/audio/faust/faust2lv2.nix +++ b/pkgs/applications/audio/faust/faust2lv2.nix @@ -1,11 +1,14 @@ -{ faust +{ boost +, faust , lv2 +, qt4 + }: faust.wrapWithBuildEnv { baseName = "faust2lv2"; - propagatedBuildInputs = [ lv2 ]; + propagatedBuildInputs = [ boost lv2 qt4 ]; } diff --git a/pkgs/applications/audio/faust/faust2lv2gui.nix b/pkgs/applications/audio/faust/faust2lv2gui.nix deleted file mode 100644 index af20bb1d745..00000000000 --- a/pkgs/applications/audio/faust/faust2lv2gui.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ boost -, faust1git -, lv2 -, qt4 - -}: - -faust1git.wrapWithBuildEnv { - - baseName = "faust2lv2"; - - propagatedBuildInputs = [ boost lv2 qt4 ]; - -} diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix index a75de090033..2ee03a3f399 100644 --- a/pkgs/applications/audio/fldigi/default.nix +++ b/pkgs/applications/audio/fldigi/default.nix @@ -2,13 +2,13 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "3.23.07"; + version = "3.23.15"; pname = "fldigi"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "0v78sk9bllxw640wxd4q2qy0h8z2j1d077nxhmpkjpf6mn6vwcda"; + sha256 = "1nxafk99fr6yb09cq3vdpzjcd85mnjwwl8rzccx21kla1ysihl5m"; }; buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio diff --git a/pkgs/applications/audio/fmsynth/default.nix b/pkgs/applications/audio/fmsynth/default.nix new file mode 100644 index 00000000000..22944ffefe4 --- /dev/null +++ b/pkgs/applications/audio/fmsynth/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitHub, gtkmm2, lv2, lvtk, pkgconfig }: +stdenv.mkDerivation rec { + name = "fmsynth-unstable-${version}"; + version = "2015-02-07"; + src = fetchFromGitHub { + owner = "Themaister"; + repo = "libfmsynth"; + rev = "9ffa1d2fea287f1209b210d2dbde2f0f60f37176"; + sha256 = "1bk0bpr069hzx2508rgfbwpxiqgr7dmdkhqdywmd2i4rmibgrm1q"; + }; + + buildInputs = [ gtkmm2 lv2 lvtk pkgconfig ]; + + buildPhase = '' + cd lv2 + substituteInPlace GNUmakefile --replace "/usr/lib/lv2" "$out/lib/lv2" + make + ''; + + preInstall = "mkdir -p $out/lib/lv2"; + + meta = { + description = "a flexible 8 operator FM synthesizer for LV2"; + longDescription = '' + The synth core supports: + + - Arbitrary amounts of polyphony + - 8 operators + - No fixed "algorithms" + - Arbitrary modulation, every operator can modulate any other operator, even itself + - Arbitrary carrier selection, every operator can be a carrier + - Sine LFO, separate LFO per voice, modulates amplitude and frequency of operators + - Envelope per operator + - Carrier stereo panning + - Velocity sensitivity per operator + - Mod wheel sensitivity per operator + - Pitch bend + - Keyboard scaling + - Sustain, sustained keys can overlap each other for a very rich sound + - Full floating point implementation optimized for SIMD + - Hard real-time constraints + ''; + homepage = https://github.com/Themaister/libfmsynth; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix index 4ccbb425612..073d28ef870 100644 --- a/pkgs/applications/audio/foo-yc20/default.nix +++ b/pkgs/applications/audio/foo-yc20/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { postInstallFixup = "rm -rf $out/lib/lv2"; meta = { + broken = true; # see: https://github.com/sampov2/foo-yc20/issues/7 description = "A Faust implementation of a 1969 designed Yamaha combo organ, the YC-20"; homepage = https://github.com/sampov2/foo-yc20; license = "BSD"; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 4fd68742ba2..e0bca0fa1c8 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -12,11 +12,11 @@ in stdenv.mkDerivation rec { name = "guitarix-${version}"; - version = "0.35.1"; + version = "0.35.2"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz"; - sha256 = "066qva1zk63qw60s0vbi9g9jh22ljw67p91pk82kv11gw24h3vg6"; + sha256 = "1qj3adjhg511jygbjkl9k5v0gcjmg6ifc479rspfyf45m383pp3p"; }; nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python ]; diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix index b4cf0288672..712f309fad0 100644 --- a/pkgs/applications/audio/helm/default.nix +++ b/pkgs/applications/audio/helm/default.nix @@ -1,15 +1,16 @@ - { stdenv, fetchurl, xorg, freetype, alsaLib, libjack2 + { stdenv, fetchFromGitHub , xorg, freetype, alsaLib, libjack2 , lv2, pkgconfig, mesa }: stdenv.mkDerivation rec { - version = "0.6.1"; + version = "0.8.6"; name = "helm-${version}"; - src = fetchurl { - url = "https://github.com/mtytel/helm/archive/v${version}.tar.gz"; - sha256 = "18d7zx6r7har47zj6x1f2z91x796mxnix7w3x1yilmqnyqc56r3w"; - }; - + src = fetchFromGitHub { + owner = "mtytel"; + repo = "helm"; + rev = "19f86e6b4db83c1c6b143fc27883592ac4e43489"; + sha256 = "0a46wnbfqkns8l136v79rr9gv4hhba065igjwkjddf045c9l94l8"; + }; buildInputs = [ xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext @@ -17,11 +18,18 @@ freetype alsaLib libjack2 pkgconfig mesa lv2 ]; + CXXFLAGS = "-DHAVE_LROUND"; + + patchPhase = '' + sed -i 's|usr/||g' Makefile + ''; + + buildPhase = '' + make lv2 + ''; + installPhase = '' - mkdir -p $out/bin - mkdir -p $out/lib/lv2 - cp -a standalone/builds/linux/build/* $out/bin - cp -a builds/linux/LV2/* $out/lib/lv2/ + make DESTDIR="$out" install ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index 9a336576d3a..68990b11ef0 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchsvn, boost, ganv, glibmm, gtkmm2, libjack2, lilv-svn -, lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord-svn, sratom +{ stdenv, fetchgit, boost, ganv, glibmm, gtk2, gtkmm2, libjack2, lilv +, lv2Unstable, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom , suil }: stdenv.mkDerivation rec { - name = "ingen-svn-${rev}"; - rev = "5675"; + name = "ingen-unstable-${rev}"; + rev = "2016-10-29"; - src = fetchsvn { - url = "http://svn.drobilla.net/lad/trunk/ingen"; - rev = rev; - sha256 = "1dk56rzbc0rwlbzr90rv8bh5163xwld32nmkvcz7ajfchi4fnv86"; + src = fetchgit { + url = "http://git.drobilla.net/cgit.cgi/ingen.git"; + rev = "fd147d0b888090bfb897505852c1f25dbdf77e18"; + sha256 = "1qmg79962my82c43vyrv5sxbqci9c7gc2s9bwaaqd0fcf08xcz1z"; }; buildInputs = [ - boost ganv glibmm gtkmm2 libjack2 lilv-svn lv2 makeWrapper pkgconfig - python raul serd sord-svn sratom suil + boost ganv glibmm gtk2 gtkmm2 libjack2 lilv lv2Unstable makeWrapper pkgconfig + python raul serd sord sratom suil ]; configurePhase = '' diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix index b563c850d52..1b68caccf4e 100644 --- a/pkgs/applications/audio/ladspa-plugins/default.nix +++ b/pkgs/applications/audio/ladspa-plugins/default.nix @@ -1,22 +1,29 @@ -{ stdenv, fetchurl, fftw, ladspaH, pkgconfig }: +{ stdenv, fetchurl, autoreconfHook, automake, fftw, ladspaH, libxml2, pkgconfig +, perlPackages }: + +stdenv.mkDerivation rec { + name = "swh-plugins-${version}"; + version = "0.4.17"; -stdenv.mkDerivation { - name = "swh-plugins-0.4.15"; src = fetchurl { - url = http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz; - sha256 = "0h462s4mmqg4iw7zdsihnrmz2vjg0fd49qxw2a284bnryjjfhpnh"; + url = "https://github.com/swh/ladspa/archive/v${version}.tar.gz"; + sha256 = "1rqwh8xrw6hnp69dg4gy336bfbfpmbx4fjrk0nb8ypjcxkz91c6i"; }; - - buildInputs = [fftw ladspaH pkgconfig]; - postInstall = - '' - mkdir -p $out/share/ladspa/ - ln -sv $out/lib/ladspa $out/share/ladspa/lib - ''; + buildInputs = [ autoreconfHook fftw ladspaH libxml2 pkgconfig perlPackages.perl perlPackages.XMLParser ]; - meta = { + patchPhase = '' + patchShebangs . + patchShebangs ./metadata/ + cp ${automake}/share/automake-*/mkinstalldirs . + ''; + + meta = with stdenv.lib; { + homepage = http://plugin.org.uk/; description = "LADSPA format audio plugins"; + license = licenses.gpl2; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/ladspa-plugins/git.nix b/pkgs/applications/audio/ladspa-plugins/git.nix deleted file mode 100644 index ef34eb91600..00000000000 --- a/pkgs/applications/audio/ladspa-plugins/git.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchgit, autoreconfHook, automake, fftw, ladspaH, libxml2, pkgconfig -, perl, perlPackages }: - -stdenv.mkDerivation { - name = "swh-plugins-git-2015-03-04"; - - src = fetchgit { - url = https://github.com/swh/ladspa.git; - rev = "4b8437e8037cace3d5bf8ce6d1d1da0182aba686"; - sha256 = "1rmqm4780dhp0pj2scl3k7m8hpp1x6w6ln4wwg954zb9570rqaxx"; - }; - - buildInputs = [ autoreconfHook fftw ladspaH libxml2 pkgconfig perl perlPackages.XMLParser ]; - - patchPhase = '' - patchShebangs . - patchShebangs ./metadata/ - cp ${automake}/share/automake-*/mkinstalldirs . - ''; - - meta = with stdenv.lib; { - homepage = http://plugin.org.uk/; - description = "LADSPA format audio plugins"; - license = licenses.gpl2; - maintainers = [ maintainers.magnetophon ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/audio/CharacterCompressor/default.nix b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix similarity index 77% rename from pkgs/applications/audio/CharacterCompressor/default.nix rename to pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix index 8e50a6f1744..206754a5195 100644 --- a/pkgs/applications/audio/CharacterCompressor/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }: +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { name = "CharacterCompressor-${version}"; - version = "0.3.1"; + version = "0.3.3"; src = fetchFromGitHub { owner = "magnetophon"; repo = "CharacterCompressor"; rev = "V${version}"; - sha256 = "0ci27v5k10prsmcd0g6q5vhr31mz8hsmrsdk436vfbcv3s108rcc"; + sha256 = "1h0bhjhx023476gbijq842b6f8z71zcyn4c9mddwyb18w9cdamp5"; }; - buildInputs = [ faust2jaqt faust2lv2gui ]; + buildInputs = [ faust2jaqt faust2lv2 ]; buildPhase = '' faust2jaqt -vec -time -t 99999 CharacterCompressor.dsp - faust2lv2 -vec -time -gui -t 99999 CharacterCompressor.dsp faust2jaqt -vec -time -t 99999 CharacterCompressorMono.dsp + sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "lib/CharacterCompressor.lib" + faust2lv2 -vec -time -gui -t 99999 CharacterCompressor.dsp faust2lv2 -vec -time -gui -t 99999 CharacterCompressorMono.dsp ''; diff --git a/pkgs/applications/audio/CompBus/default.nix b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix similarity index 60% rename from pkgs/applications/audio/CompBus/default.nix rename to pkgs/applications/audio/magnetophonDSP/CompBus/default.nix index 25175f27162..467e11daaf6 100644 --- a/pkgs/applications/audio/CompBus/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix @@ -1,22 +1,28 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }: +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { name = "CompBus-${version}"; - version = "1.1.02"; + version = "1.1.1"; src = fetchFromGitHub { owner = "magnetophon"; repo = "CompBus"; - rev = "v${version}"; - sha256 = "025vi60caxk3j2vxxrgbc59xlyr88vgn7k3127s271zvpyy7apwh"; + rev = "V${version}"; + sha256 = "0yhj680zgk4dn4fi8j3apm72f3z2mjk12amf2a7p0lwn9iyh4a2z"; }; - buildInputs = [ faust2jaqt faust2lv2gui ]; + buildInputs = [ faust2jaqt faust2lv2 ]; buildPhase = '' for f in *.dsp; do - faust2jaqt -t 99999 $f - faust2lv2 -gui -t 99999 $f + faust2jaqt -time -vec -double -t 99999 $f + done + + sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "CompBus.lib" + + for f in *.dsp; + do + faust2lv2 -time -vec -double -gui -t 99999 $f done ''; diff --git a/pkgs/applications/audio/constant-detune-chorus/default.nix b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix similarity index 62% rename from pkgs/applications/audio/constant-detune-chorus/default.nix rename to pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix index 0f53d125911..b452d91426e 100644 --- a/pkgs/applications/audio/constant-detune-chorus/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }: +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { name = "constant-detune-chorus-${version}"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "magnetophon"; repo = "constant-detune-chorus"; - rev = "v${version}"; - sha256 = "1ks2k6pflqyi2cs26bnbypphyrrgn0xf31l31kgx1qlilyc57vln"; + rev = "V${version}"; + sha256 = "1sipmc25fr7w7xqx1r0y6i2zwfkgszzwvhk1v15mnsb3cqvk8ybn"; }; - buildInputs = [ faust2jaqt faust2lv2gui ]; + buildInputs = [ faust2jaqt faust2lv2 ]; buildPhase = '' - faust2jaqt -t 99999 ConstantDetuneChorus.dsp - faust2lv2 -gui -t 99999 ConstantDetuneChorus.dsp + faust2jaqt -time -vec -t 99999 ConstantDetuneChorus.dsp + sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "ConstantDetuneChorus.dsp" + faust2lv2 -time -vec -t 99999 -gui ConstantDetuneChorus.dsp ''; installPhase = '' diff --git a/pkgs/applications/audio/LazyLimiter/default.nix b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix similarity index 59% rename from pkgs/applications/audio/LazyLimiter/default.nix rename to pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix index 16aca9c3d32..d1959ec3ceb 100644 --- a/pkgs/applications/audio/LazyLimiter/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }: +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { name = "LazyLimiter-${version}"; - version = "0.3.01"; + version = "0.3.2"; src = fetchFromGitHub { owner = "magnetophon"; repo = "LazyLimiter"; - rev = "v${version}"; - sha256 = "1yx9d5cakmqbiwb1j9v2af9h5lqzahl3kaamnyk71cf4i8g7zp3l"; + rev = "V${version}"; + sha256 = "10xdydwmsnkx8hzsm74pa546yahp29wifydbc48yywv3sfj5anm7"; }; - buildInputs = [ faust2jaqt faust2lv2gui ]; + buildInputs = [ faust2jaqt faust2lv2 ]; buildPhase = '' - faust2jaqt -t 99999 LazyLimiter.dsp - faust2lv2 -gui -t 99999 LazyLimiter.dsp + faust2jaqt -vec -time -t 99999 LazyLimiter.dsp + sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "GUI.lib" + faust2lv2 -vec -time -t 99999 -gui LazyLimiter.dsp ''; installPhase = '' diff --git a/pkgs/applications/audio/MBdistortion/default.nix b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix similarity index 58% rename from pkgs/applications/audio/MBdistortion/default.nix rename to pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix index aa71fff41c5..6216ba55593 100644 --- a/pkgs/applications/audio/MBdistortion/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }: +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { name = "MBdistortion-${version}"; - version = "1.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "magnetophon"; repo = "MBdistortion"; - rev = "v${version}"; - sha256 = "1rmvfi48hg8ybfw517zgj3fjj2xzckrmv8x131i26vj0fv7svjsp"; + rev = "V${version}"; + sha256 = "0mdzaqmxzgspfgx9w1hdip18y17hwpdcgjyq1rrfm843vkascwip"; }; - buildInputs = [ faust2jaqt faust2lv2gui ]; + buildInputs = [ faust2jaqt faust2lv2 ]; buildPhase = '' - faust2jaqt -t 99999 MBdistortion.dsp - faust2lv2 -gui -t 99999 MBdistortion.dsp + faust2jaqt -time -vec -t 99999 MBdistortion.dsp + sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "MBdistortion.dsp" + faust2lv2 -time -vec -gui -t 99999 MBdistortion.dsp ''; installPhase = '' diff --git a/pkgs/applications/audio/RhythmDelay/default.nix b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix similarity index 58% rename from pkgs/applications/audio/RhythmDelay/default.nix rename to pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix index 05d3b4f193e..0bb2034fc46 100644 --- a/pkgs/applications/audio/RhythmDelay/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }: +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { name = "RhythmDelay-${version}"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "magnetophon"; repo = "RhythmDelay"; - rev = "v${version}"; - sha256 = "0n938nm08mf3lz92k6v07k1469xxzmfkgclw40jgdssfcfa16bn7"; + rev = "V${version}"; + sha256 = "1j0bjl9agz43dcrcrbiqd7fv7xsxgd65s4ahhv5pvcr729y0fxg4"; }; - buildInputs = [ faust2jaqt faust2lv2gui ]; + buildInputs = [ faust2jaqt faust2lv2 ]; buildPhase = '' - faust2jaqt -t 99999 RhythmDelay.dsp - faust2lv2 -gui -t 99999 RhythmDelay.dsp + faust2jaqt -time -vec -t 99999 RhythmDelay.dsp + sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "RhythmDelay.dsp" + faust2lv2 -time -vec -t 99999 -gui RhythmDelay.dsp ''; installPhase = '' diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix new file mode 100644 index 00000000000..12d9679f97c --- /dev/null +++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix @@ -0,0 +1,56 @@ +{ stdenv, pkgs, callPackage, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }: +stdenv.mkDerivation rec { + name = "VoiceOfFaust-${version}"; + version = "1.1.4"; + + src = fetchFromGitHub { + owner = "magnetophon"; + repo = "VoiceOfFaust"; + rev = "V${version}"; + sha256 = "0la9b806qwrlsxgbir7n1db8v3w24wmd6k43p6qpr1fjjpkhrrgw"; + }; + + plugins = [ helmholtz mrpeach ]; + + pitchTracker = puredata-with-plugins plugins; + + buildInputs = [ faust2jack faust2lv2 ]; + + runtimeInputs = [ pitchTracker ]; + + patchPhase = '' + sed -i "s@pd -nodac@${pitchTracker}/bin/pd -nodac@g" launchers/synthWrapper + sed -i "s@../PureData/OscSendVoc.pd@$out/PureData/OscSendVoc.pd@g" launchers/synthWrapper + ''; + + buildPhase = '' + sh install.sh + # so it doesn;t end up in /bin/ : + rm -f install.sh + ''; + + installPhase = '' + mkdir -p $out/bin + + for file in ./*; do + if test -x "$file" && test -f "$file"; then + cp "$file" "$out/bin" + fi + done + + cp launchers/* $out/bin/ + mkdir $out/PureData/ + # cp PureData/OscSendVoc.pd $out/PureData/OscSendVoc.pd + cp PureData/* $out/PureData/ + + mkdir -p $out/lib/lv2 + cp -r *.lv2/ $out/lib/lv2 + ''; + + meta = { + description = "Turn your voice into a synthesizer"; + homepage = https://github.com/magnetophon/VoiceOfFaust; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} diff --git a/pkgs/applications/audio/faustCompressors/default.nix b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix similarity index 59% rename from pkgs/applications/audio/faustCompressors/default.nix rename to pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix index ea0680568db..05e2b335f82 100644 --- a/pkgs/applications/audio/faustCompressors/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix @@ -1,22 +1,28 @@ -{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }: +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { - name = "faustCompressors-${version}"; - version = "0.1.1"; + name = "faustCompressors-v${version}"; + version = "1.1.1"; src = fetchFromGitHub { owner = "magnetophon"; repo = "faustCompressors"; rev = "v${version}"; - sha256 = "0x5nd2cjhknb4aclhkkjaywx75bi2wj22prgv8n47czi09jcj0jb"; + sha256 = "0mkram2hm7i5za7pfn5crh2arbajk8praksxzgjx90rrxwl1y3d1"; }; - buildInputs = [ faust2jaqt faust2lv2gui ]; + buildInputs = [ faust2jaqt faust2lv2 ]; buildPhase = '' for f in *.dsp; do - faust2jaqt -double -t 99999 $f - faust2lv2 -double -gui -t 99999 $f + faust2jaqt -time -double -t 99999 $f + done + + sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "compressors.lib" + + for f in *.dsp; + do + faust2lv2 -time -double -gui -t 99999 $f done ''; diff --git a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix new file mode 100644 index 00000000000..daa23baa966 --- /dev/null +++ b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +stdenv.mkDerivation rec { + name = "pluginUtils-${version}"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "magnetophon"; + repo = "pluginUtils"; + rev = "V${version}"; + sha256 = "1hnr5sp7k6ypf4ks61lnyqx44dkv35yllf3a3xcbrw7yqzagwr1c"; + }; + + buildInputs = [ faust2jaqt faust2lv2 ]; + + buildPhase = '' + for f in *.dsp + do + echo "Building jack standalone for $f" + faust2jaqt -vec -time -t 99999 "$f" + sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "$f" + echo "Building lv2 for $f" + faust2lv2 -vec -time -gui -t 99999 "$f" + done + ''; + + installPhase = '' + rm -f *.dsp + rm -f *.lib + mkdir -p $out/lib/lv2 + mv *.lv2/ $out/lib/lv2 + mkdir -p $out/bin + cp * $out/bin/ + ''; + + meta = { + description = "Some simple utility lv2 plugins"; + homepage = https://github.com/magnetophon/pluginUtils; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} diff --git a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix new file mode 100644 index 00000000000..422aabb2829 --- /dev/null +++ b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +stdenv.mkDerivation rec { + name = "shelfMultiBand-${version}"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "magnetophon"; + repo = "shelfMultiBand"; + rev = "V${version}"; + sha256 = "1b1h4z5fs2xm7wvw11p9wnd0bxs3m88124f5phh0gwvpsdrd0im5"; + }; + + buildInputs = [ faust2jaqt faust2lv2 ]; + + buildPhase = '' + faust2jaqt -vec -double -time -t 99999 shelfMultiBand.dsp + faust2jaqt -vec -double -time -t 99999 shelfMultiBandMono.dsp + sed -i "s|\[ *scale *: *log *\]||g ; s|\btgroup\b|hgroup|g" "shelfMultiBand.lib" + faust2lv2 -vec -double -time -gui -t 99999 shelfMultiBandMono.dsp + faust2lv2 -vec -double -time -gui -t 99999 shelfMultiBand.dsp + ''; + + installPhase = '' + mkdir -p $out/bin + cp shelfMultiBand $out/bin/ + cp shelfMultiBandMono $out/bin/ + mkdir -p $out/lib/lv2 + cp -r shelfMultiBand.lv2/ $out/lib/lv2 + cp -r shelfMultiBandMono.lv2/ $out/lib/lv2 + ''; + + meta = { + description = "A multiband compressor made from shelving filters."; + homepage = https://github.com/magnetophon/shelfMultiBand; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 6c53d1fe755..31185c0d0c2 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { description = "Curses-based interface for MPD (music player daemon)"; homepage = http://www.musicpd.org/clients/ncmpc/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ hiberno ]; platforms = platforms.all; }; } - diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix index 56db4e8352e..fa25a474c1d 100644 --- a/pkgs/applications/audio/pamixer/default.nix +++ b/pkgs/applications/audio/pamixer/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/cdemoulins/pamixer; license = licenses.gpl3; - maintainers = with maintainers; [ hiberno ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index db73901d2aa..c84e5cdfb49 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchurl, alsaLib, libjack2, dbus, qt5 }: stdenv.mkDerivation rec { - version = "0.4.2"; + version = "0.4.3"; name = "qjackctl-${version}"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; - sha256 = "0pmgkqgkapbma42zqb5if4ngmj183rxl8bhjm7mhyhgq4bzll76g"; + sha256 = "01wyyynxy21kim0gplzvfij7275a1jz68hdx837d2j1w5x2w7zbb"; }; - buildInputs = [ + buildInputs = [ qt5.full qt5.qtx11extras - alsaLib + alsaLib libjack2 - dbus + dbus ]; configureFlags = "--enable-jack-version"; diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 8abf7cea6eb..da76d7f16db 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-15.9"; + name = "snd-16.9"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "0hs9ailgaphgyi3smnrpwksvdww85aa7szqgi6l6d2jwfx9g4bhd"; + sha256 = "1rw9wrj1f0g413ya32s9mwhvv3c6iasjza22irzf6xlv49b9s5dp"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 2c3d4b91f25..64ffeced13d 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -1,32 +1,30 @@ -{ stdenv, fetchurl, pkgconfig, fetchgit +{ stdenv, fetchurl, pkgconfig , libltc, libsndfile, libsamplerate, ftgl, freefont_ttf, libjack2 , mesa_glu, lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20160619"; + version = "20160825"; name = "x42-plugins-${version}"; src = fetchurl { url = "http://gareus.org/misc/x42-plugins/${name}.tar.xz"; - sha256 = "1ald0c5xbfkdq6g5xwyy8wmbi636m3k3gqrq16kbh46g0kld1as9"; + sha256 = "13ln5ccmrrc07ykfp040389av60dlgqz1kh6vfjkga6sq7z51msr"; }; - buildInputs = [ - mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate - lv2 mesa gtk2 cairo pango fftwFloat pkgconfig zita-convolver - ]; + buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 mesa gtk2 cairo pango fftwFloat pkgconfig zita-convolver]; - makeFlags = [ - "PREFIX=$(out)" - "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" - "LIBZITACONVOLVER=${zita-convolver}/include/zita-convolver.h" - ]; + makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" ]; - meta = with stdenv.lib; { - description = "Collection of LV2 plugins by Robin Gareus"; - homepage = https://github.com/x42/x42-plugins; - maintainers = with maintainers; [ magnetophon ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; + patchPhase = '' + patchShebangs ./stepseq.lv2/gridgen.sh + sed -i 's|/usr/include/zita-convolver.h|${zita-convolver}/include/zita-convolver.h|g' ./convoLV2/Makefile + ''; + + meta = with stdenv.lib; + { description = "Collection of LV2 plugins by Robin Gareus"; + homepage = https://github.com/x42/x42-plugins; + maintainers = with maintainers; [ magnetophon ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; } diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index a9e2711711f..2e050d730fc 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -28,10 +28,10 @@ ada-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, wisi }: elpaBuild { pname = "ada-mode"; - version = "5.2.0"; + version = "5.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-mode-5.2.0.tar"; - sha256 = "1j4f94bmykz5j6kyyg5x81k0yjai609c1qzs8sig8v267hydkpqr"; + url = "https://elpa.gnu.org/packages/ada-mode-5.2.1.tar"; + sha256 = "099c8vm6jvwypff981vbs77y6hqq31fn6s8gwqkmncq04mk3vw34"; }; packageRequires = [ cl-lib emacs wisi ]; meta = { @@ -471,10 +471,10 @@ debbugs = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, soap-client }: elpaBuild { pname = "debbugs"; - version = "0.11"; + version = "0.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.11.tar"; - sha256 = "10v9s7ayvfzd6j6hqfc9zihxgmsc2j0xhxrgy3ah30qkqn6z8w6n"; + url = "https://elpa.gnu.org/packages/debbugs-0.12.tar"; + sha256 = "1swi4d7fhahimid9j12cypmkz7dlqgffrnhfxy5ra44y3j2b35ph"; }; packageRequires = [ cl-lib soap-client ]; meta = { @@ -833,6 +833,20 @@ license = lib.licenses.free; }; }) {}; + highlight-escape-sequences = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "highlight-escape-sequences"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/highlight-escape-sequences-0.3.el"; + sha256 = "0q54h0zdaflr2sk4mwgm2ix8cdq4rm4pz03ln430qxc1zm8pz6gy"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/highlight-escape-sequences.html"; + license = lib.licenses.free; + }; + }) {}; html5-schema = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "html5-schema"; version = "0.1"; @@ -1337,10 +1351,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20161024"; + version = "20161102"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20161024.tar"; - sha256 = "1rg9hl8vghx72prc6m1c29p5crns0i70hh7lffbhqzjixq6jqvlj"; + url = "https://elpa.gnu.org/packages/org-20161102.tar"; + sha256 = "12v9jhakdxcmlw9zrcrh1fwi3kh6z0qva90hpnr0zjqyj72i0wir"; }; packageRequires = []; meta = { @@ -1388,6 +1402,20 @@ license = lib.licenses.free; }; }) {}; + parsec = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "parsec"; + version = "0.1.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/parsec-0.1.3.tar"; + sha256 = "032m9iks5a05vbc4159dfs9b7shmqm6mk05jgbs9ndvy400drwd6"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/parsec.html"; + license = lib.licenses.free; + }; + }) {}; pinentry = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "pinentry"; version = "0.1"; @@ -1569,10 +1597,10 @@ }) {}; seq = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "seq"; - version = "2.16"; + version = "2.19"; src = fetchurl { - url = "https://elpa.gnu.org/packages/seq-2.16.tar"; - sha256 = "1fc1cjbb3lrxgkhzvg4bkpxr408hhg8kqa07n0jfalrdzaa3bika"; + url = "https://elpa.gnu.org/packages/seq-2.19.tar"; + sha256 = "11hb7is6a4h1lscjcfrzh576j0g3m5yjydn16s6x5bxp5gsr6zha"; }; packageRequires = []; meta = { @@ -1981,10 +2009,10 @@ wisi = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "wisi"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisi-1.1.3.tar"; - sha256 = "1vhligxyg73gvr68767pjgiqxah00a920h6i37kip8xmhlkgp9ak"; + url = "https://elpa.gnu.org/packages/wisi-1.1.4.tar"; + sha256 = "1n0bq77vspbxpzs54r0rigb2fhj5a5vm8qxwgdnqdawanmq72l4r"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -2048,10 +2076,10 @@ yasnippet = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "yasnippet"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/yasnippet-0.10.0.tar"; - sha256 = "0vh70i73rknaxzglr4nragassgpjy2lj5mca2x6wqiqmv7mc8xdv"; + url = "https://elpa.gnu.org/packages/yasnippet-0.11.0.tar"; + sha256 = "1m0hchhianl69sb1iqa8av513qvz6krjg4b5ppwfx1sjlai9xj2y"; }; packageRequires = [ cl-lib ]; meta = { diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 4f41eb9675d..3130ded9f62 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -20,22 +20,22 @@ license = lib.licenses.free; }; }) {}; - _0xc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + _0xc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "_0xc"; - version = "20161018.1031"; + version = "20161027.2140"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "0xc"; - rev = "14891d76f031ce64969004644329d7f56821aabe"; - sha256 = "189khq7q90bdphkfx5hdj3bci7lkhcvr6yng4bbr6nj8l4qj2c5s"; + rev = "1f449d3c08bc87fd82d23a3cab71abfe6debb401"; + sha256 = "0nh06xvngckr6didb1br2c8v15v1a0rrraqhal1xmpl6xg76fxc6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fbb2c86a50a8df9a3967787fc10f33beab2c933/recipes/0xc"; sha256 = "0lxcz1x1dymsh9idhkn7jn8vphr724d6sb88a4g55x2m1rlmzg3w"; name = "_0xc"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs s ]; meta = { homepage = "https://melpa.org/#/0xc"; license = lib.licenses.free; @@ -1257,12 +1257,12 @@ ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ag"; - version = "20161021.2133"; + version = "20161027.1758"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ag.el"; - rev = "53dde62ab6889b0beeb3012c2bdeefd85c126140"; - sha256 = "0m43x263d9ksmxc34hqxngxhhwi7n2blb6n11vbckx2v91si2fjs"; + rev = "2427786228f13f5893a8513d4837d14d1a1b375f"; + sha256 = "0jwdgpinz4as7npg7fhqycy6892p6i5g0gp5dd0n2n5r40gh620n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag"; @@ -1381,12 +1381,12 @@ airline-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "airline-themes"; - version = "20161003.811"; + version = "20161024.1051"; src = fetchFromGitHub { owner = "AnthonyDiGirolamo"; repo = "airline-themes"; - rev = "563638c5b4102805e5b3282abfb2278921c07898"; - sha256 = "10c3cgjz9q5di3cpnvx970l36akf1i0w7sxas0ppk7gpy22cg2wl"; + rev = "11e69a143ed66e50f0c95fda93ba0a5fa8bdf583"; + sha256 = "1n9qf9xmqbm0mjgcbzxgnmy1020rbh1cd7jmjbbfd8xhlh0kw14z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/addeb923176132a52807308fa5e71d41c9511802/recipes/airline-themes"; @@ -1549,12 +1549,12 @@ all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }: melpaBuild { pname = "all-the-icons"; - version = "20161007.132"; + version = "20161102.415"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "692ac0816783725600b80b5307bf48a83053a378"; - sha256 = "13l5dqyhsma2a15khfs0vzk6c7rywfph4g9kgq10v89m3kwqich8"; + rev = "a7ef8e703c17c978a82f442c88d250371c5e06f7"; + sha256 = "0gfa1a17wwp66jl0v6pbp9fcn45kp3jsvpd7ha4j590ijikz2yv4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; @@ -1570,12 +1570,12 @@ amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }: melpaBuild { pname = "amd-mode"; - version = "20161021.251"; + version = "20161103.139"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "amd-mode.el"; - rev = "0c4832d86e87cc2768d8ef6827d2e367ea8de403"; - sha256 = "0449xh64lxng6pkavln4gxkrsrhngm2zmvc7lqawniq4j5j2izr3"; + rev = "01c487419f2785a4573bdd7e49800414a6f83fe7"; + sha256 = "0fxca3mg3335n4frl332ng1zndw1j3dski7gwa4j4pixc2ihi02m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode"; @@ -1663,12 +1663,12 @@ anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "anaconda-mode"; - version = "20161009.1046"; + version = "20161028.29"; src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "3f473150009f86dac68edb02e2f22850788289a5"; - sha256 = "16c2q6c44qc3bdaxq835rrbyq49z6rd3h6cgss50p4gqwfwxfxn7"; + rev = "ae336344e61c1d38480ec230d85efbe2cb17980f"; + sha256 = "1776s0gf9283amskmaqnpcpflqgvzk87n5qcishiczxijdymry7y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -2365,18 +2365,19 @@ license = lib.licenses.free; }; }) {}; - applescript-mode = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: + applescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "applescript-mode"; - version = "20120205.307"; - src = fetchsvn { - url = "http://svn.osdn.jp/svnroot/macemacsjp/applescript-mode/trunk"; - rev = "584"; - sha256 = "0n3y0314ajqhn5hzih09gl72110ifw4vzcgdxm8n6npjbx7irbml"; + version = "20090320.2332"; + src = fetchFromGitHub { + owner = "ieure"; + repo = "applescript-mode"; + rev = "8f888cd80af1e0902b5609143facd3051bc94892"; + sha256 = "0d3bqx6346vmniv001jgd6wggp80kv1kqc38sdgd88862gkqnqyg"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/79d8790798305d5e0a75b289c5d8d1b6567c0c7d/recipes/applescript-mode"; - sha256 = "1ya0dh7gz7qfflhn6dq43rapb2zg7djvxwn7p4jajyjnwbxmk611"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/576e42b33a5245e1aae0f0d879fd18762342db32/recipes/applescript-mode"; + sha256 = "0rj03xw8yx79xj9ahdwfxicxna0a0lykn2n39xng5gnm4bh2n6z4"; name = "applescript-mode"; }; packageRequires = []; @@ -2572,12 +2573,12 @@ artbollocks-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "artbollocks-mode"; - version = "20160603.1720"; + version = "20161030.2059"; src = fetchFromGitHub { owner = "sachac"; repo = "artbollocks-mode"; - rev = "f4d36cf9b506cd27e0615ba8dfed59c35885cd18"; - sha256 = "063j7q2i3701fmh44m77d572ppq0fd60hznh8jcwqa1ljbzynzkn"; + rev = "d77a01985a9161ce1676fb18d7228a0df566942b"; + sha256 = "1y69zq4r9ir1a2hy03lillxhw3skfj8ckkjv45i5xpasz4hjw50j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22b237ab91ddd3c17986ea12e6a32f2ce62d3a79/recipes/artbollocks-mode"; @@ -2695,12 +2696,12 @@ async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "async"; - version = "20161010.2322"; + version = "20161103.1036"; src = fetchFromGitHub { owner = "jwiegley"; repo = "emacs-async"; - rev = "31b169150c58b8d40db552094018ed7b053d234d"; - sha256 = "0m9kqyd0krfvp5vliqj3rcdd9j32r4hlxhhvb6mx2lvjxfmdi1wi"; + rev = "82428780ec96e18ae801783f8d7388749fafd5fa"; + sha256 = "17kznp00gs162b205q8mzy6abcf3jrmnqfb1vdv86rk1gzsr483q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a0fe448e82f42cad0fdaa40c964032892fedd83/recipes/async"; @@ -2758,12 +2759,12 @@ atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "atom-one-dark-theme"; - version = "20160914.1337"; + version = "20161101.1955"; src = fetchFromGitHub { owner = "jonathanchu"; repo = "atom-one-dark-theme"; - rev = "7e2c683d2d45f0c4901c4c492004b78345425d41"; - sha256 = "1p2vv7cwaa00qnjxhd4d7nv6lms3v0fsnwdpxck1p4a96zcgm0dz"; + rev = "ff2990e56f5ff7abf6c20dac7d4d96fa9090221b"; + sha256 = "1mph3sr9mb2hizx02xn4yaag5h6yanhg5zabrpg5cqz2w6ifagaq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme"; @@ -2776,6 +2777,27 @@ license = lib.licenses.free; }; }) {}; + atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }: + melpaBuild { + pname = "atomic-chrome"; + version = "20161106.1438"; + src = fetchFromGitHub { + owner = "alpha22jp"; + repo = "atomic-chrome"; + rev = "439b669b10b671f5795fd5557abfbc30e0d6fbb4"; + sha256 = "1bwng9qdys5wx0x9rn4nak92qpspfsb04xrl0p3szl5izz427cb6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome"; + sha256 = "0dx12mjdc4vhbvrcl61a7j247mgs71vvy0qqj6czbpfawfl46am9"; + name = "atomic-chrome"; + }; + packageRequires = [ emacs let-alist websocket ]; + meta = { + homepage = "https://melpa.org/#/atomic-chrome"; + license = lib.licenses.free; + }; + }) {}; auctex-latexmk = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auctex-latexmk"; @@ -2986,12 +3008,12 @@ auto-complete = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "auto-complete"; - version = "20160827.649"; + version = "20161029.643"; src = fetchFromGitHub { owner = "auto-complete"; repo = "auto-complete"; - rev = "b0090a942f93824bcbe9a938217c665ea658eacd"; - sha256 = "1c6gmk9j5rhjqdsgns3v0f91vy3x6zs715p68m3sh7vn7cwsdw63"; + rev = "ed1abca79bf476287bdf55ed8f7e0af53e5fdbae"; + sha256 = "0478sfs8gsn3x9q4ld2lrm1qgf6yfv34nqljh202n6fh982iqdxn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/083fb071191bccd6feb3fb84569373a597440fb1/recipes/auto-complete"; @@ -3693,12 +3715,12 @@ avk-emacs-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avk-emacs-themes"; - version = "20160909.1323"; + version = "20161029.504"; src = fetchFromGitHub { owner = "avkoval"; repo = "avk-emacs-themes"; - rev = "29b58481e0e7fcd46e4d93b6aa250d0b7061d260"; - sha256 = "12vw1r5pvk9wvwqyfg46w3pdmj8asvsk92vfwxa059z4383kq7rz"; + rev = "d8c91d67c78d90d04f2cda01ded019c6931250d6"; + sha256 = "1lyxx55yd1fd52r588j9g0vrx6nl5nl8msc5si8qfh7naprr4hh9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b986c7c981ccc5c7169930908543f2a515edaefa/recipes/avk-emacs-themes"; @@ -3858,11 +3880,11 @@ axiom-environment = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "axiom-environment"; - version = "20160325.1515"; + version = "20161106.509"; src = fetchhg { url = "https://bitbucket.com/pdo/axiom-environment"; - rev = "bc294e47f51c"; - sha256 = "0z15n7cpprbhiamq26240g5bqsiw5mgyzdisi7j6hpybyk2zyl9q"; + rev = "4d70a7ec2429"; + sha256 = "1dmixpwsl2qsiy6c0vspi1fwvgwisw84vhijhmbkfpzrqrp1lkwc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/axiom-environment"; @@ -4490,8 +4512,8 @@ src = fetchFromGitHub { owner = "DamienCassou"; repo = "beginend"; - rev = "c5bfdc3bb77a8c019aa4433cf12d3c45690c27bd"; - sha256 = "1hyiz7iwnzbg1616q0w7fndllbnx4m98kakgxn04bsqib5fqk78p"; + rev = "05ed9428b3f09221da0e05fdd918cc5a0b643197"; + sha256 = "1vsid87pmls565bqknbgr7z907v7bb7115v70vzbw4z6lc4falry"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend"; @@ -4781,8 +4803,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "b9117844856b72d0ac331813ca6ae0f1abca9fc6"; - sha256 = "1fxb3sc5k82mjjds45fwcva8z7fdmpyjvl2pciq96g72md9is8kk"; + rev = "c7adfdde3d50d783dcde21ac3ea8195bbd30369f"; + sha256 = "1qkcnk2h1k6yv9sbkir2nkbjjnzcj3ndk20cysk2wcmwqxm85840"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -4802,8 +4824,8 @@ src = fetchFromGitHub { owner = "justbur"; repo = "emacs-bind-map"; - rev = "078c522f6e763dd24a30e15af9121376affe207f"; - sha256 = "16yk8xl6ds6zp0ndfzr613k8wkzl7hnsqnmnn1bi1da5laxbwrdb"; + rev = "6e1ba6edbd5a29991698806e775288fb3de2b186"; + sha256 = "1d3nknz6ibxlcm1989lv2b4d4r0d67kpgm03aamcisnxq9d1g9r2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f58800af5965a6e7c9314aa00e971196ea0d036e/recipes/bind-map"; @@ -5072,8 +5094,8 @@ src = fetchFromGitHub { owner = "joodland"; repo = "bm"; - rev = "c77ea49f5632b5d987243eddb4b36e84b870bf42"; - sha256 = "0jfi24kck1ag19lfcfzbivwb1zhid173p7f8chc01cz68l1pp7jw"; + rev = "d1beef99733062ffc6f925a6b3a0d389e1f3ee45"; + sha256 = "19hjv6f43y2dm4b3854mssjqgzphkdj911f1y2sipc43icdwb4b4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/bm"; @@ -5110,12 +5132,12 @@ bog = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bog"; - version = "20160725.1801"; + version = "20161024.1828"; src = fetchFromGitHub { owner = "kyleam"; repo = "bog"; - rev = "fc71c376546ed01060200de91d007f2a179bc601"; - sha256 = "13z0zpy9ggam0v16kzqn5gncvmil3magrvrvhm304gvsqqglyiqi"; + rev = "a6b566a4eca0dcc89a7d2af42e057b4e2561189d"; + sha256 = "1y3i9wcvxj1s7hyxb3ni0p7hmdlln1h3a1h2ddgkjw5yv2vq768q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19fd0bf2f8e52c79120c492a6dcabdd51b465d35/recipes/bog"; @@ -5193,7 +5215,7 @@ }) {}; bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "bookmark-plus"; - version = "20160921.1035"; + version = "20161027.926"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/bookmark+.el"; sha256 = "06621js3bvslfmzmkphzzcrd8hbixin2nx30ammcqaa6572y14ad"; @@ -5209,15 +5231,36 @@ license = lib.licenses.free; }; }) {}; + bool-flip = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "bool-flip"; + version = "20161030.1654"; + src = fetchFromGitHub { + owner = "michaeljb"; + repo = "bool-flip"; + rev = "04354f6412bd096cce59138e2113eb1db3dcba63"; + sha256 = "1pdylz85sarhaakh8hdvn5mjhh4j3y6yy5sn4cjvqz9xan4g3yyl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f56377a7c3f4b75206ad9ba570c35dbf752079e9/recipes/bool-flip"; + sha256 = "1xfspqxshx7m8gh6g1snkaahka9f71fnq7hx81nik4s9s8pmxj9c"; + name = "bool-flip"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/bool-flip"; + license = lib.licenses.free; + }; + }) {}; boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; - version = "20161013.2331"; + version = "20161106.723"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "bd3f79f3f1c1aaef942ee5d2ef053534bd3adbff"; - sha256 = "0jrrfrs277spd1h3gha9fp3jbyafj4cxzg7gdzxj9px04iyyn4zs"; + rev = "dea1f7e830b38e6b70db5a318eaa269f417444d4"; + sha256 = "0f6yrls2l37rpq932n7h5fr6688vsk32my300z66mszcqfvmr566"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; @@ -6315,12 +6358,12 @@ cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "cargo"; - version = "20161019.542"; + version = "20161107.426"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "cargo.el"; - rev = "6964b08c9474a2cd4809e66efa646b871139b5d1"; - sha256 = "17jc1jvys1a3rg5hvcwkzcq98slwcidff89f7vri23hks69dc2bp"; + rev = "059b1ca83e58a4ced0a0f1cd1b4e06525fdc257a"; + sha256 = "15bgxdz65wywkckwm9rxf595hc8gabqb2015hwp1n9pa8k511jkg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo"; @@ -6378,12 +6421,12 @@ cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }: melpaBuild { pname = "cask"; - version = "20161003.1152"; + version = "20161024.1205"; src = fetchFromGitHub { owner = "cask"; repo = "cask"; - rev = "8712ea35172e8c63320f963a982c1b50fc7578d1"; - sha256 = "0709zak2y1ifwl9p6qqnzz9vpblan4n7zyrlx81jrkxd3x697dkq"; + rev = "58f641960bcb152b33fcd27d41111291702e2da6"; + sha256 = "1sl094adnchjvf189c3l1njawrj5ww1sv5vvjr9hb1ng2rw20z7b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask"; @@ -6564,22 +6607,22 @@ license = lib.licenses.free; }; }) {}; - cdnjs = callPackage ({ cl-lib ? null, dash, deferred, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: + cdnjs = callPackage ({ dash, deferred, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "cdnjs"; - version = "20140217.1312"; + version = "20161031.822"; src = fetchFromGitHub { owner = "yasuyk"; repo = "cdnjs.el"; - rev = "eac2b4d150907aeb2d568327d04775578c82887f"; - sha256 = "0aspci0zg8waa3l234l0f8fjfzm67z2gydfdwwpxksz49sm2s1jk"; + rev = "ce19880d3ec3d81e6c665d0b1dfea99cc7a3f908"; + sha256 = "02j45ngddx7n5gvy42r8y3s22bmxlnvg2pqjfh0li8m599fnd11h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66e4ce4e2c7e4aaac9dc0ce476c4759b000ff5d6/recipes/cdnjs"; sha256 = "1clm86n643z1prxrlxlg59jg43l9wwm34x5d88bj6yvix8g6wkb7"; name = "cdnjs"; }; - packageRequires = [ cl-lib dash deferred f pkg-info ]; + packageRequires = [ dash deferred f pkg-info ]; meta = { homepage = "https://melpa.org/#/cdnjs"; license = lib.licenses.free; @@ -6716,8 +6759,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "67075d95e0eef274d7d423dac80665d5b938277b"; - sha256 = "1jrr49ckph5h2z3q1xpmbj10v7h95vaw5pidxh46l344gzbczniz"; + rev = "3726a19cb9b33abf3ae7b760902637ed40051836"; + sha256 = "05mfldh44j07wslbz3hq874amfld42vwkg70f0966rmlh1nz3rwm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -6756,7 +6799,7 @@ version = "20160801.615"; src = fetchsvn { url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "11826"; + rev = "11867"; sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl"; }; recipeFile = fetchurl { @@ -6897,12 +6940,12 @@ cheatsheet = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cheatsheet"; - version = "20151203.151"; + version = "20161106.1219"; src = fetchFromGitHub { owner = "darksmile"; repo = "cheatsheet"; - rev = "c4d9af19bf563977dd74863bb70d1aa783952f1c"; - sha256 = "15kam5hf2f4nwp29nvxqm5bs8nyhqf5m44fdb21qljgbmjdlh38y"; + rev = "329ac84def1af01c19761bd745ee4f275003161f"; + sha256 = "0981dkn8vkjyw50cbsx1zsa2nmyhsbz6kmrprj5jd828m49c1kc5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d2cd657fcadb2dd3fd12864fe94a3465f8c9bd7/recipes/cheatsheet"; @@ -6939,12 +6982,12 @@ chee = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "chee"; - version = "20161020.45"; + version = "20161105.1306"; src = fetchFromGitHub { owner = "eikek"; repo = "chee"; - rev = "e0a001819033b01e95aae81246dbcd5db659695d"; - sha256 = "0w1napa2zmxmh5dvk5sdxl1w7pl27vjjmqhbjxljh4vs2vy2v9zi"; + rev = "04d2104286ca6b92dcc28e448eeadfcc8fb7b548"; + sha256 = "0lwp2hh8rxg1f98hzpdrz91snwryp9fqin9sch1vnyxywfp3g9kc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f4a3775720924e5a292819511a8ea42efe1a7dc/recipes/chee"; @@ -7107,12 +7150,12 @@ chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: melpaBuild { pname = "chinese-pyim"; - version = "20160923.2342"; + version = "20161106.1712"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim"; - rev = "3d0ccf663fd6b3753a886239dd64fbef44bc02fd"; - sha256 = "0ggz80wlq86scdvfpg4fg9hvwgis9qwsfs52dyk2gpwfpqyn7pmc"; + rev = "b210c0d5275e1e8c0b78bed186cc18fc27061dd4"; + sha256 = "1jixkb7jw07lykbfv022ccnys4xypcbv03f9bxl2r16wizzymvvd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; @@ -7167,6 +7210,27 @@ license = lib.licenses.free; }; }) {}; + chinese-pyim-wbdict = callPackage ({ chinese-pyim, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "chinese-pyim-wbdict"; + version = "20161029.2308"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "chinese-pyim-wbdict"; + rev = "7a755a1808526bd777b1fd5049b3891fd9a5ec0c"; + sha256 = "04c87l9y53xq21najw37wywilaxpk1kki8y2pisjyd36rvr7ad1y"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7c77ba5562e8bd8b8f532e7745edcdf3489584ac/recipes/chinese-pyim-wbdict"; + sha256 = "0y9hwn9rjplb69vi4s9bvf6fkvns2rlpkqm0qvv44mxq7g61lm5c"; + name = "chinese-pyim-wbdict"; + }; + packageRequires = [ chinese-pyim ]; + meta = { + homepage = "https://melpa.org/#/chinese-pyim-wbdict"; + license = lib.licenses.free; + }; + }) {}; chinese-remote-input = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-remote-input"; @@ -7233,12 +7297,12 @@ chinese-yasdcv = callPackage ({ chinese-pyim, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-yasdcv"; - version = "20150702.616"; + version = "20161030.1504"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-yasdcv"; - rev = "619e4d701ed995ad2c95f35072c638cfb3933afb"; - sha256 = "14yzmyzkf846yjrwnqrbzmvyhfav39qa5fr8jnb7lyz8rm7y9pnq"; + rev = "664494d4c4562a4d83a0e73386f854829d7a52c0"; + sha256 = "1qnhyv4b3sy596r3jz13iypi3jyr266lyphpw82ivb6dx33awk70"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b6d727c30d2ec0f885a927a16a442fe220a740d5/recipes/chinese-yasdcv"; @@ -7503,12 +7567,12 @@ circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe"; - version = "20161023.1346"; + version = "20161104.1348"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "85d8c18cacbf9c006deb331867cde65fad90b47f"; - sha256 = "0skbqd38lb0xh55xfd13c80s6xn70sqg67cpvdx6qck644apg4af"; + rev = "8a42bf93e38b6437f1da5bf4d0f6de8ad9a85fef"; + sha256 = "1rrc440hqxl7fi8f437clz169n6vacqfs5pmc7ni5m65k9kqm1fa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -7590,8 +7654,8 @@ version = "20161004.253"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "284990"; - sha256 = "15d5ils5nlqydqmvjjm5znnbj9r489n9018qym8zl58m2dw0i753"; + rev = "286103"; + sha256 = "09109zh6dx1af4jqdrc448wb5rmjgm6k6630l4z931aqwfw004kx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format"; @@ -7754,12 +7818,12 @@ clippy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }: melpaBuild { pname = "clippy"; - version = "20140417.414"; + version = "20161028.1254"; src = fetchFromGitHub { owner = "Fuco1"; repo = "clippy.el"; - rev = "23ba8772056a103267611b3757722730740d9f00"; - sha256 = "0msmigzip7hpjxwkz0khhlc2lj9wgb2919i4k0kv8ppi9j2f9hjc"; + rev = "ad4b5dba4cede6d4b21533186303d3d3e9a2510f"; + sha256 = "0rnqwzbr5hdap276ana0iz3lk2ih8kkj1m9cydavqqdrwzk4ldrm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3743596c4b6387351684b1bf00f17275b8e59e8/recipes/clippy"; @@ -7976,12 +8040,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20161017.1134"; + version = "20161105.2359"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "d3034dcbfeb5e818b5a891034a91cbc5eea87a73"; - sha256 = "04qcgj7c4z8cxq7qh25nailqv9sv2ijjbdxipb0bkvp6kvarnmn6"; + rev = "3f67fdaeade3a99dc4f481596dfb396d4fee06a9"; + sha256 = "1v170j8c3z1431zdrd3cygr4j72jlgihgzbgij6dkci8rmsldb6h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8001,8 +8065,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "d3034dcbfeb5e818b5a891034a91cbc5eea87a73"; - sha256 = "04qcgj7c4z8cxq7qh25nailqv9sv2ijjbdxipb0bkvp6kvarnmn6"; + rev = "3f67fdaeade3a99dc4f481596dfb396d4fee06a9"; + sha256 = "1v170j8c3z1431zdrd3cygr4j72jlgihgzbgij6dkci8rmsldb6h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8078,27 +8142,6 @@ license = lib.licenses.free; }; }) {}; - closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "closql"; - version = "20160902.1242"; - src = fetchFromGitLab { - owner = "tarsius"; - repo = "closql"; - rev = "8e4d0b3b31913a2362a45fcdaf05745dfc188b66"; - sha256 = "1189drdpzp05kafg5wfi556n2v6a957qs9xm3v9k2rsbgnyd2hgk"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c97468a71910ba6709792c060c1fb714004e24da/recipes/closql"; - sha256 = "0a8fqw8n03x9mygvzb95m8mmfqp3j8hynwafvryjsl0np0695b6l"; - name = "closql"; - }; - packageRequires = [ emacs emacsql-sqlite ]; - meta = { - homepage = "https://melpa.org/#/closql"; - license = lib.licenses.free; - }; - }) {}; closure-lint-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "closure-lint-mode"; @@ -8232,8 +8275,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "f660832999e086f02a9f3552c028aed900cd7249"; - sha256 = "02v72yi1b3crq549959wi0a4rxjwknzkx6wqalraz7r2p5vfwdwy"; + rev = "9df1cb0fa68869f8125025f20fa8c64467aab2e8"; + sha256 = "0p3xi5jhz0k6hf1nx6srfaidckwlw2bcsvb63q9bbchaap17lpia"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -8267,6 +8310,27 @@ license = lib.licenses.free; }; }) {}; + cmd-to-echo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "cmd-to-echo"; + version = "20161105.505"; + src = fetchFromGitHub { + owner = "mallt"; + repo = "cmd-to-echo"; + rev = "b8915d5f0a79767c29f38ccb7b4416390436e932"; + sha256 = "1z79pd169ml8cx6rzyv8gbivdcg49g4s0w4cabw85rv45fd7rpfa"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d559cee8b263d3615f48924d62341f1ce1ab2630/recipes/cmd-to-echo"; + sha256 = "0bz0zbzagrz26cvqpwl1pfwayyc49bjawk641yc6kl8gnsnv3z73"; + name = "cmd-to-echo"; + }; + packageRequires = [ emacs s ]; + meta = { + homepage = "https://melpa.org/#/cmd-to-echo"; + license = lib.licenses.free; + }; + }) {}; cmds-menu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmds-menu"; version = "20160830.1130"; @@ -8663,12 +8727,12 @@ color-theme-modern = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-modern"; - version = "20160411.1846"; + version = "20161029.720"; src = fetchFromGitHub { owner = "emacs-jp"; repo = "replace-colorthemes"; - rev = "7107540d22e8ff045e0707de84c8b179fd829302"; - sha256 = "0apvqrva3f7valjrxpslln8460kpr82z4zazj3lg3j82k102zla9"; + rev = "c76b6e8e702457fc2e8907b367efdafd3b7123d9"; + sha256 = "0ffvjilk59mbq8mn069hr9q0a0w3yqy6v3r3q94ca22bsv0gwcmm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2db82e101916d8709b711034da5ca6e4072e1077/recipes/color-theme-modern"; @@ -8765,27 +8829,6 @@ license = lib.licenses.free; }; }) {}; - colorsarenice-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "colorsarenice-theme"; - version = "20150421.1336"; - src = fetchFromGitHub { - owner = "Fanael"; - repo = "colorsarenice-theme"; - rev = "3cae55d0c7aeda3a8ef731ebc3886b2449ad87e6"; - sha256 = "18hzm7yzwlfjlbkx46rgdl31p9xyfqnxlvg8337h2bicpks7kjia"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3ac373bc7d1c4d3e49523d587d279968995e164c/recipes/colorsarenice-theme"; - sha256 = "09zlglldjbjr97clwyzyz7c0k8hswclnk2zbkm03nnn9n9yyg2qi"; - name = "colorsarenice-theme"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/colorsarenice-theme"; - license = lib.licenses.free; - }; - }) {}; column-enforce-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "column-enforce-mode"; @@ -8933,12 +8976,12 @@ commify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "commify"; - version = "20160724.2032"; + version = "20161106.1534"; src = fetchFromGitHub { owner = "ddoherty03"; repo = "commify"; - rev = "61db2dd77fc68a82767ae71a81a7059a97bcf115"; - sha256 = "0z6zpxrv0c21vv3k4kzahfl32db33h7v1x4ip1adskjdj4pa013g"; + rev = "78732c2fa6c1a10288b7436d7c561ec9ebdd41be"; + sha256 = "1kb3cbjp69niq8ravh273dma0mnkf1v2ja372ahxfsq1janrkkm6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fec4b048e1dc78a07acce7d2e6527b9f417d06d5/recipes/commify"; @@ -9067,12 +9110,12 @@ company-auctex = callPackage ({ auctex, company, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "company-auctex"; - version = "20151102.643"; + version = "20161025.24"; src = fetchFromGitHub { owner = "alexeyr"; repo = "company-auctex"; - rev = "780ba68b4154ecac4f20dbd4b1ba561ba40f248b"; - sha256 = "0mkyg9y1rhl6hdzhr51psnvy2q0zw4y29m9p0ivb7s643k3fjjp5"; + rev = "d3727c9f5bb13c52b4a345bc8f895d3dbd9178b3"; + sha256 = "0bcf6vaq6bcp60wgfq0vr3mjzv74fn7jibndz5g1d9jkd1vj64xw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/189e1a60894db0787a4468b120fbab84be1b5d59/recipes/company-auctex"; @@ -9155,8 +9198,8 @@ src = fetchFromGitHub { owner = "cpitclaudel"; repo = "company-coq"; - rev = "38674bb993874a40c7a7b96f7a3f326d29d34e46"; - sha256 = "06197qn3739bcjzlgr45a3c11xgq151f40g39am5998dj3156524"; + rev = "1929d2172875a27133d06196cd3427b7c475b7c5"; + sha256 = "16zy87nzc0aa7zc9wmbx6x0dxkhcs7q787gwf50s1hkxlw80djgr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq"; @@ -9284,12 +9327,12 @@ company-emoji = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-emoji"; - version = "20160331.1641"; + version = "20161105.2138"; src = fetchFromGitHub { owner = "dunn"; repo = "company-emoji"; - rev = "00ff8210cf80b4bc4ec0fe8f42b8a00315241f32"; - sha256 = "1ipknikwyd6h2w72s5sn32mfql4p2cmgv868n13r3wg42c619blq"; + rev = "af70f5d12a38919d5728a32784674e70566cbce6"; + sha256 = "0a1ak43js2ag157mvzyjvjh3z1x4r3r2541rbh5ihwlix6c5v637"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5733dccdffe97911a30352fbcda2900c33d79810/recipes/company-emoji"; @@ -9393,8 +9436,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "478b96fe0e77b4451b866559e2adb407fbce7120"; - sha256 = "1ymhpiklyqxi79h65yarmh1hgyswsdx5jahg9pmhg4jww34778y3"; + rev = "82514c86ff1b37eb29aa979fe51238846857935d"; + sha256 = "04fcz539haxvxlsnlmvw9inwmgssh8msn37iwlfax7z1a81bqq54"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go"; @@ -9857,12 +9900,12 @@ company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }: melpaBuild { pname = "company-ycmd"; - version = "20160918.1527"; + version = "20161026.2337"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "adda8765e1c1819bcf63feefea805bd8c0b00335"; - sha256 = "1bm0kagq6aanybc0rrsfq296sd1485f4lvkz84hxamkfm329illm"; + rev = "d116b167bf776dbeba6a822c0b3c19a2c97f68d4"; + sha256 = "192qiwpkc5a0bxsiqj6zyvlblvixq24m845dgpcsqzwpjcm7qq9l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd"; @@ -9899,12 +9942,12 @@ composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "composer"; - version = "20160903.1100"; + version = "20161029.1317"; src = fetchFromGitHub { owner = "zonuexe"; repo = "composer.el"; - rev = "5437ce0417e79ab4aad54f25bc756041eda4dece"; - sha256 = "02x1hs3mv7llidkig15m88nb3zp20smy6b80p7c71vbzapp1mz52"; + rev = "47d840e03412da5db13ae2b962576f0166517581"; + sha256 = "1vw1im39c4jvsaw3ghvwvya9l5h7jiysfhry3p22gdng0l2n4008"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer"; @@ -9924,8 +9967,8 @@ src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-deferred"; - rev = "0a795feeae901e736fc43b1c75a6e3f92f811f08"; - sha256 = "0wnzq2clhbvx0ipwsh0n1w8ssf97l0k8cwmss4l032adz72f6pbn"; + rev = "9b46dedcb89923de417f7557743c4c22421f5787"; + sha256 = "0bq00qc0hyjczqjm8nawbyqlm67azi501v7q3bhapi4rhyn0lp7i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/concurrent"; @@ -9941,12 +9984,12 @@ conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "conda"; - version = "20160922.1700"; + version = "20161103.743"; src = fetchFromGitHub { owner = "necaris"; repo = "conda.el"; - rev = "41169a10cc41c0a3e0b9a61fd8cae7f964347ed7"; - sha256 = "1n56g7n4nsqrgyhn9lwwqjivmpllibmpgnvy34gbwifkmnq4wz0b"; + rev = "5a13e7deda80adb40553f1c256531d040a4c99a1"; + sha256 = "011z47hkynss8a56c2fi702laqxicmwai6anald58436pdxi3y6y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda"; @@ -10192,12 +10235,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20161020.2248"; + version = "20161104.828"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "714cb8c140faa2c019fe1816ac9fe6bb8fbef1a1"; - sha256 = "0r3ni9c8pmcpfgikyindr1yaia59vgil5bdwf02hc6gb0albmffr"; + rev = "c8be3973a4841a3ee7d05e59666724965ecc8dd8"; + sha256 = "010hrxabaf9pj9dyj6x12sx6m9y8bk8nzdz1xsha2jq3fcglw2mc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -10441,6 +10484,27 @@ license = lib.licenses.free; }; }) {}; + creamsody-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "creamsody-theme"; + version = "20161105.144"; + src = fetchFromGitHub { + owner = "emacsfodder"; + repo = "emacs-theme-creamsody"; + rev = "a0071bf037a7f2d87097918fe5338e23f4736edd"; + sha256 = "0ch5xm2mnkd7inh7m5ir12w2b6zprzsqsl9asayhd0kpnk7r0yz4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme"; + sha256 = "0l3mq43bszxrz0bxmxb76drp4c8721cw8akgk3l5a800wqbfp2l7"; + name = "creamsody-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/creamsody-theme"; + license = lib.licenses.free; + }; + }) {}; creds = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "creds"; @@ -10652,12 +10716,12 @@ csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "csharp-mode"; - version = "20160909.1316"; + version = "20161105.512"; src = fetchFromGitHub { owner = "josteink"; repo = "csharp-mode"; - rev = "b87332e7f9fd543e4b3d32ed97b96daf7426c31f"; - sha256 = "138kkwq5dflypz52b2md53jmp3j1z8nyivwf4bs22j5skp4p9411"; + rev = "4516a18c0dd1797a2d1eb2ae3069c0e16efa14a7"; + sha256 = "0v5kd8n9hd3aqd4p1z30rnbqiwxxd1mv30d4bkwrba6k5814qy4z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode"; @@ -10712,27 +10776,6 @@ license = lib.licenses.free; }; }) {}; - cssfmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "cssfmt"; - version = "20150818.2128"; - src = fetchFromGitHub { - owner = "KeenS"; - repo = "cssfmt.el"; - rev = "802c82a1aa8d433ec473e253ae1fa4ecad3fb4b0"; - sha256 = "0hyf4im7b8zka065daw7yxrb3670dpp8q92vd2gcsva1jla92h9y"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2d95ca68c481061f5dc2614ae660a98d53837c46/recipes/cssfmt"; - sha256 = "12yq4dhyv3p5gxnd2w193ilpj2d3gx5ns09w0z1zkg7ax3a4q4b8"; - name = "cssfmt"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/cssfmt"; - license = lib.licenses.free; - }; - }) {}; cssh = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cssh"; @@ -11167,8 +11210,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "d8c5467133aa16c3eccb19427c41a62a51115837"; - sha256 = "1afanvmf4w1ic2gr8nzrh47f5gbp83bbhrzgfpwfk4ci3487y47l"; + rev = "ccfebe9171fe65484d459aa3f0f3c1c97397c103"; + sha256 = "1ji1hra4iahy12067qzda0kbw5ry9khp6z0gbfrihzjq5rmn4h3j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -11268,12 +11311,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20161024.227"; + version = "20161026.201"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "203e731f0415789fd1e15f795f245ab19ebd8cc7"; - sha256 = "1j88rqh2rqhmas72wz8y2j6izgq23q53x33wz33bfjprrs14dyv2"; + rev = "a667ef6967008ae6176838efd26b3631ba63a3df"; + sha256 = "1qrvss2qw88xqv040bp143h7aab78j1kp9x5j4s6pz0ihj593ywn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -11457,12 +11500,12 @@ dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "dart-mode"; - version = "20160212.1121"; + version = "20161026.1510"; src = fetchFromGitHub { owner = "nex3"; repo = "dart-mode"; - rev = "05fbd30fb4dd1ce931fb15a3e88b13eeec5526ef"; - sha256 = "0ylzgaf4g0fh16rc061iaw3jrl2sjiwpr4x1ndk2bp0j14n7hqid"; + rev = "1f65c88dbc55dfc6c7d5322e693d6d30962b27ea"; + sha256 = "1ki5a104r302cxbmqj8h9ddbrp46la7yz3bxj1kxv8sl9afgbqcd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d9cb763cb8e929d9442be8d06e9af02de90714a/recipes/dart-mode"; @@ -11478,12 +11521,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "20161018.136"; + version = "20161106.410"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "b7ba21202ec876775768fca08163e2cbfd130799"; - sha256 = "11kj6hd7cc02b6b32ay1dnzlwq1slvwyv7qsslgcf2kbk7qpsn94"; + rev = "1422b70b562a9d4e198eb73e03d89f446fcf5295"; + sha256 = "080d3im10wgn5qccydiavidik8rjmp432i4mhkb2x5fpqaikv62x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -11524,8 +11567,8 @@ src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "b7ba21202ec876775768fca08163e2cbfd130799"; - sha256 = "11kj6hd7cc02b6b32ay1dnzlwq1slvwyv7qsslgcf2kbk7qpsn94"; + rev = "1422b70b562a9d4e198eb73e03d89f446fcf5295"; + sha256 = "080d3im10wgn5qccydiavidik8rjmp432i4mhkb2x5fpqaikv62x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -11881,8 +11924,8 @@ src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-deferred"; - rev = "0a795feeae901e736fc43b1c75a6e3f92f811f08"; - sha256 = "0wnzq2clhbvx0ipwsh0n1w8ssf97l0k8cwmss4l032adz72f6pbn"; + rev = "9b46dedcb89923de417f7557743c4c22421f5787"; + sha256 = "0bq00qc0hyjczqjm8nawbyqlm67azi501v7q3bhapi4rhyn0lp7i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e9a114d85f630648d05a7b552370fa8413da0c2/recipes/deferred"; @@ -12001,12 +12044,12 @@ demo-it = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "demo-it"; - version = "20161021.1305"; + version = "20161103.1337"; src = fetchFromGitHub { owner = "howardabrams"; repo = "demo-it"; - rev = "43b1ee8180d0e0eeb91998eb81dbae11eac23bff"; - sha256 = "1amgjanl0dmsfv3w2kvggiq5yhwb3qvp7lfhgl29xg8gjdgy60z1"; + rev = "830a1f10982abe586c9d13685007d191eda6fbdc"; + sha256 = "0fkwzx681df0p4a8f2z6lh5j94vln0i6cvrfzym5v8cdhyhd0p80"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1dec5877db00c29d81d76be0ee2504399bad9cc4/recipes/demo-it"; @@ -12186,22 +12229,22 @@ license = lib.licenses.free; }; }) {}; - diff-hl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + diff-hl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diff-hl"; - version = "20161023.1607"; + version = "20161102.1726"; src = fetchFromGitHub { owner = "dgutov"; repo = "diff-hl"; - rev = "fa74f2f513351464f01a133b145339014811d042"; - sha256 = "0s5rdhghcr26qwk8xlankbivayg5246knbkkaifpy64gpl3v0k51"; + rev = "c476e4080de7bea98a7a9a1173df20397d1c7671"; + sha256 = "185gl1p80yx68d2hzawhrz26zy75z30qr1lb7c0gzmk5ryy5yzgv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf8fc25abd2fb91ec6a6ba951d89a19ca4f5571f/recipes/diff-hl"; sha256 = "0kw0v9xcqidhf26qzrqwdlav2zhq32xx91k7akd2536jpji5pbn6"; name = "diff-hl"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/diff-hl"; license = lib.licenses.free; @@ -12297,8 +12340,8 @@ src = fetchFromGitHub { owner = "alezost"; repo = "dim.el"; - rev = "110624657fec0c8a7b3589108230e6a635302ae0"; - sha256 = "1qiqkppfpgyqm1z31i956gj96670kjxs7m33knmhngqk7i5yc94i"; + rev = "4b00587dfaabc1f2393b9a9f9993996c288d4445"; + sha256 = "0qvx81glmrsaafcikxz07ym60haxhb39dyspv5x95f2p345f03q4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a740ab40cab3a1890f56df808f41a2d541aa77c/recipes/dim"; @@ -12314,12 +12357,12 @@ dim-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dim-autoload"; - version = "20161008.1332"; + version = "20161023.1329"; src = fetchFromGitHub { owner = "tarsius"; repo = "dim-autoload"; - rev = "3a9b7f6c5a2b71149c4cdda7e4b4ea3bd729baa5"; - sha256 = "0jp3rps3ps8mh7zsn1y9367l1gh26hhmbz61l1dcv3sk4jrw46mw"; + rev = "c91edab065f413910354940742b35bdffeb52029"; + sha256 = "0v4fgbh1byv89iiszifr31j4y2s95xwcq0g9iizxiww7mjrfggyi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66b1a81dfd09a2859ae996d5d8e3d704857a340f/recipes/dim-autoload"; @@ -12624,12 +12667,12 @@ dired-icon = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-icon"; - version = "20161023.19"; + version = "20161030.1510"; src = fetchFromGitLab { owner = "xuhdev"; repo = "dired-icon"; - rev = "ffcd62cb997efadbbc1da62e1cffe957a21a22c8"; - sha256 = "0say1v2xlqhdvkbfcm7yfmqad2lq9c7m6ldplsxcw921yfadf4qx"; + rev = "6869d1aee10317f2d4fc49d343d642d422b7117b"; + sha256 = "1cn8nfai0xsyds3824f0kw5237lyggw0zgk1d60alznm5xyzwlhb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d0947148441ed48f92f4cfaaf39c2a9aadda48/recipes/dired-icon"; @@ -12768,12 +12811,12 @@ dired-quick-sort = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "dired-quick-sort"; - version = "20160524.338"; + version = "20161025.1322"; src = fetchFromGitLab { owner = "xuhdev"; repo = "dired-quick-sort"; - rev = "f819be0bc67d8e8593fbbf71f1117b3e4fa33c27"; - sha256 = "12xcck2hypw13r522naghmfjpykld11ahyz9rqfz6qh8dnv2j234"; + rev = "192a2535025d4644729b65f38474eaf54c999f18"; + sha256 = "01n2ldsgfxnrdqdcfw1r0vrp1x1q5f6ikjzxx56qqp9f4kmfvs50"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d278178128deb03a7b1d2e586dc38da2c7af857/recipes/dired-quick-sort"; @@ -13678,12 +13721,12 @@ docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }: melpaBuild { pname = "docker"; - version = "20161018.2349"; + version = "20161031.249"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "6fcc5082b4cb4b40e75c36d2569511139ee9de72"; - sha256 = "16hw7qbbln3rcd6n052wqwyyw5mpd4h4fsg4c2pz8vwixk5jhnmj"; + rev = "2e9438cf132da1bbb25b93769754c29bd7e48a6c"; + sha256 = "1dqmnija2s1dmf0kq3d4nf212jyyqa5rjnrg4l2rlxkkfgxjdqaz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -13833,12 +13876,12 @@ doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20161009.1630"; + version = "20161103.1722"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-theme"; - rev = "af85fb024a5d18852cc86ad791f966e77aa7e4ad"; - sha256 = "02rpcziiqaqfzj36aldcpx9z5r8bz1ngp6fqwdya8jxpzydvcz9a"; + rev = "6a33ec057419e14ef0494e5ed1291cff4c8723e2"; + sha256 = "0c5v0ry6bk47hb90ghry96arvdzdhfidy0d9ffslxdf0j7zfw4i1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes"; @@ -13946,12 +13989,12 @@ dot-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dot-mode"; - version = "20161005.1443"; + version = "20161025.1037"; src = fetchFromGitHub { owner = "wyrickre"; repo = "dot-mode"; - rev = "783ccf5b1de591e9926c0b7133ad64a26db62315"; - sha256 = "1zsbr6cyyynczik7wdd7p6ii5nw7zn44ir7lvm2kkslwjswx34qc"; + rev = "cde2d593cb3f8e31db8778e434d3a4550707d2cc"; + sha256 = "1pvmypsz5c5jkx4g3hvznayyv9cs9yr5sgf251prxnqcl0ivc0y9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3082fb1c8a5e0439b3ae5e968845aecd99d28e2/recipes/dot-mode"; @@ -14174,6 +14217,27 @@ license = lib.licenses.free; }; }) {}; + drone = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "drone"; + version = "20161106.118"; + src = fetchFromGitHub { + owner = "olymk2"; + repo = "emacs-drone"; + rev = "1d4ee037ad3208847a4235426edf0c4a3e7b1899"; + sha256 = "1dwxgzf32cvfi7b6zw3qzamj82zs2c0ap6i1w0jqqgzmkz20dqvf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3b62e697798627b07000ac72c19ecd1d89c22229/recipes/drone"; + sha256 = "0wjbmgic715i4nxk90nasfamk04lskl8dll9y5klk32w1lsj546q"; + name = "drone"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/drone"; + license = lib.licenses.free; + }; + }) {}; dropbox = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, oauth }: melpaBuild { pname = "dropbox"; @@ -14260,7 +14324,7 @@ version = "20130120.1257"; src = fetchsvn { url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1766432"; + rev = "1768508"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -14319,12 +14383,12 @@ dts-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dts-mode"; - version = "20150403.1604"; + version = "20161103.523"; src = fetchFromGitHub { owner = "bgamari"; repo = "dts-mode"; - rev = "6ec1443ead16105234765f9b48df9b4aca562e61"; - sha256 = "0cafvhbpfqd8ajqg2757fs64kryrl2ckvbp5abldb4y8fa14pb9l"; + rev = "9ee0854446dcc6c53d2b8d2941051768dba50344"; + sha256 = "1k8lljdbc90nd29xrhdrsscxavzdq532wq2mg7ljc94krj7538b1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/864a7ec64c46a0357710bc80ad4880dd35b2fda1/recipes/dts-mode"; @@ -14445,11 +14509,11 @@ dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dyalog-mode"; - version = "20161015.530"; + version = "20161103.628"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "6ff00cc2f12b"; - sha256 = "1sjpwgjimrmh8s8lzbjrhhqvhrfcvs36l8ls75qmrrz5rvp386l3"; + rev = "18cd7ba257ca"; + sha256 = "0lf6na6yvdk5n9viy08cdwbgphlcxksynbkvi2f02saxdzdy368v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -14780,12 +14844,12 @@ easy-kill-extras = callPackage ({ easy-kill, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-kill-extras"; - version = "20160418.1919"; + version = "20161028.504"; src = fetchFromGitHub { owner = "knu"; repo = "easy-kill-extras.el"; - rev = "65fc4fdfb79c6dd679b4a1a57fa657b4b39919cc"; - sha256 = "0mmhqid0x56m0p3b18a757147fy8km3p4kmi0y94kjq04a4ysg3k"; + rev = "e60a74d7121eff7c263098aea2901cc05a5f6acd"; + sha256 = "1rabkb2pkafnfx68df1zjwbj8bl7361n35lvzrvldc3v85bfam48"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b55d93f78fefde47a2bd4ebbfd93c028fab1f40/recipes/easy-kill-extras"; @@ -14801,12 +14865,12 @@ easy-lentic = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lentic, lib, melpaBuild }: melpaBuild { pname = "easy-lentic"; - version = "20160727.2025"; + version = "20161031.2119"; src = fetchFromGitHub { owner = "tumashu"; repo = "easy-lentic"; - rev = "751a1d717840d9f526f26cf43e88d44981a6b14f"; - sha256 = "027w2sjagv74g9bx1k4w2f79fmxwvdsk2625abjlv7mly3aigzyy"; + rev = "6f43c8d575274349757173b9bcad3bf5b59300ac"; + sha256 = "0jw1m2ff23b99rz137ndy0gjbk3fs7srsyjd8f8fssl4xm8mzb39"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e098e70214e85e1c583a4976f895941c13de75f/recipes/easy-lentic"; @@ -14885,12 +14949,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }: melpaBuild { pname = "ebib"; - version = "20161016.1143"; + version = "20161106.2351"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "007c001d8a200ed27c0bf6f32e09f6ed38a1fb37"; - sha256 = "1374r0j8i5zmxdnd23h7svpbcwghb2wskn0fgpvnk06859xjhpgl"; + rev = "4617ea9cc952ab63dddf8a38ce21ae32442f51f0"; + sha256 = "01f71sxbif5hmgfd9696cwp541a93138d00y58szl1my0wxk0j4g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -15323,12 +15387,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20160904.1508"; + version = "20161105.2212"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "bf3bedb6f3740b1df20d7ab344c16984b141eac4"; - sha256 = "0aam813888m3smnh8ycmsmlb9nlkrxfv9myd7crvjgbsc6413bnp"; + rev = "0946f6672d95a943f1071e678aa91af6e614a143"; + sha256 = "1v5gf3jlb7pi08yjcglghsrwzvdms3r2cpgg2hzd2panwm623wz7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -15483,8 +15547,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "1d18f9f62fe85cf18b5ab522069d83d4733e85c2"; - sha256 = "0znr8i6p5ik8dh3abwycgfdm0byz0ywnj4fwh98smwb1ad3jdv37"; + rev = "80aaf63ffa357df2106a192ee04eef54a8dae2fd"; + sha256 = "0wnyyl70jssdwgcd9im5jwxnpn7l07d0v6dx9y8546d254xdwpwx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -15500,12 +15564,12 @@ ego = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "ego"; - version = "20161017.2111"; + version = "20161024.2138"; src = fetchFromGitHub { owner = "emacs-china"; repo = "EGO"; - rev = "758820bfd9a6bb3c95d559074e508a19308868d8"; - sha256 = "1npy4471xy9f2ww1851nqfpskxw0g3i7ls1ca1zzmjc7iqsm5irf"; + rev = "4b97a2e213a960cf6902ad00879262c1b274e122"; + sha256 = "04y0c385w7m60wsknaxc00wb07hkdnlvncr7qgsh5hwh61ggfh6n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0090a628a5d566a887cac0d24b080ee6bafe4612/recipes/ego"; @@ -15561,12 +15625,12 @@ ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "20161021.1010"; + version = "20161030.1637"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "701ddbe39cd11d751601fd7830dd8f26e2dfebeb"; - sha256 = "0g627j293hykhzxzb9q3ab2xy4ycdkfh905wyyc4fvxci0672zkv"; + rev = "8e3764044c9bd44fbdab4e870c2fc9a36ce02449"; + sha256 = "0f5k9bx632xjwj3l03vs0k48xvxq4nbi71039fcjqs0bchg814nj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -15670,8 +15734,8 @@ src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "0eafb42926eb4698cef52878c34ae6d1a6246b23"; - sha256 = "0fry19m2012gpsllilp02pyzcq29y4r28rq5pik4rv2znn9zvp9j"; + rev = "4b767b8565c5090538b1d73500dd50f2102150cb"; + sha256 = "1ddfz4b0bphixg3maa4mrbjc82q94s08pz0990b4pgqgh4als7sc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -16080,12 +16144,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20161021.1247"; + version = "20161030.1731"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "d54bc55af47591e87e3af9d72b91108c55629719"; - sha256 = "1pb94jasrg4539ndph1sv5fbnyfjppabic2fgi9fyh7qsab79sfk"; + rev = "a3b2acd760385a800f04652f15dfd0e7f825dfef"; + sha256 = "0a9xvfnp3pwh0q1k05q8xnray53a1aihqbxnnrfdfxx0s8rah90i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -16150,12 +16214,12 @@ elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "elfeed-web"; - version = "20160904.1131"; + version = "20161030.1731"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "d54bc55af47591e87e3af9d72b91108c55629719"; - sha256 = "1pb94jasrg4539ndph1sv5fbnyfjppabic2fgi9fyh7qsab79sfk"; + rev = "a3b2acd760385a800f04652f15dfd0e7f825dfef"; + sha256 = "0a9xvfnp3pwh0q1k05q8xnray53a1aihqbxnnrfdfxx0s8rah90i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -16171,12 +16235,12 @@ elhome = callPackage ({ fetchFromGitHub, fetchurl, initsplit, lib, melpaBuild }: melpaBuild { pname = "elhome"; - version = "20131202.1108"; + version = "20161025.1342"; src = fetchFromGitHub { owner = "demyanrogozhin"; repo = "elhome"; - rev = "af112592fbc41a625d1d17828db78357df23c127"; - sha256 = "0rdhnnyn0xsmnshnf289kxk974r57i6nx0vii1w36j6p6q0b7f9h"; + rev = "e789e806469af3e9705f72298683c21f6c3a516d"; + sha256 = "1q9glli1czbfp62aalblaak55j8rj2nl8bm8nifnnb8jrzj1qrn0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/527cc08a3424f87fe2e99119b931530840ad07ba/recipes/elhome"; @@ -16255,12 +16319,12 @@ elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: melpaBuild { pname = "elisp-refs"; - version = "20161001.1123"; + version = "20161027.2208"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refs.el"; - rev = "f4c04cbf533bbea93ac2fb6b6a41ba50c4dd2456"; - sha256 = "07x2hkhjm7nazi10h5sfkvcnpzyg86q383qyqclp78f5n6l4axif"; + rev = "f710313f4be05ff475c16ffda77f01026512ad34"; + sha256 = "0vdlcc4mfpda5pxwwfdqwnq3jhgv9mgj6739gnb00i192jg4605g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs"; @@ -16360,12 +16424,12 @@ elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "elm-mode"; - version = "20161006.11"; + version = "20161031.51"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "750bb9ced539db9dfdbd143bb2624aea54eb1e16"; - sha256 = "12s8pphf6wigaaarapp78srisqdkk2wk7myhxkidrna38pq1ad5b"; + rev = "a842d54348846746ef249a87ac7961a9a787947f"; + sha256 = "1ycbc2dz8qmdxpac6yz4dxp531r50nhzdxaknm5iwz6d94pcfgni"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -16591,12 +16655,12 @@ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, yasnippet }: melpaBuild { pname = "elpy"; - version = "20161008.910"; + version = "20161028.215"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "22bfc60a8017e7cab18b442818210263ffc6d24a"; - sha256 = "1q7wbjz3y3xd31fprf9dpv6ifjijw31kwsgayg7dl0bxkhqigrfn"; + rev = "5c900ff6b5524e216247f52ed4085734d815dacb"; + sha256 = "1h0k3nvxy84wjsiiwpxd8xnwnvbiqld26ndv6wmxqpwsjav186ik"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a36daf2b034653cd73ee2db2bc30df2a5be6f3d1/recipes/elpy"; @@ -16744,12 +16808,12 @@ elscreen-separate-buffer-list = callPackage ({ elscreen, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elscreen-separate-buffer-list"; - version = "20150521.2345"; + version = "20161106.1958"; src = fetchFromGitHub { owner = "wamei"; repo = "elscreen-separate-buffer-list"; - rev = "1aa66cdbf2b1dc87689725aef004a29bb79dd0f9"; - sha256 = "1w34nnl4zalxzmyfbc81qd82m7qp3zvz608dx6hfi44pjz0dp36f"; + rev = "7652d827aa1b8c1b04303c5b4b0bda5e8f85565e"; + sha256 = "1cpmpms3r9lywmxgciz4xq7vjw2c1mxmpd89shssqck16563zwxf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f5e5c8e2cd45a25e47c74bef59b9114aa7685eb/recipes/elscreen-separate-buffer-list"; @@ -16786,12 +16850,12 @@ elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elx"; - version = "20160523.528"; + version = "20161104.1831"; src = fetchFromGitHub { owner = "tarsius"; repo = "elx"; - rev = "0f80390bcf2a1dd9a3ba609e92f50a4a3463036e"; - sha256 = "07k8kq444ki7pxbz3vnrwqgycm9hfcdxgsnvf7qihqvzs2y1qm3d"; + rev = "84c9cd5721be9594de743330e7abcec092d2838c"; + sha256 = "0z2xgy8n3gwh71129pk53nrm13h2x51n61vz7xjqmhm6c11vgrq4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91430562ecea439af020e96405ec3f21d768cf9f/recipes/elx"; @@ -16849,12 +16913,12 @@ emacsc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsc"; - version = "20150807.257"; + version = "20161028.1006"; src = fetchFromGitHub { owner = "knu"; repo = "emacsc"; - rev = "02325c640232ee184314eb58d0051f365f7f085c"; - sha256 = "1rqr08gj07hw37mqd0flmq4a10wn16vy7wg0msqq0ab2smwjhns7"; + rev = "421e0c567358769e32f670ae8e949d99abae0c28"; + sha256 = "0zmb1qdbdlrycari1r1g65c9px357wz4f2gvmcacg83504mmf3d8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/emacsc"; @@ -16891,12 +16955,12 @@ emacsql = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }: melpaBuild { pname = "emacsql"; - version = "20160824.1308"; + version = "20161102.1605"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "3176aeee6140e464e1cede60e05b6523d1e38a23"; - sha256 = "13065qyd6p8g3hx56524wv23yddl94g666rrah2y4y872jzdbdn2"; + rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; + sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql"; @@ -16916,8 +16980,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "3176aeee6140e464e1cede60e05b6523d1e38a23"; - sha256 = "13065qyd6p8g3hx56524wv23yddl94g666rrah2y4y872jzdbdn2"; + rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; + sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql"; @@ -16937,8 +17001,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "3176aeee6140e464e1cede60e05b6523d1e38a23"; - sha256 = "13065qyd6p8g3hx56524wv23yddl94g666rrah2y4y872jzdbdn2"; + rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; + sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql"; @@ -16958,8 +17022,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "3176aeee6140e464e1cede60e05b6523d1e38a23"; - sha256 = "13065qyd6p8g3hx56524wv23yddl94g666rrah2y4y872jzdbdn2"; + rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; + sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite"; @@ -17059,12 +17123,12 @@ ember-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ember-mode"; - version = "20160609.539"; + version = "20161105.855"; src = fetchFromGitHub { owner = "madnificent"; repo = "ember-mode"; - rev = "9ad372808ded188b8741e7e6864f88e170232be1"; - sha256 = "0if1h4vcajkhjy56d5zili3i2bvgxhhkhhgf6l37bnnly243zr3q"; + rev = "3e45cf3e290ac422c1b9713f3e7db5c634bcdaf2"; + sha256 = "0g6xmqrjqzwl67ij05lwk72fdhm77p3b45jf7vc8xfn050nvn06l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ac1eef4ad87b1b6b6d8e63d340ba03dc013425b/recipes/ember-mode"; @@ -17246,12 +17310,12 @@ emms-player-mpv-jp-radios = callPackage ({ cl-lib ? null, emacs, emms, emms-player-simple-mpv, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-mpv-jp-radios"; - version = "20161002.855"; + version = "20161102.940"; src = fetchFromGitHub { owner = "momomo5717"; repo = "emms-player-mpv-jp-radios"; - rev = "2fcc970436142b8f4ce4911f2a04680fc77699b8"; - sha256 = "0ncax0vlgdah8mlqi3kr63ymf45bngr38vk6m6q3i2wdx6fbrxm9"; + rev = "aa7e2af7f2a40ae9691d8d8183060c947f4ba55e"; + sha256 = "062s55qhznd04vas602zzgxba3wd9yvx489ww7qjssj4wqgkckb6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09ba6da5057061f055d4a3212d167f9666618d4f/recipes/emms-player-mpv-jp-radios"; @@ -17531,12 +17595,12 @@ engine-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "engine-mode"; - version = "20161009.1718"; + version = "20161104.650"; src = fetchFromGitHub { owner = "hrs"; repo = "engine-mode"; - rev = "5d6c6495b31a8029b5122cfe9790c1c2609dd731"; - sha256 = "1y23yj749i14r373cfymqw6bakqvrsdgyjn91i0rp51y1rzdpp3p"; + rev = "9a1271b0051b9c939a63fa395cda2b5b64c5f36b"; + sha256 = "1nvf7anv2yplfhs4xbvrxdgd3mb41mzv4y1119lrqfvhsfd07ii5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea1b5dfb6628cf17e77369f25341835aad425f54/recipes/engine-mode"; @@ -17636,12 +17700,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20161023.113"; + version = "20161031.246"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "525692bc3ca2b4edb1122fd9f0101eee768caf93"; - sha256 = "1813f8yzyfpgc9b36fsznqkbjm9wnb2zs5kmwdl3wwg674lwm2dh"; + rev = "0dedd95b8e9ad09be9521160a7893eb58514c992"; + sha256 = "1xsbw32fysl3pdxbnczdgczbrhl3qqghgk5mcbb1j4a7rnp4js3m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -17746,27 +17810,6 @@ license = lib.licenses.free; }; }) {}; - epkg = callPackage ({ closql, dash, emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "epkg"; - version = "20160902.1246"; - src = fetchFromGitLab { - owner = "tarsius"; - repo = "epkg"; - rev = "b0606f9800c971085d5fef17dfe242aece378fb3"; - sha256 = "195y4clhs8lwbl3f5a9181v60n424s69nfzy9xrwzqclbyj42lr3"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c97468a71910ba6709792c060c1fb714004e24da/recipes/epkg"; - sha256 = "0vc1g29rfmgd2ks4lbz4599rbgcax7rgdva53ahhvp6say8fy22q"; - name = "epkg"; - }; - packageRequires = [ closql dash emacs ]; - meta = { - homepage = "https://melpa.org/#/epkg"; - license = lib.licenses.free; - }; - }) {}; epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epl"; @@ -17791,12 +17834,12 @@ epm = callPackage ({ emacs, epl, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epm"; - version = "20160628.4"; + version = "20161027.34"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "epm"; - rev = "82e342af7be59aa94bb0fb0e2a29a98c65cf2ef7"; - sha256 = "06fyndwgkmylhan81rpnv8h729p70iqrmxgbmsdm5fjrdgzzs3a6"; + rev = "ab3d194fc4d11520d6b9bce4746d7242f3f1606a"; + sha256 = "0a2197dyc4rgssqwi2bgd6cg1g23pirjpvyq9b77n1nl8jghp0sw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e12e8ae2e8e8aff7cbd75a951dd328cb9ccf58b0/recipes/epm"; @@ -17893,22 +17936,22 @@ license = lib.licenses.free; }; }) {}; - erc-crypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + erc-crypt = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-crypt"; - version = "20160323.1839"; + version = "20161105.623"; src = fetchFromGitHub { owner = "atomontage"; repo = "erc-crypt"; - rev = "e0c9951aae52b54d766c666214b25a64ede116a4"; - sha256 = "0yiv16k0b2399asghc7qv9c9pj6ih0rwc863dskr2isnpl39amra"; + rev = "d30f426b4cae10efcb91ea57afa9cc51feb4c39f"; + sha256 = "0r9n9jhd0sbf1mf3mzizaal5kqd20msm20vl73z589ph2q5vxnii"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a71b46c0370d2ed25aa3f39983048a04576ad5/recipes/erc-crypt"; sha256 = "1mzzqcxjnll4d9r9n5z80zfb3ywkd8jx6b49g02vwf1iak9h7hv3"; name = "erc-crypt"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/erc-crypt"; license = lib.licenses.free; @@ -18168,12 +18211,12 @@ ereader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, xml-plus }: melpaBuild { pname = "ereader"; - version = "20160924.1342"; + version = "20161103.1834"; src = fetchFromGitHub { owner = "bddean"; repo = "emacs-ereader"; - rev = "d673666315075e449b5c555a06ba50ae8cd8cad2"; - sha256 = "1pkjm4dh4ly4angbcnn3cyyyxpc3h38b4jlyx4050nabim13vh2k"; + rev = "af00d57441e6fe92d8f03d2557f4dec0a410e5e5"; + sha256 = "1rgh2p8sz4hcqavalm48dzp1gsnccmc8zd27rv1a4xhaaihw23cl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5a3feaacdfcddb862cd3101b33777d9c19dfd125/recipes/ereader"; @@ -18231,12 +18274,12 @@ ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }: melpaBuild { pname = "ergoemacs-mode"; - version = "20161012.2127"; + version = "20161025.1222"; src = fetchFromGitHub { owner = "ergoemacs"; repo = "ergoemacs-mode"; - rev = "ac70b2563fb6e3d69ea382fddc87b5721c20c292"; - sha256 = "0ydxyylijdd6da4n9by441352shphrpfyk2631ld5aq3gz27z9gi"; + rev = "f12edbb42f512ebeabcfb0a56e89924c21ddc529"; + sha256 = "12zmq9bsfjiigp3fdnqa349dmc8n5mb2j1szlpmzj2f4i6vm9rk3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode"; @@ -18273,12 +18316,12 @@ erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20161019.117"; + version = "20161024.359"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "055b1b09537b8900489d28ba37078edd7be57d04"; - sha256 = "05kj124sdrc29b1agcf1cps27kn023z6ii6smf6cds091nmqf897"; + rev = "3e06b82f0f29d90bff0783e7f3d1dabb435782f5"; + sha256 = "1i6zjj4pl5cdvqxv2ghcm0dml3jdm82hk3yp4l20zs49i1j3f43p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -18374,12 +18417,12 @@ ert-runner = callPackage ({ ansi, commander, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "ert-runner"; - version = "20160815.1309"; + version = "20161027.159"; src = fetchFromGitHub { owner = "rejeep"; repo = "ert-runner.el"; - rev = "b4ebafe62d0593adec38a3845af6b5499df4ab39"; - sha256 = "0babcbyarqxfqka5dl91zz58wyz1j7xfc8wy0r9818lwj15nr422"; + rev = "10628b8b90294077174f78e7b75e548f2a4b6f78"; + sha256 = "0qq7yml7zlbgvfsdiai8qbvlalh42dghm2ahv9ql9xif3sqjcjiw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a1acc68f296e80b6ed99a1783e9f67be54ffac9/recipes/ert-runner"; @@ -18416,12 +18459,12 @@ es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, spark }: melpaBuild { pname = "es-mode"; - version = "20160927.1351"; + version = "20161103.1024"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; - rev = "b2e4403197834c06bf47a9b72b57a65a28589fbf"; - sha256 = "19wzyc8qxdgm69k3nrv6x1yi3lajyxp1xhm6w54x14yqw2l8d67g"; + rev = "673506ec3d9eedc06f1e9f2953ac2720bf66f992"; + sha256 = "07r7zr38hqv0njc8zwdqmslh422kwahri2s7gp56abfk6wc0ndkm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode"; @@ -18651,8 +18694,8 @@ src = fetchFromGitHub { owner = "peterwvj"; repo = "eshell-up"; - rev = "380d7f66b2f7118be786289e9c8d87b5106803da"; - sha256 = "1ll0k99jblswp04hw2n9i7g91hypgpgxdh1cjfzd84pdwlc4avc5"; + rev = "1e6313bb62c573c0f07d3fc6dc910b7a48bc1b18"; + sha256 = "0ffs6iw0v2y2gggpr7hpzcclcdvfim98d3ln38bf1bnajfjg0fz7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d033b20d047db8ddd42bdfa2fcf190de559f706/recipes/eshell-up"; @@ -18794,12 +18837,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20161022.447"; + version = "20161101.215"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "c5282d4dc4d6fc07155e694d8a0f33e100c7697a"; - sha256 = "1lywwy0lhsjdd5sxm1i69np98l6y1ya3s44ga8fkm2zg2yl72wcb"; + rev = "bcb5fff9e9fc4f17f780149c6ba38002ce044176"; + sha256 = "1h3jlfblwsrqzw98lw4dq550zidab1f6l557fdcjkqlgjf74c4bb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -18962,12 +19005,12 @@ etable = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, interval-list, lib, melpaBuild }: melpaBuild { pname = "etable"; - version = "20150327.1016"; + version = "20161028.1309"; src = fetchFromGitHub { owner = "Fuco1"; repo = "ETable"; - rev = "8c9a32a92e7f808874c150c851f1605b2dd83d6e"; - sha256 = "1k361bbwd9z17qlycymb1x7scidvgvrh9bdp06rhwfh9j3slrbxy"; + rev = "d502141f0c69bf95256ba5cb9cd15350c7e942d2"; + sha256 = "0k0g58qzkkzall715k0864v3b7p5jnfwxqgmkj087x34frcf388k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/afee0fed80f4fa444116b12653c034d760f5f1fb/recipes/etable"; @@ -19274,8 +19317,8 @@ src = fetchFromGitHub { owner = "wbolster"; repo = "evil-colemak-basics"; - rev = "77dc58134233a2e044d0a2d4a5abc46c28470850"; - sha256 = "1k7gmivs5dpk672hjxkkpjlxzxd69133rkdchrhjk95nz0sdzq0b"; + rev = "69fd9db21bb2a281d5232d45555714b195825043"; + sha256 = "16g7322ib53cd8f12mqw25j77g0q8vivnc6q483i5kvaivnbqvd4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/945417d19faf492fb678aee3ba692d14e7518d85/recipes/evil-colemak-basics"; @@ -19295,8 +19338,8 @@ src = fetchFromGitHub { owner = "bmallred"; repo = "evil-colemak-minimal"; - rev = "334a1809ac4d3af3aeb8a18ca05c96c0c6ea6ad1"; - sha256 = "0608vcj2birsfm12w89gnpmcsalcpva61qkhh7m4kxqafglq7bzf"; + rev = "5f1db93959359d3efd57abb5a0d06e94dec92556"; + sha256 = "08dfmny7z03h6hbj21f344jv9kpzlzk31j5sd78w1c68mgx9hj6b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/828c744062069027f19fe5f2f233179f9149dc16/recipes/evil-colemak-minimal"; @@ -19400,8 +19443,8 @@ src = fetchFromGitHub { owner = "cute-jumper"; repo = "evil-embrace.el"; - rev = "8b2083c514af143f6d2f5d1cb4272c5bfb7437a3"; - sha256 = "1cplq9s3fw8nadcipjrix46jfcjbgg3xhz6d226wcqgmg90aclfn"; + rev = "4379adea032b25e359d01a36301b4a5afdd0d1b7"; + sha256 = "0rj1ippc6yi560xalhd91r7a00lk3d0jk13w464myznkpnasfw3a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4886f068766514deab5673b4366d6bdd311e3b6/recipes/evil-embrace"; @@ -19711,12 +19754,12 @@ evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mc"; - version = "20160923.1622"; + version = "20161104.859"; src = fetchFromGitHub { owner = "gabesoft"; repo = "evil-mc"; - rev = "540846d2769b7466f4d98accafdc4e0d1dc76ece"; - sha256 = "0j970h7xapg3y29rsyhirmda81d59ck5acjz0yrmjxjy0f61kq3w"; + rev = "494cbf6fc0eba4cbe7b6dbd3c75add14e2aca63c"; + sha256 = "06ywfq7vwqhqf9a715wfbpvl5va7sj6dfavizi4xjzaysmg8sn29"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; @@ -19795,12 +19838,12 @@ evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-nerd-commenter"; - version = "20160524.400"; + version = "20161031.409"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "8e126cda3d47f87f96d81b5abf76188d3b6316fe"; - sha256 = "05lv08gj0659j16jf8x1pif3b885vnj0qg3md7n827la9k94sfml"; + rev = "54c618aada776bfda0742819ff9e91845a91e095"; + sha256 = "04iyr6ys453pyfvif91qnhn6xyhl4z4cz2apj6vga61pa8lc70da"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; @@ -20005,12 +20048,12 @@ evil-snipe = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-snipe"; - version = "20160928.508"; + version = "20161103.1020"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-snipe"; - rev = "eaf97a09b38024d6bc7d44db5734bad16716c66a"; - sha256 = "1inw88n96wki9mja9xvdfc0qpwffh0l0kjnxpka5636sl7pl4i74"; + rev = "c3b9db1628192299cc3901ff21aec316bdbdb1b8"; + sha256 = "19s0d2c9d942zqi5pyav4srn0cn4yrdhd2dlds4pn7qxmvdkvyvb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe"; @@ -20047,12 +20090,12 @@ evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-surround"; - version = "20160911.1224"; + version = "20161029.606"; src = fetchFromGitHub { owner = "timcharper"; repo = "evil-surround"; - rev = "3812140e11a1b30878701cc028a4305ec3280a35"; - sha256 = "076rxzi947jg54l6giss83a22mg87798hl5iygzgb8wway6b7mfj"; + rev = "5c07befaf7930bbd61c24f3e251f8ce41026cfc2"; + sha256 = "0gd9dh1k0ydgc8nz575613bry240jb3qymzakkrq8pvcpl57nx7y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da8b46729f3bd9aa74c4f0ee2a9dc60804aa661c/recipes/evil-surround"; @@ -20236,12 +20279,12 @@ evil-vimish-fold = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, vimish-fold }: melpaBuild { pname = "evil-vimish-fold"; - version = "20161017.1837"; + version = "20161103.333"; src = fetchFromGitHub { owner = "alexmurray"; repo = "evil-vimish-fold"; - rev = "37fa430eb435ef6a6ac8ac01a6ea0102f5d751c6"; - sha256 = "0g9r9b95b3g5p8wcd0r5akmdxb7vb4wp8fj75dc5v3frgfssd1pc"; + rev = "674a8a894e4ae7e7f4b2608b0c9f801a548c69eb"; + sha256 = "1v2yr5q9c239xf002ymgwndmp5yp617rj7shw2zvfl13d7x229sg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcd51e24f88ebbbd3fddfc7c6f3b667d5104cf2b/recipes/evil-vimish-fold"; @@ -20341,12 +20384,12 @@ ewmctrl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ewmctrl"; - version = "20150630.138"; + version = "20161104.1833"; src = fetchFromGitHub { owner = "flexibeast"; repo = "ewmctrl"; - rev = "4e1ad0d54bccf2eddb7844eefb8253440aa80f28"; - sha256 = "1frhcgkiys0pqrlcsi5zcl3ngblr38wrwfi6wzqk75x21rnwnbqv"; + rev = "ba1879cc803a63d5a4047ec6f2990e369ae5af3a"; + sha256 = "12h2fgabfmaq1cpr7y7ckyyfgy53ww3v25p2kk5fq77rn40zbniy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b2a7679f0961b171bf23080e628ae80f50c446e4/recipes/ewmctrl"; @@ -20530,12 +20573,12 @@ eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eyebrowse"; - version = "20160625.201"; + version = "20161027.1213"; src = fetchFromGitHub { owner = "wasamasa"; repo = "eyebrowse"; - rev = "90b6b364bb372354deb32463a9a259ac9a16da7f"; - sha256 = "1fl26ix15bd8qgf8q9p68n92y6zmgkydrswhrwzxp8znnirkps3i"; + rev = "41344e2aa2a919eae62ecedf80dcd41456084bcc"; + sha256 = "1b9341qqzr43sq0mjb2rkc5r9a2fyzwh1dm2qh27rcsb3vg219h2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse"; @@ -20771,12 +20814,12 @@ faff-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "faff-theme"; - version = "20160928.741"; + version = "20161026.1047"; src = fetchFromGitHub { owner = "WJCFerguson"; repo = "emacs-faff-theme"; - rev = "cdac27efa1ed24c536b26df70476405e78c1de5e"; - sha256 = "1hwypmqn3q14kw9ayd89nfnk92m5k4anzi4d2sxi54sjxdl02lwn"; + rev = "61d98d43c9173662078c0c337ce78918eb6a3610"; + sha256 = "15shbzjpl89ybyyn7d53psn9i8csxi2h9jwz7mx98lg9pjy58ifa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b35c169fe56a5612ff5a4242140f617fdcae14f/recipes/faff-theme"; @@ -20838,8 +20881,8 @@ src = fetchFromGitHub { owner = "lunaryorn"; repo = "fancy-battery.el"; - rev = "bcc2d7960ba207b5b4db96fe40f7d72670fdbb68"; - sha256 = "0m7rjzl9js2gjfcaqp2n5pn5ykpqnv8qfv35l5m5kpfigsi9cbb0"; + rev = "9b88ae77a01aa3edc529840338bcb2db7f445822"; + sha256 = "1k6prddw277iszh9hq145yqidwiiy9iqz656rpmqwn5hmr1vakhk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eae3af4145c534992d1c1ee5bb6420651c7c5d82/recipes/fancy-battery"; @@ -21264,12 +21307,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "20160909.1355"; + version = "20161026.145"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "e2de1f221635910f5f4d9211bd709cb72281ac2d"; - sha256 = "1r5a6h440zg4lwjd68jp4g7gskgzwvgdm4nqc2476l71yv1ifg1p"; + rev = "4f7d96fde81c41b023515d33d635a76f8ba647cc"; + sha256 = "01fcqs3jckrqfg4i3axgzdp53mxfxa4lbc9xsfssi0fxq4b7clh6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -21807,12 +21850,12 @@ flim = callPackage ({ apel, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flim"; - version = "20160831.633"; + version = "20161029.1930"; src = fetchFromGitHub { owner = "wanderlust"; repo = "flim"; - rev = "b0d16a821c720ec9b32cf41a545656d3c00478ab"; - sha256 = "06zgl3j12ljz0w8p4p9n64jws3wjjiaydaih6bhzasbn94qmh2qv"; + rev = "62c5fee3a0b9a0a8b122940ea5cd536adfac0ef0"; + sha256 = "0iwamgidr4i7jpqfd1mrja4id0app87w6llmpbpj7sxy1pbjv1qk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94faf56ff9bf94f51ef5253e4c4244faec5eecfd/recipes/flim"; @@ -21951,12 +21994,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20161023.738"; + version = "20161106.149"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "b6e3e2db7bd8347a93637f78cc8fe20c4a4b6008"; - sha256 = "03h3g2yb4lfhg2z6n3isgy7kf6g5q3ph6k0f07kq0vg3rg4486ra"; + rev = "f44a5f7d6f0da7f656b6167f566b72cdd7c62dbb"; + sha256 = "0nyp7aw0144klm5mkq21lalma25g0pqs1y2f7j7rv6phg4mmnk1x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -22161,12 +22204,12 @@ flycheck-css-colorguard = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-css-colorguard"; - version = "20161002.242"; + version = "20161031.422"; src = fetchFromGitHub { owner = "Simplify"; repo = "flycheck-css-colorguard"; - rev = "d42f5e17d9991604da2200afd4af2e1cc48533f0"; - sha256 = "09p3dclx9pq0b4i005gjyg5qqlcls65f3qkkym1sny2jmd9nrg61"; + rev = "ae94fa0396acd99f9ec36d9572459df793f37fe8"; + sha256 = "1vy5yjf98b7dk9lniz3rgk33agg8f1x8488lvm28ljdq3jfdgcfw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f413cc5c2080091491a986f69402b305abe4a7f/recipes/flycheck-css-colorguard"; @@ -22746,27 +22789,6 @@ license = lib.licenses.free; }; }) {}; - flycheck-protobuf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, protobuf-mode }: - melpaBuild { - pname = "flycheck-protobuf"; - version = "20160211.700"; - src = fetchFromGitHub { - owner = "edvorg"; - repo = "flycheck-protobuf"; - rev = "3d4c71b535bb456045e4d0e88d63791dbe2093b5"; - sha256 = "1adcijysw4v8rrxzswi8zhd6w99iaqq7asps0jp21gr9nqci8vdj"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8f8d8e4d849400823d738c198665d46fa24d7661/recipes/flycheck-protobuf"; - sha256 = "0cn5b9pr9i9hrix7dbrylwb2812al8ipbpqvlb9bm2f8hc9kgsmc"; - name = "flycheck-protobuf"; - }; - packageRequires = [ protobuf-mode ]; - meta = { - homepage = "https://melpa.org/#/flycheck-protobuf"; - license = lib.licenses.free; - }; - }) {}; flycheck-purescript = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-purescript"; @@ -22812,12 +22834,12 @@ flycheck-rebar3 = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-rebar3"; - version = "20161022.433"; + version = "20161030.615"; src = fetchFromGitHub { owner = "joedevivo"; repo = "flycheck-rebar3"; - rev = "534df87b0c2197fa15057f1e1a19763411c59220"; - sha256 = "1sai968p20g7yiyrnmq52lxlwxdls80drjw4f1abkr99awzffsb3"; + rev = "56a7c94857f0a0ea6a2a73c476a1a2faadc0f7c6"; + sha256 = "1pas49arri2vs9zm3r8jl4md74p5fpips3imc3s7nafbfrhh8ix3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2acff5eea030b91e457df8aa75243993c87ca00e/recipes/flycheck-rebar3"; @@ -22942,8 +22964,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "adda8765e1c1819bcf63feefea805bd8c0b00335"; - sha256 = "1bm0kagq6aanybc0rrsfq296sd1485f4lvkz84hxamkfm329illm"; + rev = "d116b167bf776dbeba6a822c0b3c19a2c97f68d4"; + sha256 = "192qiwpkc5a0bxsiqj6zyvlblvixq24m845dgpcsqzwpjcm7qq9l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd"; @@ -23610,12 +23632,12 @@ flyspell-correct = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flyspell-correct"; - version = "20161014.216"; + version = "20161031.1134"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "f4ce74cf3502ff87099ec1ef6749e37def0627fa"; - sha256 = "1il46dxfxnvsllp5y3wh2fwscixkb3alykbdfdkyd8g4dqg4fg16"; + rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73"; + sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa06fbe3bc40ae5e3f6d10dee93a9d49e9288ba5/recipes/flyspell-correct"; @@ -23631,12 +23653,12 @@ flyspell-correct-helm = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, helm, lib, melpaBuild }: melpaBuild { pname = "flyspell-correct-helm"; - version = "20160730.201"; + version = "20161031.1134"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "f4ce74cf3502ff87099ec1ef6749e37def0627fa"; - sha256 = "1il46dxfxnvsllp5y3wh2fwscixkb3alykbdfdkyd8g4dqg4fg16"; + rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73"; + sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-helm"; @@ -23652,12 +23674,12 @@ flyspell-correct-ivy = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, ivy, lib, melpaBuild }: melpaBuild { pname = "flyspell-correct-ivy"; - version = "20160730.201"; + version = "20161031.1134"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "f4ce74cf3502ff87099ec1ef6749e37def0627fa"; - sha256 = "1il46dxfxnvsllp5y3wh2fwscixkb3alykbdfdkyd8g4dqg4fg16"; + rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73"; + sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-ivy"; @@ -23673,12 +23695,12 @@ flyspell-correct-popup = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, lib, melpaBuild, popup }: melpaBuild { pname = "flyspell-correct-popup"; - version = "20160730.201"; + version = "20161031.1134"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "f4ce74cf3502ff87099ec1ef6749e37def0627fa"; - sha256 = "1il46dxfxnvsllp5y3wh2fwscixkb3alykbdfdkyd8g4dqg4fg16"; + rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73"; + sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-popup"; @@ -23778,12 +23800,12 @@ focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "focus"; - version = "20161013.401"; + version = "20161106.702"; src = fetchFromGitHub { owner = "larstvei"; repo = "Focus"; - rev = "741a94586651d8f07bbfa939de25e3c2d76444a7"; - sha256 = "15fns0wpvj0lgq3ax14zhqkpfbkss68zib542cppnnl3q88jvbf6"; + rev = "ffd97a5a3663103aa96945bb1d2f03481ab6229f"; + sha256 = "1f5q99mhhcb75v2c06sxbg7psqclnlqci7fjaa484a8hyback24r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e8f1217224514f9b048b7101c89e3b1a305821e/recipes/focus"; @@ -24271,27 +24293,6 @@ license = lib.licenses.free; }; }) {}; - frame-restore = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "frame-restore"; - version = "20140811.1409"; - src = fetchFromGitHub { - owner = "lunaryorn"; - repo = "frame-restore.el"; - rev = "6346cf157d5e1b487a16839d998258b7e693cbc8"; - sha256 = "0n6jhm1198c8slvdymsfjif0dfx3wlf8q4mm0yvpiln46shhwldx"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/50ab397e8841f686e098caf6dae5dfafb0550581/recipes/frame-restore"; - sha256 = "0b321iyf57nkrm6xv8d1aydivrdapdgng35zcnrg298ws2naysvm"; - name = "frame-restore"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/frame-restore"; - license = lib.licenses.free; - }; - }) {}; frame-tag = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "frame-tag"; @@ -24439,12 +24440,12 @@ fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }: melpaBuild { pname = "fsharp-mode"; - version = "20160719.315"; + version = "20161103.300"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "3ab9f2ec3d0b70545f3834d26dbdadf760648f6d"; - sha256 = "06znv94bbx97j50226b5x2q7vnjb6j57ljmaygj0cvy8linr5j8n"; + rev = "cb70988aae85b03a26be9b3e2a70742658ff2502"; + sha256 = "111mz7fgacmfvrbv32yzmmxmx1pf7xb6rj7n7pwz51raid7a23p8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; @@ -24492,8 +24493,8 @@ version = "20161007.2213"; src = fetchgit { url = "git://factorcode.org/git/factor.git"; - rev = "417e296d46a80eeadcdbfcc06b017ccb3f86fbb9"; - sha256 = "00ghsi7yr540km7c2b4202pq17qak8g8gziqlx6l5nw64hjjkg6n"; + rev = "bbcd039c6cb4f73a2e0a262eb32a7d100f4aa40b"; + sha256 = "1rjfzw4l0cykfvj1hlzayzn63iyb818i7a591fcv4sbviqcg9c65"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; @@ -24921,12 +24922,12 @@ general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general"; - version = "20161018.819"; + version = "20161104.1437"; src = fetchFromGitHub { owner = "noctuid"; repo = "general.el"; - rev = "ae3c4e653c89dc3455f4cd8e75eb53fe41830de5"; - sha256 = "0lw189b05aq5l12qrb54wm2rw8dvcpw7ryx5ank7kbaza0nmx0mx"; + rev = "e628ab784703410e1451616953fcde9878d00301"; + sha256 = "1al3m9wgqbq3lkqw81gy0h15d4jis392nfdpybf5s0bvxbpfm29l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general"; @@ -24942,12 +24943,12 @@ general-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general-close"; - version = "20160921.520"; + version = "20161104.1235"; src = fetchFromGitHub { owner = "emacs-berlin"; repo = "general-close"; - rev = "4544040b3498d7f734ecce251708cd70089cd63b"; - sha256 = "07gh8awa37g7kyj3z44ffir98l5rk5zpk19a59b9s9jmkz1zixhg"; + rev = "3e19cca8452e3461d7797d63511ccb77cfb0e4a7"; + sha256 = "17lmg5qlakwm09j32fpkvwcxfzrkx4l16iiw38lbrlm505qnzlh2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641a48f5148df2a19476c9b3302934a604f5c283/recipes/general-close"; @@ -25068,12 +25069,12 @@ gh = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, logito, marshal, melpaBuild, pcache, s }: melpaBuild { pname = "gh"; - version = "20160728.1525"; + version = "20161102.2016"; src = fetchFromGitHub { owner = "sigma"; repo = "gh.el"; - rev = "87cd3e9dcdefeb1a6d781a3fad78eaeb6ef2ac7f"; - sha256 = "13wch5vp837nvw2ilcv40j3q9j6dx0j0a3q74g23vy3sn42r8znc"; + rev = "ed4c8a7b3c347c7c6680bd39c7f4ca632030eb74"; + sha256 = "0h5mkjipq9yw2djdq61kwp1g8bgkmqnkmgzzkg0vk1ix7crqbjif"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gh"; @@ -25114,8 +25115,8 @@ src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "757e17f34ae7c9c167cb98a5b404c7854e7d57ee"; - sha256 = "0y61l3c4rnhydr84v18r42bg26wxs3rm4nfcj822z3s5hrsd34cd"; + rev = "9ef3e67f219ab24246f0e73246f08533ff53b9cf"; + sha256 = "0v5bibr5mhllgsh2j3cjl8nh4x7sqjlyydvy3vl1zxhxwrx825iq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -25359,24 +25360,24 @@ license = lib.licenses.free; }; }) {}; - git-blame = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + git-blamed = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "git-blame"; - version = "20110509.926"; + pname = "git-blamed"; + version = "20161028.1226"; src = fetchFromGitHub { owner = "tsgates"; repo = "git-emacs"; - rev = "cfd3afe42b7d314c0cd1fc280dc35c69fc133869"; - sha256 = "125lh4gkxa0i66kvr0a6mrnc33knpqafjm3vg3278wy69pqrrznb"; + rev = "cef196abf398e2dd11f775d1e6cd8690567408aa"; + sha256 = "1n6x69z1s3hk6m6w8gpmqyrb2cxfzhi9w7q94d46c3z6r75v18vz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/git-blame"; - sha256 = "0glmnj77vya8ivjin4qja7lis67wyibzy9k6z8b54z7mqf9ikx06"; - name = "git-blame"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/87bc01218964a01cfd471ee068ed75976793a568/recipes/git-blamed"; + sha256 = "08az5mwg8kv8xsivs63y4sym54l1n34zc9z6k0iwpfixv9f8bk9p"; + name = "git-blamed"; }; packageRequires = []; meta = { - homepage = "https://melpa.org/#/git-blame"; + homepage = "https://melpa.org/#/git-blamed"; license = lib.licenses.free; }; }) {}; @@ -25408,8 +25409,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "95cacde4fcccc95c25d6fb9988d2aa097193f8c0"; - sha256 = "117jm8bafwi87n4bvivyyizxw6ayaiv4xwf469jh0jqnlggd6pwr"; + rev = "c8517573287b9e533fb7465ba0c045655b0ec167"; + sha256 = "12dhqwk1hdx3aghwfdc8nhd0zxlzm7mfcvxxqz20vq1jjbraz5iw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -25464,22 +25465,22 @@ license = lib.licenses.free; }; }) {}; - git-gutter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + git-gutter = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-gutter"; - version = "20160903.852"; + version = "20161105.656"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-git-gutter"; - rev = "338172b896bcc758a7e635cb5f79e19addf167e6"; - sha256 = "19a535y7k5s0kw12qrvxd74mb5ikszh0alsjivqpc8ydzvpqb9r7"; + rev = "00c05264af046b5ce248e5b0bc42f117d9c27a09"; + sha256 = "1c7byzv27sqcal0z7113s1897prxhynk6y89mq1fjlxmr0g20vzb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/git-gutter"; sha256 = "19s344i95piixlzq4mjgmgjw7cy8af02z6hg89jjjdbxrfl4i2fg"; name = "git-gutter"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/git-gutter"; license = lib.licenses.free; @@ -25786,8 +25787,8 @@ src = fetchFromGitHub { owner = "10sr"; repo = "github-elpa"; - rev = "2c813e0092acbe2fdeccece6f57d2a95ff85e0cd"; - sha256 = "0dlndpybh166dkjqcbqw2qwqqa9dc8g974nijyas74gi17zw93q9"; + rev = "7619a564edb1985b0487786a3b4ec6d12f897b5b"; + sha256 = "176x0dclclpa6am091f866ybqhhdnlq7jgsik5b5m74dl26bcxcg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81ec06e370f51b750ba3313b661d7386710cffb0/recipes/github-elpa"; @@ -25824,12 +25825,12 @@ github-notifier = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "github-notifier"; - version = "20160702.2112"; + version = "20161102.755"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "github-notifier.el"; - rev = "7fa3e5fd519711bcc241af73abc72fd0b6c1b3a9"; - sha256 = "0mi2yn6b1vhs4zdwqzyifi20bjy3ac0ycvza7ybvwanbkxb1kmfh"; + rev = "12621caa8d78bf2b559d2113ef476a8f2c2a4e0e"; + sha256 = "1cwabnm6nirmrwdq14l3pqdjh40h49icbfjx3z86rppp7cj3dmlm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c09f4e7e8a84a241881d214e8359f8a50ab14ddf/recipes/github-notifier"; @@ -26034,12 +26035,12 @@ gmail2bbdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gmail2bbdb"; - version = "20150909.1839"; + version = "20161104.2041"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "gmail2bbdb"; - rev = "f0e23a1262bb683285b381b1d142478ba345af1a"; - sha256 = "01hhanijqlh741f9wh6xn88qvghwqnfj5j0rvys5mghssfspqs3z"; + rev = "181ef6039227bb30a02041d8cfdc435551a7d948"; + sha256 = "0205ldrw1i7czq44pqdl374cl0rjp5w5zadrayw8brl7mmw92byn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb3c88b20a7614504165cd5fb459b0a9d5c73f60/recipes/gmail2bbdb"; @@ -26350,8 +26351,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "478b96fe0e77b4451b866559e2adb407fbce7120"; - sha256 = "1ymhpiklyqxi79h65yarmh1hgyswsdx5jahg9pmhg4jww34778y3"; + rev = "82514c86ff1b37eb29aa979fe51238846857935d"; + sha256 = "04fcz539haxvxlsnlmvw9inwmgssh8msn37iwlfax7z1a81bqq54"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete"; @@ -26493,12 +26494,12 @@ go-guru = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-guru"; - version = "20161013.1055"; + version = "20161103.1316"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "965dcbc5eb06d73cb700724535dd449a00082b84"; - sha256 = "0g7r8yhz8j2k2qnfwxkbapakvgjp3x3m4lmd7shhix0m6jl6kdin"; + rev = "adea2e5149bb976f956d994a0a9e510167481e72"; + sha256 = "0i725646ds3r6lh6l0zixsixn7acx9xsjxh4a0bcvbgkdyyadhaa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru"; @@ -26539,8 +26540,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "965dcbc5eb06d73cb700724535dd449a00082b84"; - sha256 = "0g7r8yhz8j2k2qnfwxkbapakvgjp3x3m4lmd7shhix0m6jl6kdin"; + rev = "adea2e5149bb976f956d994a0a9e510167481e72"; + sha256 = "0i725646ds3r6lh6l0zixsixn7acx9xsjxh4a0bcvbgkdyyadhaa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode"; @@ -26623,8 +26624,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "965dcbc5eb06d73cb700724535dd449a00082b84"; - sha256 = "0g7r8yhz8j2k2qnfwxkbapakvgjp3x3m4lmd7shhix0m6jl6kdin"; + rev = "adea2e5149bb976f956d994a0a9e510167481e72"; + sha256 = "0i725646ds3r6lh6l0zixsixn7acx9xsjxh4a0bcvbgkdyyadhaa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename"; @@ -26745,12 +26746,12 @@ godoctor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "godoctor"; - version = "20161014.2042"; + version = "20161029.2346"; src = fetchFromGitHub { owner = "microamp"; repo = "godoctor.el"; - rev = "d0755622a2600aece8c3319de0a1b8bc6d798ec3"; - sha256 = "1b7r3c5n3yp92gsphiyadp4ab9185vzfbbqqzgxq8rcxi3f4yjv2"; + rev = "b1cf6ea7e8fa23daa05e98b443ad9b5ee6badb9a"; + sha256 = "1shcxjhkk3l4vn1v16p86cxs00w5v02nmx2ariid5qrq2636gv8z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e23e1362ff7d477ad9ce6cfff694db989dfb87b/recipes/godoctor"; @@ -27145,8 +27146,8 @@ src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "bb498f73762deb009468da8c3bd93b7c6002a63e"; - sha256 = "0vqrqv0fdlw3z3402y9vmkr5lpf40nsf2nl5gi5gwr06fzcrv1dg"; + rev = "aac2f2f2927d6a95d507538f70f94a142cd83fd2"; + sha256 = "1vik0fh9hi81d8pai9sz9h3nrn7qkyhp289hd9p8cflkz7g9cd6h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -27388,8 +27389,8 @@ src = fetchFromGitHub { owner = "davazp"; repo = "graphql-mode"; - rev = "7798aef2a8d369d0cf6a3cbf1f85d2495969c253"; - sha256 = "1phmpj77hv2f5cq6685r6nngp2c5ssml55w7mdh4x4yji5mndn42"; + rev = "6e1f5335fa0b252b2bc422a837b82fdc82492eac"; + sha256 = "1x47abqqsry5f0ww01hp3470rqdzzr3yia8ljqq3ixpbnspp5q83"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3850073e6706d4d8151bc6ab12963a19deae8be9/recipes/graphql-mode"; @@ -27447,11 +27448,11 @@ grass-mode = callPackage ({ cl-lib ? null, dash, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grass-mode"; - version = "20160317.614"; + version = "20161102.621"; src = fetchhg { url = "https://bitbucket.com/tws/grass-mode.el"; - rev = "25414dff1fc5"; - sha256 = "0mnwmsn078hz317xfz6c05r7narx3k8956v1ajz5myxx8xrcr24z"; + rev = "fe70088c54b9"; + sha256 = "0prqgkbn0gm8g0fapkcd8192yyl2h3agn7qrlf5vrfx6780bsyw0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grass-mode"; @@ -27798,12 +27799,12 @@ gulp-task-runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gulp-task-runner"; - version = "20160911.430"; + version = "20161103.1523"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "gulp-task-runner"; - rev = "8f5c52a7180634a99e16822bbc9f6d5e014c87d2"; - sha256 = "0n4i3vdl3ayykxab9jql1ivcv7806pin91nmw9ang3fazan06diq"; + rev = "f13da9e619c1838571df0a0462c273ed6e76defc"; + sha256 = "1xai81v7c58hy9rh63kxybzmlyfkv0m7qfdp7zia60ml5xhib31r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34a2bede5ea70cf9df623c32e789d78205f9ebb0/recipes/gulp-task-runner"; @@ -27858,6 +27859,27 @@ license = lib.licenses.free; }; }) {}; + gxref = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gxref"; + version = "20161101.633"; + src = fetchFromGitHub { + owner = "dedi"; + repo = "gxref"; + rev = "24bc54ff2f8756609089f5f48f34d718db629381"; + sha256 = "184dnbg7sddck39qhnydzaa4sxxnz6mcicjb9n1632xlyg6q5wrl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/429b9150d4054fcadab8c5ca3b688921eeb19b78/recipes/gxref"; + sha256 = "06qlfjclfx00m8pr7lk6baim3vjk5i0m75i1p4aihp2vflvgjaby"; + name = "gxref"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/gxref"; + license = lib.licenses.free; + }; + }) {}; habitica = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "habitica"; @@ -28218,12 +28240,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20161020.2211"; + version = "20161101.751"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "7c763a3dd75b303da06917441c294516520dc3d1"; - sha256 = "03g79q9w08nbypjjs3zrlp85l99picyy101z0wbzz6gpxcwdqr15"; + rev = "cc432999b49bf9bb8844375436381b21f0344ebd"; + sha256 = "1dgkz5drnkdqm8lbf9d6qh35xlakzizm61yq6qkifhyisxlkg1rm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -28486,12 +28508,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20161024.701"; + version = "20161106.2328"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "8e00f252aede5521dd8d8d33cc464badafbd0ced"; - sha256 = "0hf60w1b0m1gkj70h0cnpf7028r50y7m58mvranlam59lfmcvw7m"; + rev = "c8d2db8b89a2a94e3409c358afccd00e9a15e6a9"; + sha256 = "1f8c8fi986js225g1yxf31hyn4l5ygya25yl8fprcxyp507xwmzp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -28570,12 +28592,12 @@ helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ag"; - version = "20161020.952"; + version = "20161105.744"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-ag"; - rev = "5bb0effbfb526d545a0b5a243cc5ed386ce72029"; - sha256 = "1cagdwiy2h0nhsjfbkmhnaklfy0jfy40b0cfc17xd9ywr55g19ym"; + rev = "34cddd7591e2b68bc91215da8f31036d83525909"; + sha256 = "0yr35rkfidly57fklacvh03yvpb50nyhj3cb0d1yg2xmm6civ5gn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag"; @@ -28675,12 +28697,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20161018.807"; + version = "20161101.2345"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "ff592982a051b4d733a5dbb824d4ed81211a03e0"; - sha256 = "17fl92d8hkihygsjf25njrsk259chj5vlzw0z73hfzs317pgc5yx"; + rev = "4dde1da1963c5ccbe8c4d304000011fd85f2e462"; + sha256 = "1nnj197hchbgz77lskymb7mjwjljd9m2gzyx6vl4yrsqwl4y3h6h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -29032,12 +29054,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20161024.13"; + version = "20161107.47"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "8e00f252aede5521dd8d8d33cc464badafbd0ced"; - sha256 = "0hf60w1b0m1gkj70h0cnpf7028r50y7m58mvranlam59lfmcvw7m"; + rev = "c8d2db8b89a2a94e3409c358afccd00e9a15e6a9"; + sha256 = "1f8c8fi986js225g1yxf31hyn4l5ygya25yl8fprcxyp507xwmzp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -29557,12 +29579,12 @@ helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-git-grep"; - version = "20161016.407"; + version = "20161105.813"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-git-grep"; - rev = "21ae7521a6ea0268b88a95c15c5ceb46851a44d3"; - sha256 = "1vx94f1vx0rj9by74q8gmxf06kjska06l3il4qzpsn2wasky2pr3"; + rev = "b0bb524d6c69d1d43729d68dbd28b67a723a4b90"; + sha256 = "0n7xsrblnl9awvljczg4a6g00bczw47q69fnmqwk76ndigyhx8n0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep"; @@ -29638,22 +29660,22 @@ license = lib.licenses.free; }; }) {}; - helm-go-package = callPackage ({ deferred, fetchFromGitHub, fetchurl, go-mode, helm, lib, melpaBuild }: + helm-go-package = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, go-mode, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-go-package"; - version = "20160321.115"; + version = "20161102.1853"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-go-package"; - rev = "469bbbe4c6cdd4c80444ece10f07cfb62fc4f13e"; - sha256 = "0iyfn58h50xms5915i29b54wfyxh6vi9vy3v3r91g6dwlxrjibka"; + rev = "e86914b0469d390f908b44401a31b1825af0b10d"; + sha256 = "1vxfc6dh1dahxvzz5vchx5gj33f8dyz7gqa5j1xcrxs49bqca7ad"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/449d272b94c189176305ca17652d76adac087ce5/recipes/helm-go-package"; sha256 = "102yhn1xg83l67yaq3brn35a03fkvqqhad10rq0h39n4i1slq3z6"; name = "helm-go-package"; }; - packageRequires = [ deferred go-mode helm ]; + packageRequires = [ deferred emacs go-mode helm-core ]; meta = { homepage = "https://melpa.org/#/helm-go-package"; license = lib.licenses.free; @@ -29809,12 +29831,12 @@ helm-hoogle = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-hoogle"; - version = "20160913.1022"; + version = "20161026.2234"; src = fetchFromGitHub { owner = "jwiegley"; repo = "helm-hoogle"; - rev = "882b729b9f0f23d35e808e0dcd51047954486135"; - sha256 = "016s8g87qnhgcs547wf6ynabh6qnc3p38f4h9vrlhwr5lfwb3w5d"; + rev = "73969a9d46d2121a849a01a9f7ed3636d01f7bbc"; + sha256 = "043bddm6lldl6wkifr1plqip7laai771z1a1l0x2h35l3g8c64h0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ccc21c2acc76a6794aee94902b1bc4c14119901/recipes/helm-hoogle"; @@ -30064,7 +30086,7 @@ version = "20150717.39"; src = fetchsvn { url = "https://svn.macports.org/repository/macports/users/chunyang/helm-ls-svn.el"; - rev = "154226"; + rev = "154482"; sha256 = "0b7gah21rkfd43mb89lrwaqrrwq646abh7wi4q74sx796gmpz4dz"; }; recipeFile = fetchurl { @@ -30564,12 +30586,12 @@ helm-rage = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-rage"; - version = "20161020.554"; + version = "20161030.914"; src = fetchFromGitHub { owner = "bomgar"; repo = "helm-rage"; - rev = "ae05bfa38f83e6b6c468b26ab4b02dfd29569108"; - sha256 = "1jjxfzvzqjg2illwn1ljv03cxjcfmkgsq3xvk7x9247xkv61xifk"; + rev = "07c268d162d11d8b4254a78a1bdaf881cdc560ee"; + sha256 = "1dzlawga65z0c49xzwpya09clcg013w7fm7mhqf70cniim5mcya8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84f831fdc5a0e90c23ac11c79f193f4d3c1ebb04/recipes/helm-rage"; @@ -31421,10 +31443,10 @@ }) {}; highlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight"; - version = "20160617.617"; + version = "20161103.1410"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/highlight.el"; - sha256 = "1g0csgabcaxfvv92bmqkmyqp2jlal8gj6c6ghz83a2r185ba0jji"; + sha256 = "15l0bg0pa24bm9lg3f8ghf326k5k5sa1x4lpg1749asvj5q8bjk4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/603e9fc90e6e6cf7fe903cb3c38155c1a4f45278/recipes/highlight"; @@ -31537,12 +31559,12 @@ highlight-escape-sequences = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-escape-sequences"; - version = "20151231.412"; + version = "20161028.1617"; src = fetchFromGitHub { owner = "dgutov"; repo = "highlight-escape-sequences"; - rev = "ffb8c5da19ffd2a71003b93fe33f78d0900fad9e"; - sha256 = "0rs8zyjz5mh26n8bdxn6fmyw2809nihz1vp7ih59dq11lx3mf9az"; + rev = "c3f28f2003638e88e5cf0b03835412af7814f3b0"; + sha256 = "052r7bxdflgvygpvc5p63kkv11l9f7vfn16b1094af7xnniv8i3i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd087f2c5a9524986b0f2c7fd7efd1f296363101/recipes/highlight-escape-sequences"; @@ -31831,8 +31853,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "ed127251c80be3c1606913868fea09683ed0e8fb"; - sha256 = "1xdnvfq32pj5gkmwr32wa8ly5968kkibirhvaviy3wq2dzs2qbb9"; + rev = "295246ef496f3f2bff45a098433f171e0350b889"; + sha256 = "0g5k67znhzvxczby8pq8hcisjcgikf7yv2pwxz62cspfr2ylhvwk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -32133,12 +32155,12 @@ hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-todo"; - version = "20161008.1357"; + version = "20161102.1337"; src = fetchFromGitHub { owner = "tarsius"; repo = "hl-todo"; - rev = "3ef6c978011ffd01d3de060cfbde8c91d4b269f2"; - sha256 = "0lssxnxg0dknmmrp0fri2d4wbpshnkk5zfnfbc2c9jii6bvg4982"; + rev = "a23312464fc6462d559462a44cd74735e9f73421"; + sha256 = "0sy0fjmh1m36ajzfmxa2j9akws5qa8a4f1qmj3wgj9vdqd043mr8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo"; @@ -32154,12 +32176,12 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20161024.921"; + version = "20161031.709"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "a26cf703567661488fe1bb8550f301d4db19da08"; - sha256 = "0vs26h7kwjawj7mbijz13p8fp84cypn6x3pjshvvl9mbd8v0yww4"; + rev = "912d78a9e211f588fdb59a487d6fae3e13089023"; + sha256 = "0fnd2y0w07k0rz6k3ghmk9jkx2mzdymnizrbx4ykysqdwwwnj4lw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode"; @@ -32464,6 +32486,27 @@ license = lib.licenses.free; }; }) {}; + html-to-hiccup = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "html-to-hiccup"; + version = "20161028.701"; + src = fetchFromGitHub { + owner = "plexus"; + repo = "html-to-hiccup"; + rev = "99217a5058626d253ed8ada51a7642071fe54ba5"; + sha256 = "1cvlh1iqjdmgwbw254g0rfdshsj7dhqjjp56gwqhn2fqkga44a7i"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/55a0355077a16f82b45113d37a10b26676f5f507/recipes/html-to-hiccup"; + sha256 = "10d0fafqn6f1mwjbx8zizkc5ql9njs4f3ghplirqy82cx4w8rgbq"; + name = "html-to-hiccup"; + }; + packageRequires = [ dash emacs s ]; + meta = { + homepage = "https://melpa.org/#/html-to-hiccup"; + license = lib.licenses.free; + }; + }) {}; html-to-markdown = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "html-to-markdown"; @@ -32506,22 +32549,22 @@ license = lib.licenses.free; }; }) {}; - http = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + http = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "http"; - version = "20160701.2025"; + version = "20161025.1120"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "http.el"; - rev = "5a85cb63ff8c25031c7a21f9ec7063a4ccfac547"; - sha256 = "18b8xf01n0mjshw7a4y1y3gzmag3lv9y64jyfb0dbx99xlxvvdv8"; + rev = "3b8cac5d30bf8142cdb9839292f39643be326f5b"; + sha256 = "0842l2wbk1f86lxzjsicqwxlmw639w26pr3dfk9rnymwzpm267kg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7c63aaf27240706d84e464881d40cfb7cbe9ee3/recipes/http"; sha256 = "1176jhm8m7s1pzp0zv1sqawcgn4m5zvxghypmsrjyyb5p7m6dalm"; name = "http"; }; - packageRequires = [ emacs request ]; + packageRequires = [ edit-indirect emacs request ]; meta = { homepage = "https://melpa.org/#/http"; license = lib.licenses.free; @@ -32884,12 +32927,12 @@ ibuffer-vc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ibuffer-vc"; - version = "20150714.1320"; + version = "20161103.2358"; src = fetchFromGitHub { owner = "purcell"; repo = "ibuffer-vc"; - rev = "daae8b8cec4b8e572b065e00c8c8a368fd0a8b8b"; - sha256 = "0fwxhkx5rkyv3w5vs2swhmly9siahlww2ipsmk7v8xmvk4a63bhp"; + rev = "de75fb3345384fe13d0500435241ca4a056f5fc7"; + sha256 = "0c8y53aim35v88w5h4zn49187j6v8j7frxlhcw8crfxi1v6i7wdh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/ibuffer-vc"; @@ -33487,12 +33530,12 @@ idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }: melpaBuild { pname = "idris-mode"; - version = "20161010.710"; + version = "20161102.707"; src = fetchFromGitHub { owner = "idris-hackers"; repo = "idris-mode"; - rev = "7965a00a33155588c55c597db84d89e5eb266acf"; - sha256 = "161sncq7x3flnbqd0ag4fg8yb299qkj5ri5hj451p1nz5s7hibfi"; + rev = "4c70405ffcb54157f43662ed5a561a96e08777d6"; + sha256 = "095l1vv0q5xzvxwksnjl4llj9w79ih341xayx84l45m06s1a8j5b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode"; @@ -33529,12 +33572,12 @@ iedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iedit"; - version = "20160927.1726"; + version = "20161030.1920"; src = fetchFromGitHub { owner = "victorhge"; repo = "iedit"; - rev = "39919478f9472ce7a808ca601f4c19261ecc2f99"; - sha256 = "1pwkrm98vlpzsy5iwwfksdaz3zzyi7bvdf5fglhsn4ssf47p787g"; + rev = "abcc27a9f07a7f855b0a8314f18640fd5cd7a0b6"; + sha256 = "152vxkwndv7ffggsnb1jhizf8p2fd5mbplwiln6ig2lzn21drdpa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aa2b2745bd1f1778070954c834158c19d4cfb788/recipes/iedit"; @@ -33940,12 +33983,12 @@ import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "import-js"; - version = "20160504.2210"; + version = "20161026.1046"; src = fetchFromGitHub { owner = "galooshi"; repo = "emacs-import-js"; - rev = "ce454d36fbbdd6cc9659eb0ef3c42560bdb6bfa5"; - sha256 = "1pv29qxiz9yqfp67fjj4mk8bqxs5y4qwcpx4kvznpfzdcwsza53j"; + rev = "5726c33b8d8c43974d4b367348962025c6df56b9"; + sha256 = "1gamzw0ayfrnp4wcn41p294kg4l80xa01w8phhsqq9kpsxz8mcr0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/048344edd471a473c9e32945b021b3f26f1666e0/recipes/import-js"; @@ -33958,22 +34001,22 @@ license = lib.licenses.free; }; }) {}; - import-popwin = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }: + import-popwin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }: melpaBuild { pname = "import-popwin"; - version = "20150716.233"; + version = "20161105.849"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-import-popwin"; - rev = "34c3b34ffcadafea71600acb8f4e5ba385e6da19"; - sha256 = "0ycsdwwfb27g85aby4jix1aj41a4vq6bf541iwla0xh3wsyxb01w"; + rev = "6a21efc7fd44f8c2484d22eadf298e4bfd4bc003"; + sha256 = "1h4c3cib87hvgp37c30lx7cpyxvgdsb9hp7z0nfrkbbif0acrj2i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6f0629515f36e2e98839a6894ca8c0f58862dc2/recipes/import-popwin"; sha256 = "0vkw6y09m68bvvn1wzah4gzm69z099xnqhn359xfns2ljm74bvgy"; name = "import-popwin"; }; - packageRequires = [ cl-lib popwin ]; + packageRequires = [ emacs popwin ]; meta = { homepage = "https://melpa.org/#/import-popwin"; license = lib.licenses.free; @@ -33986,8 +34029,8 @@ src = fetchFromGitHub { owner = "zk-phi"; repo = "indent-guide"; - rev = "69e1cd78f7379ff3f2c3d2a9f31610ace645bad7"; - sha256 = "0cmjfil9jkjjx1n6lx9d5g99bq8dlx7sqnmkvimw581m96ca040g"; + rev = "2f764164d0ceb5dceddd8642447b74939d98d583"; + sha256 = "0g4ddx741liazyc16qh65phs8ic00gmxv768yhyhrns7f6hfrq5b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d7110054801e3af5e5ef710a29f73116a2bc746/recipes/indent-guide"; @@ -34003,12 +34046,12 @@ indicators = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "indicators"; - version = "20130217.1405"; + version = "20161029.706"; src = fetchFromGitHub { owner = "Fuco1"; repo = "indicators.el"; - rev = "c6d520eb3536cf3a77c635fa36fec031d3f84fe4"; - sha256 = "1zsw68zzvjjh93cldc0w83k67hzcgi226vz3d0nzqc9sczqk8civ"; + rev = "a9f228bab20285d599976d3acd506b38e03a0ff3"; + sha256 = "0wfdg3ijysvfi1vbgnc50m1f8c6mcg3qhhz987qflxkb8vdrcnqy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72c96bad0d0b5a4f738fd1b2afe5d302eded440d/recipes/indicators"; @@ -34170,10 +34213,10 @@ }) {}; info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "info-plus"; - version = "20160702.1343"; + version = "20161031.727"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/info+.el"; - sha256 = "0rpkfzsas76qp7a77hf60gkdlisbgcf1apwkkzj2lp1dbkncbx30"; + sha256 = "11kili1v46sji4ymdz1a3fx159hzdk4r39irhlsmxy3zrnzwlaxj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e77aadd8195928eed022f1e00c088151e68aa280/recipes/info+"; @@ -34482,12 +34525,12 @@ interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "interleave"; - version = "20160825.953"; + version = "20161101.256"; src = fetchFromGitHub { owner = "rudolfochrist"; repo = "interleave"; - rev = "fa2c32c7b55b6f7ea5900e89c9a749469501a9b6"; - sha256 = "1slf22a044iirn4p5rw1hvgg1grmhml4rjk4g74xbsg68xiyg6ma"; + rev = "f0707fd914d547e88594b3208a216ddff9664a97"; + sha256 = "0xk62r0fziyybr5ivvl6yyknfv98b60nw66swz65ld9w3ld8xlpp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2/recipes/interleave"; @@ -34503,12 +34546,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20161020.340"; + version = "20161027.207"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "e858b01160bd1ed844ceae54d785032907dea4a7"; - sha256 = "1laaqs85fhrrl860xv7s1fjiz2mm3a2xdwpd0b72h1991q19dhwf"; + rev = "fe0b045aadef5590eb33e03c1512430e5d52d639"; + sha256 = "18phlz8b2qwiy1mwqri02syxp7564ca0kmcdlw8m7wz6xqdr9vih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -34773,12 +34816,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "20160925.1030"; + version = "20161106.830"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "4b63b809c9643b90d396cbcc1ed0a53659888f4d"; - sha256 = "1mi838x36wi2jw4i64hcdlfi2ji76sqr5v832h0z8x2in40zrckf"; + rev = "bfe703a4c0e91a960c606bf2420b1f118e53a0a6"; + sha256 = "1dy0as8n5syf4cbpdpw7fpd205jzkj0k7av1c73nxvd4zd28pxj2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -34835,10 +34878,10 @@ }) {}; isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-plus"; - version = "20161022.1545"; + version = "20161106.1457"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/isearch+.el"; - sha256 = "15a8gd2rsllk5avv6w0m1dkjv6aydsbbimywvj0i3mwjm6ika9lj"; + sha256 = "0bg6cy0yksklb929xxrpb6qyzkfbix7d5sgl48hfr4am0y3qgqi0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+"; @@ -35061,12 +35104,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20161021.2214"; + version = "20161030.27"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "714cb8c140faa2c019fe1816ac9fe6bb8fbef1a1"; - sha256 = "0r3ni9c8pmcpfgikyindr1yaia59vgil5bdwf02hc6gb0albmffr"; + rev = "c8be3973a4841a3ee7d05e59666724965ecc8dd8"; + sha256 = "010hrxabaf9pj9dyj6x12sx6m9y8bk8nzdz1xsha2jq3fcglw2mc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -35082,12 +35125,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20161018.807"; + version = "20161101.2345"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "ff592982a051b4d733a5dbb824d4ed81211a03e0"; - sha256 = "17fl92d8hkihygsjf25njrsk259chj5vlzw0z73hfzs317pgc5yx"; + rev = "4dde1da1963c5ccbe8c4d304000011fd85f2e462"; + sha256 = "1nnj197hchbgz77lskymb7mjwjljd9m2gzyx6vl4yrsqwl4y3h6h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -35149,8 +35192,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "714cb8c140faa2c019fe1816ac9fe6bb8fbef1a1"; - sha256 = "0r3ni9c8pmcpfgikyindr1yaia59vgil5bdwf02hc6gb0albmffr"; + rev = "c8be3973a4841a3ee7d05e59666724965ecc8dd8"; + sha256 = "010hrxabaf9pj9dyj6x12sx6m9y8bk8nzdz1xsha2jq3fcglw2mc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -35353,12 +35396,12 @@ jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "jade"; - version = "20161014.103"; + version = "20161102.1441"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "jade"; - rev = "c9dfafc5e721db7cd11f02ca65fdf8ec3798f6e9"; - sha256 = "08xa0839df1pz8n2zk1zsr89lzrx0a5a2cjvq9gdmmgjqppry9hs"; + rev = "87697c66f883f07ff3cf646ff182a7edb49b957a"; + sha256 = "0cb17p1g7zm1cnxzfb520v7v430x01df0s6g8xi05y197kd99lbj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; @@ -35689,16 +35732,16 @@ jdee = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jdee"; - version = "20161022.612"; + version = "20161106.1043"; src = fetchFromGitHub { owner = "jdee-emacs"; repo = "jdee"; - rev = "12811feaa621bd06d29ebb0e0021d650e4c442d8"; - sha256 = "12m4iw9fjjr2kr1ffwhk98j1fs76zxrqhkbn4m9mg5cb96lmgmi9"; + rev = "28fd7e8045387c4abeecb73623afad366417de07"; + sha256 = "12qj3r7apylh0qccqsr6lqlfbrp6xz3hpqrk2gqd3b01j0hp4cwd"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/92d19f9b3c3163dbac4c0407e90fdfce5bf9008c/recipes/jdee"; - sha256 = "1yn8vszj0hs2jwwd4x55f11hs2wrxjjvxpngsj7lkcwax04kkvq3"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee"; + sha256 = "15n76w0ygjmsa2bym59bkmbbh0kpqx6nacp4zz32hlg48kgz1dx4"; name = "jdee"; }; packageRequires = [ emacs ]; @@ -36043,12 +36086,12 @@ js-auto-beautify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-beautify, web-mode }: melpaBuild { pname = "js-auto-beautify"; - version = "20161021.1922"; + version = "20161030.2209"; src = fetchFromGitHub { owner = "Qquanwei"; repo = "auto-beautify.el"; - rev = "71f69c8ba65faf66c4752af322b45f56c3239ebd"; - sha256 = "1z2y4r1p3ar9h8irkyh7ifvpp1igjmdmag5wzqa828xhs1xhbq80"; + rev = "dd2e5940a07c5bb8e793f25e644def62c3426eed"; + sha256 = "0wqw9gj59n4bxb3zpr3ddaqzwl2rb8zk7zv5dkfrzzvy2rz10zxd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7658000fb834fb17950a333967b116a785150633/recipes/js-auto-beautify"; @@ -36106,12 +36149,12 @@ js-import = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "js-import"; - version = "20161022.620"; + version = "20161027.2259"; src = fetchFromGitHub { owner = "jakoblind"; repo = "js-import"; - rev = "fdc6709469a95c848aa1619c11230827a9670206"; - sha256 = "1cldgsyy7jrm1splqk5fhg5x033ra8827wzv9z57734z6di1yk6a"; + rev = "e57a8dc4a61d2b33add3da7ac44ea28979b792f9"; + sha256 = "1prcifdih35nnbbgz04dd4prfmi25fdxjwajp4wms2hm0q8z4mkr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69613bafcb5ca5d5436a4b27be6863f37a7d2fab/recipes/js-import"; @@ -36169,12 +36212,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20161016.156"; + version = "20161025.1012"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "91e722a798fc8c30cfa4fad119acc83892d41e9c"; - sha256 = "1pg9cdl8i10qlbsr756dsrsjvbp6fym04a97q54mfgjsv25kvrg7"; + rev = "94b27217cd8305029fdfdd2f4ef660622de8a582"; + sha256 = "0p8025p7n6frmdiycr5g8fg8hs2ygszpmx51c1xla2qjhn7wcf61"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -36190,12 +36233,12 @@ js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }: melpaBuild { pname = "js2-refactor"; - version = "20161019.911"; + version = "20161102.1108"; src = fetchFromGitHub { owner = "magnars"; repo = "js2-refactor.el"; - rev = "1d15ffd95c0eecbb5ba3b5b5189ba87eb2126fdd"; - sha256 = "1nk1ap4cy6fqyy1c6prqnv0spcqy72vkjw2npnzffvg9afqcrlyh"; + rev = "5633ee969c4644bde96c7f4134b02de463f910e1"; + sha256 = "0jwirj3aaigr8d5hnb5gpi447y2yl6ashxaqcagbasy6gvdf1knc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor"; @@ -36299,8 +36342,8 @@ src = fetchFromGitHub { owner = "gongo"; repo = "json-reformat"; - rev = "24c2bf3c41897b5cf1398dcaedfec88526308bf4"; - sha256 = "05bjyw0hkpiyfadsx3giawykbj4qinfr1ilzd0xvx8akzq2ipq0y"; + rev = "8eb6668ed447988aea06467ba8f42e1f2178246f"; + sha256 = "11y11yybhb8wfj8qcj4gw8rhhly7kjs7ylyxwsh7qnfgq6f771qh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8c7976237f327fdfa58eea26ac8679f40ef3163/recipes/json-reformat"; @@ -36461,12 +36504,12 @@ julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "julia-mode"; - version = "20161017.613"; + version = "20161027.625"; src = fetchFromGitHub { owner = "JuliaLang"; repo = "julia-emacs"; - rev = "483805b938a3fe543e075cbb60eefd4af805ad23"; - sha256 = "0diyvgm5y8iw0zsg4vjzv74kgzib0mspw4b4di06rg1gs7ivfl8r"; + rev = "feb6e79dddc8f992f85ae8c955ce024d57ec5e26"; + sha256 = "015y0y5xx7b3iky3r9gdnkh4kq1nxvdshvmlb0yy3mg71s62xi76"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8522d197cb1b2c139959e7189765001c5ee7e61a/recipes/julia-mode"; @@ -37237,8 +37280,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "57dd0d91b7e5cf79da3d8e5c314c4fc083e418e9"; - sha256 = "11m239xgfpvfkjl3scbm1wf21ahp5fz1m7g10qjpa9ls7k1jni46"; + rev = "e66f76fedbe7b8c042bd57eec282b6e1a88cb492"; + sha256 = "04w9gsip1h8qhppmw4g42apwnqpnfx8rcxgjvlskln97fgpf083d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -37548,12 +37591,12 @@ labburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "labburn-theme"; - version = "20160801.753"; + version = "20161103.932"; src = fetchFromGitHub { owner = "ksjogo"; repo = "labburn-theme"; - rev = "564e1454f1b1fe436494f0cd9fbb78a889fd2969"; - sha256 = "0fm8zlc27m22lfa2ay81h2s5aar0vyhfhwbha3nl1wwdi9720w0f"; + rev = "28ec20825e266723a5a42a630d865ae8fdfab3d4"; + sha256 = "0kc0l07c3zq48mpjkqj7sbpz3j3h5bx4z83r7954pj6s4za8cqmg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bfc9870fbe61f58f107b72fd7f16efba22c902/recipes/labburn-theme"; @@ -37880,12 +37923,12 @@ leanote = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pcache, request, s }: melpaBuild { pname = "leanote"; - version = "20160905.1849"; + version = "20161029.756"; src = fetchFromGitHub { owner = "aborn"; repo = "leanote-emacs"; - rev = "7aa69b38d16985943c398bf10f3961cf59b54835"; - sha256 = "0iif540czjvikqk9dhdhrvkw372zdgsm882nzxpqiq81diw3chq2"; + rev = "f5f0ed732e8fb2316591e5152306e090774c4d49"; + sha256 = "0cj8nd63sjp8iysmxl1a1qqb5qpmmd95yp5g5b1g4ikak17mx2vq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b00b806ae4562ca5a74f41c12ef35bfa597bcfa8/recipes/leanote"; @@ -37901,12 +37944,12 @@ ledger-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20161003.916"; + version = "20161030.1103"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "c46efbc497b51223c2276d1e23a9fcf1ea440634"; - sha256 = "1z9776k6swm3nvy81i3mnrsn472d8wd9p26gwy6zgidi7k9sj3k3"; + rev = "20901f226c0fc32dbd2a2836bdf6525389205313"; + sha256 = "0y1vsr7szjvcy6dk6v98rdm1hkvyn8mg6lj18dcm1kwaxgbycdih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/851eca11911b337f809d030785dc2608c8a47424/recipes/ledger-mode"; @@ -38090,12 +38133,12 @@ leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "leuven-theme"; - version = "20161018.1057"; + version = "20161030.1205"; src = fetchFromGitHub { owner = "fniessen"; repo = "emacs-leuven-theme"; - rev = "05763cc1896c93ef0ed1df2f07e210137fad33d1"; - sha256 = "0z0lxcnmvw1vdfrf2rcsskyxj28x1m7m5732yfyjzdnwywwvrwm1"; + rev = "db7181c9ffce2e5f3244344440895df4e08bbcc1"; + sha256 = "1nka98zp1xmk94vv1vxd5ymkpprs0mgss4zxny87jax8drmlbjbd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme"; @@ -38154,8 +38197,8 @@ src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "8cf18f7a2172212e5cbd295bf9a573896596a70e"; - sha256 = "1mrqxlbhvzyz69axp4yvckms8lzrbqb9jyd539dv2dmml9mb7xbr"; + rev = "82636b12d82b0e3be076b69bfc31bb3507ba3530"; + sha256 = "0bjx08s95xklq6qszg1p3gl62c4y3kacwvz61ywgchhxvxdwi450"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -38467,12 +38510,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20161019.2038"; + version = "20161026.1538"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "a8c9c82c7354cc09ad98ea5a7475ec51a6a638c5"; - sha256 = "0sdhkw0krk1d4p2s3xzfyx84icm3k3ka1qv52c6fzj92pcv6rfap"; + rev = "fa1aaf0be0102ad5bedcea1154a62746f6457379"; + sha256 = "16hcy02jx4f3m6ps8m6sxks18a9mzagn262wcvf8vq3q1iargwai"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -38867,8 +38910,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "05c107461ec2f9e25bb45e124186accc89f2c59f"; - sha256 = "1apsp79k5javfm8775yd8vy26xq6jlsh45nfwllpnk3zwlaiwa2v"; + rev = "3e6b5bc83fc2b89b0d3624c3ba5d36af162a225c"; + sha256 = "0h1flxwsd83hrgpjz4z4plarvcvmwagvqxfpz3k05hi75c5cpcds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -38888,8 +38931,8 @@ src = fetchFromGitHub { owner = "rocky"; repo = "emacs-load-relative"; - rev = "b11fb74be7e5f465a2fe505e4d44cd13ec9ae136"; - sha256 = "0v0v036hq0qxj0yybr1fpsfkl01750nvl9q3c0sfiis9ylpqgzmq"; + rev = "8280df5ce6db836559a5c2442b97a2f02b6f7a05"; + sha256 = "0jzq3vpdq5cw5nh2l2pvj0y3lnvjff2wyy6ip2z9n6xcjjdnzki9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f052f201f7c308325c27cc2423e85cf6b9b67b4e/recipes/load-relative"; @@ -39237,12 +39280,12 @@ lua-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lua-mode"; - version = "20160821.1216"; + version = "20161101.1340"; src = fetchFromGitHub { owner = "immerrr"; repo = "lua-mode"; - rev = "33097fec0d32145389c6ec8c407a1b706c8e77e5"; - sha256 = "1dbvnm201i1vdaygsd846c9q7ykn3yh76b46ni0jgmfcc084cxq5"; + rev = "d7596990cdd197d3db682c4b2ca5410a4b522574"; + sha256 = "1sid1k2vv3bawsirz11apslhx7f5dfva4gwcv7q7p3b0zxlyw1f1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/lua-mode"; @@ -39486,12 +39529,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20161024.155"; + version = "20161105.1602"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "95cacde4fcccc95c25d6fb9988d2aa097193f8c0"; - sha256 = "117jm8bafwi87n4bvivyyizxw6ayaiv4xwf469jh0jqnlggd6pwr"; + rev = "c8517573287b9e533fb7465ba0c045655b0ec167"; + sha256 = "12dhqwk1hdx3aghwfdc8nhd0zxlzm7mfcvxxqz20vq1jjbraz5iw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -39514,12 +39557,12 @@ magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-annex"; - version = "20160624.2254"; + version = "20161106.1441"; src = fetchFromGitHub { owner = "magit"; repo = "magit-annex"; - rev = "17c3aa4f3b2ded6c67b9ae593bcd0c929631c940"; - sha256 = "0ra9g2dmpvii0pdwv5hmx4kr0m695ry5msnsyc6lvzrcc9hvmw5b"; + rev = "aff3aa6f46f561e1cfe4f240396559097a409fb1"; + sha256 = "1mvg5qk93b7ihy7jbk6ywwp2a00qz7wwz3rd2basxj01z6glfxk4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex"; @@ -39665,8 +39708,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "95cacde4fcccc95c25d6fb9988d2aa097193f8c0"; - sha256 = "117jm8bafwi87n4bvivyyizxw6ayaiv4xwf469jh0jqnlggd6pwr"; + rev = "c8517573287b9e533fb7465ba0c045655b0ec167"; + sha256 = "12dhqwk1hdx3aghwfdc8nhd0zxlzm7mfcvxxqz20vq1jjbraz5iw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -39707,8 +39750,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit-stgit"; - rev = "9d13effdbc213a0c8dcce78e1825011631fa0652"; - sha256 = "163a1rddl54jgxm5dygnbp1pz1as4hhjszan1rcabvzcfnfdpakj"; + rev = "1b064485d512ab547d606dcea9ad4298f355095c"; + sha256 = "01mgnm5nr2yg377pk4bwlzzgbabsx611wrpx2vzsbiwd97yppdqf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-stgit"; @@ -39728,8 +39771,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit-svn"; - rev = "9b2f8c14e83ee5851a63bd23b5f19422b00c0ff5"; - sha256 = "0r3nkrisyjawjwbm74yi6fqiwcqzlfkypsdscfhii0q50ky8plph"; + rev = "63a47732cc112d24db26052ffad93895319b60cf"; + sha256 = "1g2isa8n2j8kk0c5iwx8qai8k14sazwkc3dwhcpchm3zs0bfpdm3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-svn"; @@ -39749,8 +39792,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit-topgit"; - rev = "243fdfa7ce62dce4efd01b6b818a2791868db2f0"; - sha256 = "06fbjv3zd92lvg4xjsp9l4jkxx2glhng3ys3s9jmvy5y49pymwb2"; + rev = "11489ea798bc88d0ea5244bbf725285eedfefbef"; + sha256 = "1y7ss475ibjx354m73jn5dxd98g33jcijx48b30p45rbm6ha3i8q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-topgit"; @@ -39766,12 +39809,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }: melpaBuild { pname = "magithub"; - version = "20161013.2332"; + version = "20161105.1817"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "78b1046f5c98e0286f1c48bd816eafd16e70d35c"; - sha256 = "0jwqs508aipxb05y9qljpfqkk2m69iavg716h93qn4lm6mvnl668"; + rev = "55ef2b694109e8f4caeb7cebd49345bbce7e5749"; + sha256 = "05k68hx83dvnvr1mkw8pmyn77dh7wa7j5q8awcjswxqw2pkxcmxy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub"; @@ -40081,12 +40124,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20160626.1924"; + version = "20161103.115"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "1ec88c8da5f92982566d58d5c4ea743317977506"; - sha256 = "1l3h6jbcv39pslknp6y56pvx6kf0brbgrzlhmsc22n4238294x2z"; + rev = "9c32e47b80dce357278f520593eb670abb66879d"; + sha256 = "1p5i26bcsa9vp5hapy2pxkb55yhqyhpmsi9qyqhkh9bxaqa70baf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -40372,27 +40415,6 @@ license = lib.licenses.free; }; }) {}; - marmalade = callPackage ({ fetchFromGitHub, fetchurl, furl, lib, melpaBuild }: - melpaBuild { - pname = "marmalade"; - version = "20110602.1622"; - src = fetchFromGitHub { - owner = "nex3"; - repo = "marmalade"; - rev = "2a4f07fbd4c17e08556c1a80c1753c37b3626d39"; - sha256 = "1ygznmqb3fqy94p8qi71i223m7cpw3f596pkls2ybjlbpb4psjcl"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/82a61911de111f6ef3a99fef0a0f93ab549ab261/recipes/marmalade"; - sha256 = "0ppa2s1fma1lc01byanfxpxfrjqk2snxbsmdbkcipjdi5dpb0a9s"; - name = "marmalade"; - }; - packageRequires = [ furl ]; - meta = { - homepage = "https://melpa.org/#/marmalade"; - license = lib.licenses.free; - }; - }) {}; marmalade-client = callPackage ({ fetchFromGitHub, fetchurl, gh, kv, lib, melpaBuild, web }: melpaBuild { pname = "marmalade-client"; @@ -40539,26 +40561,6 @@ license = lib.licenses.free; }; }) {}; - matrix-client = callPackage ({ fetchgit, fetchurl, json ? null, lib, melpaBuild, request }: - melpaBuild { - pname = "matrix-client"; - version = "20161004.1933"; - src = fetchgit { - url = "http://fort.kickass.systems/git/rrix/matrix-client.git"; - rev = "5bf61e088fba83754a9e9bbef8459c82bea3be1d"; - sha256 = "1p8wfxf8pxy9ic5sd6ci1197v3j0r6564k4sw5agqplyzap5g9v5"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/152969c540b57c0a9532e698c24eac0de5e0269c/recipes/matrix-client"; - sha256 = "0znm8b1hd7iyb84qzxs25y850cbxxmydyzr7kx094rji55685c68"; - name = "matrix-client"; - }; - packageRequires = [ json request ]; - meta = { - homepage = "https://melpa.org/#/matrix-client"; - license = lib.licenses.free; - }; - }) {}; maude-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "maude-mode"; @@ -41120,12 +41122,12 @@ mew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mew"; - version = "20161011.1859"; + version = "20161030.1807"; src = fetchFromGitHub { owner = "kazu-yamamoto"; repo = "Mew"; - rev = "eb3cb8f25f20a0a241f88ec48953cf49ff43a116"; - sha256 = "1bnkbd448apnh244napsv28zvfcqczgsc0ly3fjh1qc2kfihx978"; + rev = "15469053c8d7996b82270179d879d6e1e038282b"; + sha256 = "1ss01b1add6p8fgxaqy1nc5h9ycr87a647qyaqbm2knza0xrbhni"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew"; @@ -41577,10 +41579,10 @@ }) {}; misc-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "misc-cmds"; - version = "20160719.1606"; + version = "20161102.1111"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/misc-cmds.el"; - sha256 = "195dqyjgxv51lj1779w98l7p8qhr8aa87w0k4dqawzfap2mms85h"; + sha256 = "1d55k9x2x29s0n2pkvp9lv8lbbha46f349dayniirspi55r89z02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/misc-cmds"; @@ -42111,12 +42113,12 @@ monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monroe"; - version = "20160808.654"; + version = "20161025.621"; src = fetchFromGitHub { owner = "sanel"; repo = "monroe"; - rev = "0b9b043f042145bf62969add7ec476ea51da7cbd"; - sha256 = "101lfrykdbv37spkbw7zihhx26bc1lhjyxbanrcp9880bxj04jiy"; + rev = "fd742eee779c16f608d2369913ff067e1c47261f"; + sha256 = "0abs920fs4gk7rf2ch2h4mk956aimx0plp1xnawv08iippj185li"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe"; @@ -42294,12 +42296,12 @@ move-dup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "move-dup"; - version = "20140925.808"; + version = "20161026.742"; src = fetchFromGitHub { owner = "wyuenho"; repo = "move-dup"; - rev = "964d1bbaacd4559d2dbde9cb44015c400d5a71b5"; - sha256 = "0baynb6gq04rxh10l6rn0myrhg7c7fwqaryiiyddp4jy7llf83c8"; + rev = "612f5b3faa5bc36f7403b6fac7a1a524ae146f37"; + sha256 = "0xiwlqhhx9aqj4059srp04zw1nksf8crp1z1wcfn4516f8mxs66p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ea1f7f015a366192492981ff75672fc363c6c18/recipes/move-dup"; @@ -42340,8 +42342,8 @@ src = fetchFromGitHub { owner = "retroj"; repo = "mowedline"; - rev = "c941d44c994e29f0c5f6c4532950eaceec0a6376"; - sha256 = "1wrdcxdlcvrhvarz71a09168bp1rd154ihs5v55dgh1sm7pv34la"; + rev = "63056cb9b29c5d3b5ef9d22ace7633c87e1e4299"; + sha256 = "1f4ijffjpf9p1p5gvbv8yd9hiyqrdiyg4wmqrnr76yls7zbxdf1a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline"; @@ -42403,8 +42405,8 @@ src = fetchFromGitHub { owner = "google"; repo = "mozc"; - rev = "d87954bf3791fb871c6e16621077fb0b97cc10a5"; - sha256 = "01rx4ll6qdlf3qf0f3srmid24zsifqbvm43nqy7k6glnidv8fcnn"; + rev = "efc1eaa4361add1803ae5245c4f3dfdea106ba48"; + sha256 = "0ws529sh9xa583m8gk78gwqnz2704sz0dw9c0l9nfz0hk3h75ivk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c/recipes/mozc"; @@ -42711,12 +42713,12 @@ multi-line = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "multi-line"; - version = "20161013.156"; + version = "20161103.1715"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "multi-line"; - rev = "778c7510b7f066f53cf1f96a6ad1079fda5dc1f7"; - sha256 = "0lr1i2a4fw40iz8qz2zqch63ci9pwvrri219phv22kn76jqn39mh"; + rev = "f510b7bc3c4726f262620bd6739f7de80d13ff35"; + sha256 = "01dbk0vxznmqhx8vd2iaa967ng5apnwkv0mlyd235wk2z1j8wci4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8eee6798a0ba71d437a1cbf82e360a5b60eafb/recipes/multi-line"; @@ -43272,8 +43274,8 @@ src = fetchFromGitHub { owner = "john2x"; repo = "nameframe"; - rev = "696223c61ca8e8f5cc557d2c198801a2f3c32ad3"; - sha256 = "14zrxv0x7p7rfrwdk02kzgvg8n594ij47yrr0c8q7b6vckhrz4gw"; + rev = "603061cb98eef5472a8e664ee44e5ce1b2d886ff"; + sha256 = "1clfl49viak24v7g7jrg5a8qnf8gz83ywg7mq30hyz2hy9vkq6w0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd314150b3f8ce529a2ae39a71e03bebedfdc6b9/recipes/nameframe"; @@ -43293,8 +43295,8 @@ src = fetchFromGitHub { owner = "john2x"; repo = "nameframe"; - rev = "696223c61ca8e8f5cc557d2c198801a2f3c32ad3"; - sha256 = "14zrxv0x7p7rfrwdk02kzgvg8n594ij47yrr0c8q7b6vckhrz4gw"; + rev = "603061cb98eef5472a8e664ee44e5ce1b2d886ff"; + sha256 = "1clfl49viak24v7g7jrg5a8qnf8gz83ywg7mq30hyz2hy9vkq6w0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2543af5579d37a3eb52e6fea41da315f5590331e/recipes/nameframe-perspective"; @@ -43314,8 +43316,8 @@ src = fetchFromGitHub { owner = "john2x"; repo = "nameframe"; - rev = "696223c61ca8e8f5cc557d2c198801a2f3c32ad3"; - sha256 = "14zrxv0x7p7rfrwdk02kzgvg8n594ij47yrr0c8q7b6vckhrz4gw"; + rev = "603061cb98eef5472a8e664ee44e5ce1b2d886ff"; + sha256 = "1clfl49viak24v7g7jrg5a8qnf8gz83ywg7mq30hyz2hy9vkq6w0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc17af8ff1694120d12a0cdbfccec78834810acd/recipes/nameframe-projectile"; @@ -43726,12 +43728,12 @@ nemerle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nemerle"; - version = "20130328.746"; + version = "20161029.1323"; src = fetchFromGitHub { owner = "rsdn"; repo = "nemerle"; - rev = "97c18aca4d29d7f183437b2bfdfb8193cc47162a"; - sha256 = "0nspqnv5jk59r9l8mnca0d3fkyybhnrbm6jbghyv7z35xfh5n0bn"; + rev = "2e74d2bcab9ea91078f0ffa040ad8d9372e0a305"; + sha256 = "1n6gma3g08wvs083frbb0a7nygy5f9cfidqkbqf1xxm806ancvdz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle"; @@ -43768,12 +43770,12 @@ neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neotree"; - version = "20161013.808"; + version = "20161028.2314"; src = fetchFromGitHub { owner = "jaypei"; repo = "emacs-neotree"; - rev = "7ae38b71faf7878eac01cbb82c9819c903e5cd6d"; - sha256 = "0bzmv6ds74f1y4w81v59wikraqzjjsd2minzjk7xqp6iiv2i7rgh"; + rev = "991e1b8cb7cc3a0bbb9aa8fb109800b46b6cf3b2"; + sha256 = "0v4l4y4zwp93dgvlca23f6y9kgkzvv7i3cmvb6s5jki5syb86r3m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree"; @@ -44024,8 +44026,8 @@ src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "6a2b876d3ab210c0c4e61c6f60d34304e024b54d"; - sha256 = "1ypi182ffr65vixg5va2bcgga29r9jxa8w0pv2cpilbys8w53hpd"; + rev = "b7bac03427e4f13ec7681aa25d3a1111fab7a4c3"; + sha256 = "1sga2iqm3qf4qyvxm89maakkxg4dskwy0m5vfa54b95jr8616p5g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; @@ -44066,8 +44068,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "fdbbcc44924cb4d9028fa68b2f7d423fb5d8670f"; - sha256 = "0g420z3n0yspks0zy5ky529gbwriyrp702glslwq27ndl38aiiza"; + rev = "eec5409a69054cf21214c3f5846ec0310fcb8228"; + sha256 = "1478xf9mp6v539r6mgpm7lfqa21xa5vd1kwybm24bdnzlq7h5pws"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -44227,22 +44229,22 @@ license = lib.licenses.free; }; }) {}; - noctilux-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + noctilux-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "noctilux-theme"; - version = "20150723.747"; + version = "20161029.810"; src = fetchFromGitHub { owner = "sjrmanning"; repo = "noctilux-theme"; - rev = "5f21c8523ddb99c4e5bc727d59ddf6bf6f50d626"; - sha256 = "1a1pp3sd5g4wkhywb5jfchcdpjsjb0iyhk2sxvd0gpc4kk4zh6xs"; + rev = "8980a500eb2613771c873c78499a1f8a580fff9c"; + sha256 = "1qfwra5q6k3p5p2i35pzs3hcksvpg1f5nk4q4qrkqb8flypfasdc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c0a18df34c105da8c5710643cd8027402bb07c95/recipes/noctilux-theme"; sha256 = "15ymyv3rq0n31d8h0ry0l4w4r5a8as0q63ajm9wb6yrxxjl1imfp"; name = "noctilux-theme"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/noctilux-theme"; license = lib.licenses.free; @@ -44332,11 +44334,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20161022.847"; + version = "20161104.851"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "9be349c20faea4b119c69ec63a39476ec9570d85"; - sha256 = "1l2rmi6mc6iqvr2iizfai3apwf6qads9il05v8rmsh1s0278p8w4"; + rev = "343534d82dc8882b3f0e2a847ee9d10ba5392809"; + sha256 = "1gq6vj6ac5f2kxrmzh8szn5577znfaxmp9fw3zcfjdrdmw0775n4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -44605,8 +44607,8 @@ src = fetchFromGitHub { owner = "TeMPOraL"; repo = "nyan-mode"; - rev = "5ad24b20a59754f0673adfd33a323bde9e3a1ae4"; - sha256 = "1fdxwlih732ci2xpvk90ri35n4g3rjh91hs001j3y1c5ilpcp5cg"; + rev = "98f2283d60686d331346371bc7f7f3d49bdfaf34"; + sha256 = "0yv6wv1vdc5zd1sh3f8vcz7wdizziasjzr11shx2bhm8nhnqcdbj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d8c3000df5f2ee2493a54dee6f9b65008add753/recipes/nyan-mode"; @@ -44709,8 +44711,8 @@ version = "20160310.1353"; src = fetchhg { url = "https://bitbucket.com/pdo/axiom-environment"; - rev = "bc294e47f51c"; - sha256 = "0z15n7cpprbhiamq26240g5bqsiw5mgyzdisi7j6hpybyk2zyl9q"; + rev = "4d70a7ec2429"; + sha256 = "1dmixpwsl2qsiy6c0vspi1fwvgwisw84vhijhmbkfpzrqrp1lkwc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ob-axiom"; @@ -46158,12 +46160,12 @@ org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-board"; - version = "20161022.624"; + version = "20161025.1203"; src = fetchFromGitHub { owner = "scallywag"; repo = "org-board"; - rev = "ebb5c949cb505248619e24534de9d9a19fa2979a"; - sha256 = "1clykj4ijm1pp3phhmm52w0vnz4ilhp8hb7gmfr0xvqd14cr9aq8"; + rev = "fcc653735faf1ab018273d7821981090f752c838"; + sha256 = "0x8mfka6m5452r5sj7m6ypvd91cqqgyxb00rx3v8y6wbpf2nsrc8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board"; @@ -46620,12 +46622,12 @@ org-elisp-help = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-elisp-help"; - version = "20130423.1545"; + version = "20161105.719"; src = fetchFromGitHub { owner = "tarsius"; repo = "org-elisp-help"; - rev = "df319441e528a0cad42d29e71fc3547a61dde1c5"; - sha256 = "0va8wm319vvw7w0j102mx656icy3fi4mz3b6bxira6z6xl9b92s0"; + rev = "23506883074b65943987d09f1c0ecd6dc1e4a443"; + sha256 = "1wqq6phpp73qj2ra9k0whrngfaia28wc772v24dsds4dnw3zxsq0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9bf5046a4c3be8a83004d506bd258a6f7ff15/recipes/org-elisp-help"; @@ -46641,12 +46643,12 @@ org-evil = callPackage ({ dash, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, monitor, org }: melpaBuild { pname = "org-evil"; - version = "20161019.802"; + version = "20161029.222"; src = fetchFromGitHub { owner = "GuiltyDolphin"; repo = "org-evil"; - rev = "d5c48f2f03b7aa85aa0ca850735ecb3539b21389"; - sha256 = "1wl5v5f60m6dm6ca8pv7k5myr6y3dn7s2w3rdaz9dqpprxxpqh62"; + rev = "5349f4f50d8b16ac4d38ef70a2a7562632e193cc"; + sha256 = "112rr4cwldwnwhg0qdq6khfl41azxp0c4j5l4il06560s6h7dmjq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17a4772d409aa5dbda5fb84d86c237fd2653c70b/recipes/org-evil"; @@ -46895,8 +46897,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "359afa68060cee6a72707f53d69e1f9244cbc50c"; - sha256 = "0mlba0mjzgfxfx7iy8nb5dz0js2l7b810x1lcj6lpfalk7yg9d50"; + rev = "8dc2d7767811f7d754328da0398e49718bd797de"; + sha256 = "06xl5rrw2kx6dx604gm50jj5ccv9m9szgwa4pkk1nvigy52vsj0q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -46915,8 +46917,8 @@ version = "20160808.220"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "359afa68060cee6a72707f53d69e1f9244cbc50c"; - sha256 = "0mlba0mjzgfxfx7iy8nb5dz0js2l7b810x1lcj6lpfalk7yg9d50"; + rev = "8dc2d7767811f7d754328da0398e49718bd797de"; + sha256 = "06xl5rrw2kx6dx604gm50jj5ccv9m9szgwa4pkk1nvigy52vsj0q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -47043,27 +47045,6 @@ license = lib.licenses.free; }; }) {}; - org-pandoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "org-pandoc"; - version = "20130729.1850"; - src = fetchFromGitHub { - owner = "robtillotson"; - repo = "org-pandoc"; - rev = "84b5df1f5516704540e19e048e18f437dc090a7d"; - sha256 = "022qqas919aziq4scs5j1wdbvd0qyw8kkirn2vzfb5k2fjl8z7iq"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d2952138e5c4d0a075925ed2ee17daf941deaee2/recipes/org-pandoc"; - sha256 = "1r6j6rkwfv7fv7kp73gh1bdz3y5ffwk5f2wyv4mpxs885cfbsm8v"; - name = "org-pandoc"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/org-pandoc"; - license = lib.licenses.free; - }; - }) {}; org-password-manager = callPackage ({ fetchgit, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "org-password-manager"; @@ -47087,12 +47068,12 @@ org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }: melpaBuild { pname = "org-pdfview"; - version = "20161011.106"; + version = "20161105.1652"; src = fetchFromGitHub { owner = "markus1189"; repo = "org-pdfview"; - rev = "5ed6b514351132c07d65054cdfc9b3da747a26d2"; - sha256 = "0707y3kw9snmj4ba2v5dqwgr9fyd50xnpdxabak1jy89ckcgahxv"; + rev = "8de30861216eaa2a922a2eccb6e7b1392f70a58d"; + sha256 = "1n5m3smgn3rxq9l110m3hqxip1xnyk4mjf70822ald4fv3l33q32"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aadf708e55ddfe13d93d124681a5e6f97a690d79/recipes/org-pdfview"; @@ -47168,22 +47149,22 @@ license = lib.licenses.free; }; }) {}; - org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: + org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, projectile }: melpaBuild { pname = "org-projectile"; - version = "20160822.2123"; + version = "20161103.2316"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "21956fa2276761c1ea8f70f4e731bed10a8e560d"; - sha256 = "1viviyklv1cipa2n37n85kfmm3s2jlwgyh983afmj3b8jkz8xfw2"; + rev = "a68ef488404f175d8b8867ad958233f927e451f1"; + sha256 = "0xvy108m4gqkzh00zgch8c163kri10rzgshbmz9kx9vgsqki2m1r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dde8c06c968d4375926d269150a16b31c3a840e/recipes/org-projectile"; sha256 = "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm"; name = "org-projectile"; }; - packageRequires = [ dash emacs projectile ]; + packageRequires = [ dash emacs pcache projectile ]; meta = { homepage = "https://melpa.org/#/org-projectile"; license = lib.licenses.free; @@ -47282,12 +47263,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }: melpaBuild { pname = "org-ref"; - version = "20161023.1844"; + version = "20161107.323"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "95a75c1a14ce347b801cc346ff39462fdfb785bb"; - sha256 = "11y8kfyfdzq6jx0mdnarac39jz8vk1b3bhbiiidaqqrjy31g427d"; + rev = "40b1c4322903b30b9c44906093f3ad73f7fba142"; + sha256 = "02hm36hkcsyjp28idrsfz52imjaig9qlwsamfkww0fqf9j5vp0hs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -47635,12 +47616,12 @@ org-webpage = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "org-webpage"; - version = "20160904.122"; + version = "20161030.100"; src = fetchFromGitHub { owner = "tumashu"; repo = "org-webpage"; - rev = "4c760fe11a6ca6b58e821753d648a6c8d3df4b85"; - sha256 = "00s7hzps7qr91i6hdkf96r253286d6j0gq5h69ia2jnp15827bgj"; + rev = "6a3c80ec00bb16707def17138e4230221511df3a"; + sha256 = "1xr9rkkhijb3af2fqhphz7c869648l1hvf4g6qffi1kmla3djf9x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1428ef6b2291d415ae2114de123652d9e378398e/recipes/org-webpage"; @@ -47803,12 +47784,12 @@ orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }: melpaBuild { pname = "orgit"; - version = "20160801.715"; + version = "20161105.857"; src = fetchFromGitHub { owner = "magit"; repo = "orgit"; - rev = "3747e49964fc4e96c41aa10a5553d7ad609e8f43"; - sha256 = "1x3pdk5wgk4cw9qq2l2d0baidnrjxj1qjdp6ajx7hlmwmxl7c203"; + rev = "adcfef22dc9bfa6503513d0a937bf4b32ad7ab94"; + sha256 = "0f3lqw2b9xr0278s7502sa2hkyhml45j8jpssaicyliz2k1kiyzv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit"; @@ -47824,12 +47805,12 @@ orglink = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "orglink"; - version = "20161008.1359"; + version = "20161104.1800"; src = fetchFromGitHub { owner = "tarsius"; repo = "orglink"; - rev = "3b617ba7290ee550caab1aa055a6bedabe33d6fd"; - sha256 = "0d1i30jbfbv0hm77sf278ism28ds5lz7675ji8f1gf01rfkchjbn"; + rev = "50debcf3508d2252bdce35c8822af1b3a81fd2dd"; + sha256 = "1b86c4pyc7cs02lrhnk93gh3czp9wajm17wd9mhszcbdn996rnhz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9b8e97cda6af91d54d402887f225e3a0caf055/recipes/orglink"; @@ -48244,12 +48225,12 @@ outshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, outorg }: melpaBuild { pname = "outshine"; - version = "20160416.846"; + version = "20161024.2158"; src = fetchFromGitHub { owner = "tj64"; repo = "outshine"; - rev = "61b2df38068ebd2fd12452485916eea2914daa3b"; - sha256 = "1smfdfw0swvfbqlxi7nkrgbmfqhs0x47ky6xhgf38la1s6ivh29n"; + rev = "d45a512d149996ca232c0218e2d6b5bc802285a9"; + sha256 = "0f4jb39pd23kszf9wpdmibn3wqgx76y68n1l7jb9y8l47vs519lh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6dc02a576abb8e115f674a9d896f8bc932b7571b/recipes/outshine"; @@ -48374,8 +48355,8 @@ src = fetchFromGitHub { owner = "jkitchin"; repo = "scimax"; - rev = "bdb140750528d54200771e1d43a644a8c0692a5f"; - sha256 = "1cqvbk92cfr4p3i884vqi6hz1f67hkpcbvj71rx1z1x0vvs75505"; + rev = "6f9cf1691cd8e597f3c6ca20ef299d5c62c9920a"; + sha256 = "15i877mr3mwzh44dzi1y4rx86kkx783fg3lai78vsby2c7jd0w42"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip"; @@ -48395,8 +48376,8 @@ src = fetchFromGitHub { owner = "larstvei"; repo = "ox-gfm"; - rev = "8fa2c82e4c1d52381d4528fdd7acd234cc75e380"; - sha256 = "0hga00njg914wdpib7jc0xkw4pq40q1rcxqj6i9dsp4kl0h15wq1"; + rev = "cc4f3cdb0075d988d4ba3e4c638d97fd0155ab73"; + sha256 = "1wx58j4ffy9sy63nrywjz23yyy4948bjlly0s9sk2yw0lmzvwpa3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10e90430f29ce213fe57c507f06371ea0b29b66b/recipes/ox-gfm"; @@ -48475,16 +48456,16 @@ ox-jira = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-jira"; - version = "20160426.553"; + version = "20161026.429"; src = fetchFromGitHub { owner = "stig"; repo = "ox-jira.el"; - rev = "c4b8fd30c3bc48621759c9d128644d2d386e591e"; - sha256 = "0csl9fcfwnpl6x3ld7xrlvgz6gwmgcd15a4zdc570w8vp26ra5k9"; + rev = "1a73ccb857fa5ded871808f0283bd7d727c54f61"; + sha256 = "0zab9dfzjb9qkxisx7a0wrqspf2di5xrap6gb13qxnaknmpavp28"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6905c43603bc3d64dfd04a5dbb25c9ac78e68631/recipes/ox-jira"; - sha256 = "0bm7i1ambd71xmy1y9jcdh52irgcsziwwb9d3y3rq0pnsqv5cpvp"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/e8a77d9c903acd6d7fdcb53f63384144e85589c9/recipes/ox-jira"; + sha256 = "088ks14d7slgs2qsqp1kkxvqzzhdkwphdvpg27ix686dz1krxxib"; name = "ox-jira"; }; packageRequires = [ org ]; @@ -48559,12 +48540,12 @@ ox-pandoc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org }: melpaBuild { pname = "ox-pandoc"; - version = "20160702.145"; + version = "20161101.1920"; src = fetchFromGitHub { owner = "kawabata"; repo = "ox-pandoc"; - rev = "a66a06fdc0c705f3b55d4d533c5c07097fa2f28a"; - sha256 = "150vhknzjhddwy8fw4p963ship96rbgaapkh4aq1193q8hanspzl"; + rev = "973bb43495213e883383cf263ce173e36e09fb66"; + sha256 = "0g6jil43c8761ynhy77g0fvddw9wg9f6lzs5fr24hwj30q9vlnyz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92f89a923d877c9dea9349a5c594209cb716bf18/recipes/ox-pandoc"; @@ -48748,12 +48729,12 @@ ox-twbs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-twbs"; - version = "20160915.207"; + version = "20161103.1316"; src = fetchFromGitHub { owner = "marsmining"; repo = "ox-twbs"; - rev = "d9847c7e7c1df384088726217e65a6c0067a67c7"; - sha256 = "1qf2ka61yykd234lwwfl2x206rlgkhnqfd5494iqqk4nsdz06bai"; + rev = "2414e6b1de7deb6dd2ae79a7be633fdccb9c2f28"; + sha256 = "0kd45p8y7ykadmai4jn1x1pgpafyqggwb1ccbjzalxw4k9wmd45f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3263133ba6dde790a364bad7c96144912971ba2d/recipes/ox-twbs"; @@ -48874,12 +48855,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "20161024.443"; + version = "20161106.718"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "e821f61f2cff31de6532d10c72a2527c50f0d4be"; - sha256 = "15dygw0kd73n159axxhrwgr75cnvynk9gi99kljr09yr1pc11vpg"; + rev = "46f12c815bc791b2889292d4b32eccad9e313d1d"; + sha256 = "0dvljayxc9dkrw5w0xj92859wvh0kmvq1jl8mgf7916nafxgl0pf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -49102,12 +49083,12 @@ palimpsest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "palimpsest"; - version = "20130731.821"; + version = "20161029.400"; src = fetchFromGitHub { owner = "danielsz"; repo = "Palimpsest"; - rev = "69fe61494bfd24305bf7e387fa716474918eafa2"; - sha256 = "1kbja107smdjqv82p84jx13jk1410c9vms89p1iy1jvn7s8g9fiq"; + rev = "7f5f43080155c53099f3174cb09684d77924d771"; + sha256 = "1z2acbmxsxfcw5d39zdzhg6l3r24m22nrfrp18j52d4i2jqawjfa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14f6d011a0314637a2f4c1b00efa4912e67b7fa4/recipes/palimpsest"; @@ -49165,12 +49146,12 @@ pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "pandoc-mode"; - version = "20160902.126"; + version = "20161104.1521"; src = fetchFromGitHub { owner = "joostkremers"; repo = "pandoc-mode"; - rev = "4a8173071bb67d1e12640abcd6b45c37ba882cd2"; - sha256 = "1pzk6bhr65p7asw28lk4g85vv9rdfa1aqrxcgppjvc0xmvqvrgv0"; + rev = "88ad7ea08afae0bf062755bb1e91c5543aac6028"; + sha256 = "0vjxlbm143i9a8pi5v2q82fms8lwf1i24nddxj4a1js2r6mpz15m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode"; @@ -49228,12 +49209,12 @@ paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }: melpaBuild { pname = "paradox"; - version = "20161020.1842"; + version = "20161102.1351"; src = fetchFromGitHub { owner = "Malabarba"; repo = "paradox"; - rev = "df7340518e229c42d2ea5decce8ca750a9bfa762"; - sha256 = "0w23mqd0s3fdcmdwnwj0070gabqbipwwbd4h3f663zp200xrnyqs"; + rev = "b693226ad827409fc1d6243a5a949d1c87c53104"; + sha256 = "050ygdhlxd7785h262vg8pdv2w0sgq36jh0wsjv9q64qmrndrklf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox"; @@ -49331,12 +49312,12 @@ paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "paren-face"; - version = "20161008.1400"; + version = "20161028.1127"; src = fetchFromGitHub { owner = "tarsius"; repo = "paren-face"; - rev = "fd8b9a863f0e15e8feeab862d0f67ab35ef18be3"; - sha256 = "08j4kgvbx7fr3f0243508chbgd3bh9i6dhbqkndqj93zmbxxdhcw"; + rev = "0a7cbd65bb578cc52a9dc495a4fcaf23a57507bf"; + sha256 = "0wsnng874dbyikd4dgx2rxmcp0774ix5v29dq372zynq6lamqkl7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d398398d1d5838dc4985a06515ee668f0f566aab/recipes/paren-face"; @@ -49373,12 +49354,12 @@ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parinfer"; - version = "20161024.750"; + version = "20161101.932"; src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "42fee8539ee71471531814466b9a7ee20af523d4"; - sha256 = "0y26sg8qdvvhn1ya71abi58x99yl78pf78rkj3npa9vds3a718pj"; + rev = "fb9e9f94a8010d2167a03ea6b58a320b0925af10"; + sha256 = "0zwv0r8jzb27gnv0j4n9xxylzk42sg6w6ljvdkx9nm2qgrfq3nsv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; @@ -49436,12 +49417,12 @@ parsec = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parsec"; - version = "20161021.1405"; + version = "20161027.1726"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "parsec.el"; - rev = "8c108be16dc07340d7681bebfba52649821e5d63"; - sha256 = "1h564hjhqyb5l39nmin6k4n50qh18rryy8giwhgnl6pkr1fw7fdl"; + rev = "21f5a117a054d1d21af51b0d92e7fa40b056a7e9"; + sha256 = "1fmsaf4fgg9nkwbrjafvfgsscgspggxbrbg32kpc2db5lcmi6h7y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/248aaf5ff9c98cd3e439d0a26611cdefe6b6c32a/recipes/parsec"; @@ -49770,12 +49751,12 @@ pcap-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pcap-mode"; - version = "20161011.638"; + version = "20161025.748"; src = fetchFromGitHub { owner = "orgcandman"; repo = "pcap-mode"; - rev = "f681f074a335f40cf355171ecd05ebc8877642b0"; - sha256 = "10cj12bv2m9x1fmwi6s0awgsq9bqmrjnrgxmyp203c6yp9gbhv74"; + rev = "52780669af0ade136f84d73f21b4dbb7ab655416"; + sha256 = "1v218cjs0qy3ac0rbzm22y1x388nxnf0pslh9jrvlymkn227pjs8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44f4cb526556a4b58b7e67314002e73413a59a76/recipes/pcap-mode"; @@ -49959,12 +49940,12 @@ pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }: melpaBuild { pname = "pdf-tools"; - version = "20161018.353"; + version = "20161026.1557"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; - rev = "249cece6cf0746924715990283cefe1d9b1ae093"; - sha256 = "0l0p9s88b2bi3hdm7w5h3jbgrv8170yijq0d4h9lhijsymjzmg98"; + rev = "9696abb82e427670b8283599365a234ddaa170b4"; + sha256 = "0jmpvwar5hks2qbqkfabqw16zj9iyl99c79h6vm2z7jypsmzc8mp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; @@ -50207,15 +50188,36 @@ license = lib.licenses.free; }; }) {}; + persp-fr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, persp-mode }: + melpaBuild { + pname = "persp-fr"; + version = "20161030.159"; + src = fetchFromGitHub { + owner = "rocher"; + repo = "persp-fr"; + rev = "00db4a17977b4e9c5c3212ce94fbc106f24d9d81"; + sha256 = "0m70wawbxm0kg641qj6sdsij5d2icmmad2p977c8qpcc8qh91gs7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8e09213dddf003a1275eafb767431a507ecf7639/recipes/persp-fr"; + sha256 = "0p4379yr1b32l8ghq1axyb8qhp28gnq5qxxvbk3mdzgbwwj8y4b2"; + name = "persp-fr"; + }; + packageRequires = [ emacs persp-mode ]; + meta = { + homepage = "https://melpa.org/#/persp-fr"; + license = lib.licenses.free; + }; + }) {}; persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "20161024.704"; + version = "20161025.507"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "f6327c5052e1efa392353b6398cdc4b12c4fe17a"; - sha256 = "01902jlmin93j5wzhbl0dmzp836q7mrq4yvx01rggjbzd51pijw4"; + rev = "8200c8753513b14ebc1a8b40b917d7c0a6f5ac6a"; + sha256 = "13pcdy18pqanjhkacl5rbfmyw3y52d9ll0b6w0w4ffc2lhqpi7nd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -50315,12 +50317,12 @@ ph = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ph"; - version = "20130312.1137"; + version = "20161029.822"; src = fetchFromGitHub { owner = "gromnitsky"; repo = "ph"; - rev = "ed45c371642e313810b56c45af08fdfbd71a7dfe"; - sha256 = "1qxsc5wyk8l9gkgmqy3mzwxdhji1ljqw9s1jfxkax7fyv4d1v31p"; + rev = "a66e38637d1898b2ec31ee611033ac3f295fd97f"; + sha256 = "10xznvjszn0smn6wf84rykkkiqyzv7xf7fjjyklhll7zphg714mw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f62ca074ca2df780ab32aac50b2b828ee6a9934c/recipes/ph"; @@ -50693,12 +50695,12 @@ php-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, s }: melpaBuild { pname = "php-scratch"; - version = "20160730.115"; + version = "20161103.1517"; src = fetchFromGitHub { owner = "mallt"; repo = "php-scratch"; - rev = "755ea9dbc21b55329255967def2426a0fcbca597"; - sha256 = "1vnlv2amhh05lj6sxaq4l4hxv1rjjm7sg9j5b04g2dl22jdjv4ww"; + rev = "3aa66d1d53b84b779374edff7a7e6b5f2cd7575d"; + sha256 = "0iyb4y0wrd1yqm56p37riw6nwvrlcgxj1x0nhw8304p8hv76mzdi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68336364f6956325a2e03194d7db30747ab7f80c/recipes/php-scratch"; @@ -50966,12 +50968,12 @@ pivotal-tracker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pivotal-tracker"; - version = "20161017.2054"; + version = "20161028.618"; src = fetchFromGitHub { owner = "jxa"; repo = "pivotal-tracker"; - rev = "1d43a5908a21853d595cae79c58caadf2c7c0a07"; - sha256 = "19sf59f888pp8m11j9xbsrckw3750c7894nr4dcacwv90i0qwpw0"; + rev = "87b4e3cce343519b54a8ff4fef5d7b7745e27c3c"; + sha256 = "08rj1nimxrz5g1gj231f9d6p8al1svvwv1782h8hyxi87fzmw9sw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/793d86ec68fc10d4f23eca4ffef162e920d9fc42/recipes/pivotal-tracker"; @@ -51092,12 +51094,12 @@ plan9-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plan9-theme"; - version = "20160620.109"; + version = "20161102.1954"; src = fetchFromGitHub { owner = "john2x"; repo = "plan9-theme.el"; - rev = "d87ff625e280c017d0fb6cd3c141ca6dd0bf9c29"; - sha256 = "0ijqgms585jp3b5l95dk30g8yjfffljk8i3rgf71wrdvcsinyicb"; + rev = "6f1aaa35f57fc451e4c06164e74f61e17ce1cacf"; + sha256 = "0cfs7qxz16aiz43pk4dcg3nvhs5r64fgy3476wpy0fac0fm275rl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cdc4c2bafaa09e38edd485a9091db689fbda2fe6/recipes/plan9-theme"; @@ -51113,12 +51115,12 @@ planet-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "planet-theme"; - version = "20160821.717"; + version = "20161030.1917"; src = fetchFromGitHub { owner = "cmack"; repo = "emacs-planet-theme"; - rev = "4a3517728e009fb025d3f727eec4ea87b876aa2c"; - sha256 = "191cyq2q2ybrpqjb4hlqjlmpahdaxm1cpg1414x7xlnpj45chc1c"; + rev = "b0a310ff36565fe22224c407cf59569986698a32"; + sha256 = "1xdj59skmldq5dnarirhwq4qycipas86nbyqwl8zsv0bh20nl1rs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/18c4b8311b42af9f914264245f4dd377adcfbd0c/recipes/planet-theme"; @@ -51341,8 +51343,8 @@ version = "20160827.857"; src = fetchgit { url = "git://git.savannah.gnu.org/gettext.git"; - rev = "dce3a16e5e9368245735e29bf498dcd5e3e474a4"; - sha256 = "0pnb3fwxvmk1rgc0y6cap6yswv6kp7nycl2sbc19rq7pjwamzvaz"; + rev = "f837369264c119d0e96c9ba6e5960deba59eee73"; + sha256 = "12mxyg47hsgzzvqv19qlq9yhhryam62k7adll1i9n39xi6as13py"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode"; @@ -51880,12 +51882,12 @@ powershell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "powershell"; - version = "20160210.1858"; + version = "20161103.2354"; src = fetchFromGitHub { owner = "jschaf"; repo = "powershell.el"; - rev = "0e51db56fddcafcfe0611142ea939969673c2b58"; - sha256 = "1ym373mjyk3vfbw2c918zgaf9m35j8bkrpcj9d8m9drf4h7a8d3b"; + rev = "3c09e1b87064bedc065e45346fd4c3e051eeb0f0"; + sha256 = "19cq6n8dhvr2vw8nx3f4dkybqs9dqa6ss3z2ycql8rdmc5wg6jpn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7002c50f2734675134791916aa9d8b82b4582fcb/recipes/powershell"; @@ -52211,8 +52213,8 @@ src = fetchFromGitHub { owner = "rejeep"; repo = "prodigy.el"; - rev = "a2d1af72b97c7cad0b601b80ef36d242b34483d1"; - sha256 = "1dj2dx7vvvwg2839gy4qfr8kmlvzjs7n8xwj21vmxr6fqaa7cy3p"; + rev = "e53e1ba0d8c5081b4671f4292b164e919d0fdb2b"; + sha256 = "18xbql40myis77lyjiqq3kdsp0961iwf4rcg3c9i5w49chw3ql85"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04686b7a450ccd4631ecf1d9bcd51572c21fd20d/recipes/prodigy"; @@ -52393,12 +52395,12 @@ projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20161008.47"; + version = "20161105.834"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "44f75e3ceceeebac7111954e6f33cda50d4793d5"; - sha256 = "1av32m99fczdmilxci8r8ni73f3x4kmvm99jjjjx4dnpg4siv35d"; + rev = "b573b0656f9fc4c1afa1275c3e3d9ca9badda7f6"; + sha256 = "1frirasi53apys8jhff6ywlbl8h77nd5z2z9ir3jjb9ysrsk7kmq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -52477,12 +52479,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "20160923.708"; + version = "20161024.1043"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "c3a54723005d015d5d4364e4c74617dfd10ee294"; - sha256 = "1gywkxm9qk7y5za6fzjizxlc1lvwwa4mhadcyf1pxpq2119yhqy0"; + rev = "168ab64262d5927520a838bb659ab38b4f001eee"; + sha256 = "1lkzl5svc2xff3ln2bcj9jxrvn8l00yyvd8nwjsad7ns44lfw5g2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -52603,12 +52605,12 @@ projmake-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, indicators, lib, melpaBuild }: melpaBuild { pname = "projmake-mode"; - version = "20150619.1420"; + version = "20161031.1015"; src = fetchFromGitHub { owner = "ericbmerritt"; repo = "projmake-mode"; - rev = "25e2f28ca2c528e42c6422735829fc77bab8b451"; - sha256 = "1sxxy0s96sgm6i743qwjs0qjpsdr03gqc1cddvvpxbryh42vw9jn"; + rev = "a897701f7e8f8cc11459ed44eb0e454db2a460c1"; + sha256 = "0las0xl4af6sn5pbllq16abw2hj1kswwpkyi6lf31sbwr5wnq4qb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/df23138073d2416fa6522beca86b7a62eb4d42e3/recipes/projmake-mode"; @@ -52733,8 +52735,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "58580da37357941d502805be3ae520441be77728"; - sha256 = "1kbh8km3zgs7znj88wq6zsk6gj7i2c4qz4520m2ycy3ba2wsxs6n"; + rev = "0d7199edc802299bdba39400c04f119c7db82667"; + sha256 = "11jvsdkbxlpdvli557d3rydn8hiyvrpxa0cc4k02yi2pf2hmqkdb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -52939,12 +52941,12 @@ punpun-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "punpun-theme"; - version = "20160527.230"; + version = "20161103.147"; src = fetchFromGitHub { owner = "wasamasa"; repo = "punpun-theme"; - rev = "48ae2f9d9092b65cf3b4816cdaa6bd52efbd8d45"; - sha256 = "131si1wqv0wvdgwbw58y8w90v6z3nd5rf293144brv9d8853icpy"; + rev = "cce8b10b2df6f9187a9eaa0c3f21ff0dda175968"; + sha256 = "1iz1qc9bphl2y2z7abc33fvyaccj733drkl7nzbr1jlpbknkmk2k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77a9edbb36dc9474adb23d356e6c596789aab2a2/recipes/punpun-theme"; @@ -53446,8 +53448,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "bbffb9b1d160f4d7aacdfe5d3d729abd06766371"; - sha256 = "0ghkslnx07iz0xd1dqgm47imy6030wrwrq99zgnqp8b1ylyz5vmh"; + rev = "21ecaa744484218be5c89c7108771465425542bc"; + sha256 = "1l41hyc17vlpfdnjp2bvkirfk12paabs1qwvc03x29ibylw86a23"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -53589,12 +53591,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20161009.2250"; + version = "20161105.1431"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "a4295abe5e9bc115ffbdcb332266abbc51456ba8"; - sha256 = "1jwg3180ixkhbqv5zf4g9557mcxxsh2ls6kx2vs5m2w95pd9mhdj"; + rev = "fdd052ab2d70e0acf2dcb25a5a94cf52f4c4123d"; + sha256 = "1pdva6a7jdi8aw1q2k32n0kagkldjh8fkapjdmn65rs362nqj7iq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -53631,12 +53633,12 @@ python-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, folding, lib, melpaBuild, python ? null }: melpaBuild { pname = "python-x"; - version = "20160923.548"; + version = "20161029.531"; src = fetchFromGitHub { owner = "wavexx"; repo = "python-x.el"; - rev = "d9827cbf410717cd2d6f5f64a70ee64e9ae5b8b3"; - sha256 = "0ggbzjgqgwm0858gp2iyv0zh5337jv2kaswy8af2yqa6vm0fr7gl"; + rev = "ef749fe2d3e58d5f6d7f32453d06964786c085d5"; + sha256 = "1nncinrwh0nqy8wn1q8yzi15nf15gj576ccsp5l28951gjgkc6s9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87ed5ea4868945df1bf92d1eae5d3ebb83ece117/recipes/python-x"; @@ -53946,12 +53948,12 @@ racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }: melpaBuild { pname = "racer"; - version = "20161017.1829"; + version = "20161105.1637"; src = fetchFromGitHub { owner = "racer-rust"; repo = "emacs-racer"; - rev = "05ce76e8e331d37755b25ac7ac23bfb75880c880"; - sha256 = "1vvaq76jahayx3nps9mz96xz47rnq8dfxnxmj8w5j1mv69lkhxlb"; + rev = "4d5c6332d24ba302913606fde3feda6abaef2ea9"; + sha256 = "1qnkb9z23diyvkkhl2q00yvb8sybpvphlfchdyzsrhylixnkq83n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer"; @@ -53967,12 +53969,12 @@ racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "racket-mode"; - version = "20161022.1923"; + version = "20161101.1859"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "5279cda4a9385130cf7cc97bbdd33260deb0720d"; - sha256 = "0bjskvkcy1m2k436dwc3aa25pkiqgbl0z86bsm9jaxhcq0122vq0"; + rev = "ab625571837c96446e3704febea48b453787c5ce"; + sha256 = "0wnas67q1njg6czx86zywgq6a142rkh8qv4vbdjvqnyxd4y8jrsq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode"; @@ -54048,6 +54050,27 @@ license = lib.licenses.free; }; }) {}; + railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "railscasts-reloaded-theme"; + version = "20161104.550"; + src = fetchFromGitHub { + owner = "thegeorgeous"; + repo = "railscasts-reloaded-theme"; + rev = "b33640716d0d9930b09e671d2c62c5839fbce210"; + sha256 = "17n1fd9hjqalxffhjfzr08psarcc7ahsi0ns6clx9mwaq3fycg5g"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme"; + sha256 = "1iy30mnm3s7p7qigrm3lvv7xjgwvinwg6yg0hry2aifwn88cnwmz"; + name = "railscasts-reloaded-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/railscasts-reloaded-theme"; + license = lib.licenses.free; + }; + }) {}; railscasts-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "railscasts-theme"; @@ -54937,8 +54960,8 @@ src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "e4b6e1e482c1a82cade511956b2453b18c50bf26"; - sha256 = "17p07i8z5y2bp923i9sbplq9jn6p5kwscdf6725d7721n0ablpaj"; + rev = "bd962668615abcc48b4797168e948dde62b3f197"; + sha256 = "1xz82h933dxl2bj90l24h50qji4h1ivmnf657yp89dbyc42fz7zf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -54974,12 +54997,12 @@ redtick = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redtick"; - version = "20160516.1416"; + version = "20161103.1157"; src = fetchFromGitHub { owner = "ferfebles"; repo = "redtick"; - rev = "d62dec07400e47ac3e9ef0c045ede916f1025a82"; - sha256 = "1c9ngm95b8rqg11m5w69031d8lgyvh9xpnr4h5r6yyg7836hdk2v"; + rev = "ac8b213cf3dbd43a86910a152426b14576fbece0"; + sha256 = "1c1hllznnrypbh0cp162kbdcm0vrcsws5nx5l32c6h89n9dm397g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3187bd436541e2a5c2b28de67c62f5d5165af737/recipes/redtick"; @@ -55016,12 +55039,12 @@ refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: melpaBuild { pname = "refine"; - version = "20160924.1555"; + version = "20161104.804"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refine"; - rev = "d1f5ced303957ce602385d6491e25cf1b0068d4f"; - sha256 = "1liflg4nnwy4ara41s1c91g1ahlz9p7r500rbkx201lknspavpkz"; + rev = "a83ddbf79abb65f5cfc98d9b19815727e2395b91"; + sha256 = "1kciixx40pdd9vlzd54hxy43adk9bhcga23m2lim5q2fdj9qbyir"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine"; @@ -55906,6 +55929,27 @@ license = lib.licenses.free; }; }) {}; + rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: + melpaBuild { + pname = "rjsx-mode"; + version = "20161105.833"; + src = fetchFromGitHub { + owner = "felipeochoa"; + repo = "rjsx-mode"; + rev = "66086b6557fcafacf9bfdd80140e7dde4daac266"; + sha256 = "1y9inxk3kr8cygi8rnj4dns7azq1ka1yvvj7wsm6hnmm1i3wk3lx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; + sha256 = "0w3ij8k8058pfw443chm1kn30ia0f5rfbg03w9ddw86xb3wa2q0b"; + name = "rjsx-mode"; + }; + packageRequires = [ emacs js2-mode ]; + meta = { + homepage = "https://melpa.org/#/rjsx-mode"; + license = lib.licenses.free; + }; + }) {}; robe = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "robe"; @@ -56119,12 +56163,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20161018.1119"; + version = "20161028.1136"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "5f5c617b1b58fa63c852c9170c040274d28d694d"; - sha256 = "0qhj3xysq4xzi6bgsnn484r1h4s8zdym0l98znlf0jml9bzczr74"; + rev = "129cc5dece4a22fb0d786d1309bcba523252e744"; + sha256 = "0xwiqcv1xgv9ma2k8zjv2v10h4sm2m5xng7k3g9n5fafrd7j0lwp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -56185,7 +56229,7 @@ version = "20160911.333"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "56485"; + rev = "56665"; sha256 = "12w256fbx4xmwn96s0f66mvlczkmqdbi6w622l1b2sr3zbfh6wg8"; }; recipeFile = fetchurl { @@ -56265,7 +56309,7 @@ version = "20150424.752"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "56485"; + rev = "56665"; sha256 = "12w256fbx4xmwn96s0f66mvlczkmqdbi6w622l1b2sr3zbfh6wg8"; }; recipeFile = fetchurl { @@ -56492,12 +56536,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20160909.935"; + version = "20161031.2109"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "1587839ba493b5ab98fb8415338172a9a22f224b"; - sha256 = "19di6dnk5fn91gqkjx0icr0scn1s3pkgrngp9ls2w96nl6i561l3"; + rev = "e32765893ce2efb2db6662f507fb9d33d5c1b61b"; + sha256 = "03i79iqhr8fzri018hx65rix1fsdxk38pkvbw5z6n5flbfr4m0k4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -56639,12 +56683,12 @@ sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "sage-shell-mode"; - version = "20161019.446"; + version = "20161026.532"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage-shell-mode"; - rev = "ef0c1d2a7e8c162a18c27787ee8cde5b61586e70"; - sha256 = "0jl0qwcbjkhnic91qwglaryddsc60cip24bsh2f5dpjsics7nh0g"; + rev = "ca8930f2f7ba3dcfa6b09d23b9f4cdc5c466d141"; + sha256 = "0mmbx11k8w26mc4f1x43l9nai6s37yjr98wrl4dgz24bg1qh27q1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode"; @@ -56828,12 +56872,12 @@ sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sbt-mode"; - version = "20161006.622"; + version = "20161026.350"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-sbt-mode"; - rev = "4e21f0673d39231fec070abfb24ab0c18948eb5c"; - sha256 = "1ymkph8ikcsall9waq3vxac8jkji2bl9676pchydqr4ajc3aw8xm"; + rev = "dbca1e2ae1b91ccb2bd10c4231fd01b47c0c6801"; + sha256 = "1216lmx6rwm61kcv7mfp6k1vgln4bbibx77swxr66d0a2qil8rv1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode"; @@ -56853,8 +56897,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "cfd46eaa3ab17ff4d1f8cdc348f35d2f9b63c0ce"; - sha256 = "1901y4faw2w29wws26zlhs2lq9md1pcmd1c57n4zjzsp65kdivjg"; + rev = "54dd1b77ac33ade3efe7aa8c78f9915d850f12c3"; + sha256 = "12m86z76a157sfg3y4grizxii0747w3wxv1szlfnghqdkgc1qx69"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -56972,6 +57016,26 @@ license = lib.licenses.free; }; }) {}; + schrute = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "schrute"; + version = "20161024.54"; + src = fetchgit { + url = "https://bitbucket.org/shackra/dwight-k.-schrute"; + rev = "1bfcd4a24ac833448355facc82255344d61d8fa2"; + sha256 = "157jkf810dd954l5zv49w8ajwkfjwqx0mwga0s4jdrq2ial797f4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/505fc4d26049d4e2973a54b24117ccaf4f2fb7e7/recipes/schrute"; + sha256 = "1sr49wr3738sqfzix7v9rj6bvv7q2a46qdkimn9z7rnsjys9i7zy"; + name = "schrute"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/schrute"; + license = lib.licenses.free; + }; + }) {}; scion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scion"; @@ -57284,6 +57348,27 @@ license = lib.licenses.free; }; }) {}; + sdcv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, showtip }: + melpaBuild { + pname = "sdcv"; + version = "20161029.1945"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "sdcv.el"; + rev = "62235bb69b903a5b191ff9935616dddf15fed52c"; + sha256 = "1y2a7132xsi10j9mx0mrpkp947h171rp67n04q0y5smjapvgjjlf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/173e233b2dacaaf54d92f3bcc06e54d068520dd4/recipes/sdcv"; + sha256 = "1bj3b17sjd9fha686g6w191l4p8a1p8sb9br65xf54n6nd9bmv7a"; + name = "sdcv"; + }; + packageRequires = [ cl-lib emacs popup pos-tip showtip ]; + meta = { + homepage = "https://melpa.org/#/sdcv"; + license = lib.licenses.free; + }; + }) {}; search-web = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "search-web"; @@ -57614,22 +57699,22 @@ license = lib.licenses.free; }; }) {}; - seoul256-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + seoul256-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "seoul256-theme"; - version = "20150714.1535"; + version = "20161025.2120"; src = fetchFromGitHub { - owner = "ChrisDavison"; - repo = "seoul256.el"; - rev = "32790703847b868e8fdd9c0736b0b8a0167f97cf"; - sha256 = "15vmd1qmj8a6a5mmvdcnbav6mi5rhrp39m85idzv02zm0x9x6lyc"; + owner = "anandpiyer"; + repo = "seoul256-emacs"; + rev = "2ae4dcbbc62a3befe63d6294b0132cf28076bf80"; + sha256 = "1cchzy8vclwi8fcic54i6hqklwd57l6j6604lii8a4gcr4mhixdx"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1aff32f498ec4fd765c346f0c9da44cf919723f2/recipes/seoul256-theme"; - sha256 = "0mgyq725x5hmhs3h8v5macv8bfkginjghhwr9kli60vdb4skgjvp"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/664fc68d7b0eb92940fc188f5b9bee7ac7e0c674/recipes/seoul256-theme"; + sha256 = "058fadcqz21c22lzf33badibb7hn3w695akh560v10n8750h5wca"; name = "seoul256-theme"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/seoul256-theme"; license = lib.licenses.free; @@ -57741,12 +57826,12 @@ seti-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "seti-theme"; - version = "20150314.122"; + version = "20161028.816"; src = fetchFromGitHub { owner = "caisah"; repo = "seti-theme"; - rev = "f2f472af00f251f8cdced29faadbb3380d3c7ff1"; - sha256 = "18igxblmrbxwhd2d68cz1bpj4524djh2dw2rwhxlij76f9v805wn"; + rev = "8d9031db5cf357b4ce920dd77ad9aeb97e037ad8"; + sha256 = "18c8k0g30392ly7nlzfz2pzgszmxi7cyrxmxcff9qvzpxxpl9q4h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/088924b78575359996cf30745497b287cfb11f37/recipes/seti-theme"; @@ -58029,12 +58114,12 @@ shell-switcher = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shell-switcher"; - version = "20160111.2335"; + version = "20161028.2252"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "shell-switcher"; - rev = "bdf28e10a05d7187a4c4440d164ae08ba943b856"; - sha256 = "1bcrxq43a45alv6x0wms4d4nykiqz2mzk04kwk5lmf5pw3dqm900"; + rev = "28a7f753dd7addd2933510526f52620cb5a22048"; + sha256 = "1x7rrf56hjasciim8rj29vfngwis4pr3mhclvxd4sbmhz9y66wm0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a16194f6ddc05350b9875f4e0a3a0383c79e650e/recipes/shell-switcher"; @@ -58113,12 +58198,12 @@ shen-elisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shen-elisp"; - version = "20160624.340"; + version = "20161030.1115"; src = fetchFromGitHub { owner = "deech"; repo = "shen-elisp"; - rev = "822d2e4e791e883ba38ac8bed483a908c60ada1a"; - sha256 = "0zpd1jpyw1243nk7m89x45kn99ly9b64p365v16gdhng3yk2l02c"; + rev = "e7c3da5d817c90588ebc276bd8defa9d497baf69"; + sha256 = "00isccj80g0qdjd15bl2dnlxqvmz2p3nih6v9ljx3vs2jb43pibx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ed9f0577c6828236582df1781e751b8b81746492/recipes/shen-elisp"; @@ -58259,10 +58344,10 @@ }) {}; showkey = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "showkey"; - version = "20160816.2247"; + version = "20161027.653"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/showkey.el"; - sha256 = "1aipl39lh2kym5pc7a8z5sznrrssz327spd6y9cf84agy2k7mv5d"; + sha256 = "0nqf2pdphc820faijnarg4mq3zblsl2dj3scralhxnqwl68ky7ch"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e2b5576d501aee95c8f62d721a69077a1f3df424/recipes/showkey"; @@ -58510,8 +58595,8 @@ src = fetchFromGitHub { owner = "jtkDvlp"; repo = "simple-bookmarks"; - rev = "e89e8163a0705e28e9346320a1ee13c1aae249af"; - sha256 = "0bx8inaihfs48rzi01nlr3wp2iw0bnk318hhgpd4zg64ap3sgdsv"; + rev = "6c58337f2b7dbe9e58b5e097b1567f046a01d071"; + sha256 = "05071n96d91q3jz9dwp1qkqwq56k0d7cd1pnjj4jvjx4kb852waj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a60dd50c388a75ce21a5aec9acf938835d7afdbc/recipes/simple-bookmarks"; @@ -58569,12 +58654,12 @@ simple-mpc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "simple-mpc"; - version = "20160930.805"; + version = "20161103.1219"; src = fetchFromGitHub { owner = "jorenvo"; repo = "simple-mpc"; - rev = "b48bbcfe9a59941cfcc7e4a31200aada18ab9e05"; - sha256 = "0gp39ay1viixk6x5hnaa09c73vbz8xx453rnkw79pqchhsnyh6va"; + rev = "61b39d02313fa51a1dd7326fe24871666c64a077"; + sha256 = "1g8s37misx0kl32ngffqgqdzphz22v25k39q571jz4q1dibhmsyz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62d762308c1ec0c1d8f7b4755b7deb285cbac018/recipes/simple-mpc"; @@ -58861,12 +58946,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20160928.2036"; + version = "20161104.633"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "c38db1a8c85e6c5940fa14aefd6a767b5e668c9d"; - sha256 = "03a4vk3dbxnyar7rswnnwxazp4pxkxgwqc3akn7ilhdfmx817rrq"; + rev = "c87637c799b19e878d65f1a6906c93b74ad1e3cc"; + sha256 = "0qqp19dwz4vbz83pkhhc5xlwqhq482v2dpmqgq1i6lh42m1xkk5k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -58945,12 +59030,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20161012.1531"; + version = "20161102.711"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "f54b0c445065ba42f8abb8519a44ba2dadd9a68c"; - sha256 = "1s015n4z7mxbw1dv317v7w3mdl0z6p0xwcd20a5prz6yk78yw0gk"; + rev = "14f2502cae166ea5dfbab82a04f9fbae429a211b"; + sha256 = "17f40bam7v1p5ypw2vd6gbzgbmz9jswy7sqgs8xac46ijn4n62w3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -59613,12 +59698,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20161015.1227"; + version = "20161105.1503"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "768ad1a44e9b4aa49a8539a8353087cbe99eff21"; - sha256 = "0y4gwsdrmxwy017cmabfkmc8q2va13kjxw2zhmn4nz7ykih2pq1h"; + rev = "5c680283c9af6d2726bbc107508cbe85a978b39f"; + sha256 = "0fwmjqgcj5q5g035zf4sf36r1ghgb8zb3xqx3a4xvb6bzmzrqa5f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -59847,8 +59932,8 @@ src = fetchFromGitHub { owner = "microamp"; repo = "smmry.el"; - rev = "b7ee765337fa627a6c59eb4f2a91df5d280ac6df"; - sha256 = "0hzs8xi7n3bsqwm3nlm3vk8p2p33ydwxpwk9wp3325g03jl921in"; + rev = "986a1b0aec8ab1ef17dbfb7886f47e5558cf738a"; + sha256 = "1gq2066js1kf035217z0n6w0bf0dsyskykf56xycci5s1i7xv2vz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba2d4be4dd4d6c378eabd833f05a944afa21817b/recipes/smmry"; @@ -59969,12 +60054,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "20160913.2031"; + version = "20161101.1909"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "2bceb7f266f71cd85f9b328de02797eb457da17c"; - sha256 = "0cda7r6l3kbvpvqgxk0n102mk48j26i4ns25y0ykglx8k154nhys"; + rev = "9a474fd2c8c17c330d02ba2ee32b543c80d55e2e"; + sha256 = "0dig58in7hlr2mq1j0lrpszj9y1amgwgnq99znd2zjkw80cpvv7c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -60480,12 +60565,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20161023.535"; + version = "20161024.1259"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "db781c348b2ecdf871445986ef1cb2783c867ea0"; - sha256 = "0zwap27k3gqkzbdg3wsysb34gc540imimagy38l6gin7g0a315ja"; + rev = "30068e248b9db11a2eb37dd20b96cbf8ac574326"; + sha256 = "0c9w02vkbd70wx4ddv5q2qk7agigllh6aabw6y80ph1fdvyadnzy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -60564,12 +60649,12 @@ sparql-mode = callPackage ({ async, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sparql-mode"; - version = "20161015.1256"; + version = "20161029.531"; src = fetchFromGitHub { owner = "ljos"; repo = "sparql-mode"; - rev = "6f1bcf7a6a03e53de24d3d1c49d4186525764f0f"; - sha256 = "15xq91qyj5nw03zr343s0r5x60p4a702bdv9k0pgm85787jrfr86"; + rev = "74b901d5689ee4864c4d552d7052b8f128f77339"; + sha256 = "0dr42d0grgbmvfiw7v6lpxfgiqkhx8srkyql196gd2yrixmndrzx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode"; @@ -60686,12 +60771,12 @@ sphinx-frontend = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sphinx-frontend"; - version = "20160606.820"; + version = "20161025.58"; src = fetchFromGitHub { owner = "kostafey"; repo = "sphinx-frontend"; - rev = "e483773ac6b1366ca43128f727e2b3cc2269997f"; - sha256 = "0k8dpqp6hzycbd504zkp7j5ar2zvf6lnn0p60i392g9pj573fnsh"; + rev = "0cbb03361c245382d3e679dded30c4fc1713c252"; + sha256 = "1ksjgd995pcb4lvwip08i8ay0xpin8dcam3hcgnbjjqjg9hja1cf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4cf72e71f159b9eaaa0834682d5dd4eb258616cf/recipes/sphinx-frontend"; @@ -61102,10 +61187,10 @@ }) {}; sr-speedbar = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "sr-speedbar"; - version = "20150804.951"; + version = "20161025.131"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/sr-speedbar.el"; - sha256 = "1ffnm2kfh8cg5rdhrkqmh4krggbxvqg3s6lc1nssv88av1c5cs3i"; + sha256 = "15kvl270a5xx1w5fjlrawslnpwyks2x17356xcr0idhv5xw2wn30"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1f3e11958db5ecf764d6e659608220af2166fb3/recipes/sr-speedbar"; @@ -61205,12 +61290,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20160917.447"; + version = "20161031.2219"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "78d064134e807742fa2ceb7b1c4672ffb284a20d"; - sha256 = "0vm3pcs2ijd3s8w8rj7wdkqi077xd5qq157987hygy92lw9svfqh"; + rev = "e94c9e70ba64d231ff538db54acd4b5ecade3ed7"; + sha256 = "1igw97v0779gnk9ymk4inqmz92kkxdim5hkdhm52qk03kn7766zs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy"; @@ -61433,27 +61518,6 @@ license = lib.licenses.free; }; }) {}; - stekene-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "stekene-theme"; - version = "20141108.1211"; - src = fetchFromGitHub { - owner = "Fanael"; - repo = "stekene-theme"; - rev = "45b643a5af7dac70997d6a60e69c2f2473337d98"; - sha256 = "0w1qb8r6nrxi5hbf8l4247yqq754zfbxz64pqqcnw43cxk0qd4j3"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a4be17a072d4e878c510e3ef2c73bad166375195/recipes/stekene-theme"; - sha256 = "0v1kwlnrqaygzaz376a5njg9kv4yf5l35k87xga4wdd2mxfwrmf1"; - name = "stekene-theme"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/stekene-theme"; - license = lib.licenses.free; - }; - }) {}; stem = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stem"; @@ -61738,6 +61802,27 @@ license = lib.licenses.free; }; }) {}; + stylefmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "stylefmt"; + version = "20161025.124"; + src = fetchFromGitHub { + owner = "KeenS"; + repo = "stylefmt.el"; + rev = "7a38f26bf8ff947215f34f0a064c7ca80575ccbc"; + sha256 = "0cx9llbmfjhaxb60mj483ihl78xb30ldvhd1hdldmc9d473xbvmz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/63af0555576b0430f46d7383d7ea56e1789f43e9/recipes/stylefmt"; + sha256 = "17jj8n8x4ib51a6jdsywcssi6cvxmql9sk7f5clmbi94qxlh48lr"; + name = "stylefmt"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/stylefmt"; + license = lib.licenses.free; + }; + }) {}; stylus-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sws-mode }: melpaBuild { pname = "stylus-mode"; @@ -61969,12 +62054,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20161021.2159"; + version = "20161104.1314"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "3bca9f0d011dde62936daca4feaf51070bf86e07"; - sha256 = "16hi592ibxshrmai7sj73d2fgdwsr9131y9gz67kb6b1rw7pbpjv"; + rev = "fd78622bf70cf70c344513587805538c259ea45d"; + sha256 = "1bjybkvydazanwvyp5hmlrpbcyhw8bmw808ym1gavb64qzsswp2l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -62345,8 +62430,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "714cb8c140faa2c019fe1816ac9fe6bb8fbef1a1"; - sha256 = "0r3ni9c8pmcpfgikyindr1yaia59vgil5bdwf02hc6gb0albmffr"; + rev = "c8be3973a4841a3ee7d05e59666724965ecc8dd8"; + sha256 = "010hrxabaf9pj9dyj6x12sx6m9y8bk8nzdz1xsha2jq3fcglw2mc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -62467,12 +62552,12 @@ sx = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "sx"; - version = "20160125.1601"; + version = "20161104.1755"; src = fetchFromGitHub { owner = "vermiculus"; repo = "sx.el"; - rev = "4b8f0c335a6fb055284773dfd480106e8c82fd81"; - sha256 = "0d0c2i8hh0wrz8vnhxpxzwj7vlrjx6lrb3cx56pn4ny9qyqfzmw3"; + rev = "87dfd1e2ce093d53c0919dac7899bbf06bd96224"; + sha256 = "1ln75xg05waxahbaxlvb6vj7yi3svnni2247dzc9khi99dnwlbhf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f16958a09820233fbe2abe403561fd9a012d0046/recipes/sx"; @@ -62694,12 +62779,12 @@ syslog-mode = callPackage ({ fetchFromGitHub, fetchurl, hide-lines, lib, melpaBuild }: melpaBuild { pname = "syslog-mode"; - version = "20160525.1914"; + version = "20161106.1611"; src = fetchFromGitHub { owner = "vapniks"; repo = "syslog-mode"; - rev = "f93b2f4dd59608eaa10ec1d8f32484e6476e7169"; - sha256 = "1k3lh920p62ji5n5bvgxcfr6vc5ljssn9j0n4zydhh6ybk9j5f9n"; + rev = "d30f58d713fad72e8e8bfa92d6b2ed5300dbf022"; + sha256 = "011n5285c2gwc3i0cxnhk5g867d1jvga6ck92y787xjxm2k688kr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/478b307f885a06d9ced43758d8c117370152baae/recipes/syslog-mode"; @@ -63239,12 +63324,12 @@ telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "telephone-line"; - version = "20160302.1515"; + version = "20161105.840"; src = fetchFromGitHub { owner = "dbordak"; repo = "telephone-line"; - rev = "5c0af25f193b72dbb8dd2f9c9cbadf7f541e0c77"; - sha256 = "0c5h3i2viw9iryx2hfmmi0k30y96kqn7vhkbv76fzkhzby5r25fy"; + rev = "44f296e6a16afdde97927c170c6dd0cdb3a3598b"; + sha256 = "16zjijz9syzbcxq1d4bx11kagxwhzygrlgdqvb443cch5s70n2n7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line"; @@ -63323,12 +63408,12 @@ term-manager = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "term-manager"; - version = "20161013.127"; + version = "20161106.1419"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "term-manager"; - rev = "f023c857459d6b7436907f626aa59929336f7b61"; - sha256 = "024yqz3g9m3vpw9r9p58sz4gakkv59q2hs208v6rlbfsd5y75zpi"; + rev = "5272c03ddde3557838796c9b64139ef7c676091e"; + sha256 = "11b4zgx6sjnblbb08dclgrljnkg98w6dy5i9dqrwqgkmhhgsd387"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2f7d8c8fcbb535432f8e70729d69a572e49a1a/recipes/term-manager"; @@ -63404,22 +63489,22 @@ license = lib.licenses.free; }; }) {}; - term-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, term-manager }: + term-projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, term-manager }: melpaBuild { pname = "term-projectile"; - version = "20161003.1428"; + version = "20161106.1419"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "term-manager"; - rev = "f023c857459d6b7436907f626aa59929336f7b61"; - sha256 = "024yqz3g9m3vpw9r9p58sz4gakkv59q2hs208v6rlbfsd5y75zpi"; + rev = "5272c03ddde3557838796c9b64139ef7c676091e"; + sha256 = "11b4zgx6sjnblbb08dclgrljnkg98w6dy5i9dqrwqgkmhhgsd387"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5260876280148fae28a459f07932cebb059b560e/recipes/term-projectile"; sha256 = "1mzyzjxkdfvf1kq9m3c1f6y6xzj1qq53rixawmnzmil5cmznvwag"; name = "term-projectile"; }; - packageRequires = [ projectile term-manager ]; + packageRequires = [ emacs projectile term-manager ]; meta = { homepage = "https://melpa.org/#/term-projectile"; license = lib.licenses.free; @@ -63474,8 +63559,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "e26299182e30c6e997c0cc53c1c9c51a9489cbe5"; - sha256 = "05gqhcjr35nn612pj58pypwy1hl45fd53wg0nh25yn4sjkwaim3v"; + rev = "0c5c1d2b2f4a7514a03d8e869e74f501965f011e"; + sha256 = "1nsn90zslnv6i6mdgjryznh520rzlknfbvmri5zpqnjnahmaif36"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -63495,8 +63580,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "e26299182e30c6e997c0cc53c1c9c51a9489cbe5"; - sha256 = "05gqhcjr35nn612pj58pypwy1hl45fd53wg0nh25yn4sjkwaim3v"; + rev = "0c5c1d2b2f4a7514a03d8e869e74f501965f011e"; + sha256 = "1nsn90zslnv6i6mdgjryznh520rzlknfbvmri5zpqnjnahmaif36"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -63698,6 +63783,27 @@ license = lib.licenses.free; }; }) {}; + textx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "textx-mode"; + version = "20161106.1243"; + src = fetchFromGitHub { + owner = "novakboskov"; + repo = "textx-mode"; + rev = "1f9ae651508176b4cb1ae9a03aec06049f333c61"; + sha256 = "00hdnfa27rb9inqq4dn51v8jrbsl4scql0cngp6fxdaf93j1p5gk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/dada0378af342e0798c418032a8dcc7dfd80d600/recipes/textx-mode"; + sha256 = "10y95m6fskvdb2gh078ifa70nc48shkvw0223iyqbyjys35h53bn"; + name = "textx-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/textx-mode"; + license = lib.licenses.free; + }; + }) {}; tfs = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "tfs"; version = "20120508.1120"; @@ -63818,10 +63924,10 @@ }) {}; thingatpt-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "thingatpt-plus"; - version = "20161004.640"; + version = "20161104.1310"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/thingatpt+.el"; - sha256 = "0p0sb5w646vlc623nk7qajfmywn281kabwaa8ha3la39a6sdd1xh"; + sha256 = "0n738nry3iska0121xzwvnlmvzpvmzds7xg3fxh4vk3z3czpb5rq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thingatpt+"; @@ -63904,8 +64010,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "59cb6661bcee265d39ad524154472ebe27760f1e"; - sha256 = "1dsl3m2l8qh3qp7nnavmxmp50cib8zf6vmd28i9s31cxbm479x90"; + rev = "74c99ba38b02288daf05229cdf34e60261d2d01e"; + sha256 = "0l0ffczgpsvp6znlnnc89nxcmw6yzmxn4dbsr0px3pqz1mffgyp1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -63961,12 +64067,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "20161004.2019"; + version = "20161103.1005"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "a8fc3e8223a40243616347e875cfa1151be9a794"; - sha256 = "0nvdz0v11baxsnhhi6hmv9ikrxgi0a4351r787plrdb2qz7zpmrl"; + rev = "74c8be8c72cb7fdbdcbfda430d4d283bc32e16dc"; + sha256 = "1p6nc2rjggvf3jfsffk9danm4ah9lxhj2z61p267pb2mjs0ywkvf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -63997,6 +64103,27 @@ license = lib.licenses.free; }; }) {}; + tile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, stream }: + melpaBuild { + pname = "tile"; + version = "20161104.1737"; + src = fetchFromGitHub { + owner = "IvanMalison"; + repo = "tile"; + rev = "2e0bb114d8cf9276ee73f616cae0a3baa64fbf5c"; + sha256 = "06kc90cy5nq5w87f253a70n6r234lq5kw06m5yb19vw7ph94bx9c"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/424cfd28378ef328721bb0dc3651808e64c01306/recipes/tile"; + sha256 = "1795048ilpg6y9pn0jj0js5446hwxhwm6qmk50hds0hpcb396vbv"; + name = "tile"; + }; + packageRequires = [ dash emacs s stream ]; + meta = { + homepage = "https://melpa.org/#/tile"; + license = lib.licenses.free; + }; + }) {}; time-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "time-ext"; @@ -64105,12 +64232,12 @@ tinkerer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "tinkerer"; - version = "20150219.2249"; + version = "20161102.531"; src = fetchFromGitHub { owner = "yyr"; repo = "tinkerer.el"; - rev = "1125780d1fba0330435fcbe943716032ed543a57"; - sha256 = "0rf177kr0qfhg8g5xrpi405dhp2va1yk170zm3f8hghi2575ciy2"; + rev = "713769e5f5eb90a87d515b7ba2dca71f2f297218"; + sha256 = "1dpf6s1mv8mvcr84hzawhjgz3fjpbr8qrlcvdsw3r2c6b9pdi4hw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a28e1dfe987287bac7c45f83ae6e754bc13e345/recipes/tinkerer"; @@ -64672,8 +64799,8 @@ src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "85d8c18cacbf9c006deb331867cde65fad90b47f"; - sha256 = "0skbqd38lb0xh55xfd13c80s6xn70sqg67cpvdx6qck644apg4af"; + rev = "8a42bf93e38b6437f1da5bf4d0f6de8ad9a85fef"; + sha256 = "1rrc440hqxl7fi8f437clz169n6vacqfs5pmc7ni5m65k9kqm1fa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; @@ -64773,12 +64900,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "20161021.904"; + version = "20161103.1632"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "a84c48b3c3fbbd56aa990f1807670f5cdb28c0ef"; - sha256 = "0fppkpy5brxx79gglga510swnd0fiw43i87zisvc9ivykbigiys1"; + rev = "fc0af768454f7964ba0c8b6934fc0cae24b8ebe8"; + sha256 = "05zrdgv0b7a3y89phg66y8cfpmshm34yg7ahhc861k6wh4kvkv89"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -66086,12 +66213,12 @@ use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; - version = "20161017.1640"; + version = "20161031.1025"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "b9117844856b72d0ac331813ca6ae0f1abca9fc6"; - sha256 = "1fxb3sc5k82mjjds45fwcva8z7fdmpyjvl2pciq96g72md9is8kk"; + rev = "c7adfdde3d50d783dcde21ac3ea8195bbd30369f"; + sha256 = "1qkcnk2h1k6yv9sbkir2nkbjjnzcj3ndk20cysk2wcmwqxm85840"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; @@ -66398,6 +66525,27 @@ license = lib.licenses.free; }; }) {}; + vc-fossil = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "vc-fossil"; + version = "20161030.842"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "vc-fossil"; + rev = "066a1c591c18102d199407e303ccdd0dd8c26be9"; + sha256 = "1z42y04h4649i1hn3lc0ydkmaps39357jy25hlcy07x5nxpklvxf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5c8f2a79d6ad9cac527db2d08f3ee6aa199152d1/recipes/vc-fossil"; + sha256 = "0fym5wnig3bdkj86x0n7milcxh3fbigpx42827aim6bm3ry7a081"; + name = "vc-fossil"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/vc-fossil"; + license = lib.licenses.free; + }; + }) {}; vc-osc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vc-osc"; @@ -66615,8 +66763,8 @@ src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "a3a7fa4a84c6117e618ed771c7327f413e1a021b"; - sha256 = "114jyzx6asxr0r3xqi11wz10aij3h2rpyk9ga5xwzw47f7sayw64"; + rev = "c964571c38fd3a6bfadc88fd9def3ed03132a052"; + sha256 = "01sdkhljh7mdwv4mvm37gimjvl3i0jpn4xzmd9sdjll0dbc8rxki"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; @@ -66968,12 +67116,12 @@ vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vlf"; - version = "20150101.718"; + version = "20161030.840"; src = fetchFromGitHub { owner = "m00natic"; repo = "vlfi"; - rev = "4eaf763cadac62d7a74f7b2d2436d7793c8f7b43"; - sha256 = "0vl0hwxzzvgna8sysf517qq08fi1zsff3dmcgwvsgzhc47sq8mng"; + rev = "a8ba8363b20d13fdb474faae0ea8d4178c350ca0"; + sha256 = "02xqfrv45d0d36jn6nvzmy6pc9dy7mban2dvljxspgpidqlwj8p8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9116b11eb513dd9e1dc9542d274dd60f183b24c4/recipes/vlf"; @@ -67007,12 +67155,12 @@ vmd-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vmd-mode"; - version = "20160531.1719"; + version = "20161106.125"; src = fetchFromGitHub { owner = "blak3mill3r"; repo = "vmd-mode"; - rev = "3f650c04dd1b823a4dc3c7e965ea50c1dfc5645c"; - sha256 = "0wjfpgypdii7y2zp2c3yb6pmgpcza11ds2x3dya4syn6ll7zhgz9"; + rev = "e3b27f4f179002984643895292bb207c3e221a5c"; + sha256 = "0gpamwnsszhna9crhbg2zcvr9hrq7lackhgclq63lsvcm0z2ynfz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a305ed69dbad1a5f456acd1aad2fb9409d6d1fd6/recipes/vmd-mode"; @@ -67025,22 +67173,22 @@ license = lib.licenses.free; }; }) {}; - voca-builder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + voca-builder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "voca-builder"; - version = "20150625.1133"; + version = "20161101.945"; src = fetchFromGitHub { owner = "yitang"; repo = "voca-builder"; - rev = "cd74c13e005e33ab125d43233b1267a8819b0abb"; - sha256 = "183pvfp5nnqpgdmfxm84qrnid0lijgk79l5lhwzmnznzkrb7bgxw"; + rev = "51573beec8cd8308477b0faf453aad93e17f57c5"; + sha256 = "1gd7zqmyn389dfyx1yll1bw5f8kjib87k33s9hxsbx0db8vas9q6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42a930e024ce525b2890ccd5a1eb4844859faafd/recipes/voca-builder"; sha256 = "0mbw87mpbb8rw7xzhmg6yjla2c80x9820kw4q00x00ny5rbhm76y"; name = "voca-builder"; }; - packageRequires = []; + packageRequires = [ popup ]; meta = { homepage = "https://melpa.org/#/voca-builder"; license = lib.licenses.free; @@ -67254,12 +67402,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20161018.938"; + version = "20161029.2147"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "5de8cfb87e6e5ed953aa229de0bf19a965367735"; - sha256 = "1rwsi9d4lik5jx9y9fbknjkjqjpky2mc8piyziihcq3hk16vdkgr"; + rev = "8cd89d439515331a96facdcf3eb3eb424819c2e8"; + sha256 = "107p0yrfp4lpm1clzls78f8ylmr6fpjjz467pf0vyygnd5xhxf4r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -67275,12 +67423,12 @@ warm-night-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "warm-night-theme"; - version = "20150607.741"; + version = "20161101.728"; src = fetchFromGitHub { owner = "mswift42"; repo = "warm-night-theme"; - rev = "67cc2a1591c0627e6310cdfe8ca7c8d4565b9c16"; - sha256 = "1x472s5qr6wvla7nj5i9mas8z9qhkj4zj5qghfwn5chb9igvfkif"; + rev = "020f084d23409b5035150508ba6e57c2509edd64"; + sha256 = "1jmjyx06p0cvqi1vlg5px2g965q9pgi3j61msxjf5skzw53vlc88"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/312e3298d51b8ed72028df34dbd7620cdd03d8dd/recipes/warm-night-theme"; @@ -67359,12 +67507,12 @@ wc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wc-mode"; - version = "20131121.826"; + version = "20161031.648"; src = fetchFromGitHub { owner = "bnbeckwith"; repo = "wc-mode"; - rev = "c465751b434b20f848f0b8fa2b4e2dec5717f217"; - sha256 = "1j1k3ab0ymr66w23z3r4yd1g6410n5y80jfyg2f9i9rdk7vq18gd"; + rev = "122f90bd1d422a84cc50acabd350d44d39ddeb69"; + sha256 = "0pjlxv46zzqdq6q131jb306vqlg4sfqls1x8vag7mmfw462hafqp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/wc-mode"; @@ -67447,8 +67595,8 @@ src = fetchFromGitHub { owner = "yasuyk"; repo = "web-beautify"; - rev = "1ca9841e9ae951d60d591befa5efaaf839916b75"; - sha256 = "0j8v8p4w586wz80q9scdby6b80sbxz4lqg9zb5pbr2w8bsps8n4m"; + rev = "9c6a09969c04cb07f5f56ac6f6c3abba5f06c871"; + sha256 = "0vzd0bmm53a0bhdbyvrqgswy453pnsfcnr71piwwhw4dp2zx32hd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d528d3e20b1656dff40860cac0e0fa9dc1a3e87/recipes/web-beautify"; @@ -67485,12 +67633,12 @@ web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20161023.1219"; + version = "20161106.132"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "fda08e84567f62ea02b8a4893c745c237eb6b5b9"; - sha256 = "18jdsh4l7ygdvhfh0jyd5alsshvbx4pfx47impi3i2fy4rbkxljm"; + rev = "bae44d506af5d4f548f1b992229e369890f2a8a4"; + sha256 = "1ygsvcsf3pddcwyaw0m19z5j8is982ypxmz96qs2h0krfq9l6vl9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -67524,18 +67672,19 @@ license = lib.licenses.free; }; }) {}; - weblogger = callPackage ({ fetchbzr, fetchurl, lib, melpaBuild, xml-rpc }: + weblogger = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "weblogger"; version = "20110926.918"; - src = fetchbzr { - url = "lp:weblogger-el"; - rev = "38"; - sha256 = "1z7ld9d0crwdh778fyaapx75vpnlnslsh9nf07ywkylhz4w68yyv"; + src = fetchFromGitHub { + owner = "hexmode"; + repo = "weblogger-el"; + rev = "b3dd4aead9d3a87e6d85e7fef4f4f3bd40d87b53"; + sha256 = "03dkabszk6ya3vaps1ap16psk5bbar8zd5ipn1lmyzsbd3hwm8mj"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4e08837a9af8185951df9b44b9b94a799f0de923/recipes/weblogger"; - sha256 = "189zs1321rybgi4zihps7d2jll5z13726jsg5mi7iycg85nkv2fk"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/e8ccb10a5d1f4db3b20f96dee3c14ee64f4674e2/recipes/weblogger"; + sha256 = "0k0l715lnqb0a4hlkfjkyhr8i1jaml8z2xzhal7ryhjgvf8xinvs"; name = "weblogger"; }; packageRequires = [ xml-rpc ]; @@ -67799,12 +67948,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20161005.1154"; + version = "20161106.950"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "a6a9f352e735f3d7faf45d0e8f23f3a346c04f9c"; - sha256 = "06h2yc73z4vj2pzf16v78whh83zrvv1zsl6hvhwylgys1vn2ssk5"; + rev = "17f4b0069273f9c9877dc079e5cf49ed9cb4d278"; + sha256 = "1h673yjl0hp6p244pkk6hmazgfrj2sbz9cvd1r6rnrp1lpn8z1dl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -67989,8 +68138,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "046a815ce570f65cfd79ed9f7dd73087b985aef5"; - sha256 = "1bmx2brynga0hv4cxc7n9skxi9gmhz3rjbfgxrsf1kc8yfpk56yq"; + rev = "5e9b37cfbec400b51a8d9d1bc6603595e1a0aefd"; + sha256 = "1w4drcqix3wwk15m1kkfss2mmip1q8j4hglyz4spaffkkqmmz438"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -68336,8 +68485,8 @@ version = "20160419.1232"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "b9e861ccb52d"; - sha256 = "0gk1nclvkwdx20m2cnhfyb4l9jfxkvya8fifvfgry8swzbmab9h2"; + rev = "9f38303df3b7"; + sha256 = "10bcyzaj4ramas2vwjnsl9pk82gnnvfrwdxn6g217xbjjjlylwds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -68378,8 +68527,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "1a6c49bfdef5aacce14b76f06adda3b66d1f3847"; - sha256 = "1ignivq4df5a716p7n4cm6jbv9zly9b1ssn39a49wzvy9ch5m76q"; + rev = "b2d9d6b38cbb3993d4c100b098fc7efc9274b9b4"; + sha256 = "1l42a5d7hdpa1nyvhqzas9smbgkrscylj58av7gsky6kndps89dk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -68497,6 +68646,27 @@ license = lib.licenses.free; }; }) {}; + wordgen = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "wordgen"; + version = "20161104.944"; + src = fetchFromGitHub { + owner = "Fanael"; + repo = "wordgen.el"; + rev = "c46d8da6dae8c82d3a5d8b903a12dd5f2ae94939"; + sha256 = "0gcbj64dkzwa2xfp6y9lwb5m678g7lf9jrkr9whdrm9mgpifmdmi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5cfdc64a9aa79575dad8057c4cd747d2cdd460aa/recipes/wordgen"; + sha256 = "0vlrplm3pmpwwa8p8j6lck97b875gzzm7vxxc8l9l18vs237cz1m"; + name = "wordgen"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/wordgen"; + license = lib.licenses.free; + }; + }) {}; wordnut = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wordnut"; @@ -68542,12 +68712,12 @@ worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "worf"; - version = "20160929.43"; + version = "20161107.535"; src = fetchFromGitHub { owner = "abo-abo"; repo = "worf"; - rev = "b4b3888a1a2c39e659e60f3a106d0ff8b6f1e2a0"; - sha256 = "014f4a9xrn07c587p7npgdl9wcahqlba2hv2kcz891nz0zpxnwkb"; + rev = "997b7e02ab4684166162eb1bdf4b711e18017952"; + sha256 = "0nhh10rhn17a4iscl2y3c1v7axvc154s7j1cfpidjk9xc52vwz9d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf"; @@ -68836,12 +69006,12 @@ x86-lookup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "x86-lookup"; - version = "20160624.1104"; + version = "20161030.1736"; src = fetchFromGitHub { owner = "skeeto"; repo = "x86-lookup"; - rev = "70c5b1092484a031f3a3d9334399f14aef449df8"; - sha256 = "0q31mcz9bx19y517y1pli4znqxflvmvjf2k5wsi8sld7f5w4wwix"; + rev = "208810ea93214491e6e2329cdbf81de85437939a"; + sha256 = "0whhi05mg7xirzfcz7fzn4hkqq0qbrhqi77myrgdhwgs123cd9bj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27757b9b5673f5581e678e8cad719138db654415/recipes/x86-lookup"; @@ -68857,12 +69027,12 @@ xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-css-mode"; - version = "20161017.1807"; + version = "20161025.341"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-css-mode"; - rev = "33805b3ec7c8881c32584cdbfb1e4b2719b53d7e"; - sha256 = "1ja8aqg01s9i5sa2prfr7f809ak42ic63jldw022z3jjag0qn7jm"; + rev = "0dc80c428cc48dfbb411b77588db7030903705b6"; + sha256 = "0rmyd6wa540k41zidzp0wi773ycn6kj1wiwbb3kxfam38ds705y3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57c2e2112c4eb50ee6ebddef9c3d219cc5ced804/recipes/xah-css-mode"; @@ -68878,12 +69048,12 @@ xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20161024.900"; + version = "20161105.1325"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "a225039d38e5bb61ae89066e4528ca7c2d792984"; - sha256 = "0qa6c498sm2sdh0pjci0hqpihp4ccs8hj1p7h3wks6kz3c3xr42a"; + rev = "79e004ee10d7f1d67200140f18e8a720be177273"; + sha256 = "17f5n23sp31manf58mvvyrixygza6plc0sl6n5k7lqfnlcas27d8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode"; @@ -68920,12 +69090,12 @@ xah-fly-keys = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20161016.459"; + version = "20161102.1328"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "f9849ddd3b128628e4e9632e1e21edb8c904cb38"; - sha256 = "14dc0lwmh4zf8whj3m65nsxvadqqmhr6kiymrx6vykwbsj4lzfiq"; + rev = "40b0818411a77d496418f30a55f5ad4616350f35"; + sha256 = "1p0kc5viia17l4mls9ql2486cpnj2l2rp6nxlxij8ilw901q18d7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys"; @@ -69319,12 +69489,12 @@ xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xterm-color"; - version = "20161013.1627"; + version = "20161104.1949"; src = fetchFromGitHub { owner = "atomontage"; repo = "xterm-color"; - rev = "9c850434b398f5e758b0e6ff6d9ce8f7351521f0"; - sha256 = "14h46z8hqyx4135adj3lqbfpkaxlnvky7x4sfsnxbx82zqlcqnac"; + rev = "77e058710b20cb222647151e70416ef597929518"; + sha256 = "179nkk5hi6ylckjgxi536r78fvzv39kdnlbcdi0sscfn44q1ng6k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color"; @@ -69424,12 +69594,12 @@ xwidgete = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xwidgete"; - version = "20160719.324"; + version = "20161029.1112"; src = fetchFromGitHub { owner = "tuhdo"; repo = "xwidgete"; - rev = "943d715f2caab69f76d0de9bd4387cf60f6c4fe3"; - sha256 = "0wrb8cvm3ap9y212z3fxc6shbzk0xv1jbw47rnbxgl97asq7rcaj"; + rev = "adcf3f84772f4a382ba791a6584fa7dddfafdcdd"; + sha256 = "17zlbrnxyc0lgsy5g8zqz13mqizhaqpp4i975x9m4ilpl5ycaqqx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4e83b11c3d5b9773a26e2da4d848f645edcea5b/recipes/xwidgete"; @@ -69550,12 +69720,12 @@ yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaml-mode"; - version = "20160902.1142"; + version = "20161105.814"; src = fetchFromGitHub { owner = "yoshiki"; repo = "yaml-mode"; - rev = "b03fba2be23ef928cc6e8752c87bf5f0e3dd422a"; - sha256 = "1nnqv0xq1w181cvd4yin7qij1lghyqg2x8qsll3k4f6jwnmwc561"; + rev = "f378589912af8731428198ef57546c616d941df0"; + sha256 = "0ag1psjrn4b1idz096jwdsygax7ydirhlky7zpj6awqzx4gh43yg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode"; @@ -69757,12 +69927,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20161022.646"; + version = "20161026.1601"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "eaaec309b19ea704dddb265bcd3d9e09c9996265"; - sha256 = "1ckj1d053v74m2kchd2lbr3qrdmn0d7p9l0lwnpjl63yzvhkfjid"; + rev = "e6b865127783f498b61fa99ad0f5413200ac09d0"; + sha256 = "0djj2gi0s0jyxpqgfk2818xnj5ykwhzy5k9yi65klsw2nanhh8y9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -69782,8 +69952,8 @@ src = fetchFromGitHub { owner = "mineo"; repo = "yatemplate"; - rev = "90c14d2e2b8247eeba464a52560af484f8542558"; - sha256 = "00q3803nz89r91v1rwld98j1wgfc7kc6ni5a3h3zjwz1issyv5is"; + rev = "da42cb16c4534eb31c5946bf7f5a5710ef57256d"; + sha256 = "09ag32gbmidp12w3pay5iid6b75zwdm317hsz2kdvslik18j7r66"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate"; @@ -69841,12 +70011,12 @@ ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "20161018.2336"; + version = "20161106.705"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "adda8765e1c1819bcf63feefea805bd8c0b00335"; - sha256 = "1bm0kagq6aanybc0rrsfq296sd1485f4lvkz84hxamkfm329illm"; + rev = "d116b167bf776dbeba6a822c0b3c19a2c97f68d4"; + sha256 = "192qiwpkc5a0bxsiqj6zyvlblvixq24m845dgpcsqzwpjcm7qq9l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -69955,12 +70125,12 @@ zeal-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zeal-at-point"; - version = "20160725.2044"; + version = "20161027.2344"; src = fetchFromGitHub { owner = "jinzhu"; repo = "zeal-at-point"; - rev = "675ee27456fb454562b249cad768d4a5207a6b4e"; - sha256 = "131q95x9zvzayfn0slyzjyl87fap9j16bfdlc449khfp0zymcbla"; + rev = "2ca9f1070197bd6af7807bca6a1f2099c7b3ed1c"; + sha256 = "1l7kzmhkjnfy32l0kw3xnqs3dipmsad2ckcx7plvfwfh75yrddq9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4bcb472b6b18b75acd9c68e1fc7ecce4c2a40d8f/recipes/zeal-at-point"; @@ -70076,22 +70246,22 @@ license = lib.licenses.free; }; }) {}; - zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild, powerline, s }: + zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild, powerline }: melpaBuild { pname = "zerodark-theme"; - version = "20161014.1000"; + version = "20161106.1246"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "166998e69a83535618dc4e79715e203fc340d513"; - sha256 = "1ac5vqg9v6qj37xjw3xjlv47iyh5wwy59xwzah9pdi587224jcfv"; + rev = "62773d94e975cafeca26b93679aaa04adfc36882"; + sha256 = "0ayxrz3n1ca4kgby09crrwdxii4py5v5icnclys6wmnigvmb4jsw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9"; name = "zerodark-theme"; }; - packageRequires = [ all-the-icons flycheck magit powerline s ]; + packageRequires = [ all-the-icons flycheck magit powerline ]; meta = { homepage = "https://melpa.org/#/zerodark-theme"; license = lib.licenses.free; @@ -70452,12 +70622,12 @@ ztree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ztree"; - version = "20160925.719"; + version = "20161026.1249"; src = fetchFromGitHub { owner = "fourier"; repo = "ztree"; - rev = "e5eb534859acc0cc0a13403fd166457db9fb7eb5"; - sha256 = "158lzqsjpm1zlkq4c2hvg3s8z5yp30g0qj5wk2r1j3svfz4q9nl9"; + rev = "6826c3f3f3735fbf060206072392d67f0990f817"; + sha256 = "1ybrx6p9i55zsjnxa7cgali6x77aam2h55b8g5fqw23wnvr11x4q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f151e057c05407748991f23c021e94c178b87248/recipes/ztree"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index aa9547d4b7b..c7d7c5b5ed1 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -1031,12 +1031,12 @@ all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }: melpaBuild { pname = "all-the-icons"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "9266eeb6ab2eef04389850422d7da059c707380e"; - sha256 = "169g2dk3m0f7z64pjxcs918r6j5g2pzphrylr2vm40kppigy8gmw"; + rev = "692ac0816783725600b80b5307bf48a83053a378"; + sha256 = "13l5dqyhsma2a15khfs0vzk6c7rywfph4g9kgq10v89m3kwqich8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; @@ -1624,6 +1624,27 @@ license = lib.licenses.free; }; }) {}; + atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }: + melpaBuild { + pname = "atomic-chrome"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "alpha22jp"; + repo = "atomic-chrome"; + rev = "439b669b10b671f5795fd5557abfbc30e0d6fbb4"; + sha256 = "1bwng9qdys5wx0x9rn4nak92qpspfsb04xrl0p3szl5izz427cb6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome"; + sha256 = "0dx12mjdc4vhbvrcl61a7j247mgs71vvy0qqj6czbpfawfl46am9"; + name = "atomic-chrome"; + }; + packageRequires = [ emacs let-alist websocket ]; + meta = { + homepage = "https://melpa.org/#/atomic-chrome"; + license = lib.licenses.free; + }; + }) {}; auctex-latexmk = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auctex-latexmk"; @@ -3082,12 +3103,12 @@ cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }: melpaBuild { pname = "cask"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "cask"; repo = "cask"; - rev = "f5b828ef4ff6c367f87181a5b998aa78e42c2f24"; - sha256 = "0kmm1dlyf4f8b7dy2v2n7nf6620v6cq70ndlv5607dibhmaa8ksr"; + rev = "58f641960bcb152b33fcd27d41111291702e2da6"; + sha256 = "1sl094adnchjvf189c3l1njawrj5ww1sv5vvjr9hb1ng2rw20z7b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask"; @@ -3205,6 +3226,27 @@ license = lib.licenses.free; }; }) {}; + cdnjs = callPackage ({ dash, deferred, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: + melpaBuild { + pname = "cdnjs"; + version = "0.2.1"; + src = fetchFromGitHub { + owner = "yasuyk"; + repo = "cdnjs.el"; + rev = "ce19880d3ec3d81e6c665d0b1dfea99cc7a3f908"; + sha256 = "02j45ngddx7n5gvy42r8y3s22bmxlnvg2pqjfh0li8m599fnd11h"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/66e4ce4e2c7e4aaac9dc0ce476c4759b000ff5d6/recipes/cdnjs"; + sha256 = "1clm86n643z1prxrlxlg59jg43l9wwm34x5d88bj6yvix8g6wkb7"; + name = "cdnjs"; + }; + packageRequires = [ dash deferred f pkg-info ]; + meta = { + homepage = "https://melpa.org/#/cdnjs"; + license = lib.licenses.free; + }; + }) {}; celery = callPackage ({ dash-functional, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "celery"; @@ -3376,12 +3418,12 @@ chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: melpaBuild { pname = "chinese-pyim"; - version = "0.5"; + version = "1.5.1"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim"; - rev = "915f77912f0f8cfe064c6872cae5c0709e4e094e"; - sha256 = "004xnn6j4jc607h5qcl9jr0dqvhvqvgm77wrbdmdxpwd6hwp2sf4"; + rev = "b210c0d5275e1e8c0b78bed186cc18fc27061dd4"; + sha256 = "1jixkb7jw07lykbfv022ccnys4xypcbv03f9bxl2r16wizzymvvd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; @@ -3846,27 +3888,6 @@ license = lib.licenses.free; }; }) {}; - closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "closql"; - version = "0.2.0"; - src = fetchFromGitLab { - owner = "tarsius"; - repo = "closql"; - rev = "8e4d0b3b31913a2362a45fcdaf05745dfc188b66"; - sha256 = "1189drdpzp05kafg5wfi556n2v6a957qs9xm3v9k2rsbgnyd2hgk"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c97468a71910ba6709792c060c1fb714004e24da/recipes/closql"; - sha256 = "0a8fqw8n03x9mygvzb95m8mmfqp3j8hynwafvryjsl0np0695b6l"; - name = "closql"; - }; - packageRequires = [ emacs emacsql-sqlite ]; - meta = { - homepage = "https://melpa.org/#/closql"; - license = lib.licenses.free; - }; - }) {}; cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cm-mode"; @@ -3912,12 +3933,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.7.0pre2"; + version = "3.7.0pre3"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "876da11858ab6649bb088c4bb7758fc84910ba20"; - sha256 = "179925wbpnfiazqizw5zrhcdb5pi5a8x2x9m5wp0mvw9gxvmnwvn"; + rev = "adf5f253ec029aec4ee7aadb95c6f908030fb98b"; + sha256 = "1dbpxhs3ss91b9q4cvx8fl60zf7w8jad4cbm5cqpzhi6jfac5gxn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -4077,27 +4098,6 @@ license = lib.licenses.free; }; }) {}; - colorsarenice-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "colorsarenice-theme"; - version = "1.0.20"; - src = fetchFromGitHub { - owner = "Fanael"; - repo = "colorsarenice-theme"; - rev = "3cae55d0c7aeda3a8ef731ebc3886b2449ad87e6"; - sha256 = "18hzm7yzwlfjlbkx46rgdl31p9xyfqnxlvg8337h2bicpks7kjia"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3ac373bc7d1c4d3e49523d587d279968995e164c/recipes/colorsarenice-theme"; - sha256 = "09zlglldjbjr97clwyzyz7c0k8hswclnk2zbkm03nnn9n9yyg2qi"; - name = "colorsarenice-theme"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/colorsarenice-theme"; - license = lib.licenses.free; - }; - }) {}; commander = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "commander"; @@ -4353,12 +4353,12 @@ company-emoji = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-emoji"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "dunn"; repo = "company-emoji"; - rev = "c77e9c6f87a7853787c70eae885e12b6162d4cc5"; - sha256 = "1f8sjjms9kxni153pia6b45p2ih2mhm2r07d0j3fmxmz3q2jdldd"; + rev = "3dad255d6928e28e7a700d8cbac060f87d43d25e"; + sha256 = "1g4dxps5s93ivs0ca6blia8spchdykny12c1gygm6jh9m6k7kfvh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5733dccdffe97911a30352fbcda2900c33d79810/recipes/company-emoji"; @@ -4716,12 +4716,12 @@ composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "composer"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "zonuexe"; repo = "composer.el"; - rev = "d955d9dd39b3bd0ba04ade648108ddb805bac4bc"; - sha256 = "1yxywibs7zdhc4kgl372rl49r1ivl96adnapz2k58kggjybjk778"; + rev = "47d840e03412da5db13ae2b962576f0166517581"; + sha256 = "1vw1im39c4jvsaw3ghvwvya9l5h7jiysfhry3p22gdng0l2n4008"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer"; @@ -4758,12 +4758,12 @@ conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "conda"; - version = "0.0.5"; + version = "0.0.6"; src = fetchFromGitHub { owner = "necaris"; repo = "conda.el"; - rev = "41169a10cc41c0a3e0b9a61fd8cae7f964347ed7"; - sha256 = "1n56g7n4nsqrgyhn9lwwqjivmpllibmpgnvy34gbwifkmnq4wz0b"; + rev = "5a13e7deda80adb40553f1c256531d040a4c99a1"; + sha256 = "011z47hkynss8a56c2fi702laqxicmwai6anald58436pdxi3y6y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda"; @@ -5007,6 +5007,27 @@ license = lib.licenses.free; }; }) {}; + creamsody-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "creamsody-theme"; + version = "0.1.3"; + src = fetchFromGitHub { + owner = "emacsfodder"; + repo = "emacs-theme-creamsody"; + rev = "41164f285735383848aba1bfef4282bca4e9a8e8"; + sha256 = "0inql6g8f1nhx0k781ahm26fjpmpqq1cm3i7bf64ib9g5izjf91d"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme"; + sha256 = "0l3mq43bszxrz0bxmxb76drp4c8721cw8akgk3l5a800wqbfp2l7"; + name = "creamsody-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/creamsody-theme"; + license = lib.licenses.free; + }; + }) {}; creds = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "creds"; @@ -5239,12 +5260,12 @@ cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cyberpunk-theme"; - version = "1.17"; + version = "1.18"; src = fetchFromGitHub { owner = "n3mo"; repo = "cyberpunk-theme.el"; - rev = "4ffdaee0a32b8e235bf44c0daedde66eaf7b1b33"; - sha256 = "1yhizh8j745hv5ancpvijds9dasvsr2scwjscksp2x3krnd26ssp"; + rev = "bec963abce7a208ec192a8349ed0b8e1ac3b3041"; + sha256 = "1adbws88113lfm5ljahms12aji1swip732l7pamxwibfywhgpn2f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c632d1e501d48dab54432ab111ce589aa229125/recipes/cyberpunk-theme"; @@ -5281,12 +5302,12 @@ cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cython-mode"; - version = "0.24.1"; + version = "0.25.1"; src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "27d7795ce424cd710431c47ab4cb29111f1a3e9c"; - sha256 = "0kddvsnc4a2ass4zfzrqp26jlbnqsgbv0dy9rmj3p2n61wqkw4wk"; + rev = "278a567621d586af74a1c845de0a1426b686c72e"; + sha256 = "0wqnjcspdysn0fd4ckd49wbvi4x2gbl91asgrmijac1lq6k9vj2j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -5804,12 +5825,12 @@ dim-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dim-autoload"; - version = "1.2.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "dim-autoload"; - rev = "3a9b7f6c5a2b71149c4cdda7e4b4ea3bd729baa5"; - sha256 = "0jp3rps3ps8mh7zsn1y9367l1gh26hhmbz61l1dcv3sk4jrw46mw"; + rev = "c91edab065f413910354940742b35bdffeb52029"; + sha256 = "0v4fgbh1byv89iiszifr31j4y2s95xwcq0g9iizxiww7mjrfggyi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66b1a81dfd09a2859ae996d5d8e3d704857a340f/recipes/dim-autoload"; @@ -5927,22 +5948,22 @@ license = lib.licenses.free; }; }) {}; - dired-icon = callPackage ({ cl-lib ? null, fetchFromGitLab, fetchurl, lib, melpaBuild }: + dired-icon = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-icon"; - version = "0.2"; + version = "0.3"; src = fetchFromGitLab { owner = "xuhdev"; repo = "dired-icon"; - rev = "68b7b7cf593e4e511eb78cdf83fefdb77ba4ebde"; - sha256 = "0a7j40rw5wpxlw822ishgbcx7lk1pr4v6qqg4b5y1v5xvwaj7ciy"; + rev = "7fc95de6d7722b304124a890e4fb577e16897b1f"; + sha256 = "079vcbdgn4fgbi1kkcf3na3cwmkm41mx43f4gkbzk8hv4vzgr4kb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d0947148441ed48f92f4cfaaf39c2a9aadda48/recipes/dired-icon"; sha256 = "1fl12pbncvq80la3bjgq1wlbpmf32mq76sq61mbnwcimi3nj27na"; name = "dired-icon"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/dired-icon"; license = lib.licenses.free; @@ -6223,12 +6244,12 @@ dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dix"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "11348456ba73ab045f68ba79c51d93855ee85c31"; - sha256 = "0q35p9p26ywfaw6k8q05zmr8vmkiakykwns4ffgyl57dafkpjfj0"; + rev = "c7a699fdab0c8f3de32000c804b1504b39c936ad"; + sha256 = "0xbzw4wvhaz7h4zq2pnfcps7wfm99vyhsk25hhsr632jnz790xdf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix"; @@ -6244,12 +6265,12 @@ dix-evil = callPackage ({ dix, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dix-evil"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "11348456ba73ab045f68ba79c51d93855ee85c31"; - sha256 = "0q35p9p26ywfaw6k8q05zmr8vmkiakykwns4ffgyl57dafkpjfj0"; + rev = "c7a699fdab0c8f3de32000c804b1504b39c936ad"; + sha256 = "0xbzw4wvhaz7h4zq2pnfcps7wfm99vyhsk25hhsr632jnz790xdf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil"; @@ -6265,12 +6286,12 @@ docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }: melpaBuild { pname = "docker"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "1ee7b78d22807326bb30e45137bc36cb2ccef93f"; - sha256 = "03cbcmyqyrsafml9x497h8c4pw5rj5g02rr97ch87nbkzrih1kal"; + rev = "2e9438cf132da1bbb25b93769754c29bd7e48a6c"; + sha256 = "1dqmnija2s1dmf0kq3d4nf212jyyqa5rjnrg4l2rlxkkfgxjdqaz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -6570,8 +6591,8 @@ version = "0.3"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "6ff00cc2f12b"; - sha256 = "1sjpwgjimrmh8s8lzbjrhhqvhrfcvs36l8ls75qmrrz5rvp386l3"; + rev = "18cd7ba257ca"; + sha256 = "0lf6na6yvdk5n9viy08cdwbgphlcxksynbkvi2f02saxdzdy368v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -6776,12 +6797,12 @@ easy-kill-extras = callPackage ({ easy-kill, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-kill-extras"; - version = "0.9.4"; + version = "0.9.4.1"; src = fetchFromGitHub { owner = "knu"; repo = "easy-kill-extras.el"; - rev = "242844bc95b9015396405d84c4335338037968c3"; - sha256 = "18fdlxz9k961k8wafdw0gq0y514bvrfvx6qc1lmm4pk3gdcfbbi0"; + rev = "e60a74d7121eff7c263098aea2901cc05a5f6acd"; + sha256 = "1rabkb2pkafnfx68df1zjwbj8bl7361n35lvzrvldc3v85bfam48"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b55d93f78fefde47a2bd4ebbfd93c028fab1f40/recipes/easy-kill-extras"; @@ -6860,12 +6881,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }: melpaBuild { pname = "ebib"; - version = "2.7.2"; + version = "2.8.1"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "212b6a594d13ffcc5683f9bcfd274682abff2b05"; - sha256 = "1d19qw9980iq4idmcdr8ri42pdmyig6c1nwpxijqvdnd0zxfbnph"; + rev = "219665ba1c9aad885cee6e9914448139be7f7299"; + sha256 = "0s9hyyhjzf7ldr67znhmhl5k1q6qacnlnqw20cdc0iihidj2fg2j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -7154,12 +7175,12 @@ egison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "egison-mode"; - version = "3.6.0"; + version = "3.6.1"; src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "a3241316207b6b623c5ae61e8fe8fb17783b981b"; - sha256 = "07vdvjy4x21gyw2r4rxrj929hj1jp4a8igwgb2m5a5x50capwzhy"; + rev = "80aaf63ffa357df2106a192ee04eef54a8dae2fd"; + sha256 = "0wnyyl70jssdwgcd9im5jwxnpn7l07d0v6dx9y8546d254xdwpwx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -7194,12 +7215,12 @@ ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "0.10.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "0c47d8078d075c87bcc0bb2f072bef14fa57cd7e"; - sha256 = "1dljb6pd35l5mv51fm0bjfw4g6d19fj5sc1yag7jir6nmx0k992m"; + rev = "8e3764044c9bd44fbdab4e870c2fc9a36ce02449"; + sha256 = "0f5k9bx632xjwj3l03vs0k48xvxq4nbi71039fcjqs0bchg814nj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -7467,12 +7488,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "0fd363d09150ad101edafca667dac82ffaec5adf"; - sha256 = "1a95ncphwvg5f1q8jbjg2hhalggms8yd59wp1g6jmz1kjfhawbj0"; + rev = "a3b2acd760385a800f04652f15dfd0e7f825dfef"; + sha256 = "0a9xvfnp3pwh0q1k05q8xnray53a1aihqbxnnrfdfxx0s8rah90i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -7488,12 +7509,12 @@ elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "elfeed-web"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "0fd363d09150ad101edafca667dac82ffaec5adf"; - sha256 = "1a95ncphwvg5f1q8jbjg2hhalggms8yd59wp1g6jmz1kjfhawbj0"; + rev = "a3b2acd760385a800f04652f15dfd0e7f825dfef"; + sha256 = "0a9xvfnp3pwh0q1k05q8xnray53a1aihqbxnnrfdfxx0s8rah90i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -7572,12 +7593,12 @@ elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "elm-mode"; - version = "0.19.6"; + version = "0.19.9"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "750bb9ced539db9dfdbd143bb2624aea54eb1e16"; - sha256 = "12s8pphf6wigaaarapp78srisqdkk2wk7myhxkidrna38pq1ad5b"; + rev = "a842d54348846746ef249a87ac7961a9a787947f"; + sha256 = "1ycbc2dz8qmdxpac6yz4dxp531r50nhzdxaknm5iwz6d94pcfgni"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -7698,12 +7719,12 @@ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, yasnippet }: melpaBuild { pname = "elpy"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "c9487a14e9cb21b531660de7e648086e270ab08f"; - sha256 = "1x4asq5zqv8wbp034gzcrza9y2nbbwx1nrwi4jnwak0x0yn3c2dj"; + rev = "5c900ff6b5524e216247f52ed4085734d815dacb"; + sha256 = "1h0k3nvxy84wjsiiwpxd8xnwnvbiqld26ndv6wmxqpwsjav186ik"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a36daf2b034653cd73ee2db2bc30df2a5be6f3d1/recipes/elpy"; @@ -7809,12 +7830,12 @@ elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elx"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "tarsius"; repo = "elx"; - rev = "0f80390bcf2a1dd9a3ba609e92f50a4a3463036e"; - sha256 = "07k8kq444ki7pxbz3vnrwqgycm9hfcdxgsnvf7qihqvzs2y1qm3d"; + rev = "84c9cd5721be9594de743330e7abcec092d2838c"; + sha256 = "0z2xgy8n3gwh71129pk53nrm13h2x51n61vz7xjqmhm6c11vgrq4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91430562ecea439af020e96405ec3f21d768cf9f/recipes/elx"; @@ -7893,12 +7914,12 @@ emacsql = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }: melpaBuild { pname = "emacsql"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "176cf10063a158a114f2308f0ec0aea299ad5d24"; - sha256 = "1wc5hkirza6b4c0v557ihzbffvxy97pfcn5samcggbmrir5kpshw"; + rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; + sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql"; @@ -7914,12 +7935,12 @@ emacsql-mysql = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsql-mysql"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "176cf10063a158a114f2308f0ec0aea299ad5d24"; - sha256 = "1wc5hkirza6b4c0v557ihzbffvxy97pfcn5samcggbmrir5kpshw"; + rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; + sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql"; @@ -7935,12 +7956,12 @@ emacsql-psql = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }: melpaBuild { pname = "emacsql-psql"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "176cf10063a158a114f2308f0ec0aea299ad5d24"; - sha256 = "1wc5hkirza6b4c0v557ihzbffvxy97pfcn5samcggbmrir5kpshw"; + rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; + sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql"; @@ -7956,12 +7977,12 @@ emacsql-sqlite = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsql-sqlite"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "176cf10063a158a114f2308f0ec0aea299ad5d24"; - sha256 = "1wc5hkirza6b4c0v557ihzbffvxy97pfcn5samcggbmrir5kpshw"; + rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; + sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite"; @@ -8410,27 +8431,6 @@ license = lib.licenses.free; }; }) {}; - epkg = callPackage ({ closql, dash, emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "epkg"; - version = "1.0.2"; - src = fetchFromGitLab { - owner = "tarsius"; - repo = "epkg"; - rev = "b0606f9800c971085d5fef17dfe242aece378fb3"; - sha256 = "195y4clhs8lwbl3f5a9181v60n424s69nfzy9xrwzqclbyj42lr3"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c97468a71910ba6709792c060c1fb714004e24da/recipes/epkg"; - sha256 = "0vc1g29rfmgd2ks4lbz4599rbgcax7rgdva53ahhvp6say8fy22q"; - name = "epkg"; - }; - packageRequires = [ closql dash emacs ]; - meta = { - homepage = "https://melpa.org/#/epkg"; - license = lib.licenses.free; - }; - }) {}; epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epl"; @@ -9394,6 +9394,27 @@ license = lib.licenses.free; }; }) {}; + evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-mc"; + version = "0.0.2"; + src = fetchFromGitHub { + owner = "gabesoft"; + repo = "evil-mc"; + rev = "ccda120de2fea505147a85232c9500285edd98e8"; + sha256 = "199wcxjqyr9grvw0kahzhkh8kcg53baxhahizrknwav8mpmrvj9z"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; + sha256 = "0cq4xg6svb5gz4ra607wy768as2igla4h1xcrfnxldknk476fqqs"; + name = "evil-mc"; + }; + packageRequires = [ cl-lib emacs evil ]; + meta = { + homepage = "https://melpa.org/#/evil-mc"; + license = lib.licenses.free; + }; + }) {}; evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }: melpaBuild { pname = "evil-multiedit"; @@ -9418,12 +9439,12 @@ evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-nerd-commenter"; - version = "2.3"; + version = "2.3.1"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "981c80bb53384f93987d03c1b307767f2a68791a"; - sha256 = "16wn74690572n3xpxvnvka524fzswxxni3dy98bwpvsqj6yx2ds5"; + rev = "54c618aada776bfda0742819ff9e91845a91e095"; + sha256 = "04iyr6ys453pyfvif91qnhn6xyhl4z4cz2apj6vga61pa8lc70da"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; @@ -9859,12 +9880,12 @@ eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eyebrowse"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "wasamasa"; repo = "eyebrowse"; - rev = "eb7dac9dba845cd73b57b9046761804969adec11"; - sha256 = "0ynd4mq2vckyczfblw3r92lcbn4518jh3mzv5r11drlra9sdjnl8"; + rev = "41344e2aa2a919eae62ecedf80dcd41456084bcc"; + sha256 = "1b9341qqzr43sq0mjb2rkc5r9a2fyzwh1dm2qh27rcsb3vg219h2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse"; @@ -10132,12 +10153,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "5.2.4"; + version = "5.2.5"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "b69411d15902d9d1cbb0184885f726270de0b98c"; - sha256 = "1jlggfk9qx6gi8ifzvjn9hpbqgs8dc7hmss8aflnzf3gn4202svp"; + rev = "2b7e35e5121beba73309acd8e9586987e8e2b8a6"; + sha256 = "0wm2ddv1198wmgppigk68n3g6qcfcj446xcpf2fy7s29ck71scm1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -10790,12 +10811,12 @@ flycheck-rebar3 = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-rebar3"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "joedevivo"; repo = "flycheck-rebar3"; - rev = "534df87b0c2197fa15057f1e1a19763411c59220"; - sha256 = "1sai968p20g7yiyrnmq52lxlwxdls80drjw4f1abkr99awzffsb3"; + rev = "56a7c94857f0a0ea6a2a73c476a1a2faadc0f7c6"; + sha256 = "1pas49arri2vs9zm3r8jl4md74p5fpips3imc3s7nafbfrhh8ix3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2acff5eea030b91e457df8aa75243993c87ca00e/recipes/flycheck-rebar3"; @@ -11627,27 +11648,6 @@ license = lib.licenses.free; }; }) {}; - frame-restore = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "frame-restore"; - version = "0.5"; - src = fetchFromGitHub { - owner = "lunaryorn"; - repo = "frame-restore.el"; - rev = "5bfd06e18cdf5031062de5e052e9a877c3953804"; - sha256 = "1vznkbly0lyh5kri9lcgy309ws96q3d5m1lghck9l8ain8hphhqz"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/50ab397e8841f686e098caf6dae5dfafb0550581/recipes/frame-restore"; - sha256 = "0b321iyf57nkrm6xv8d1aydivrdapdgng35zcnrg298ws2naysvm"; - name = "frame-restore"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/frame-restore"; - license = lib.licenses.free; - }; - }) {}; fringe-helper = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fringe-helper"; @@ -11690,22 +11690,30 @@ license = lib.licenses.free; }; }) {}; - fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, s }: + fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }: melpaBuild { pname = "fsharp-mode"; - version = "1.8.1"; + version = "1.9.3"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "51bad86059528f1ce87ef12e1657531aa11a386d"; - sha256 = "00api7q86mrfv8z2g7skh34mhlkxwymf4gfpxa6zcvirhlpglyxr"; + rev = "d5b9fde6dec186972f6ea457582504ca813b8778"; + sha256 = "0wnhj9wfvm193pmni23isgagrdym2bqgay601kfacmjxffpv8879"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; sha256 = "07pkj30cawh0diqhrp3jkshgsd0i3y34rdnjb4af8mr7dsbsxb6z"; name = "fsharp-mode"; }; - packageRequires = [ company company-quickhelp dash popup pos-tip s ]; + packageRequires = [ + company + company-quickhelp + dash + flycheck + popup + pos-tip + s + ]; meta = { homepage = "https://melpa.org/#/fsharp-mode"; license = lib.licenses.free; @@ -12741,12 +12749,12 @@ gmail2bbdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gmail2bbdb"; - version = "0.0.4"; + version = "0.0.6"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "gmail2bbdb"; - rev = "2043fb8ee90c119b13bc8caf85fdf0a05f494b98"; - sha256 = "0p6n52m3y56nx7chwvmnslrnwc0xmh4fmmlkbkfz9n58hlmw8x1x"; + rev = "181ef6039227bb30a02041d8cfdc435551a7d948"; + sha256 = "0205ldrw1i7czq44pqdl374cl0rjp5w5zadrayw8brl7mmw92byn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb3c88b20a7614504165cd5fb459b0a9d5c73f60/recipes/gmail2bbdb"; @@ -13056,12 +13064,12 @@ godoctor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "godoctor"; - version = "0.0.5"; + version = "0.0.7"; src = fetchFromGitHub { owner = "microamp"; repo = "godoctor.el"; - rev = "de7f838af320c87f10cba17619492e072000c47e"; - sha256 = "1f9xfpyza23763pamknnpcvcxm7dcwk8dpj5a1mm7brg764yis2z"; + rev = "3482c9b119aeb3d81c1a07876bde5cdafe933ede"; + sha256 = "1shcxjhkk3l4vn1v16p86cxs00w5v02nmx2ariid5qrq2636gv8z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e23e1362ff7d477ad9ce6cfff694db989dfb87b/recipes/godoctor"; @@ -13245,12 +13253,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "0.10.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "bb498f73762deb009468da8c3bd93b7c6002a63e"; - sha256 = "0vqrqv0fdlw3z3402y9vmkr5lpf40nsf2nl5gi5gwr06fzcrv1dg"; + rev = "cd80b8e8a7075484941720e24faa3c9a98cfa2cc"; + sha256 = "0l6vlh8sszsxjs49xsiwfbzcbc55fmiry96g3h1p358nfrg20017"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -13491,8 +13499,8 @@ version = "0.1"; src = fetchhg { url = "https://bitbucket.com/tws/grass-mode.el"; - rev = "25414dff1fc5"; - sha256 = "0mnwmsn078hz317xfz6c05r7narx3k8956v1ajz5myxx8xrcr24z"; + rev = "fe70088c54b9"; + sha256 = "0prqgkbn0gm8g0fapkcd8192yyl2h3agn7qrlf5vrfx6780bsyw0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grass-mode"; @@ -13713,27 +13721,6 @@ license = lib.licenses.free; }; }) {}; - gulp-task-runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "gulp-task-runner"; - version = "1.0"; - src = fetchFromGitHub { - owner = "NicolasPetton"; - repo = "gulp-task-runner"; - rev = "8f5c52a7180634a99e16822bbc9f6d5e014c87d2"; - sha256 = "0n4i3vdl3ayykxab9jql1ivcv7806pin91nmw9ang3fazan06diq"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/34a2bede5ea70cf9df623c32e789d78205f9ebb0/recipes/gulp-task-runner"; - sha256 = "0211mws99bc9ipg7r3qqm1n7gszvwil31psinf0250wliyppjij7"; - name = "gulp-task-runner"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/gulp-task-runner"; - license = lib.licenses.free; - }; - }) {}; guru-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "guru-mode"; @@ -14573,22 +14560,22 @@ license = lib.licenses.free; }; }) {}; - helm-go-package = callPackage ({ deferred, fetchFromGitHub, fetchurl, go-mode, helm, lib, melpaBuild }: + helm-go-package = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, go-mode, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-go-package"; - version = "0.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-go-package"; - rev = "2204710b8a8e68c8cd4c8528eb6de4ad900941da"; - sha256 = "0h3iql8dxq80vpr1cv7fdaw0aniykp2rfzh07j5941jkiy4q63h0"; + rev = "7db5ea9ce97502152a6bb1fe38f8fabb5a49abd2"; + sha256 = "08llqkswilzsigh28w9qjbqi5g5z0ylfabz5sqia7c18gjshvz0h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/449d272b94c189176305ca17652d76adac087ce5/recipes/helm-go-package"; sha256 = "102yhn1xg83l67yaq3brn35a03fkvqqhad10rq0h39n4i1slq3z6"; name = "helm-go-package"; }; - packageRequires = [ deferred go-mode helm ]; + packageRequires = [ deferred emacs go-mode helm-core ]; meta = { homepage = "https://melpa.org/#/helm-go-package"; license = lib.licenses.free; @@ -15689,12 +15676,12 @@ hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-todo"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "tarsius"; repo = "hl-todo"; - rev = "3ef6c978011ffd01d3de060cfbde8c91d4b269f2"; - sha256 = "0lssxnxg0dknmmrp0fri2d4wbpshnkk5zfnfbc2c9jii6bvg4982"; + rev = "17e0db99ca41f10a8cc2daff812d1c7bae048a8b"; + sha256 = "0my7xaphyh3rm6yfnim2p5fpp6ldj8y57g4kpnldw6vw4kd57x3j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo"; @@ -16424,12 +16411,12 @@ imapfilter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imapfilter"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "tarsius"; repo = "imapfilter"; - rev = "f3aca4c07178c56080e4c85875f78321e94a9649"; - sha256 = "15lflvpapm5749qq7jzdwbd0isb89i6df3np4wn9y9gjl7y92wk7"; + rev = "a879ddc36fedc30311693f308f414c520fdfc370"; + sha256 = "0rx4r6822iwl4gb9j0fii0sqinqvp3lzrc768rasgicgpklaqkjs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2415894afa3404fbd73c84c58f8b8267187d6d86/recipes/imapfilter"; @@ -16568,22 +16555,43 @@ license = lib.licenses.free; }; }) {}; - import-popwin = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }: + import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "import-js"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "galooshi"; + repo = "emacs-import-js"; + rev = "5726c33b8d8c43974d4b367348962025c6df56b9"; + sha256 = "1gamzw0ayfrnp4wcn41p294kg4l80xa01w8phhsqq9kpsxz8mcr0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/048344edd471a473c9e32945b021b3f26f1666e0/recipes/import-js"; + sha256 = "0qzr4vfv3whdly73k7x621dwznca7nlhd3gpppr2w2sg12jym5ha"; + name = "import-js"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/import-js"; + license = lib.licenses.free; + }; + }) {}; + import-popwin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }: melpaBuild { pname = "import-popwin"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-import-popwin"; - rev = "34c3b34ffcadafea71600acb8f4e5ba385e6da19"; - sha256 = "0ycsdwwfb27g85aby4jix1aj41a4vq6bf541iwla0xh3wsyxb01w"; + rev = "6a21efc7fd44f8c2484d22eadf298e4bfd4bc003"; + sha256 = "1h4c3cib87hvgp37c30lx7cpyxvgdsb9hp7z0nfrkbbif0acrj2i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6f0629515f36e2e98839a6894ca8c0f58862dc2/recipes/import-popwin"; sha256 = "0vkw6y09m68bvvn1wzah4gzm69z099xnqhn359xfns2ljm74bvgy"; name = "import-popwin"; }; - packageRequires = [ cl-lib popwin ]; + packageRequires = [ emacs popwin ]; meta = { homepage = "https://melpa.org/#/import-popwin"; license = lib.licenses.free; @@ -16885,12 +16893,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "0.1.18"; + version = "0.1.19"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "5378bb637c76c48eca64ccda0c855f7557aecb60"; - sha256 = "1vgmbs790l8z90bk8sib3xvli06p1nkrjnnvlnhsjzkkpxynf2nf"; + rev = "fe0b045aadef5590eb33e03c1512430e5d52d639"; + sha256 = "18phlz8b2qwiy1mwqri02syxp7564ca0kmcdlw8m7wz6xqdr9vih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -16948,12 +16956,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "3d64dec24b01bc582801db537ed12a5812f4f0ee"; - sha256 = "1y72xhs978ah53fmp10pa8riscx94y9bjvr26wk2f3zc94c6cq3d"; + rev = "250ed1e03359fe5b29070da13cd55abc6deb0cda"; + sha256 = "168bnirfqpgiqmrjs52ixzqzq074y9szvxi6bml9zbxi8dcmafaq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -17198,12 +17206,12 @@ jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "jade"; - version = "0.23"; + version = "0.24"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "jade"; - rev = "67174f42c38eeeda73cfed62197abf59f19b3b9c"; - sha256 = "080dvzxymbrnaazx64lbvigd982z237a8427myi4mg5wnk68q1wg"; + rev = "c669a9b28dc09806c30864659f6ac924045a083d"; + sha256 = "0fykdci5vi84xrnghaqfs79zsi8x6kv77wx5xw6yphjksdqrp2f3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; @@ -17492,12 +17500,12 @@ js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }: melpaBuild { pname = "js2-refactor"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "magnars"; repo = "js2-refactor.el"; - rev = "ac3da94a33b714d44d4f0adc670a829fdc522e34"; - sha256 = "08wxsz90x5zhma3q8kqfd01avhzxjmcrjc95s757l5xaynsc2bly"; + rev = "bd73f03fc5f0d1ca1dce29e28bb43f78af483a38"; + sha256 = "1q2c61bhbr6b4a1wgqsbwxywymsxy7h3wc9fkcy3ryip3xd88b7b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor"; @@ -19165,12 +19173,12 @@ magit-stgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-stgit"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "magit"; repo = "magit-stgit"; - rev = "d1793345a8d32b2c509077d634ca73148a68de4b"; - sha256 = "1mk8g8rr9vf8jm0mmsj33p8gc71nhlv3847hvqywy6z40nhcjnyb"; + rev = "1b064485d512ab547d606dcea9ad4298f355095c"; + sha256 = "01mgnm5nr2yg377pk4bwlzzgbabsx611wrpx2vzsbiwd97yppdqf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-stgit"; @@ -19186,12 +19194,12 @@ magit-svn = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-svn"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "magit"; repo = "magit-svn"; - rev = "c6222981d4aae088d658cce5e58a14efea8590d6"; - sha256 = "1g8zq0s38di96wlhljp370kyj4a0ir1z3vb94k66v2m5nj83ap68"; + rev = "63a47732cc112d24db26052ffad93895319b60cf"; + sha256 = "1g2isa8n2j8kk0c5iwx8qai8k14sazwkc3dwhcpchm3zs0bfpdm3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-svn"; @@ -19207,12 +19215,12 @@ magit-topgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-topgit"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "magit"; repo = "magit-topgit"; - rev = "732de604c31c74e9da24616428c6e9668b57c881"; - sha256 = "0dj183vphnvz9k2amga0ydcb4gkjxr28qz67055mxrf89q1qjq33"; + rev = "11489ea798bc88d0ea5244bbf725285eedfefbef"; + sha256 = "1y7ss475ibjx354m73jn5dxd98g33jcijx48b30p45rbm6ha3i8q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-topgit"; @@ -19540,27 +19548,6 @@ license = lib.licenses.free; }; }) {}; - marmalade = callPackage ({ fetchFromGitHub, fetchurl, furl, lib, melpaBuild }: - melpaBuild { - pname = "marmalade"; - version = "0.0.4"; - src = fetchFromGitHub { - owner = "nex3"; - repo = "marmalade"; - rev = "01d6ddf5f0e822d6df393aa4546b069b2d6545d7"; - sha256 = "0pbli67wia8pximvgd68x6i9acdgsk51g9hjpqfm49rqg5nqalh9"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/82a61911de111f6ef3a99fef0a0f93ab549ab261/recipes/marmalade"; - sha256 = "0ppa2s1fma1lc01byanfxpxfrjqk2snxbsmdbkcipjdi5dpb0a9s"; - name = "marmalade"; - }; - packageRequires = [ furl ]; - meta = { - homepage = "https://melpa.org/#/marmalade"; - license = lib.licenses.free; - }; - }) {}; marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild }: melpaBuild { pname = "marshal"; @@ -21159,12 +21146,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "537e584d115fb056a23a0b055e0a28f543182c45"; - sha256 = "1cma5047c3486bjfshb612iq6j3yml0c02gqy8d0ms9507r60igq"; + rev = "c176eae5d97f627c946ad43c980a1300e3cbeb50"; + sha256 = "1fs50qll79w0kiyh4jr9kj08ara4s8mhfybx2x1s01xnd6yzjhk8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -22088,12 +22075,12 @@ org-elisp-help = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-elisp-help"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "org-elisp-help"; - rev = "0ead4f715b0a8fd21428f763cfc502177d82b3db"; - sha256 = "18x8c6jcqkfam79z4hskr8h1lvzvd5rlfgymmj1ps6p6hd3j4ihl"; + rev = "23506883074b65943987d09f1c0ecd6dc1e4a443"; + sha256 = "1wqq6phpp73qj2ra9k0whrngfaia28wc772v24dsds4dnw3zxsq0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0a9bf5046a4c3be8a83004d506bd258a6f7ff15/recipes/org-elisp-help"; @@ -22357,22 +22344,22 @@ license = lib.licenses.free; }; }) {}; - org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: + org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, projectile }: melpaBuild { pname = "org-projectile"; - version = "0.2.3"; + version = "0.2.5"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "9e7453874e472ade60b95af44167d5a6d4e24317"; - sha256 = "0nccb2w3zjgx2w2x207w3100c7c4d1ii22j1qaz3v623d7azn0qq"; + rev = "e17aa19d50284cd2c7ff45ce201f33c06626295e"; + sha256 = "0i7fy95jyi7nbgafb9xxfdgwfgs0cyqagx7s7z3b07sr6p0krxcv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dde8c06c968d4375926d269150a16b31c3a840e/recipes/org-projectile"; sha256 = "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm"; name = "org-projectile"; }; - packageRequires = [ dash emacs projectile ]; + packageRequires = [ dash emacs pcache projectile ]; meta = { homepage = "https://melpa.org/#/org-projectile"; license = lib.licenses.free; @@ -22797,12 +22784,12 @@ orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }: melpaBuild { pname = "orgit"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "magit"; repo = "orgit"; - rev = "3747e49964fc4e96c41aa10a5553d7ad609e8f43"; - sha256 = "1x3pdk5wgk4cw9qq2l2d0baidnrjxj1qjdp6ajx7hlmwmxl7c203"; + rev = "adcfef22dc9bfa6503513d0a937bf4b32ad7ab94"; + sha256 = "0f3lqw2b9xr0278s7502sa2hkyhml45j8jpssaicyliz2k1kiyzv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit"; @@ -23133,12 +23120,12 @@ ox-twbs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-twbs"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "marsmining"; repo = "ox-twbs"; - rev = "d9847c7e7c1df384088726217e65a6c0067a67c7"; - sha256 = "1qf2ka61yykd234lwwfl2x206rlgkhnqfd5494iqqk4nsdz06bai"; + rev = "2414e6b1de7deb6dd2ae79a7be633fdccb9c2f28"; + sha256 = "0kd45p8y7ykadmai4jn1x1pgpafyqggwb1ccbjzalxw4k9wmd45f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3263133ba6dde790a364bad7c96144912971ba2d/recipes/ox-twbs"; @@ -23364,12 +23351,12 @@ pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "pandoc-mode"; - version = "2.19"; + version = "2.22"; src = fetchFromGitHub { owner = "joostkremers"; repo = "pandoc-mode"; - rev = "4a8173071bb67d1e12640abcd6b45c37ba882cd2"; - sha256 = "1pzk6bhr65p7asw28lk4g85vv9rdfa1aqrxcgppjvc0xmvqvrgv0"; + rev = "b4e03ab345043fa7447dd59e59234dd33395e3cc"; + sha256 = "08yxi878l1hibcsq0bb93g2rjwlc0xw415rgn1rzs3zib2hqj1qc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode"; @@ -23427,12 +23414,12 @@ paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }: melpaBuild { pname = "paradox"; - version = "2.4.1"; + version = "2.5"; src = fetchFromGitHub { owner = "Malabarba"; repo = "paradox"; - rev = "9086bd2241f86488e816682af0ef9897569ab31b"; - sha256 = "1vq3xjllgvzwp18mv2y1qydbbl6j1nk58vw7sm99zsf3wdpls465"; + rev = "e9053ef6a7c9a433f2e5e612ba507459ded2840b"; + sha256 = "00jm904qnj9d6286gfixbcd5awwza5pv9vkisfpz6j7705bjvmap"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox"; @@ -23488,12 +23475,12 @@ paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "paren-face"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "tarsius"; repo = "paren-face"; - rev = "fd8b9a863f0e15e8feeab862d0f67ab35ef18be3"; - sha256 = "08j4kgvbx7fr3f0243508chbgd3bh9i6dhbqkndqj93zmbxxdhcw"; + rev = "0a7cbd65bb578cc52a9dc495a4fcaf23a57507bf"; + sha256 = "0wsnng874dbyikd4dgx2rxmcp0774ix5v29dq372zynq6lamqkl7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d398398d1d5838dc4985a06515ee668f0f566aab/recipes/paren-face"; @@ -23530,12 +23517,12 @@ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parinfer"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "3831280b746049ab0dd76c4ab1facf35a7e91ff5"; - sha256 = "14wj10yc0qg1g9sky8sgrlimc9a4fxk1jxvmacswb71s51vm906n"; + rev = "a1a5bce179fe694f07d28a75339bf8e4f5b285db"; + sha256 = "0m0k4lb79qy61j0n2a9amx6zz36vgxhadlvyjg9kqg9xwlks5yxc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; @@ -23572,12 +23559,12 @@ parsec = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parsec"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "parsec.el"; - rev = "34521c605fe525cc9b8f7b0e4ca991ca1eb25218"; - sha256 = "1fylcg7m95naz377ia2g9iyysaj64zd2x0warqdzs8isbpwj3cmc"; + rev = "8f0c266d8b9b0ee5fcf9b80c518644b2849ff3b3"; + sha256 = "1zwdh3dwqvw9z79mxgf9kf1l2c0pb32sknhrs7ppca613nk9c58j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/248aaf5ff9c98cd3e439d0a26611cdefe6b6c32a/recipes/parsec"; @@ -25499,12 +25486,12 @@ qml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "qml-mode"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "coldnew"; repo = "qml-mode"; - rev = "efb465917f260b4b18c30bd45c58bc291c8246f0"; - sha256 = "1mlka59gyylj4cabi1b552h11qx54kjqwx3bkmsdngjrd4da222a"; + rev = "6c5f33ba88ae010bf201a80ee8095e20a724558c"; + sha256 = "1sncsvzjfgmhp4m8w5jd4y51k24n2jfpgvrkd64wlhhzbj3wb947"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3abc88ddbb6b8ecafa45e75ceba9a1294ad88d4/recipes/qml-mode"; @@ -25583,12 +25570,12 @@ racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }: melpaBuild { pname = "racer"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "racer-rust"; repo = "emacs-racer"; - rev = "0f0246ddad7d89205b1babe228c4b132c19dded3"; - sha256 = "0zvv83rrchq92yqi6w14q5m88fva7gcm8q4vhj226acf5iq1xwdm"; + rev = "8ad54e7674e49735390d63e3aea828a4d4bcddd0"; + sha256 = "0xj5iki10cg8j8vvqjlw6lfx97k3agwirhchcjnzbnkry48x9qi6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer"; @@ -25601,6 +25588,27 @@ license = lib.licenses.free; }; }) {}; + railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "railscasts-reloaded-theme"; + version = "1.1.0"; + src = fetchFromGitHub { + owner = "thegeorgeous"; + repo = "railscasts-reloaded-theme"; + rev = "c2b6f408606c3f89ddbd19325bdbfc9a9d3d2168"; + sha256 = "1lkm0shfa7d47qmpjg1q4awazvf6ci68d98zy04r018s31isavxr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme"; + sha256 = "1iy30mnm3s7p7qigrm3lvv7xjgwvinwg6yg0hry2aifwn88cnwmz"; + name = "railscasts-reloaded-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/railscasts-reloaded-theme"; + license = lib.licenses.free; + }; + }) {}; rainbow-blocks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rainbow-blocks"; @@ -25982,12 +25990,12 @@ refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: melpaBuild { pname = "refine"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refine"; - rev = "b59764e181990ddd3ab441cdc290b5fe178860f4"; - sha256 = "1x5r6cb430hfbdqq3samlfkaawy49i1gi6mzai2061r780h7w4fx"; + rev = "9760e56ab849a4827e6c9425fdef6f5a7784c967"; + sha256 = "1b4n0mfplh6vj87p3124c2fw24fj0vm9jvcaxrvccfq3sida4sf3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine"; @@ -26528,12 +26536,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "2.3"; + version = "2.5"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "da75268b1caa973402ab17e501718da7fc748b34"; - sha256 = "0pir76xhi58nqfmjcijn5s7dz3pjjz43g97hh7sd1m32s8saddm1"; + rev = "129cc5dece4a22fb0d786d1309bcba523252e744"; + sha256 = "0xwiqcv1xgv9ma2k8zjv2v10h4sm2m5xng7k3g9n5fafrd7j0lwp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -26693,6 +26701,27 @@ license = lib.licenses.free; }; }) {}; + rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "rust-mode"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "rust-lang"; + repo = "rust-mode"; + rev = "e32765893ce2efb2db6662f507fb9d33d5c1b61b"; + sha256 = "03i79iqhr8fzri018hx65rix1fsdxk38pkvbw5z6n5flbfr4m0k4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; + sha256 = "1i1mw1v99nyikscg2s1m216b0h8svbzmf5kjvjgk9zjiba4cbqzc"; + name = "rust-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/rust-mode"; + license = lib.licenses.free; + }; + }) {}; rvm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rvm"; @@ -26882,6 +26911,26 @@ license = lib.licenses.free; }; }) {}; + schrute = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "schrute"; + version = "0.2"; + src = fetchgit { + url = "https://bitbucket.org/shackra/dwight-k.-schrute"; + rev = "99857394886e516d5ebd63fedff200bceaef1d4d"; + sha256 = "0z1cnmyn7r0l93ivl5hr4illmrm9wdyza8822l175a62n9pr8hv6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/505fc4d26049d4e2973a54b24117ccaf4f2fb7e7/recipes/schrute"; + sha256 = "1sr49wr3738sqfzix7v9rj6bvv7q2a46qdkimn9z7rnsjys9i7zy"; + name = "schrute"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/schrute"; + license = lib.licenses.free; + }; + }) {}; scpaste = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }: melpaBuild { pname = "scpaste"; @@ -27913,12 +27962,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "2350913f1db3b3744d2ff23c9f0f1676c8c9289e"; - sha256 = "1bz8k56w50mfdsyg3m7x4iibkzv4jiwwlxqlqmxclx9l45hz4ppx"; + rev = "253afc49ff30a19ea1a7af10e1e8abdb46546ac1"; + sha256 = "0ml0fdvgx60vqansh4j17ihkrnyjdndkijysqhqx1q78d97vnhi4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -28666,27 +28715,6 @@ license = lib.licenses.free; }; }) {}; - stekene-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "stekene-theme"; - version = "1.0.15"; - src = fetchFromGitHub { - owner = "Fanael"; - repo = "stekene-theme"; - rev = "5a5ed0aed5c6c6c56aa1e59516a40c697b04a673"; - sha256 = "0pik6mq8syhxk9l9ns8wgvg5312qkckm3cilb3irwdm1dvnl5hpf"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a4be17a072d4e878c510e3ef2c73bad166375195/recipes/stekene-theme"; - sha256 = "0v1kwlnrqaygzaz376a5njg9kv4yf5l35k87xga4wdd2mxfwrmf1"; - name = "stekene-theme"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/stekene-theme"; - license = lib.licenses.free; - }; - }) {}; stgit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stgit"; version = "0.17.1"; @@ -29880,6 +29908,27 @@ license = lib.licenses.free; }; }) {}; + textx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "textx-mode"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "novakboskov"; + repo = "textx-mode"; + rev = "1f9ae651508176b4cb1ae9a03aec06049f333c61"; + sha256 = "00hdnfa27rb9inqq4dn51v8jrbsl4scql0cngp6fxdaf93j1p5gk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/dada0378af342e0798c418032a8dcc7dfd80d600/recipes/textx-mode"; + sha256 = "10y95m6fskvdb2gh078ifa70nc48shkvw0223iyqbyjys35h53bn"; + name = "textx-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/textx-mode"; + license = lib.licenses.free; + }; + }) {}; theme-changer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "theme-changer"; @@ -30071,12 +30120,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "5e20a6fbbed0a74a16c834a8e3e7950bdd5a9149"; - sha256 = "0nsh2rz9w33m79rrr8nrz3g1wcgfrv7dc8q9g3s82ckj5g8gxfpr"; + rev = "fc0af768454f7964ba0c8b6934fc0cae24b8ebe8"; + sha256 = "05zrdgv0b7a3y89phg66y8cfpmshm34yg7ahhc861k6wh4kvkv89"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -31148,12 +31197,12 @@ wc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wc-mode"; - version = "1.0"; + version = "1.3"; src = fetchFromGitHub { owner = "bnbeckwith"; repo = "wc-mode"; - rev = "eb0b23e0de8bcf21c61c1edacd9fe89b2e6888d0"; - sha256 = "0kzs256ymhdrqzva32j215q9fl66n9571prb7mi6syx1vpk7m3lw"; + rev = "122f90bd1d422a84cc50acabd350d44d39ddeb69"; + sha256 = "0pjlxv46zzqdq6q131jb306vqlg4sfqls1x8vag7mmfw462hafqp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/wc-mode"; @@ -31271,26 +31320,6 @@ license = lib.licenses.free; }; }) {}; - weblogger = callPackage ({ fetchbzr, fetchurl, lib, melpaBuild, xml-rpc }: - melpaBuild { - pname = "weblogger"; - version = "1.4.5"; - src = fetchbzr { - url = "lp:weblogger-el"; - rev = "38"; - sha256 = "1z7ld9d0crwdh778fyaapx75vpnlnslsh9nf07ywkylhz4w68yyv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4e08837a9af8185951df9b44b9b94a799f0de923/recipes/weblogger"; - sha256 = "189zs1321rybgi4zihps7d2jll5z13726jsg5mi7iycg85nkv2fk"; - name = "weblogger"; - }; - packageRequires = [ xml-rpc ]; - meta = { - homepage = "https://melpa.org/#/weblogger"; - license = lib.licenses.free; - }; - }) {}; webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "webpaste"; @@ -31462,12 +31491,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "1.1.15"; + version = "1.2.1"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "1eace34a1f5b780a30797976d0cfec5936048b7b"; - sha256 = "0sgisdgid6xw6pggdi42i07wmar8bbxg9wk1b7jvyi7i7q94s843"; + rev = "17f4b0069273f9c9877dc079e5cf49ed9cb4d278"; + sha256 = "1h673yjl0hp6p244pkk6hmazgfrj2sbz9cvd1r6rnrp1lpn8z1dl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -31717,8 +31746,8 @@ version = "0.9.1"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "b9e861ccb52d"; - sha256 = "0gk1nclvkwdx20m2cnhfyb4l9jfxkvya8fifvfgry8swzbmab9h2"; + rev = "9f38303df3b7"; + sha256 = "10bcyzaj4ramas2vwjnsl9pk82gnnvfrwdxn6g217xbjjjlylwds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -31986,12 +32015,12 @@ x86-lookup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "x86-lookup"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "skeeto"; repo = "x86-lookup"; - rev = "7a2f43908985590ab8b904004cd4c41e341216be"; - sha256 = "0fks0bnil7m4m56k267f0awqnyq3vr2ywd81rsmbk1154g3acndc"; + rev = "208810ea93214491e6e2329cdbf81de85437939a"; + sha256 = "0whhi05mg7xirzfcz7fzn4hkqq0qbrhqi77myrgdhwgs123cd9bj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27757b9b5673f5581e678e8cad719138db654415/recipes/x86-lookup"; @@ -32235,22 +32264,22 @@ license = lib.licenses.free; }; }) {}; - yaml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaml-mode"; - version = "0.0.12"; + version = "0.0.13"; src = fetchFromGitHub { owner = "yoshiki"; repo = "yaml-mode"; - rev = "a817e46cc55eb90b7e1dd7cff74e43e080f0f690"; - sha256 = "1mj1gwrflpdlmc7wl1axygn1jqlrjys1dh3cpdh27zrgsjvhd6c1"; + rev = "2ace378bef2047a980fba0e42e3e6b5d990f2c66"; + sha256 = "1wx4gqkg0v0mcykimiihrp4lg2s9qac31w8rw5frbs1r37v3l8x7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode"; sha256 = "0afp83xcr8h153cayyaszwkgpap0iyk351dlykmv6bv9d2m774mc"; name = "yaml-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/yaml-mode"; license = lib.licenses.free; @@ -32280,12 +32309,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "dc3e4ca3454e8ffcd9a9eae312dba5b3657f9b11"; - sha256 = "16akdsqb74b4lriywidszmyyc8irq5dws8ya3mcja87kvih76148"; + rev = "e6b865127783f498b61fa99ad0f5413200ac09d0"; + sha256 = "0djj2gi0s0jyxpqgfk2818xnj5ykwhzy5k9yi65klsw2nanhh8y9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -32301,12 +32330,12 @@ yatemplate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "yatemplate"; - version = "1.0"; + version = "2.0"; src = fetchFromGitHub { owner = "mineo"; repo = "yatemplate"; - rev = "a49a218b6fcfbbf6e51021be78aee6d3b220e3f6"; - sha256 = "1yplaj7pry43qps8hvqxj9983ah4jvaiq94l171a7f8qi28386s8"; + rev = "90c14d2e2b8247eeba464a52560af484f8542558"; + sha256 = "00q3803nz89r91v1rwld98j1wgfc7kc6ni5a3h3zjwz1issyv5is"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate"; @@ -32445,22 +32474,22 @@ license = lib.licenses.free; }; }) {}; - zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild, powerline, s }: + zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild, powerline }: melpaBuild { pname = "zerodark-theme"; - version = "3.6"; + version = "3.7"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "0c662244a7d619938ec3673c21c735c19ee4e659"; - sha256 = "1c0r12dnhax5amiy01y0npm57r4wg8ln0ay4bick1f2jgc47g36k"; + rev = "a9fc16f317cade7db85433e66c80ba784e07a975"; + sha256 = "1b5zg2w7nfcszwbqhxan470vvsrpqwddwjj9kzgh6qxcl81y7s1p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9"; name = "zerodark-theme"; }; - packageRequires = [ all-the-icons flycheck magit powerline s ]; + packageRequires = [ all-the-icons flycheck magit powerline ]; meta = { homepage = "https://melpa.org/#/zerodark-theme"; license = lib.licenses.free; diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 822f9e5f1bd..bdade742b04 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 = "20161024"; + version = "20161102"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20161024.tar"; - sha256 = "0yph2wiwl426wn1vgbwxgnh8lr6x40swbpzzl87vfzfh5wjx4l1h"; + url = "http://orgmode.org/elpa/org-20161102.tar"; + sha256 = "1mj100pnxskgrfmabj0vdmsijmr7v5ir7c18aypv92nh3fnmiz0f"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20161024"; + version = "20161102"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20161024.tar"; - sha256 = "1pr4mnf8mrxnlnn61y3w1jkwf1d7wlf9v8j65vvs1c26rbnzms85"; + url = "http://orgmode.org/elpa/org-plus-contrib-20161102.tar"; + sha256 = "124rizp50jaqshcmrr7x2132x5sy7q81nfb37482j9wzrc9l7b95"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/stratego/builder.sh b/pkgs/applications/editors/emacs-modes/stratego/builder.sh deleted file mode 100644 index 7d734ec0888..00000000000 --- a/pkgs/applications/editors/emacs-modes/stratego/builder.sh +++ /dev/null @@ -1,4 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/share/emacs/site-lisp -cp $src $out/share/emacs/site-lisp/stratego.el diff --git a/pkgs/applications/editors/emacs-modes/stratego/default.nix b/pkgs/applications/editors/emacs-modes/stratego/default.nix deleted file mode 100644 index bb4078d2d2d..00000000000 --- a/pkgs/applications/editors/emacs-modes/stratego/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchsvn}: -stdenv.mkDerivation { - name = "stratego-mode"; - builder = ./builder.sh; - src = fetchsvn { - url = https://svn.strategoxt.org/repos/StrategoXT/stratego-editors/trunk/emacs/stratego.el; - rev = 12678; - sha256 = "4ab4ec587550233f29ca08b82fa0a9f7e5b33fc178348037e3ab1816bd60f538"; - }; -} diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 96ed8532eae..1ce86e96c4d 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -204,12 +204,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2016.2.4"; + version = "2016.2.5"; 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 = "14c1afkmny78vj434y46nja3v9smzcqsfdkhr83bqic1a0h4g84w"; + sha256 = "1rncnm5dvhpfb7l5p2k0hs4yqzp8n1c4rvz9vldlf5k7mvwggp7p"; }; wmClass = "jetbrains-rubymine"; }; @@ -264,12 +264,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2016.2.1"; + version = "2016.2.2"; description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "0vgr0ds6z0y8qw2v55nr3pi5zb5x0n6pxm13hcp44iradns5kmbp"; + sha256 = "0np0ypqga1xx9zq0qwpxiw9xdkr7k0jcdv1w790aafjar7a5qbyz"; }; wmClass = "jetbrains-phpstorm"; }; diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index 845a02bebf6..cf1d70350ba 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules, makeQtWrapper -, qtquickcontrols, qtwebkit +, qtquickcontrols, qtwebkit, qttools , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor -, threadweaver, kxmlgui, kwindowsystem +, threadweaver, kxmlgui, kwindowsystem, grantlee , plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared_mime_info -, libksysguard, llvmPackages +, libksysguard, llvmPackages, makeWrapper }: let pname = "kdevelop"; - version = "5.0"; - dirVersion = "5.0.0"; + version = "5.0.2"; + dirVersion = "5.0.2"; in stdenv.mkDerivation rec { @@ -18,22 +18,25 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/${pname}/${dirVersion}/src/${name}.tar.xz"; - sha256 = "5e034b8670f4ba13ccb2948c28efa0b54df346e85b648078698cca8974ea811c"; + sha256 = "9b017901167723230dee8b565cdc7b0e61762415ffcc0a32708f04f7ab668666"; }; - nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ]; + nativeBuildInputs = [ + cmake gettext pkgconfig extra-cmake-modules makeWrapper makeQtWrapper + ]; buildInputs = [ qtquickcontrols qtwebkit kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor - threadweaver kxmlgui kwindowsystem plasma-framework krunner + threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner kdevplatform kdevelop-pg-qt shared_mime_info libksysguard llvmPackages.llvm llvmPackages.clang-unwrapped ]; postInstall = '' wrapQtProgram "$out/bin/kdevelop" + wrapProgram "$out/bin/kdevelop!" --prefix PATH ":" "${qttools}/bin" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix index 52af0a4e05d..d8a7e7f2b9e 100644 --- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix +++ b/pkgs/applications/editors/kdevelop5/kdevplatform.nix @@ -6,8 +6,8 @@ let pname = "kdevplatform"; - version = "5.0"; - dirVersion = "5.0.0"; + version = "5.0.2"; + dirVersion = "5.0.2"; in stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://kde/stable/kdevelop/${dirVersion}/src/${name}.tar.xz"; - sha256 = "4085b355ab8d599d902afbc11027e1aefb22afe30d63ed54ea5fe02f24edfd10"; + sha256 = "a7f311198bb72f5fee064d99055e8df39ecf4e9066fe5c0ff901ee8c24d960ec"; }; nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ]; diff --git a/pkgs/applications/editors/kile/frameworks.nix b/pkgs/applications/editors/kile/frameworks.nix index c16dce1eccc..7a02c3d3f8c 100644 --- a/pkgs/applications/editors/kile/frameworks.nix +++ b/pkgs/applications/editors/kile/frameworks.nix @@ -24,12 +24,12 @@ let unwrapped = kdeDerivation rec { name = "kile-${version}"; - version = "2016-07-25"; + version = "2016-10-24"; src = fetchgit { url = git://anongit.kde.org/kile.git; - rev = "9cad4757df2493a6099b89114340493c6b436d0b"; - sha256 = "0kikrkssfd7bj580iwsipirbz2klxvk0f7nfg5y9mkv0pnchx2mj"; + rev = "e005e2ac140881aa7610bd363d181cf306f91f80"; + sha256 = "1labv8jagsfk0k7nvxh90in9464avzdabgs215y1h658zjh1wpy4"; }; diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 2e573e09b31..91f8e677adb 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -26,6 +26,18 @@ stdenv.mkDerivation { url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-4/debian/patches/CVE-2016-7800_part2.patch"; sha256 = "1h4xv3i1aq5avsd584rwa5sa7ca8f7w9ggmh7j2llqq5kymwsv5f"; }) + (fetchpatch { + url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8682.patch"; + sha256 = "1wfirw2yi5y72657kvnbgjs0f9b3rs9nvk8gjbwhb9a03z9ws0y5"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8683.patch"; + sha256 = "102252zb34nj6alk1nhh1wbn3apd2v9rzk7clmm237332yj72vif"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8684.patch"; + sha256 = "1p36gpz904wnmbz1n64x4pdpg8lp9zs3gx0awklxqdvgl8m82vvy"; + }) ]; configureFlags = [ diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 734364b9ccd..e07fa1df546 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -11,11 +11,11 @@ with lib; stdenv.mkDerivation rec { - name = "blender-2.78"; + name = "blender-2.78a"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "0hfl7q6phydlk8mbkksnqxj004qqad99xkrp5n9wrz9vrcf3x1hp"; + sha256 = "1byf1klrvm8fdw2libx7wldz2i6lblp9nih6y58ydh00paqi8jh1"; }; buildInputs = diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 43e41284f14..324fa12dc46 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "cherrytree-${version}"; - version = "0.37.1"; + version = "0.37.6"; src = fetchurl { url = "http://www.giuspen.com/software/${name}.tar.xz"; - sha256 = "45f1cee4067598cf2ca8ae6f89d03789b86f9e3bf196236119868653420d7cdd"; + sha256 = "0x4cgsimpwh7wfbzbzw2f5ipxxjizpi4wa99s1cwizynfjr38y5s"; }; buildInputs = with pythonPackages; diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix new file mode 100644 index 00000000000..6ccae9d5360 --- /dev/null +++ b/pkgs/applications/misc/exercism/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "exercism-${version}"; + version = "2.3.0"; + + goPackagePath = "github.com/exercism/cli"; + + src = fetchFromGitHub { + owner = "exercism"; + repo = "cli"; + rev = "v${version}"; + sha256 = "1zhvvmsh5kw739kylk0bqj1wa6vjyahz43dlxdpv42h8gfiiksf5"; + }; + + meta = with stdenv.lib; { + description = "A Go based command line tool for exercism.io"; + homepage = http://exercism.io/cli; + license = licenses.mit; + maintainers = [ maintainers.rbasso ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 4050f8bf589..b604905320b 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -7,7 +7,7 @@ , gnupg1compat , icoutils , imagemagick -, netcat +, netcat-gnu , p7zip , python2Packages , unzip @@ -34,7 +34,7 @@ let gnupg1compat icoutils imagemagick - netcat + netcat-gnu p7zip unzip wget diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix index 29d7067e235..aa1c1deebd6 100644 --- a/pkgs/applications/misc/styx/default.nix +++ b/pkgs/applications/misc/styx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "styx-${version}"; - version = "0.2.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "styx-static"; repo = "styx"; rev = "v${version}"; - sha256 = "1bcd0ss628mhchrl85fy6acxcxqvm1d3qywfaxhikahl1r7inpwg"; + sha256 = "0wyibdyi4ld0kfhng5ldb2rlgjrci014fahxn7nnchlg7dvcc5ni"; }; server = caddy.bin; @@ -19,13 +19,14 @@ stdenv.mkDerivation rec { installPhase = '' mkdir $out - install -D -m 777 $sourceRoot/styx.sh $out/bin/styx + install -D -m 777 styx.sh $out/bin/styx mkdir -p $out/share/styx - cp -r $sourceRoot/sample $out/share/styx + cp -r lib $out/share/styx + cp -r scaffold $out/share/styx mkdir -p $out/share/doc/styx - asciidoctor $sourceRoot/doc/manual.doc -o $out/share/doc/styx/index.html + asciidoctor doc/manual.adoc -o $out/share/doc/styx/index.html substituteAllInPlace $out/bin/styx substituteAllInPlace $out/share/doc/styx/index.html diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix new file mode 100644 index 00000000000..836deb656a2 --- /dev/null +++ b/pkgs/applications/misc/volnoti/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, fetchpatch +, pkgconfig, dbus, gdk_pixbuf, glib, libX11, gtk2, librsvg +, dbus_glib, autoreconfHook, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "volnoti-unstable-${version}"; + version = "2013-09-23"; + + src = fetchFromGitHub { + owner = "davidbrazdil"; + repo = "volnoti"; + rev = "4af7c8e54ecc499097121909f02ecb42a8a60d24"; + sha256 = "155lb7w563dkdkdn4752hl0zjhgnq3j4cvs9z98nb25k1xpmpki7"; + }; + + patches = [ + # Fix dbus interface headers. See + # https://github.com/davidbrazdil/volnoti/pull/10 + (fetchpatch { + url = "https://github.com/davidbrazdil/volnoti/pull/10.patch"; + sha256 = "046zfdjmvhb7jrsgh04vfgi35sgy1zkrhd3bzdby3nvds1wslfam"; + }) + ]; + + nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ]; + + buildInputs = [ + dbus gdk_pixbuf glib libX11 gtk2 dbus_glib librsvg + ]; + + meta = with stdenv.lib; { + description = "Lightweight volume notification for Linux"; + homepage = "https://github.com/davidbrazdil/volnoti"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.gilligan ]; + }; +} diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 3a62270afcf..af1256d3442 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -72,7 +72,6 @@ in buildPythonApplication rec { ''; postFixup = '' - wrapPythonPrograms mv $out/bin/qutebrowser $out/bin/.qutebrowser-noqtpath makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index bbceca88ae8..c7f2bc83c4d 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terraform-${version}"; - version = "0.7.7"; + version = "0.7.8"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/terraform"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "hashicorp"; repo = "terraform"; - sha256 = "0wza5ladh406lf8hd4fbh4ri82qbcf91lif82357ldy78ghsi5g7"; + sha256 = "0b42qji85h49aabzlb21vkcfpykrf8g4k2a51jhz9y28ywpbx5n4"; }; postInstall = '' diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 9639fe9e74a..d10e787b6ff 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -23,11 +23,11 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "12.4.22"; + version = "13.4.21"; sha256 = { - "x86_64-linux" = "1vmaddk19w9b9lg03v2jr532qpk6miw24rrprx6x6md9ll9asv8y"; - "i686-linux" = "1pzxsdsi37fvk0gr69m2sa61q7afy5gcz8p78nsdr4i0gga1gxfr"; + "x86_64-linux" = "0ckinjrnnijs2wx80c0bqdlcsw5zhx64rsh3bylcjfbpvyli96q4"; + "i686-linux" = "08lhj4hlhvxm4zp9jai01f8cydfgfkl91l4ydd85yccl9ii4flh5"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index 751f6f9855b..bf6da8c207a 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, curl, coreutils, gawk, bash, which }: stdenv.mkDerivation { - name = "esniper-2.31.0"; + name = "esniper-2.32.0"; src = fetchurl { - url = "mirror://sourceforge/esniper/esniper-2-31-0.tgz"; - sha256 = "0xn6gdyr0c18khwcsi2brp49wkancrsrxxca7hvbawhbf263glih"; + url = "mirror://sourceforge/esniper/esniper-2-32-0.tgz"; + sha256 = "04lka4d0mnrwc369yzvq28n8qi1qbm8810ykx6d0a4kaghiybqsy"; }; buildInputs = [ openssl curl ]; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 3a08cd26292..2ca16eb4458 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -4,7 +4,7 @@ , libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, pango , systemd, libXScrnSaver }: -let version = "0.0.9"; in +let version = "0.0.10"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://cdn-canary.discordapp.com/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "72f692cea62b836220f40d81d110846f9cde9a0fba7a8d47226d89e0980255b9"; + sha256 = "1wkbbnbqbwgixdbm69dlirhgjnn8llqyzil01nqwpknh1qwd06pr"; }; libPath = stdenv.lib.makeLibraryPath [ diff --git a/pkgs/applications/networking/irc/konversation/1.6.nix b/pkgs/applications/networking/irc/konversation/1.6.nix index 995eddd9321..c6876405462 100644 --- a/pkgs/applications/networking/irc/konversation/1.6.nix +++ b/pkgs/applications/networking/irc/konversation/1.6.nix @@ -30,13 +30,13 @@ let unwrapped = let pname = "konversation"; - version = "1.6.1"; + version = "1.6.2"; in kdeDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "28346d6629261a5328c43ffa09c12e37743b3ef4f4bc4c411d39bc19f7bf06c6"; + sha256 = "1798sslwz7a3h1v524ra33p0j5iqvcg0v1insyvb5qp4kv11slmn"; }; buildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index c1c7947cd0a..2033dfc8e91 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -2,14 +2,14 @@ , cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl }: stdenv.mkDerivation rec { - version = "20160910"; + version = "20161104"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "1i1idqk9l3njqsiw8n8jgjawcz9n9h5180qvpxfwg7sg9zx2sjhj"; + sha256 = "070p18khvxsrcn30jhyrnagka5mgza9mi5vmrrr6xl8mpgkyrlaw"; }; buildInputs = @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { homepage = http://www.neomutt.org; license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ hiberno cstrahan vrthra ]; + maintainers = with maintainers; [ cstrahan vrthra erikryb ]; }; } diff --git a/pkgs/applications/networking/siproxd/cheaders.patch b/pkgs/applications/networking/siproxd/cheaders.patch index 53c4813cc33..69a3e328737 100644 --- a/pkgs/applications/networking/siproxd/cheaders.patch +++ b/pkgs/applications/networking/siproxd/cheaders.patch @@ -3,11 +3,12 @@ index 1904ab3..cb3624d 100644 --- a/src/dejitter.c +++ b/src/dejitter.c @@ -22,6 +22,8 @@ - + #include - + +#include +#include + #include #include #include #include diff --git a/pkgs/applications/networking/siproxd/default.nix b/pkgs/applications/networking/siproxd/default.nix index 69ebab78f94..14ed2587e63 100644 --- a/pkgs/applications/networking/siproxd/default.nix +++ b/pkgs/applications/networking/siproxd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libosip }: stdenv.mkDerivation rec { - name = "siproxd-0.8.1"; - + name = "siproxd-0.8.2"; + src = fetchurl { url = "mirror://sourceforge/siproxd/${name}.tar.gz"; - sha256 = "1bcxl0h5nc28m8lcdhpbl5yc93w98xm53mfzrf04knsvmx7z0bfz"; + sha256 = "1l6cyxxhra825jiiw9npa7jrbfgbyfpk4966cqkrw66cn28y8v2j"; }; patches = [ ./cheaders.patch ]; diff --git a/pkgs/applications/networking/syncthing/inotify-deps.nix b/pkgs/applications/networking/syncthing/inotify-deps.nix index 302e5ee10e1..7b0be65c8af 100644 --- a/pkgs/applications/networking/syncthing/inotify-deps.nix +++ b/pkgs/applications/networking/syncthing/inotify-deps.nix @@ -4,17 +4,8 @@ fetch = { type = "git"; url = "https://github.com/cenkalti/backoff"; - rev = "cdf48bbc1eb78d1349cbda326a4a037f7ba565c6"; - sha256 = "0dg7hvpv0a1db8qriygz1jqgp16v8k505b197x9902z7z6lldgbh"; - }; - } - { - goPackagePath = "github.com/gobwas/glob"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/glob"; - rev = "ce6abff51712df5da11095fb41dd4b0353559797"; - sha256 = "1gxv4nnn3f9hw1ncdmhsr8fbfdma2h713ima7b4k28gxydfa8i9m"; + rev = "b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3"; + sha256 = "0lhcll9pzcxbbm9sdsijvcvdqc4lrsgbyw0q1xly0pnz556v6pyc"; }; } { @@ -22,8 +13,8 @@ fetch = { type = "git"; url = "https://github.com/syncthing/syncthing"; - rev = "66a506e72b9dcc749d09a03cb120ba86bbf3d7f8"; - sha256 = "0is4f1r3im2bbmbca9fafzxffikxaf86vd6f851831fk5wi4pzw9"; + rev = "7fba8cf759a3b48cfc1507a8c32355865500a571"; + sha256 = "1s8l528fqq661ks70cna5cx1bawpv7szcx88z33bs4gkaq2fbws5"; }; } { @@ -31,8 +22,8 @@ fetch = { type = "git"; url = "https://github.com/zillode/notify"; - rev = "2da5cc9881e8f16bab76b63129c7781898f97d16"; - sha256 = "0qwsj730p5mivp2xw9zr5vq8xr7rr9cxjmi564wgmsn7dcvqnr40"; + rev = "df33c1a773b462f936a149c36696c018c047eaa9"; + sha256 = "0ncfqnj5kvbyw630xsxqkxy3y6jv5hp89fqi9mzra3lr4zckiv3s"; }; } ] diff --git a/pkgs/applications/networking/syncthing/inotify.nix b/pkgs/applications/networking/syncthing/inotify.nix index f1343d4a67e..8d9a813f961 100644 --- a/pkgs/applications/networking/syncthing/inotify.nix +++ b/pkgs/applications/networking/syncthing/inotify.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "syncthing-inotify-${version}"; - version = "0.8.3"; + version = "0.8.4"; goPackagePath = "github.com/syncthing/syncthing-inotify"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "syncthing"; repo = "syncthing-inotify"; rev = "v${version}"; - sha256 = "194pbz9zzxaz0vri93czpbsxl85znlba2gy61mjgyr0dm2h4s6yw"; + sha256 = "0iix4gd5zh2ydn429jmcf0pr1pxxd1wq1vp5ciq9bavhvnim9clw"; }; goDeps = ./inotify-deps.nix; @@ -25,6 +25,8 @@ buildGoPackage rec { substitute $src/etc/linux-systemd/user/syncthing-inotify.service \ $bin/etc/systemd/user/syncthing-inotify.service \ --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify + '' + stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/syncthing-inotify ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/office/skrooge/2.nix b/pkgs/applications/office/skrooge/2.nix index f9be34efd95..6751e7d6d11 100644 --- a/pkgs/applications/office/skrooge/2.nix +++ b/pkgs/applications/office/skrooge/2.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "skrooge-${version}"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { url = "http://download.kde.org/stable/skrooge/${name}.tar.xz"; - sha256 = "132d022337140f841f51420536c31dfe07c90fa3a38878279026825f5d2526fe"; + sha256 = "03ayrrr7rrj1jl1qh3sgn56hbi44wn4ldgcj08b93mqw7wdvpglp"; }; nativeBuildInputs = [ cmake ecm makeQtWrapper ]; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 3cb7ed491fb..0e9f2eba1d1 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -77,6 +77,6 @@ stdenv.mkDerivation { description = "Collect, organize, cite, and share your research sources"; license = licenses.agpl3; platforms = platforms.linux; - maintainers = with maintainers; [ ttuegel ]; + broken = true; # probably; see #20049 }; } diff --git a/pkgs/applications/science/biology/pal2nal/default.nix b/pkgs/applications/science/biology/pal2nal/default.nix deleted file mode 100644 index 956f8b07e98..00000000000 --- a/pkgs/applications/science/biology/pal2nal/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{stdenv, fetchurl, perl, paml}: - -stdenv.mkDerivation { - name = "pal2nal-12"; - src = fetchurl { - url = http://coot.embl.de/pal2nal/distribution/pal2nal.v12.tar.gz; - sha256 = "1qj9sq5skpa7vyccl9gxc5ls85jwiq8j6mr8wvacz4yhyg0afy04"; - }; - - installPhase = '' - mkdir -p $out/bin - - cp -v pal2nal.pl $out/bin - - mkdir -p $out/doc - - cp -v README $out/doc - ''; - - meta = { - description = "Program for aligning nucleotide sequences based on an aminoacid alignment"; - longDescription = '' - PAL2NAL is a program that converts a multiple sequence alignment of proteins and the corresponding DNA (or mRNA) sequences into a codon alignment. The program automatically assigns the corresponding codon sequence even if the input DNA sequence has mismatches with the input protein sequence, or contains UTRs, polyA tails. It can also deal with frame shifts in the input alignment, which is suitable for the analysis of pseudogenes. The resulting codon alignment can further be subjected to the calculation of synonymous (KS) and non-synonymous (KA) substitution rates. - -If the input is a pair of sequences, PAL2NAL automatically calculates KS and KA by the codeml program in PAML. -''; - license = "non-commercial"; - homepage = http://coot.embl.de/pal2nal/; - pkgMaintainer = "Pjotr Prins"; - }; -} diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix index cec0aa7e5eb..589c2809a93 100644 --- a/pkgs/applications/science/biology/paml/default.nix +++ b/pkgs/applications/science/biology/paml/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "4.2a"; + version = "4.9c"; name = "paml-${version}"; src = fetchurl { - url = "http://abacus.gene.ucl.ac.uk/software/paml${version}.tar.gz"; - sha256 = "0yywyrjgxrpavp50n00l01pl90b7pykgb2k53yrlykz9dnf583pb"; + url = "http://abacus.gene.ucl.ac.uk/software/paml${version}.tgz"; + sha256 = "18a1l47223l7jyjavm8a8la84q9k9kbxwmj7kz4z3pdx70qrl04j"; }; preBuild = '' @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' mkdir -pv $out/bin - cp -v codeml $out/bin + cp -v codeml $out/bin cp -v baseml $out/bin cp -v basemlg $out/bin cp -v chi2 $out/bin @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { description = "Phylogenetic Analysis by Maximum Likelihood (PAML)"; longDescription = ''PAML is a package of programs for phylogenetic analyses of DNA or protein sequences using maximum likelihood. It is maintained and distributed for academic use free of charge by Ziheng Yang. ANSI C source codes are distributed for UNIX/Linux/Mac OSX, and executables are provided for MS Windows. PAML is not good for tree making. It may be used to estimate parameters and test hypotheses to study the evolutionary process, when you have reconstructed trees using other programs such as PAUP*, PHYLIP, MOLPHY, PhyML, RaxML, etc.''; license = "non-commercial"; - homepage = http://abacus.gene.ucl.ac.uk/software/paml.html; + homepage = http://abacus.gene.ucl.ac.uk/software/paml.html; }; } diff --git a/pkgs/applications/science/logic/coq/8.5.nix b/pkgs/applications/science/logic/coq/8.5.nix index eb74891f511..aae2101f50e 100644 --- a/pkgs/applications/science/logic/coq/8.5.nix +++ b/pkgs/applications/science/logic/coq/8.5.nix @@ -2,11 +2,22 @@ # - The csdp program used for the Micromega tactic is statically referenced. # However, coq can build without csdp by setting it to null. # In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found. +# - The patch-level version can be specified through the `pl` argument to +# the derivation; it defaults to the greatest. -{stdenv, fetchurl, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}: +{ stdenv, fetchurl, writeText, pkgconfig +, ocaml, findlib, camlp5, ncurses +, lablgtk ? null, csdp ? null +, pl ? "3" +}: let - version = "8.5pl2"; + version = "8.5pl${pl}"; + sha256 = { + "1" = "1w2xvm6w16khfn63bp95s25hnkn2ny3w0yqg3lq63gp11aqpbyjb"; + "2" = "0wyywia0darak2zmc5v0ra9rn0b9whwdfiahralm8v5za499s8w3"; + "3" = "0fyk2a4fpifibq8y8jhx1891k55qnsnlygglch64sva0bph94nrh"; + }."${pl}"; coq-version = "8.5"; buildIde = lablgtk != null; ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; @@ -24,7 +35,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz"; - sha256 = "0wyywia0darak2zmc5v0ra9rn0b9whwdfiahralm8v5za499s8w3"; + inherit sha256; }; buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; @@ -34,7 +45,7 @@ stdenv.mkDerivation { RM=$(type -tp rm) substituteInPlace configure --replace "/bin/uname" "$UNAME" substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM" - substituteInPlace configure.ml --replace "if arch = \"Darwin\" || arch = \"FreeBSD\" then \"md5" "if arch = \"Darwinx\" then \"md5" + substituteInPlace configure.ml --replace '"md5 -q"' '"md5sum"' ${csdpPatch} ''; @@ -57,7 +68,11 @@ stdenv.mkDerivation { prefixKey = "-prefix "; - buildFlags = "revision coq coqide"; + buildFlags = "revision coq coqide bin/votour"; + + postInstall = '' + cp bin/votour $out/bin/ + ''; meta = with stdenv.lib; { description = "Coq proof assistant"; diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile index eb3054dfd5b..f9d95e121f5 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile +++ b/pkgs/applications/version-management/gitlab/Gemfile @@ -103,7 +103,7 @@ gem 'seed-fu', '~> 2.3.5' # Markdown and HTML processing gem 'html-pipeline', '~> 1.11.0' gem 'task_list', '~> 1.0.2', require: 'task_list/railtie' -gem 'github-markup', '~> 1.4' +gem 'gitlab-markup', '~> 1.5.0' gem 'redcarpet', '~> 3.3.3' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~>3.6' diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock index 69f2af4f6f0..0dd9b47ff3e 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -281,6 +281,7 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) + gitlab-markup (1.5.0) gitlab_git (10.6.6) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) @@ -868,8 +869,8 @@ DEPENDENCIES gemnasium-gitlab-service (~> 0.2) gemojione (~> 3.0) github-linguist (~> 4.7.0) - github-markup (~> 1.4) gitlab-flowdock-git-hook (~> 1.0.1) + github-markup (~> 1.5.0) gitlab_git (~> 10.6.6) gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 7d6a85a81aa..92b5b552ec6 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { name = "gitlab-${version}"; - version = "8.12.6"; + version = "8.12.8"; buildInputs = [ env ruby bundler tzdata git nodejs procps ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "gitlabhq"; repo = "gitlabhq"; rev = "v${version}"; - sha256 = "14dbr8a1il75xz83hkdjm3yq49168mkn62l86bi36n5pfw44kcvh"; + sha256 = "1l2r3mjyra53wpq724d974zv9ax5hb1qrdsz4071b2p34s70gbl3"; }; patches = [ diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix index bf552b5d4ef..a87d4f92c62 100644 --- a/pkgs/applications/version-management/gitlab/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gemset.nix @@ -937,6 +937,7 @@ type = "gem"; }; version = "1.4.0"; + meta.priority = 10; # lower priority, exectuable conflicts with gitlab-markdown }; gitlab-flowdock-git-hook = { dependencies = ["flowdock" "gitlab-grit" "multi_json"]; @@ -955,6 +956,14 @@ }; version = "2.8.1"; }; + gitlab-markup = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yxwp4q0dwiykxv24x2yhvnn59wmw1jv0vz3d8hjw44nn9jxn25a"; + type = "gem"; + }; + version = "1.5.0"; + }; gitlab_git = { source = { remotes = ["https://rubygems.org"]; @@ -2821,4 +2830,4 @@ }; version = "2.0.0"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix new file mode 100644 index 00000000000..d5215488707 --- /dev/null +++ b/pkgs/applications/video/motion/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libjpeg, ffmpeg }: + +stdenv.mkDerivation rec { + name = "motion-${version}"; + version = "4.0.1"; + src = fetchFromGitHub { + owner = "Motion-Project"; + repo = "motion"; + rev = "release-${version}"; + sha256 = "172bn2ny5r9fcb4kn9bjq3znpgl8ai84w4b99vhk5jggp2haa3bb"; + }; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libjpeg ffmpeg ]; + meta = with stdenv.lib; { + homepage = http://www.lavrsen.dk/foswiki/bin/view/Motion/WebHome; + description = "Monitors the video signal from cameras"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.puffnfresh ]; + }; +} diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index b41eae41a5c..3ed58017fe2 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -31,6 +31,7 @@ , libpngSupport ? true, libpng ? null , youtubeSupport ? true, youtube-dl ? null , vaapiSupport ? true, libva ? null +, drmSupport ? true, libdrm ? null , vapoursynthSupport ? false, vapoursynth ? null , jackaudioSupport ? false, libjack2 ? null @@ -65,6 +66,7 @@ assert youtubeSupport -> available youtube-dl; assert vapoursynthSupport -> available vapoursynth; assert jackaudioSupport -> available libjack2; assert vaapiSupport -> available libva; +assert drmSupport -> available libdrm; let # Purity: Waf is normally downloaded by bootstrap.py, but @@ -133,6 +135,7 @@ in stdenv.mkDerivation rec { ++ optional sdl2Support SDL2 ++ optional cacaSupport libcaca ++ optional vaapiSupport libva + ++ optional drmSupport libdrm ++ optional vapoursynthSupport vapoursynth ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ] diff --git a/pkgs/applications/virtualization/qemu/CVE-2016-9102.patch b/pkgs/applications/virtualization/qemu/CVE-2016-9102.patch new file mode 100644 index 00000000000..05a95599937 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/CVE-2016-9102.patch @@ -0,0 +1,12 @@ +diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c +index d938427..7557a7d 100644 +--- a/hw/9pfs/9p.c ++++ b/hw/9pfs/9p.c +@@ -3261,6 +3261,7 @@ + xattr_fidp->fs.xattr.flags = flags; + v9fs_string_init(&xattr_fidp->fs.xattr.name); + v9fs_string_copy(&xattr_fidp->fs.xattr.name, &name); ++ g_free(xattr_fidp->fs.xattr.value); + xattr_fidp->fs.xattr.value = g_malloc0(size); + err = offset; + put_fid(pdu, file_fidp); diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index f1ee4426d97..f81781987cc 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -47,6 +47,77 @@ stdenv.mkDerivation rec { patches = [ ./no-etc-install.patch + (fetchpatch { + url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/net-vmxnet-initialise-local-tx-descriptor-CVE-2016-6836.patch"; + sha256 = "1i01vsxsdwrb5r7i9dmrshal4fvpj2j01cmvfkl5wz3ssq5z02wc"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-mptconfig-fix-an-assert-expression-CVE-2016-7157.patch"; + sha256 = "1wqf9k79wdr1k25siyhhybz1bpb0iyshv6fvsf55pgk5p0dg1970"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-mptconfig-fix-misuse-of-MPTSAS_CONFIG_PACK-CVE-2016-7157.patch"; + sha256 = "0l78fcbq8mywlgax234dh4226kxzbdgmarz1yrssaaiipkzq4xgw"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-mptsas-use-g_new0-to-allocate-MPTSASRequest-obj-CVE-2016-7423.patch"; + sha256 = "14l8w40zjjhpmzz4rkh69h5na8d4did7v99ng7nzrychakd5l29h"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-pvscsi-check-page-count-while-initialising-descriptor-rings-CVE-2016-7155.patch"; + sha256 = "1dwkci5mqgx3xz2q69kbcn48l8vwql9g3qaza2jxi402xdgc07zn"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-pvscsi-limit-loop-to-fetch-SG-list-CVE-2016-7156.patch"; + sha256 = "1r5xm4m9g39p89smsia4i9jbs32nq9gdkpx6wgd91vmswggcbqsi"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/scsi-pvscsi-limit-process-IO-loop-to-ring-size-CVE-2016-7421.patch"; + sha256 = "07661d1kd0ddkmzsrjph7jnhz2qbfavkxamnvs3axaqpp52kx6ga"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/usb-xhci-fix-memory-leak-in-usb_xhci_exit-CVE-2016-7466.patch"; + sha256 = "0nckwzn9k6369vni12s8hhjn73gbk6ns0mazns0dlgcq546q2fjj"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/q/qemu/1:2.7+dfsg-3/debian/patches/virtio-add-check-for-descriptor-s-mapped-address-CVE-2016-7422.patch"; + sha256 = "1f1ilpzlxfjqvwmv9h0mzygwl5l8zd690f32vxfv9g6rfbr5h72k"; + }) + (fetchpatch { + name = "qemu-CVE-2016-8909.patch"; + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=0c0fc2b5fd534786051889459848764edd798050"; + sha256 = "0mavkajxchfacpl4gpg7dhppbnhs1bbqn2rwqwiwkl0m5h19d9fv"; + }) + (fetchpatch { + name = "qemu-CVE-2016-8910.patch"; + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=c7c35916692fe010fef25ac338443d3fe40be225"; + sha256 = "10qmlggifdmvj5hg3brs712agjq6ppnslm0n5d5jfgjl7599wxml"; + }) + (fetchpatch { + name = "qemu-CVE-2016-9103.patch"; + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=eb687602853b4ae656e9236ee4222609f3a6887d"; + sha256 = "0j20n4z1wzybx8m7pn1zsxmz4rbl8z14mbalfabcjdgz8sx8g90d"; + }) + (fetchpatch { + name = "qemu-CVE-2016-9104.patch"; + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=7e55d65c56a03dcd2c5d7c49d37c5a74b55d4bd6"; + sha256 = "1l99sf70098l6v05dq4x7p2glxx1l4nq1l8l3711ykp9vxkp91qs"; + }) + (fetchpatch { + name = "qemu-CVE-2016-9105.patch"; + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=4c1586787ff43c9acd18a56c12d720e3e6be9f7c"; + sha256 = "0b2w5myw2vjqk81wm8dz373xfhfkx3hgy7bxr94l060snxcl7ar4"; + }) + (fetchpatch { + name = "qemu-CVE-2016-9106.patch"; + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=fdfcc9aeea1492f4b819a24c94dfb678145b1bf9"; + sha256 = "0npi3fag52icq7xr799h5zi11xscbakdhqmdab0kyl6q331cc32z"; + }) + + # FIXME: Fix for CVE-2016-9101 not yet ready: https://lists.gnu.org/archive/html/qemu-devel/2016-10/msg03024.html + + # from http://git.qemu.org/?p=qemu.git;a=patch;h=ff55e94d23ae94c8628b0115320157c763eb3e06 + ./CVE-2016-9102.patch ]; hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix index 37086f52730..63389153a0a 100644 --- a/pkgs/applications/virtualization/remotebox/default.nix +++ b/pkgs/applications/virtualization/remotebox/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "remotebox-${version}"; - version = "2.0"; + version = "2.1"; src = fetchurl { url = "http://remotebox.knobgoblin.org.uk/downloads/RemoteBox-${version}.tar.bz2"; - sha256 = "0c73i53wdjd2m2sdgq3r3xp30irxh5z5rak2rk79yb686s6bv759"; + sha256 = "0pyi433pwbpyh58p08q8acav7mk90gchgjghvl9f8wqafx7bp404"; }; buildInputs = with perlPackages; [ perl Glib Gtk2 Pango SOAPLite ]; diff --git a/pkgs/applications/window-managers/lemonbar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix index 132c10ae973..a1334112cf9 100644 --- a/pkgs/applications/window-managers/lemonbar/xft.nix +++ b/pkgs/applications/window-managers/lemonbar/xft.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { meta = { description = "A lightweight xcb based bar with XFT-support"; homepage = https://github.com/krypt-n/bar; - maintainers = [ stdenv.lib.maintainers.hiberno ]; license = "Custom"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index 2ce69a68f32..ac577385ad4 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { description = "A tiling window manager for X11"; homepage = https://github.com/stumpwm/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ hiberno the-kenny ]; + maintainers = with maintainers; [ the-kenny ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/yabar/default.nix b/pkgs/applications/window-managers/yabar/default.nix index c199cf6c01b..34d42425253 100644 --- a/pkgs/applications/window-managers/yabar/default.nix +++ b/pkgs/applications/window-managers/yabar/default.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A modern and lightweight status bar for X window managers"; homepage = "https://github.com/geommer/yabar"; - maintainers = [ maintainers.hiberno ]; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 03f068d8298..3ccdc34db5b 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -24,7 +24,7 @@ nonFlagArgs=0 [[ "@prog@" = *++ ]] && isCpp=1 || isCpp=0 cppInclude=1 -params=("$@") +expandResponseParams "$@" n=0 while [ $n -lt ${#params[*]} ]; do p=${params[n]} diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh index 44d9a047936..056cfa92053 100644 --- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh @@ -16,7 +16,7 @@ source @out@/nix-support/utils.sh # Optionally filter out paths not refering to the store. -params=("$@") +expandResponseParams "$@" if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" \ -a \( -z "$NIX_IGNORE_LD_THROUGH_GCC" -o -z "$NIX_LDFLAGS_SET" \) ]; then rest=() diff --git a/pkgs/build-support/cc-wrapper/utils.sh b/pkgs/build-support/cc-wrapper/utils.sh index 3ab512d85c4..481d642f967 100644 --- a/pkgs/build-support/cc-wrapper/utils.sh +++ b/pkgs/build-support/cc-wrapper/utils.sh @@ -22,3 +22,27 @@ badPath() { "${p:0:4}" != "/tmp" -a \ "${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP" } + +expandResponseParams() { + local inparams=("$@") + local n=0 + local p + params=() + while [ $n -lt ${#inparams[*]} ]; do + p=${inparams[n]} + case $p in + @*) + if [ -e "${p:1}" ]; then + args=$(<"${p:1}") + eval 'for arg in '$args'; do params+=("$arg"); done' + else + params+=("$p") + fi + ;; + *) + params+=("$p") + ;; + esac + n=$((n + 1)) + done +} diff --git a/pkgs/build-support/vm/windows/bootstrap.nix b/pkgs/build-support/vm/windows/bootstrap.nix index ebea819b191..3b06d8f4749 100644 --- a/pkgs/build-support/vm/windows/bootstrap.nix +++ b/pkgs/build-support/vm/windows/bootstrap.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, vmTools, writeScript, writeText, runCommand, makeInitrd -, python, perl, coreutils, dosfstools, gzip, mtools, netcat, openssh, qemu +, python, perl, coreutils, dosfstools, gzip, mtools, netcat-gnu, openssh, qemu , samba, socat, vde2, cdrkit, pathsFromGraph, gnugrep }: @@ -10,7 +10,7 @@ with stdenv.lib; let controller = import ./controller { inherit stdenv writeScript vmTools makeInitrd; - inherit samba vde2 openssh socat netcat coreutils gzip gnugrep; + inherit samba vde2 openssh socat netcat-gnu coreutils gzip gnugrep; }; mkCygwinImage = import ./cygwin-iso { diff --git a/pkgs/build-support/vm/windows/controller/default.nix b/pkgs/build-support/vm/windows/controller/default.nix index 06a0a229306..9009702113e 100644 --- a/pkgs/build-support/vm/windows/controller/default.nix +++ b/pkgs/build-support/vm/windows/controller/default.nix @@ -1,5 +1,5 @@ { stdenv, writeScript, vmTools, makeInitrd -, samba, vde2, openssh, socat, netcat, coreutils, gnugrep, gzip +, samba, vde2, openssh, socat, netcat-gnu, coreutils, gnugrep, gzip }: { sshKey @@ -79,7 +79,7 @@ let ${coreutils}/bin/chmod 600 /ssh.key '' + (if installMode then '' echo -n "Waiting for Windows installation to finish..." - while ! ${netcat}/bin/netcat -z 192.168.0.1 22; do + while ! ${netcat-gnu}/bin/netcat -z 192.168.0.1 22; do echo -n . # Print a dot every 10 seconds only to shorten line length. ${coreutils}/bin/sleep 10 @@ -118,7 +118,7 @@ let ${samba}/sbin/smbd -D echo -n "Waiting for Windows VM to become available..." - while ! ${netcat}/bin/netcat -z 192.168.0.1 22; do + while ! ${netcat-gnu}/bin/netcat -z 192.168.0.1 22; do echo -n . ${coreutils}/bin/sleep 1 done diff --git a/pkgs/build-support/vm/windows/default.nix b/pkgs/build-support/vm/windows/default.nix index f9f1d75c70d..c668e7569a4 100644 --- a/pkgs/build-support/vm/windows/default.nix +++ b/pkgs/build-support/vm/windows/default.nix @@ -3,7 +3,7 @@ pkgs: let bootstrapper = import ./bootstrap.nix { inherit (pkgs) stdenv vmTools writeScript writeText runCommand makeInitrd; - inherit (pkgs) coreutils dosfstools gzip mtools netcat openssh qemu samba; + inherit (pkgs) coreutils dosfstools gzip mtools netcat-gnu openssh qemu samba; inherit (pkgs) socat vde2 fetchurl python perl cdrkit pathsFromGraph; inherit (pkgs) gnugrep; }; diff --git a/pkgs/data/fonts/mononoki/default.nix b/pkgs/data/fonts/mononoki/default.nix index fe429fe1df8..d93c0fb96d4 100644 --- a/pkgs/data/fonts/mononoki/default.nix +++ b/pkgs/data/fonts/mononoki/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/madmalik/mononoki; description = "A font for programming and code review"; license = licenses.ofl; - maintainers = [ maintainers.hiberno ]; platforms = platforms.all; }; } diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index b4078720d0a..682c42afa3e 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.03"; + version = "9.0.04"; ttf = fetchurl { - url = "http://fossies.org/linux/unifont/font/precompiled/${name}.ttf"; - sha256 = "00j97r658xl33zgi66glgbx2s7j9q52cj4iq7z1rrf3p38xzgbff"; + url = "mirror://gnu/unifont/${name}/${name}.ttf"; + sha256 = "052waajjdry67jjl7vy984padyzdrkhf5gylgbnvj90q6d52j02z"; }; pcf = fetchurl { - url = "http://fossies.org/linux/unifont/font/precompiled/${name}.pcf.gz"; - sha256 = "1w3gaz8afc3q7svgm4hmgjhvi9pxkmgsib8sscgi52c7ff0mhq9f"; + url = "mirror://gnu/unifont/${name}/${name}.pcf.gz"; + sha256 = "0736qmlzsf4xlipj4vzihafkigc3xjisxnwcqhl9dzkhxfjq9612"; }; buildInputs = [ mkfontscale mkfontdir ]; diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix new file mode 100644 index 00000000000..812362d6b30 --- /dev/null +++ b/pkgs/data/misc/hackage/default.nix @@ -0,0 +1,11 @@ +{ fetchFromGitHub }: + +# Use builtins.fetchTarball "https://github.com/commercialhaskell/all-cabal-hashes/archive/hackage.tar.gz" +# instead if you want the latest Hackage automatically at the price of frequent re-downloads. + +fetchFromGitHub { + owner = "commercialhaskell"; + repo = "all-cabal-hashes"; + rev = "ee101d34ff8bd59897aa2eb0a124bcd3fb47ceec"; + sha256 = "1hky0s2c1rv1srfnhbyi3ny14rnfnnp2j9fsr4ylz76xyxgjf5wm"; +} diff --git a/pkgs/desktops/kde-5/plasma/fetch.sh b/pkgs/desktops/kde-5/plasma/fetch.sh index a5ddcf35677..0809f2d6693 100644 --- a/pkgs/desktops/kde-5/plasma/fetch.sh +++ b/pkgs/desktops/kde-5/plasma/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.2/ -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.3/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/kde-5/plasma/kmenuedit.nix b/pkgs/desktops/kde-5/plasma/kmenuedit.nix index 3adb77a0051..f10bf6bb3cd 100644 --- a/pkgs/desktops/kde-5/plasma/kmenuedit.nix +++ b/pkgs/desktops/kde-5/plasma/kmenuedit.nix @@ -1,11 +1,14 @@ -{ plasmaPackage, ecm, kdoctools, ki18n, kxmlgui -, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support +{ + plasmaPackage, + ecm, kdoctools, + kdbusaddons, kdelibs4support, khotkeys, ki18n, kiconthemes, kio, kxmlgui, + sonnet }: plasmaPackage { name = "kmenuedit"; nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ - kdelibs4support ki18n kio sonnet kxmlgui kdbusaddons kiconthemes + kdbusaddons kdelibs4support khotkeys ki18n kiconthemes kio kxmlgui sonnet ]; } diff --git a/pkgs/desktops/kde-5/plasma/ksysguard.nix b/pkgs/desktops/kde-5/plasma/ksysguard.nix index b0e94c6a595..f7e5cced708 100644 --- a/pkgs/desktops/kde-5/plasma/ksysguard.nix +++ b/pkgs/desktops/kde-5/plasma/ksysguard.nix @@ -1,13 +1,17 @@ -{ plasmaPackage, ecm, kdoctools, kconfig -, kcoreaddons, kdelibs4support, ki18n, kitemviews, knewstuff -, kiconthemes, libksysguard +{ + plasmaPackage, + ecm, kdoctools, + lm_sensors, + kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews, + knewstuff, libksysguard, qtwebkit }: plasmaPackage { name = "ksysguard"; nativeBuildInputs = [ ecm kdoctools ]; + buildInputs = [ lm_sensors ]; propagatedBuildInputs = [ kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard - kdelibs4support ki18n + kdelibs4support ki18n qtwebkit ]; } diff --git a/pkgs/desktops/kde-5/plasma/libksysguard/default.nix b/pkgs/desktops/kde-5/plasma/libksysguard/default.nix index b6ca3dfa26d..2d81d061f4c 100644 --- a/pkgs/desktops/kde-5/plasma/libksysguard/default.nix +++ b/pkgs/desktops/kde-5/plasma/libksysguard/default.nix @@ -1,7 +1,9 @@ -{ fetchpatch, plasmaPackage, ecm, kauth, kcompletion -, kconfigwidgets, kcoreaddons, kservice, kwidgetsaddons -, kwindowsystem, plasma-framework, qtscript, qtx11extras -, kconfig, ki18n, kiconthemes +{ + plasmaPackage, + ecm, + kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes, + kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebkit, + qtx11extras }: plasmaPackage { @@ -9,11 +11,10 @@ plasmaPackage { patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; - nativeBuildInputs = [ - ecm - ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ - kauth kconfig ki18n kiconthemes kwindowsystem plasma-framework qtx11extras - kcompletion kconfigwidgets kcoreaddons kservice kwidgetsaddons qtscript + kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets + kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras + qtwebkit ]; } diff --git a/pkgs/desktops/kde-5/plasma/oxygen.nix b/pkgs/desktops/kde-5/plasma/oxygen.nix index 3c54055a633..44a7575526f 100644 --- a/pkgs/desktops/kde-5/plasma/oxygen.nix +++ b/pkgs/desktops/kde-5/plasma/oxygen.nix @@ -1,16 +1,16 @@ -{ plasmaPackage, ecm, ki18n, kcmutils, kconfig -, kdecoration, kguiaddons, kwidgetsaddons, kservice, kcompletion -, frameworkintegration, kwindowsystem, makeQtWrapper, qtx11extras +{ + plasmaPackage, + ecm, makeQtWrapper, + frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons, + ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtx11extras }: plasmaPackage { name = "oxygen"; - nativeBuildInputs = [ - ecm makeQtWrapper - ]; + nativeBuildInputs = [ ecm makeQtWrapper ]; propagatedBuildInputs = [ - kcmutils kconfig kdecoration kguiaddons kwidgetsaddons kservice kcompletion - frameworkintegration ki18n kwindowsystem qtx11extras + frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons + ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras ]; postInstall = '' wrapQtProgram "$out/bin/oxygen-demo5" diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix index e2b1acd198f..7e8823e2db9 100644 --- a/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix +++ b/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix @@ -1,20 +1,20 @@ -{ plasmaPackage, substituteAll, ecm, kdoctools -, attica, baloo, boost, fontconfig, kactivities, kactivities-stats -, kauth, kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons -, kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications -, knotifyconfig, kpeople, krunner, kwallet, kwin, phonon -, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras -, qtsvg, libXcursor, libXft, libxkbfile, xf86inputevdev -, xf86inputsynaptics, xinput, xkeyboard_config, xorgserver -, libcanberra_kde, libpulseaudio, utillinux -, qtquickcontrols, ksysguard +{ + plasmaPackage, substituteAll, + ecm, kdoctools, + attica, baloo, boost, fontconfig, ibus, kactivities, kactivities-stats, kauth, + kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons, + kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications, knotifyconfig, + kpeople, krunner, ksysguard, kwallet, kwin, libXcursor, libXft, + libcanberra_kde, libpulseaudio, libxkbfile, phonon, plasma-framework, + plasma-workspace, qtdeclarative, qtquickcontrols, qtsvg, qtx11extras, xf86inputevdev, + xf86inputsynaptics, xinput, xkeyboard_config, xorgserver, utillinux }: plasmaPackage rec { name = "plasma-desktop"; nativeBuildInputs = [ ecm kdoctools ]; buildInputs = [ - attica boost fontconfig kcmutils kdbusaddons kded kitemmodels knewstuff + attica boost fontconfig ibus kcmutils kdbusaddons kded kitemmodels knewstuff knotifications knotifyconfig kwallet libcanberra_kde libXcursor libpulseaudio libXft libxkbfile phonon qtsvg xf86inputevdev xf86inputsynaptics xkeyboard_config xinput baloo kactivities diff --git a/pkgs/desktops/kde-5/plasma/srcs.nix b/pkgs/desktops/kde-5/plasma/srcs.nix index 5fc836f10a8..08daf740183 100644 --- a/pkgs/desktops/kde-5/plasma/srcs.nix +++ b/pkgs/desktops/kde-5/plasma/srcs.nix @@ -3,323 +3,323 @@ { bluedevil = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/bluedevil-5.8.2.tar.xz"; - sha256 = "1m8bhvh27af8hwqyicsrqbxsfl6mmwlyc9y9cv5fh4rkf0lkcsnd"; - name = "bluedevil-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/bluedevil-5.8.3.tar.xz"; + sha256 = "1d05bzy1za7s9mlsh1drhlgjbb7z78jayhqml3zym05igs517la6"; + name = "bluedevil-5.8.3.tar.xz"; }; }; breeze = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/breeze-5.8.2.tar.xz"; - sha256 = "1n87n2vaxgb7wpg5jmb6x6l1z6gwl8jh9kjrgaq0blm1qkhac3k8"; - name = "breeze-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/breeze-5.8.3.tar.xz"; + sha256 = "0apim1byibkbqkxb1f5ra53wfr4cwmrkdsx4ls7mph4iknr5wdwp"; + name = "breeze-5.8.3.tar.xz"; }; }; breeze-grub = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/breeze-grub-5.8.2.tar.xz"; - sha256 = "1q4i87xvxajz67lkdf9k9z6vy6l0wlirz31n043fyy32gw0mrmf1"; - name = "breeze-grub-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/breeze-grub-5.8.3.tar.xz"; + sha256 = "01yyhwccxrkmxi95rsg9645fd0i2ca97j425q0pxci9fg93bwl8k"; + name = "breeze-grub-5.8.3.tar.xz"; }; }; breeze-gtk = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/breeze-gtk-5.8.2.tar.xz"; - sha256 = "1vdn7nh1vn8cjxd6cvaj12imd523g7qjc7rlhih6q76ly6h9hv7k"; - name = "breeze-gtk-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/breeze-gtk-5.8.3.tar.xz"; + sha256 = "1wm8v4fav9crk3wn3azsylymvcg67cgncv4zx1fy8rmblikp080g"; + name = "breeze-gtk-5.8.3.tar.xz"; }; }; breeze-plymouth = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/breeze-plymouth-5.8.2.tar.xz"; - sha256 = "1dkp0h3idzpfbvwrmjzn5sbq0077ndr36qh087yyhdjwj1mlk98r"; - name = "breeze-plymouth-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/breeze-plymouth-5.8.3.tar.xz"; + sha256 = "0gdl603kjxfrvcardinfq710j5gzzc6ky8ypzmr7myk5kl4i9gf3"; + name = "breeze-plymouth-5.8.3.tar.xz"; }; }; discover = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/discover-5.8.2.tar.xz"; - sha256 = "00zmdr6di37rcqncss4z51557a8zzli7n01imjjv8h784vkn0p04"; - name = "discover-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/discover-5.8.3.tar.xz"; + sha256 = "18fqr15jw3hfbpq6ma3md89lqzmlilfbic6zd0pm9mvpmwawbjxh"; + name = "discover-5.8.3.tar.xz"; }; }; kactivitymanagerd = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/kactivitymanagerd-5.8.2.tar.xz"; - sha256 = "1dgdxpdxkdz0l498sadgfbp21by8d73r11ibb6mvxwmrba6q4lsc"; - name = "kactivitymanagerd-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/kactivitymanagerd-5.8.3.tar.xz"; + sha256 = "18nkg64i7znyk29km8clcmpg5wrd60a0nbgdb6n0cnjjyra2ljfj"; + name = "kactivitymanagerd-5.8.3.tar.xz"; }; }; kde-cli-tools = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/kde-cli-tools-5.8.2.tar.xz"; - sha256 = "1gwp6hkpfaijxxc1v4km6kcwrzvwagkn5dgl181xghra26ar0bca"; - name = "kde-cli-tools-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/kde-cli-tools-5.8.3.tar.xz"; + sha256 = "02sa4l6mx6bfys44wcaf9mpfk3vrw65zzd1jx466xy0dda43kw9b"; + name = "kde-cli-tools-5.8.3.tar.xz"; }; }; kdecoration = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/kdecoration-5.8.2.tar.xz"; - sha256 = "0wbi6z3k9s18fi1vc7larnhwcdzrxrc13plpcnl365la8zrnp766"; - name = "kdecoration-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/kdecoration-5.8.3.tar.xz"; + sha256 = "0d7q16ms3vrsrwc7fql3ly7hmbyx0v35llj9z8h1k642j3ci8jca"; + name = "kdecoration-5.8.3.tar.xz"; }; }; kde-gtk-config = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/kde-gtk-config-5.8.2.tar.xz"; - sha256 = "16kn6wy71x1zjpfppiwpmj6skw97ni5pyg2b2af733spfbkx0ca7"; - name = "kde-gtk-config-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/kde-gtk-config-5.8.3.tar.xz"; + sha256 = "0y3xykz8db3y92mnhbwld2wcsh4sqxacnmx899ig5xy08chqym3d"; + name = "kde-gtk-config-5.8.3.tar.xz"; }; }; kdeplasma-addons = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/kdeplasma-addons-5.8.2.tar.xz"; - sha256 = "18d9a2iwvr4klgm10yvsjjhszkc6zk26kmsay4c2q4pqbsvq7nqq"; - name = "kdeplasma-addons-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/kdeplasma-addons-5.8.3.tar.xz"; + sha256 = "1ssk70rvfzi3a9mx514qsh5hld2v12kz3m4n7vpl9sq1fc5hq8k3"; + name = "kdeplasma-addons-5.8.3.tar.xz"; }; }; kgamma5 = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/kgamma5-5.8.2.tar.xz"; - sha256 = "0l73w2arpvv7x4yawp044j781pwmwpijr23mwhfcmnw7bmc7g5vn"; - name = "kgamma5-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/kgamma5-5.8.3.tar.xz"; + sha256 = "038i3dm6lxvlb5s6faxr5h6cw6xhymq71fnbphhbcbc1v08sa065"; + name = "kgamma5-5.8.3.tar.xz"; }; }; khotkeys = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/khotkeys-5.8.2.tar.xz"; - sha256 = "17cmlny98ip0ckdafhlqm97p0rkrr9w2d18xf0hdxcypj13q4ba5"; - name = "khotkeys-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/khotkeys-5.8.3.tar.xz"; + sha256 = "0lqwsdbr38qhz79sgdg3m3wx70f6ys4bv8mhnczfs06mchzm6zy9"; + name = "khotkeys-5.8.3.tar.xz"; }; }; kinfocenter = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/kinfocenter-5.8.2.tar.xz"; - sha256 = "1j1l3fczw7sy43dff0mcwpvyvfz4r7ja7zg7x8vq5v2hi3c3f865"; - name = "kinfocenter-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/kinfocenter-5.8.3.tar.xz"; + sha256 = "1hs9yg15rhhm2lra472wq9f1ca7aj6wsd6drb538mdma53mz21pv"; + name = "kinfocenter-5.8.3.tar.xz"; }; }; kmenuedit = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/kmenuedit-5.8.2.tar.xz"; - sha256 = "0r214s2pqm925l1mpzj4cwk73xvsf00wbm4g495dc63kwxpamx21"; - name = "kmenuedit-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/kmenuedit-5.8.3.tar.xz"; + sha256 = "06zji52iw8d18nda87xh54d7q94aqddrfgp3i9lsir50bgabqnc7"; + name = "kmenuedit-5.8.3.tar.xz"; }; }; kscreen = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/kscreen-5.8.2.tar.xz"; - sha256 = "03i2zwpalq4d1y38bkwacvkqfanzdsdpafpqw17qjcan3jgxkkwr"; - name = "kscreen-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/kscreen-5.8.3.tar.xz"; + sha256 = "07mldxxxna1y8ngam8l2h3bs1plvfgqhzj95ryprsfypls7pj1ny"; + name = "kscreen-5.8.3.tar.xz"; }; }; kscreenlocker = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/kscreenlocker-5.8.2.tar.xz"; - sha256 = "0may2h54yamzzd3jfv50skcxsws2liw36vb4smvyv9j8nvqvwyp1"; - name = "kscreenlocker-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/kscreenlocker-5.8.3.tar.xz"; + sha256 = "039i01c48g3grfm6vn5zmgaazlv4lln8w3rx8d107rlfqslfq4gv"; + name = "kscreenlocker-5.8.3.tar.xz"; }; }; ksshaskpass = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/ksshaskpass-5.8.2.tar.xz"; - sha256 = "1wk8jrwlr7lndsbhngkffvpjrqwi88x19vrxivb18gcr28m6403s"; - name = "ksshaskpass-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/ksshaskpass-5.8.3.tar.xz"; + sha256 = "0kvfnzbq6y9vs1a9yn3hf0cxbwdfs0mw440gsgjgbpmamnv4xpkj"; + name = "ksshaskpass-5.8.3.tar.xz"; }; }; ksysguard = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/ksysguard-5.8.2.tar.xz"; - sha256 = "1myg260bn7bjv18wadwzfwns9jc63r5plk3psdf6w727hcmizvnn"; - name = "ksysguard-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/ksysguard-5.8.3.tar.xz"; + sha256 = "0a1mfm0gfsi1b79c7m62rk8pp6fsbvrqhv5b07rasapn53zwr6zd"; + name = "ksysguard-5.8.3.tar.xz"; }; }; kwallet-pam = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/kwallet-pam-5.8.2.tar.xz"; - sha256 = "1iw8cyr44kwjfqhf1ybnjy0pjv4yk87w3vir8j91an4mxhdcc2sb"; - name = "kwallet-pam-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/kwallet-pam-5.8.3.tar.xz"; + sha256 = "1lbmzi0pimp2pw4g0dmrw0vpb2mmm64akzjzv0l72i6f4sylsqpd"; + name = "kwallet-pam-5.8.3.tar.xz"; }; }; kwayland-integration = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/kwayland-integration-5.8.2.tar.xz"; - sha256 = "12zmf11117y5zp307ymfy5gsjpcf97sqw1n3nzk55p9kzlfln1pa"; - name = "kwayland-integration-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/kwayland-integration-5.8.3.tar.xz"; + sha256 = "1w717601ivpnfvjprlyh0qvcj61m8nh9qpsqmhsy7993jvm8wal4"; + name = "kwayland-integration-5.8.3.tar.xz"; }; }; kwin = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/kwin-5.8.2.tar.xz"; - sha256 = "04c9bvbd487pgf4l7a7vxaydjr9hwdjg149mzcxzm5y1nx7ll08y"; - name = "kwin-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/kwin-5.8.3.tar.xz"; + sha256 = "0a3z17f1ma6yspbs4wyj1cp17hglf4xj1pmwya6nbf08d6gbxq1w"; + name = "kwin-5.8.3.tar.xz"; }; }; kwrited = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/kwrited-5.8.2.tar.xz"; - sha256 = "1659783rca0hcisrhxz1bnimn0q17825sbs6zlwxlwsh2qq8fq23"; - name = "kwrited-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/kwrited-5.8.3.tar.xz"; + sha256 = "0s2fsxyw6x664pirbvkd5zf0zazhx9yxzv2xk8d8cb8gfbj32cc9"; + name = "kwrited-5.8.3.tar.xz"; }; }; libkscreen = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/libkscreen-5.8.2.tar.xz"; - sha256 = "0p2nhgvr3cxq0js6zkcnhglwqffnrnws8vdi7lyl069y9r8lvp7c"; - name = "libkscreen-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/libkscreen-5.8.3.tar.xz"; + sha256 = "09jakk3yrnp0vf2dihalm08lndcvp18c6c4qjr1bg65cjij9fvx7"; + name = "libkscreen-5.8.3.tar.xz"; }; }; libksysguard = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/libksysguard-5.8.2.tar.xz"; - sha256 = "158n30wbpsgbw3axhhsc58hnwhwdd02j3zc9hhcybmnbkfl5c96l"; - name = "libksysguard-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/libksysguard-5.8.3.tar.xz"; + sha256 = "11601hlrm6lm0vrw2icx2778g6yzd9fsgpa8s8rdwr0qw9i0wacy"; + name = "libksysguard-5.8.3.tar.xz"; }; }; milou = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/milou-5.8.2.tar.xz"; - sha256 = "0ikba2xk2d4v66rhdln97d89avrkbhpjh1zir5ds3s103yyrj4q9"; - name = "milou-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/milou-5.8.3.tar.xz"; + sha256 = "03vr8ndr14ak111gq0hwlq4b5g1hwhbh3vk5b3xrk13bhxg6nfsl"; + name = "milou-5.8.3.tar.xz"; }; }; oxygen = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/oxygen-5.8.2.tar.xz"; - sha256 = "1n0gfgn7m0953dd69nvl0ikp97zmcn3hjm01s43nxjma3gp8pqar"; - name = "oxygen-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/oxygen-5.8.3.tar.xz"; + sha256 = "0ircd8v5khgmpigazxy7pykiqk8maah28ypsh3z66aim0ni4h3jg"; + name = "oxygen-5.8.3.tar.xz"; }; }; plasma-desktop = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/plasma-desktop-5.8.2.tar.xz"; - sha256 = "0023wb3fnk0cap7v2zwig6h3vqvykrwwq9vyl0xbsj5vzx3f8yqj"; - name = "plasma-desktop-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/plasma-desktop-5.8.3.tar.xz"; + sha256 = "0pkjkhwqgin203dkl5clnvc9l9jnk7dqaxh7h7rbc8d5bfjiwzg7"; + name = "plasma-desktop-5.8.3.tar.xz"; }; }; plasma-integration = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/plasma-integration-5.8.2.tar.xz"; - sha256 = "1z7pd5j7llac1iv4w4q4r9wysqi4shc65fcg6bh637gxqjgyq4rf"; - name = "plasma-integration-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/plasma-integration-5.8.3.tar.xz"; + sha256 = "196gxymfbrdjravgqk2ia2fpanim4l08a0vh5r13ppm7q7vzwz23"; + name = "plasma-integration-5.8.3.tar.xz"; }; }; plasma-nm = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/plasma-nm-5.8.2.tar.xz"; - sha256 = "035nhs8z977gp3d041ywnam1y4vk7458mx81f2qrx2bv8g6znq22"; - name = "plasma-nm-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/plasma-nm-5.8.3.tar.xz"; + sha256 = "1rsj0gl9plza7ykkp161ipvxlax67vdvns0fnq34sk9hg7s5ckb7"; + name = "plasma-nm-5.8.3.tar.xz"; }; }; plasma-pa = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/plasma-pa-5.8.2.tar.xz"; - sha256 = "1j55q4brjh77i1imr7pb9gp9a8vaynnr2ljdsm4jqsijwcjj1yhi"; - name = "plasma-pa-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/plasma-pa-5.8.3.tar.xz"; + sha256 = "1l3xdcrkvjpmmbzvyhqrs6y8xhkz5k1xkxlm3d3bx4x0mn24qmq4"; + name = "plasma-pa-5.8.3.tar.xz"; }; }; plasma-sdk = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/plasma-sdk-5.8.2.tar.xz"; - sha256 = "0h6393qxwms0xdq69nyzs18kbyl6amzff26l20fqpp49xrqpq95y"; - name = "plasma-sdk-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/plasma-sdk-5.8.3.tar.xz"; + sha256 = "1jgv6yf7m9x2869cprbg2r9ka56ypmprvvznagb4zrjnjfdnqrm7"; + name = "plasma-sdk-5.8.3.tar.xz"; }; }; plasma-tests = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/plasma-tests-5.8.2.tar.xz"; - sha256 = "0ls8mxabvw39xb8nrl89n1jn0bkgykzx7hcv45q17aw5jm8s0wy5"; - name = "plasma-tests-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/plasma-tests-5.8.3.tar.xz"; + sha256 = "1aidrc3wi3z7lap5m193xqcahl0p2pdg9hddygzq6dr46r1ipbi4"; + name = "plasma-tests-5.8.3.tar.xz"; }; }; plasma-workspace = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/plasma-workspace-5.8.2.tar.xz"; - sha256 = "1dxvxz9qvkg1h79j997qgs573l730w1g0n1dy78n344bnvn8zx44"; - name = "plasma-workspace-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/plasma-workspace-5.8.3.tar.xz"; + sha256 = "16h5flf346lwrdl35clkq0qv3i0fa4clxyyn3dvpsp9mvxdlabwb"; + name = "plasma-workspace-5.8.3.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/plasma-workspace-wallpapers-5.8.2.tar.xz"; - sha256 = "0wkkpl1n6ggicgj6lszmb661wrmddhq9wx3djr3hyvvi5r586rxi"; - name = "plasma-workspace-wallpapers-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/plasma-workspace-wallpapers-5.8.3.tar.xz"; + sha256 = "0dy3w60d4wbm571kbv6qshmrqf6r30j53hz92kkyiwgqja18ysg2"; + name = "plasma-workspace-wallpapers-5.8.3.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.8.2"; + version = "1-5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/polkit-kde-agent-1-5.8.2.tar.xz"; - sha256 = "1ipli3xq4dc8lnyamqfzsjcfh3808gbw3qaaqksng2ki0i84aw8f"; - name = "polkit-kde-agent-1-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/polkit-kde-agent-1-5.8.3.tar.xz"; + sha256 = "04llryjkjzkzccfjwdhwcbkvp8wfgjfw4yabbq4kl1i2girimw0z"; + name = "polkit-kde-agent-1-5.8.3.tar.xz"; }; }; powerdevil = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/powerdevil-5.8.2.tar.xz"; - sha256 = "0bjk08f3bliy4cz3pcs77qhsc3l82fqk3q0djiwgmsr77ksabj7x"; - name = "powerdevil-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/powerdevil-5.8.3.tar.xz"; + sha256 = "1im9sxzb4c3cplplzizfxdlyg1knm94y2hj9ssllxfggy5d38ps1"; + name = "powerdevil-5.8.3.tar.xz"; }; }; sddm-kcm = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/sddm-kcm-5.8.2.tar.xz"; - sha256 = "1n3r2hjwrsxiwzzgkpf4xgp2645kzzdl49i91qcsqznhiqp7kjx3"; - name = "sddm-kcm-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/sddm-kcm-5.8.3.tar.xz"; + sha256 = "1cs29rb259zz06qwfhnjxzy2xzzqvfwpphz4whbyl5kn07bzah8d"; + name = "sddm-kcm-5.8.3.tar.xz"; }; }; systemsettings = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/systemsettings-5.8.2.tar.xz"; - sha256 = "157knafprh4b689jjr8w4bqrh9kp92ggvf40s4ny8cfyjr2bzcvi"; - name = "systemsettings-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/systemsettings-5.8.3.tar.xz"; + sha256 = "0shac5659h928p2kq053kllw66j3sw6a06kczgck5lq28kxwh3mm"; + name = "systemsettings-5.8.3.tar.xz"; }; }; user-manager = { - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.2/user-manager-5.8.2.tar.xz"; - sha256 = "1344qvzrlswc69wvnaqic300wxra6ix6w6iczj29sprxsa5ycf91"; - name = "user-manager-5.8.2.tar.xz"; + url = "${mirror}/stable/plasma/5.8.3/user-manager-5.8.3.tar.xz"; + sha256 = "0kh9knr2rfrhakzdyf94cap19v21ciglammdp4svyql7drwfvq8v"; + name = "user-manager-5.8.3.tar.xz"; }; }; } diff --git a/pkgs/desktops/lumina/LuminaOS-NixOS.cpp.patch b/pkgs/desktops/lumina/LuminaOS-NixOS.cpp.patch new file mode 100644 index 00000000000..6ddd9c76591 --- /dev/null +++ b/pkgs/desktops/lumina/LuminaOS-NixOS.cpp.patch @@ -0,0 +1,26 @@ +diff --git a/src-qt5/core/libLumina/LuminaOS-NixOS.cpp b/src-qt5/core/libLumina/LuminaOS-NixOS.cpp +index b92d1b0..441b1bf 100644 +--- a/src-qt5/core/libLumina/LuminaOS-NixOS.cpp ++++ b/src-qt5/core/libLumina/LuminaOS-NixOS.cpp +@@ -13,17 +13,17 @@ + //can't read xbrightness settings - assume invalid until set + static int screenbrightness = -1; + +-QString LOS::OSName(){ return "Gentoo Linux"; } ++QString LOS::OSName(){ return "NixOS"; } + + //OS-specific prefix(s) + // NOTE: PREFIX, L_ETCDIR, L_SHAREDIR are defined in the OS-detect.pri project file and passed in + QString LOS::LuminaShare(){ return (L_SHAREDIR+"/lumina-desktop/"); } //Install dir for Lumina share files +-QString LOS::AppPrefix(){ return "/usr/"; } //Prefix for applications +-QString LOS::SysPrefix(){ return "/"; } //Prefix for system ++QString LOS::AppPrefix(){ return PREFIX+"/usr"; } //Prefix for applications ++QString LOS::SysPrefix(){ return PREFIX; } //Prefix for system + + //OS-specific application shortcuts (*.desktop files) + QString LOS::ControlPanelShortcut(){ return ""; } //system control panel +-QString LOS::AppStoreShortcut(){ return LOS::AppPrefix() + "/share/applications/porthole.desktop"; } //graphical app/pkg manager ++QString LOS::AppStoreShortcut(){ return ""; } //graphical app/pkg manager + //OS-specific RSS feeds (Format: QStringList[ :::: ]; ) + QStringList LOS::RSSFeeds(){ return QStringList(); } + diff --git a/pkgs/desktops/lumina/avoid-absolute-path-on-sessdir.patch b/pkgs/desktops/lumina/avoid-absolute-path-on-sessdir.patch new file mode 100644 index 00000000000..f5ef6cba41f --- /dev/null +++ b/pkgs/desktops/lumina/avoid-absolute-path-on-sessdir.patch @@ -0,0 +1,11 @@ +diff -Naur lumina-1.0.0-Release-p1-OLD/src-qt5/OS-detect.pri lumina-1.0.0-Release-p1-PATCH/src-qt5/OS-detect.pri +--- lumina-1.0.0-Release-p1-OLD/src-qt5/OS-detect.pri 2016-08-09 12:04:30.000000000 -0300 ++++ lumina-1.0.0-Release-p1-PATCH/src-qt5/OS-detect.pri 2016-08-13 17:32:18.272137900 -0300 +@@ -55,7 +55,6 @@ + #Use the defaults for everything else + + }else : linux-*{ +- L_SESSDIR=/usr/share/xsessions + OS=Linux + LIBS += -L/usr/local/lib -L/usr/lib -L/lib + diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix new file mode 100644 index 00000000000..66229420cf6 --- /dev/null +++ b/pkgs/desktops/lumina/default.nix @@ -0,0 +1,69 @@ +{ stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils, + numlockx, xorg, qt5, kde5 +}: + +stdenv.mkDerivation rec { + name = "lumina-${version}"; + version = "1.1.0-p1"; + + src = fetchFromGitHub { + owner = "trueos"; + repo = "lumina"; + rev = "v${version}"; + sha256 = "1kkb6v6p6w5mx1qdmcrq3r674k9ahpc6wlsb9pi2lq8qk9yaid0m"; + }; + + nativeBuildInputs = [ + qt5.qmakeHook + qt5.qttools + ]; + + buildInputs = [ + xorg.libxcb + xorg.xcbutilwm + xorg.xcbutilimage + qt5.qtbase + qt5.qtsvg + qt5.qtmultimedia + qt5.qtx11extras + kde5.oxygen-icons5 + fluxbox + xscreensaver + desktop_file_utils + numlockx + ]; + + patches = [ + ./avoid-absolute-path-on-sessdir.patch + ./LuminaOS-NixOS.cpp.patch + ]; + + prePatch = '' + # Copy Gentoo setup as NixOS setup and then patch it + # TODO: write a complete NixOS setup? + cp -a src-qt5/core/libLumina/LuminaOS-Gentoo.cpp src-qt5/core/libLumina/LuminaOS-NixOS.cpp + ''; + + postPatch = '' + # Fix location of fluxbox styles + substituteInPlace src-qt5/core-utils/lumina-config/pages/page_fluxbox_settings.cpp \ + --replace 'LOS::AppPrefix()+"share/fluxbox' "\"${fluxbox}/share/fluxbox" + ''; + + qmakeFlags = [ "LINUX_DISTRO=NixOS" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A lightweight, portable desktop environment"; + longDescription = '' + The Lumina Desktop Environment is a lightweight system interface + that is designed for use on any Unix-like operating system. It + is based on QT5. + ''; + homepage = https://lumina-desktop.org; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix index 770f3449023..3314d313ad2 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, gnome2, libxfce4ui, - libxfce4util, xfce4panel, libnotify, lm_sensors, hddtemp, netcat + libxfce4util, xfce4panel, libnotify, lm_sensors, hddtemp, netcat-gnu }: stdenv.mkDerivation rec { @@ -26,14 +26,14 @@ stdenv.mkDerivation rec { libnotify lm_sensors hddtemp - netcat + netcat-gnu ]; enableParallelBuilding = true; configureFlags = [ "--with-pathhddtemp=${hddtemp}/bin/hddtemp" - "--with-pathnetcat=${netcat}/bin/netcat" + "--with-pathnetcat=${netcat-gnu}/bin/netcat" ]; meta = { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix index e4c44865583..a9c4da810c1 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { p_name = "xfce4-whiskermenu-plugin"; - version = "1.5.3"; + version = "1.6.1"; name = "${p_name}-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "gottcode"; repo = "xfce4-whiskermenu-plugin"; rev = "v${version}"; - sha256 = "07gmf9x3pw6xajklj0idahbnv0psnkhiqhb88bmkp344jirsx6ba"; + sha256 = "19hldrrgy7qmrncv5rfsclybycjp9rjfnslhm996h62d2p675qpc"; }; nativeBuildInputs = [ cmake pkgconfig intltool ]; diff --git a/pkgs/development/compilers/abc/builder-binjar.sh b/pkgs/development/compilers/abc/builder-binjar.sh deleted file mode 100644 index a954c49aa3f..00000000000 --- a/pkgs/development/compilers/abc/builder-binjar.sh +++ /dev/null @@ -1,4 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/jars -cp $src $out/jars/$jarname.jar diff --git a/pkgs/development/compilers/abc/builder.sh b/pkgs/development/compilers/abc/builder.sh deleted file mode 100644 index ba594023842..00000000000 --- a/pkgs/development/compilers/abc/builder.sh +++ /dev/null @@ -1,40 +0,0 @@ -source $stdenv/setup - -tar zxvf $src - -cd abc-* - -for p in $patches; do - echo "applying patch $p" - patch -p1 < $p -done - -cat > ant.settings < $out/bin/abc < build-tmp.xml -mv build-tmp.xml build.xml - -cat > ant.settings < ant.settings <commit_hash.txt af6afb0415761b53721f89c7f65064807f41cbd3 + echo >commit_hash.txt 4633f3def897db0f91237f98cf46e5d84fb05e61 ''; buildInputs = [ boost cmake jsoncpp ]; diff --git a/pkgs/development/eclipse/jdt-sdk/builder.sh b/pkgs/development/eclipse/jdt-sdk/builder.sh deleted file mode 100755 index 40de662b775..00000000000 --- a/pkgs/development/eclipse/jdt-sdk/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -set -e - -source $stdenv/setup - -unzip $src -mkdir $out -mv eclipse $out/ diff --git a/pkgs/development/eclipse/jdt-sdk/default.nix b/pkgs/development/eclipse/jdt-sdk/default.nix deleted file mode 100644 index 40d1589f770..00000000000 --- a/pkgs/development/eclipse/jdt-sdk/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{stdenv, fetchurl, unzip}: - -stdenv.mkDerivation ( rec { - pname = "eclipse-JDT-SDK"; - version = "3.3.2"; - name = "${pname}-${version}"; - - builder = ./builder.sh; - src = fetchurl { - url = http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.3.2-200802211800/eclipse-JDT-SDK-3.3.2.zip; - md5 = "f9e513b7e3b609feef28651c07807b17"; - }; - - buildInputs = [unzip]; -}) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 50bb3695a71..4f93b2f857c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -5,7 +5,7 @@ with import ./lib.nix { inherit pkgs; }; self: super: { # Some packages need a non-core version of Cabal. - cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_1_24_0_0; }); + cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_1_24_1_0; }); # Link statically to avoid runtime dependency on GHC. jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = self.Cabal_1_20_0_4; }; @@ -43,7 +43,7 @@ self: super: { src = pkgs.fetchFromGitHub { owner = "joeyh"; repo = "git-annex"; - sha256 = "1nd1q5c4jr9s6xczyv464zq4y10rk8c1av22nfb28abrskxagcjc"; + sha256 = "1np1v2x5n9dl39cbwlqbjap1j5120q4n8p18cm1884vdxidbkc01"; rev = drv.version; }; })).overrideScope (self: super: { @@ -142,13 +142,13 @@ self: super: { HDBC-odbc = dontHaddock super.HDBC-odbc; hoodle-core = dontHaddock super.hoodle-core; hsc3-db = dontHaddock super.hsc3-db; - hspec-discover = dontHaddock super.hspec-discover; http-client-conduit = dontHaddock super.http-client-conduit; http-client-multipart = dontHaddock super.http-client-multipart; markdown-unlit = dontHaddock super.markdown-unlit; network-conduit = dontHaddock super.network-conduit; shakespeare-js = dontHaddock super.shakespeare-js; shakespeare-text = dontHaddock super.shakespeare-text; + swagger = dontHaddock super.swagger; # http://hydra.cryp.to/build/2035868/nixlog/1/raw wai-test = dontHaddock super.wai-test; zlib-conduit = dontHaddock super.zlib-conduit; @@ -291,14 +291,12 @@ self: super: { bitcoin-api-extra = dontCheck super.bitcoin-api-extra; bitx-bitcoin = dontCheck super.bitx-bitcoin; # http://hydra.cryp.to/build/926187/log/raw concurrent-dns-cache = dontCheck super.concurrent-dns-cache; - dbus = dontCheck super.dbus; # http://hydra.cryp.to/build/498404/log/raw digitalocean-kzs = dontCheck super.digitalocean-kzs; # https://github.com/KazumaSATO/digitalocean-kzs/issues/1 github-types = dontCheck super.github-types; # http://hydra.cryp.to/build/1114046/nixlog/1/raw hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw hasql-transaction = dontCheck super.hasql-transaction; # wants to connect to postgresql hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; }); - hoogle_5_0_4 = super.hoogle_5_0_4.override { haskell-src-exts = self.haskell-src-exts_1_18_2; }; marmalade-upload = dontCheck super.marmalade-upload; # http://hydra.cryp.to/build/501904/nixlog/1/raw mongoDB = dontCheck super.mongoDB; network-transport-tcp = dontCheck super.network-transport-tcp; @@ -801,7 +799,7 @@ self: super: { ln -s $lispdir $out/share/emacs/site-lisp ''; })).override { - haskell-src-exts = self.haskell-src-exts_1_18_2; + haskell-src-exts = self.haskell-src-exts_1_19_0; }; # # Make elisp files available at a location where people expect it. @@ -976,13 +974,16 @@ self: super: { # https://github.com/commercialhaskell/stack/issues/2263 stack = super.stack.overrideScope (self: super: { - http-client = self.http-client_0_5_3_3; + http-client = self.http-client_0_5_3_4; http-client-tls = self.http-client-tls_0_3_3; http-conduit = self.http-conduit_2_2_3; optparse-applicative = dontCheck self.optparse-applicative_0_13_0_0; criterion = super.criterion.override { inherit (super) optparse-applicative; }; }); + # The latest Hoogle needs versions not yet in LTS Haskell 7.x. + hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_18_2; }; + # Test suite fails a QuickCheck property. optparse-applicative_0_13_0_0 = dontCheck super.optparse-applicative_0_13_0_0; @@ -1015,15 +1016,26 @@ self: super: { doCheck = false; }); + # http-api-data_0.3.x requires QuickCheck > 2.9, but overriding that version + # is hard because of transitive dependencies, so we just disable tests. + http-api-data_0_3_2 = dontCheck super.http-api-data_0_3_2; + + # Fix build for latest versions of servant and servant-client. + servant_0_9_1_1 = super.servant_0_9_1_1.overrideScope (self: super: { + http-api-data = self.http-api-data_0_3_2; + }); + servant-client_0_9_1_1 = super.servant-client_0_9_1_1.overrideScope (self: super: { + http-api-data = self.http-api-data_0_3_2; + servant-server = self.servant-server_0_9_1_1; + servant = self.servant_0_9_1_1; + }); + # https://github.com/pontarius/pontarius-xmpp/issues/105 pontarius-xmpp = dontCheck super.pontarius-xmpp; # https://github.com/fpco/store/issues/77 store = dontCheck super.store; - - store_0_3 = super.store_0_3.overrideScope (self: super: { - store-core = self.store-core_0_3; - }); + store_0_3 = super.store_0_3.overrideScope (self: super: { store-core = self.store-core_0_3; }); # https://github.com/bmillwood/applicative-quoters/issues/6 applicative-quoters = doJailbreak super.applicative-quoters; @@ -1041,4 +1053,22 @@ self: super: { http-conduit = self.http-conduit_2_2_3; }); + # https://hydra.nixos.org/build/42769611/nixlog/1/raw + # note: the library is unmaintained, no upstream issue + dataenc = doJailbreak super.dataenc; + + libsystemd-journal = overrideCabal super.libsystemd-journal (old: { + librarySystemDepends = old.librarySystemDepends or [] ++ [ pkgs.systemd ]; + }); + + # horribly outdated (X11 interface changed a lot) + sindre = markBroken super.sindre; + + # https://github.com/jmillikin/haskell-dbus/pull/7 + # http://hydra.cryp.to/build/498404/log/raw + dbus = dontCheck (appendPatch super.dbus ./patches/hdbus-semicolons.patch); + + # Test suite occasionally runs for 1+ days on Hydra. + distributed-process-tests = dontCheck super.distributed-process-tests; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 95629c37532..9710d139f8a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -37,10 +37,10 @@ self: super: { xhtml = null; # Enable latest version of cabal-install. - cabal-install = (dontCheck (super.cabal-install)).overrideScope (self: super: { Cabal = self.Cabal_1_24_0_0; }); + cabal-install = (dontCheck (super.cabal-install)).overrideScope (self: super: { Cabal = self.Cabal_1_24_1_0; }); # Build jailbreak-cabal with the latest version of Cabal. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_0_0; }; + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_1_0; }; Extra = appendPatch super.Extra (pkgs.fetchpatch { url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch"; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 2e89521fca8..37b050d05d4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -32,7 +32,7 @@ core-packages: - xhtml-3000.2.1 default-package-overrides: - # LTS Haskell 7.5 + # LTS Haskell 7.8 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -146,7 +146,7 @@ default-package-overrides: - array-memoize ==0.6.0 - arrow-list ==0.7 - ascii-progress ==0.3.3.0 - - asciidiagram ==1.3.1.2 + - asciidiagram ==1.3.2 - asn1-encoding ==0.9.4 - asn1-parse ==0.9.4 - asn1-types ==0.3.2 @@ -254,17 +254,17 @@ default-package-overrides: - bzlib ==0.5.0.5 - bzlib-conduit ==0.2.1.4 - c2hs ==0.28.1 - - Cabal ==1.24.0.0 + - Cabal ==1.24.1.0 - cabal-dependency-licenses ==0.1.2.0 - cabal-file-th ==0.2.3 - cabal-helper ==0.7.2.0 - - cabal-install ==1.24.0.0 + - cabal-install ==1.24.0.1 - cabal-rpm ==0.10.0 - cabal-sort ==0.0.5.3 - cabal-src ==0.3.0.2 - cache ==0.1.0.0 - cacophony ==0.8.0 - - cairo ==0.13.3.0 + - cairo ==0.13.3.1 - call-stack ==0.1.0 - camfort ==0.900 - carray ==0.1.6.5 @@ -276,17 +276,18 @@ default-package-overrides: - cassava-conduit ==0.3.2 - cassava-megaparsec ==0.1.0 - cassette ==0.1.0 - - cayley-client ==0.2.0.0 + - cayley-client ==0.2.1.0 - cereal ==0.5.3.0 - cereal-conduit ==0.7.3 + - cereal-text ==0.1.0.2 - cereal-vector ==0.2.0.1 - cgi ==3001.3.0.1 - ChannelT ==0.0.0.2 - charset ==0.3.7.1 - charsetdetect-ae ==1.1.0.1 - - Chart ==1.8 - - Chart-cairo ==1.8 - - Chart-diagrams ==1.8 + - Chart ==1.8.1 + - Chart-cairo ==1.8.1 + - Chart-diagrams ==1.8.1 - ChasingBottoms ==1.3.1.2 - cheapskate ==0.1.0.5 - cheapskate-highlight ==0.1.0.0 @@ -421,7 +422,7 @@ default-package-overrides: - dbus ==0.10.12 - debian-build ==0.10.1.0 - Decimal ==0.4.2 - - declarative ==0.2.2 + - declarative ==0.2.3 - deepseq-generics ==0.2.0.0 - dejafu ==0.4.0.0 - dependent-map ==0.2.3.0 @@ -448,7 +449,7 @@ default-package-overrides: - digest ==0.0.1.2 - digits ==0.3.1 - dimensional ==1.0.1.3 - - direct-sqlite ==2.3.17 + - direct-sqlite ==2.3.18 - directory-tree ==0.12.1 - discount ==0.1.1 - disk-free-space ==0.1.0.1 @@ -472,7 +473,7 @@ default-package-overrides: - dotenv ==0.3.1.0 - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.1.0 - - download ==0.3.2.4 + - download ==0.3.2.5 - dpor ==0.2.0.0 - drawille ==0.1.0.6 - DRBG ==0.5.5 @@ -579,7 +580,7 @@ default-package-overrides: - force-layout ==0.4.0.6 - forecast-io ==0.2.0.0 - foreign-store ==0.2 - - formatting ==6.2.2 + - formatting ==6.2.3 - fortran-src ==0.1.0.4 - Frames ==0.1.6 - free ==4.12.4 @@ -631,7 +632,7 @@ default-package-overrides: - gi-pango ==1.0.3 - gi-soup ==2.4.3 - gi-webkit ==3.0.3 - - gio ==0.13.3.0 + - gio ==0.13.3.1 - gipeda ==0.3.2.2 - giphy-api ==0.4.0.0 - git-fmt ==0.4.1.0 @@ -643,9 +644,9 @@ default-package-overrides: - gitrev ==1.2.0 - gitson ==0.5.2 - gl ==0.7.8.1 - - glabrous ==0.1.2.0 + - glabrous ==0.1.3.0 - GLFW-b ==1.4.8.1 - - glib ==0.13.4.0 + - glib ==0.13.4.1 - Glob ==0.7.12 - gloss ==1.10.2.3 - gloss-rendering ==1.10.3.3 @@ -749,7 +750,7 @@ default-package-overrides: - gogol-youtube-analytics ==0.1.0 - gogol-youtube-reporting ==0.1.0 - google-cloud ==0.0.4 - - google-oauth2-jwt ==0.1.2.0 + - google-oauth2-jwt ==0.1.2.1 - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 - graph-wrapper ==0.2.5.1 @@ -762,10 +763,10 @@ default-package-overrides: - grouped-list ==0.2.1.2 - groupoids ==4.0 - groups ==0.4.0.0 - - gtk ==0.14.5 + - gtk ==0.14.6 - gtk2hs-buildtools ==0.13.2.1 - - gtk3 ==0.14.5 - - gtksourceview3 ==0.13.3.0 + - gtk3 ==0.14.6 + - gtksourceview3 ==0.13.3.1 - H ==0.9.0.1 - hackage-db ==1.22 - hackage-mirror ==0.1.1.1 @@ -811,7 +812,7 @@ default-package-overrides: - haskoin-core ==0.4.0 - hasql ==0.19.15.2 - hastache ==0.6.1 - - hasty-hamiltonian ==1.1.3 + - hasty-hamiltonian ==1.1.4 - HaTeX ==3.17.0.2 - hatex-guide ==1.3.1.5 - hbayes ==0.5.2 @@ -846,23 +847,22 @@ default-package-overrides: - hjsmin ==0.2.0.2 - hjsonpointer ==1.0.0.2 - hjsonschema ==1.1.0.1 - - hledger ==0.27.1 - - hledger-interest ==1.4.4 - - hledger-lib ==0.27.1 + - hledger ==1.0.1 + - hledger-interest ==1.5 + - hledger-lib ==1.0.1 - hlibgit2 ==0.18.0.15 - hlibsass ==0.1.5.0 - hlint ==1.9.35 - hmatrix ==0.17.0.2 - hmatrix-gsl ==0.17.0.0 - - hmatrix-gsl-stats ==0.4.1.3 - - hmatrix-special ==0.4.0.0 + - hmatrix-gsl-stats ==0.4.1.4 + - hmatrix-special ==0.4.0.1 - hmpfr ==0.4.2 - hmt ==0.15 - hoauth2 ==0.5.4.0 - hocilib ==0.1.0 - holy-project ==0.2.0.1 - homplexity ==0.4.3.3 - - hoogle ==5.0.1 - hOpenPGP ==2.5.5 - hopenpgp-tools ==0.19.4 - hopenssl ==1.7 @@ -876,7 +876,7 @@ default-package-overrides: - hPDB ==1.2.0.9 - hPDB-examples ==1.2.0.7 - HPDF ==1.4.10 - - hpio ==0.8.0.3 + - hpio ==0.8.0.4 - hprotoc ==2.4.0 - hquantlib ==0.0.3.2 - hreader ==1.0.2 @@ -901,11 +901,11 @@ default-package-overrides: - HsOpenSSL ==0.11.3.2 - HsOpenSSL-x509-system ==0.1.0.3 - hsp ==0.10.0 - - hspec ==2.2.3 + - hspec ==2.2.4 - hspec-attoparsec ==0.1.0.2 - hspec-contrib ==0.3.0 - - hspec-core ==2.2.3 - - hspec-discover ==2.2.3 + - hspec-core ==2.2.4 + - hspec-discover ==2.2.4 - hspec-expectations ==0.7.2 - hspec-expectations-pretty-diff ==0.7.2.4 - hspec-golden-aeson ==0.2.0.3 @@ -938,7 +938,7 @@ default-package-overrides: - http-date ==0.0.6.1 - http-link-header ==1.0.2 - http-media ==0.6.4 - - http-reverse-proxy ==0.4.3.1 + - http-reverse-proxy ==0.4.3.2 - http-streams ==0.8.4.0 - http-types ==0.9.1 - http2 ==1.6.2 @@ -950,7 +950,7 @@ default-package-overrides: - hvect ==0.3.1.0 - hw-bits ==0.1.0.1 - hw-conduit ==0.0.0.11 - - hw-diagnostics ==0.0.0.4 + - hw-diagnostics ==0.0.0.5 - hw-parser ==0.0.0.1 - hw-prim ==0.1.0.3 - hw-rankselect ==0.3.0.0 @@ -990,7 +990,7 @@ default-package-overrides: - inline-r ==0.9.0.0 - insert-ordered-containers ==0.1.0.1 - integration ==0.2.1 - - intero ==0.1.18 + - intero ==0.1.19 - interpolate ==0.1.0 - interpolatedstring-perl6 ==1.0.0 - IntervalMap ==0.5.1.1 @@ -1008,8 +1008,8 @@ default-package-overrides: - iproute ==1.7.1 - IPv6Addr ==0.6.1.0 - irc ==0.6.1.0 - - irc-client ==0.4.4.0 - - irc-conduit ==0.2.1.0 + - irc-client ==0.4.4.1 + - irc-conduit ==0.2.1.1 - irc-ctcp ==0.1.3.0 - irc-dcc ==2.0.0 - islink ==0.1.0.0 @@ -1050,7 +1050,7 @@ default-package-overrides: - lackey ==0.4.1 - language-c ==0.5.0 - language-c-quote ==0.11.7 - - language-dockerfile ==0.3.4.0 + - language-dockerfile ==0.3.5.0 - language-ecmascript ==0.17.1.0 - language-fortran ==0.5.1 - language-glsl ==0.2.0 @@ -1121,7 +1121,7 @@ default-package-overrides: - matrix ==0.3.5.0 - maximal-cliques ==0.1.1 - mbox ==0.3.3 - - mcmc-types ==1.0.1 + - mcmc-types ==1.0.2 - megaparsec ==5.0.1 - memory ==0.13 - MemoTrie ==0.6.4 @@ -1139,7 +1139,7 @@ default-package-overrides: - microlens-mtl ==0.1.10.0 - microlens-platform ==0.3.7.0 - microlens-th ==0.4.1.0 - - mighty-metropolis ==1.0.2 + - mighty-metropolis ==1.0.3 - mime-mail ==0.4.11 - mime-mail-ses ==0.3.2.3 - mime-types ==0.1.0.7 @@ -1148,7 +1148,7 @@ default-package-overrides: - MissingH ==1.4.0.1 - mmap ==0.5.9 - mmorph ==1.0.6 - - mockery ==0.3.3 + - mockery ==0.3.4 - modify-fasta ==0.8.2.1 - moesocks ==1.0.0.41 - monad-control ==1.0.1.0 @@ -1200,7 +1200,7 @@ default-package-overrides: - MusicBrainz ==0.2.4 - mustache ==2.1 - mutable-containers ==0.3.3 - - mwc-probability ==1.2.1 + - mwc-probability ==1.2.2 - mwc-random ==0.13.4.0 - mwc-random-monad ==0.7.3.1 - nagios-check ==0.3.2 @@ -1280,15 +1280,15 @@ default-package-overrides: - pagination ==0.1.1 - palette ==0.1.0.4 - pandoc ==1.17.1 - - pandoc-citeproc ==0.10.1.2 + - pandoc-citeproc ==0.10.2.2 - pandoc-types ==1.16.1.1 - - pango ==0.13.3.0 + - pango ==0.13.3.1 - parallel ==3.2.1.0 - parallel-io ==0.3.3 - parseargs ==0.2.0.7 - parsec ==3.1.11 - parsers ==0.12.4 - - partial-handler ==1.0.1 + - partial-handler ==1.0.2 - path ==0.5.9 - path-extra ==0.0.3 - path-io ==1.2.0 @@ -1307,7 +1307,7 @@ default-package-overrides: - pdfinfo ==1.5.4 - pem ==0.2.2 - permutation ==0.5.0.5 - - persistable-record ==0.4.0.3 + - persistable-record ==0.4.1.0 - persistable-types-HDBC-pg ==0.0.1.4 - persistent ==2.6 - persistent-postgresql ==2.6 @@ -1378,7 +1378,7 @@ default-package-overrides: - primitive ==0.6.1.0 - process-extras ==0.4.1.4 - product-profunctors ==0.7.1.0 - - profiteur ==0.3.0.2 + - profiteur ==0.3.0.3 - profunctor-extras ==4.0 - profunctors ==5.2 - project-template ==0.2.0 @@ -1390,7 +1390,7 @@ default-package-overrides: - protobuf-simple ==0.1.0.2 - protocol-buffers ==2.4.0 - protocol-buffers-descriptor ==2.4.0 - - protolude ==0.1.8 + - protolude ==0.1.10 - proxied ==0.2 - psql-helpers ==0.1.0.0 - PSQueue ==1.1 @@ -1406,6 +1406,7 @@ default-package-overrides: - quantum-random ==0.6.3 - QuasiText ==0.1.2.6 - questioner ==0.1.1.0 + - quickbench ==1.0 - QuickCheck ==2.8.2 - quickcheck-arbitrary-adt ==0.2.0.0 - quickcheck-assertions ==0.2.0 @@ -1470,7 +1471,7 @@ default-package-overrides: - repa-io ==3.4.1.1 - RepLib ==0.5.4 - reroute ==0.4.0.1 - - resolve-trivial-conflicts ==0.3.2.2 + - resolve-trivial-conflicts ==0.3.2.3 - resource-pool ==0.2.3.2 - resourcet ==1.1.8 - rest-client ==0.5.1.1 @@ -1497,7 +1498,7 @@ default-package-overrides: - s3-signer ==0.3.0.0 - safe ==0.3.9 - safe-exceptions ==0.1.4.0 - - safecopy ==0.9.1 + - safecopy ==0.9.2 - SafeSemaphore ==0.10.1 - sampling ==0.2.0 - sandi ==0.4.0 @@ -1554,7 +1555,6 @@ default-package-overrides: - shake-language-c ==0.10.0 - shakespeare ==2.0.11.1 - shell-conduit ==4.5.2 - - ShellCheck ==0.4.4 - shelly ==1.6.8.1 - shortcut-links ==0.4.2.0 - should-not-typecheck ==2.1.0 @@ -1596,8 +1596,8 @@ default-package-overrides: - sourcemap ==0.1.6 - spdx ==0.2.1.0 - speculation ==1.5.0.3 - - speedy-slice ==0.1.3 - - sphinx ==0.6.0.1 + - speedy-slice ==0.1.4 + - sphinx ==0.6.0.2 - Spintax ==0.1.0.1 - splice ==0.6.1.1 - split ==0.2.3.1 @@ -1612,7 +1612,7 @@ default-package-overrides: - sql-words ==0.1.4.1 - sqlite-simple ==0.4.9.0 - srcloc ==0.5.1.0 - - stache ==0.1.7 + - stache ==0.1.8 - stack-run-auto ==0.1.1.4 - stackage-curator ==0.14.1.1 - stackage-types ==1.2.0 @@ -1629,7 +1629,7 @@ default-package-overrides: - stm-containers ==0.2.15 - stm-delay ==0.1.1.1 - stm-stats ==0.2.0.0 - - STMonadTrans ==0.3.3 + - STMonadTrans ==0.3.4 - stopwatch ==0.1.0.3 - storable-complex ==0.2.2 - storable-endian ==0.2.5 @@ -1713,7 +1713,7 @@ default-package-overrides: - test-framework-th ==0.2.4 - test-simple ==0.1.8 - testing-feat ==0.4.0.3 - - texmath ==0.8.6.6 + - texmath ==0.8.6.7 - text ==1.2.2.1 - text-all ==0.3.0.2 - text-binary ==0.2.1.1 @@ -1859,7 +1859,7 @@ default-package-overrides: - vinyl ==0.5.2 - vinyl-utils ==0.3.0.0 - void ==0.7.1 - - vty ==5.11.1 + - vty ==5.11.3 - wai ==3.2.1.1 - wai-app-static ==3.1.6.1 - wai-conduit ==3.0.0.3 @@ -1892,12 +1892,12 @@ default-package-overrides: - web-routes-boomerang ==0.28.4.2 - web-routes-happstack ==0.23.10 - web-routes-hsp ==0.24.6.1 - - web-routes-th ==0.22.5 + - web-routes-th ==0.22.6 - web-routes-wai ==0.24.3 - webdriver ==0.8.4 - webdriver-angular ==0.1.11 - - webkitgtk3 ==0.14.2.0 - - webkitgtk3-javascriptcore ==0.14.2.0 + - webkitgtk3 ==0.14.2.1 + - webkitgtk3-javascriptcore ==0.14.2.1 - webpage ==0.0.4 - webrtc-vad ==0.1.0.3 - websockets ==0.9.7.0 @@ -1909,7 +1909,7 @@ default-package-overrides: - Win32-extras ==0.2.0.1 - Win32-notify ==0.3.0.1 - with-location ==0.1.0 - - withdependencies ==0.2.3 + - withdependencies ==0.2.4 - witherable ==0.1.3.3 - wizards ==1.0.2 - wl-pprint ==1.2 @@ -1968,7 +1968,7 @@ default-package-overrides: - yesod-eventsource ==1.4.0.1 - yesod-fay ==0.8.0 - yesod-fb ==0.3.4 - - yesod-form ==1.4.7.1 + - yesod-form ==1.4.8 - yesod-form-richtext ==0.1.0.0 - yesod-gitrepo ==0.2.1.0 - yesod-gitrev ==0.1.0.0 @@ -1976,7 +1976,7 @@ default-package-overrides: - yesod-newsfeed ==1.6 - yesod-persistent ==1.4.0.6 - yesod-sitemap ==1.4.0.1 - - yesod-static ==1.5.0.5 + - yesod-static ==1.5.1.1 - yesod-static-angular ==0.1.8 - yesod-table ==2.0.3 - yesod-test ==1.5.3 @@ -1991,7 +1991,7 @@ default-package-overrides: - zip ==0.1.3 - zip-archive ==0.3.0.5 - zippers ==0.2.2 - - zlib ==0.6.1.1 + - zlib ==0.6.1.2 - zlib-bindings ==0.1.1.5 - zlib-lens ==0.1.2.1 - zoom-refs ==0.0.0.1 @@ -2012,7 +2012,7 @@ extra-packages: - haddock-api == 2.15.* # required on GHC 7.8.x - haddock-api == 2.16.* # required on GHC 7.10.x - haddock-library == 1.2.* # required for haddock-api-2.16.x - - hoogle < 5 # required by current implementation of ghcWithHoogle + - haskell-src-exts == 1.18.* # required by hoogle-5.0.4 - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms - parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3 @@ -2218,6 +2218,7 @@ dont-distribute-packages: al: [ i686-linux, x86_64-linux, x86_64-darwin ] AlanDeniseEricLauren: [ i686-linux, x86_64-linux, x86_64-darwin ] alex-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] + alfred: [ i686-linux, x86_64-linux, x86_64-darwin ] algebra-sql: [ i686-linux, x86_64-linux, x86_64-darwin ] algebraic: [ i686-linux, x86_64-linux, x86_64-darwin ] algo-s: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2241,7 +2242,11 @@ dont-distribute-packages: amazon-emailer: [ i686-linux, x86_64-linux, x86_64-darwin ] amazon-products: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-apigateway: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-elbv2: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-kinesis-analytics: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-rds: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-servicecatalog: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-snowball: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-sqs: [ i686-linux, x86_64-linux, x86_64-darwin ] AMI: [ i686-linux, x86_64-linux, x86_64-darwin ] ampersand: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2360,8 +2365,10 @@ dont-distribute-packages: authenticate-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ] authoring: [ i686-linux, x86_64-linux, x86_64-darwin ] AutoForms: [ i686-linux, x86_64-linux, x86_64-darwin ] + autom: [ i686-linux, x86_64-linux, x86_64-darwin ] avahi: [ i686-linux, x86_64-linux, x86_64-darwin ] avatar-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] + avers-api-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] avers-api: [ i686-linux, x86_64-linux, x86_64-darwin ] avers-server: [ i686-linux, x86_64-linux, x86_64-darwin ] avers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2724,6 +2731,7 @@ dont-distribute-packages: chalkboard: [ i686-linux, x86_64-linux, x86_64-darwin ] charade: [ i686-linux, x86_64-linux, x86_64-darwin ] charsetdetect: [ i686-linux, x86_64-linux, x86_64-darwin ] + Chart-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] chart-histogram: [ i686-linux, x86_64-linux, x86_64-darwin ] Chart-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] chatter: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2736,6 +2744,7 @@ dont-distribute-packages: checked: [ i686-linux, x86_64-linux, x86_64-darwin ] chell-hunit: [ i686-linux, x86_64-linux, x86_64-darwin ] chevalier-common: [ i686-linux, x86_64-linux, x86_64-darwin ] + chitauri: [ i686-linux, x86_64-linux, x86_64-darwin ] Chitra: [ i686-linux, x86_64-linux, x86_64-darwin ] chorale-geo: [ i686-linux, x86_64-linux, x86_64-darwin ] chorale: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2844,6 +2853,7 @@ dont-distribute-packages: collections-api: [ i686-linux, x86_64-linux, x86_64-darwin ] collections-base-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] collections: [ i686-linux, x86_64-linux, x86_64-darwin ] + colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] color-counter: [ i686-linux, x86_64-linux, x86_64-darwin ] colour-space: [ i686-linux, x86_64-linux, x86_64-darwin ] coltrane: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3027,6 +3037,7 @@ dont-distribute-packages: curry-base: [ i686-linux, x86_64-linux, x86_64-darwin ] curry-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] CurryDB: [ i686-linux, x86_64-linux, x86_64-darwin ] + curryrs: [ i686-linux, x86_64-linux, x86_64-darwin ] curve25519: [ i686-linux, x86_64-linux, x86_64-darwin ] curves: [ i686-linux, x86_64-linux, x86_64-darwin ] custom-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3109,6 +3120,8 @@ dont-distribute-packages: dbcleaner: [ i686-linux, x86_64-linux, x86_64-darwin ] dbjava: [ i686-linux, x86_64-linux, x86_64-darwin ] DBlimited: [ i686-linux, x86_64-linux, x86_64-darwin ] + dbmigrations-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] + dbmigrations-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] dbmigrations: [ i686-linux, x86_64-linux, x86_64-darwin ] dbus-client: [ i686-linux, x86_64-linux, x86_64-darwin ] dbus-core: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3177,6 +3190,7 @@ dont-distribute-packages: dgs: [ i686-linux, x86_64-linux, x86_64-darwin ] dia-functions: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-hsqml: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3410,6 +3424,7 @@ dont-distribute-packages: error-util: [ i686-linux, x86_64-linux, x86_64-darwin ] ersatz-toysat: [ i686-linux, x86_64-linux, x86_64-darwin ] ert: [ i686-linux, x86_64-linux, x86_64-darwin ] + escape-artist: [ i686-linux, x86_64-linux, x86_64-darwin ] esotericbot: [ i686-linux, x86_64-linux, x86_64-darwin ] EsounD: [ i686-linux, x86_64-linux, x86_64-darwin ] esqueleto: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3483,6 +3498,7 @@ dont-distribute-packages: fathead-util: [ i686-linux, x86_64-linux, x86_64-darwin ] fault-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] fay-hsx: [ i686-linux, x86_64-linux, x86_64-darwin ] + fay-simplejson: [ i686-linux, x86_64-linux, x86_64-darwin ] fb-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] fbmessenger-api: [ i686-linux, x86_64-linux, x86_64-darwin ] fca: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3518,6 +3534,7 @@ dont-distribute-packages: FileManip: [ i686-linux, x86_64-linux, x86_64-darwin ] FileManipCompat: [ i686-linux, x86_64-linux, x86_64-darwin ] filepath-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] + Files: [ i686-linux, x86_64-linux, x86_64-darwin ] filesystem-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] filesystem-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] FileSystem: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3796,6 +3813,7 @@ dont-distribute-packages: glirc: [ i686-linux, x86_64-linux, x86_64-darwin ] gll: [ i686-linux, x86_64-linux, x86_64-darwin ] GLMatrix: [ i686-linux, x86_64-linux, x86_64-darwin ] + glob-posix: [ i686-linux, x86_64-linux, x86_64-darwin ] global-config: [ i686-linux, x86_64-linux, x86_64-darwin ] global-variables: [ i686-linux, x86_64-linux, x86_64-darwin ] global: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4120,6 +4138,8 @@ dont-distribute-packages: haskell-tools-ast-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-ast-trf: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-ast: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tools-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tools-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-prettyprint: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tools-refactor: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4300,6 +4320,9 @@ dont-distribute-packages: hexpat-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpat-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpat-pickle-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] + hexpat-pickle: [ i686-linux, x86_64-linux, x86_64-darwin ] + hexpat-tagsoup: [ i686-linux, x86_64-linux, x86_64-darwin ] + hexpat: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpr: [ i686-linux, x86_64-linux, x86_64-darwin ] hexquote: [ i686-linux, x86_64-linux, x86_64-darwin ] hF2: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4397,10 +4420,6 @@ dont-distribute-packages: HLearn-classification: [ i686-linux, x86_64-linux, x86_64-darwin ] HLearn-datastructures: [ i686-linux, x86_64-linux, x86_64-darwin ] HLearn-distributions: [ i686-linux, x86_64-linux, x86_64-darwin ] - hledger-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] - hledger-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] - hledger-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] - hledger-web: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibBladeRF: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibev: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibfam: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4469,6 +4488,8 @@ dont-distribute-packages: hoovie: [ i686-linux, x86_64-linux, x86_64-darwin ] hopencc: [ i686-linux, x86_64-linux, x86_64-darwin ] hopencl: [ i686-linux, x86_64-linux, x86_64-darwin ] + hopenpgp-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] + hOpenPGP: [ i686-linux, x86_64-linux, x86_64-darwin ] hopfield: [ i686-linux, x86_64-linux, x86_64-darwin ] hopfli: [ i686-linux, x86_64-linux, x86_64-darwin ] hops: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4642,6 +4663,7 @@ dont-distribute-packages: hstest: [ i686-linux, x86_64-linux, x86_64-darwin ] hstidy: [ i686-linux, x86_64-linux, x86_64-darwin ] hstorchat: [ i686-linux, x86_64-linux, x86_64-darwin ] + hstox: [ i686-linux, x86_64-linux, x86_64-darwin ] hstradeking: [ i686-linux, x86_64-linux, x86_64-darwin ] HStringTemplateHelpers: [ i686-linux, x86_64-linux, x86_64-darwin ] hstyle: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4681,6 +4703,7 @@ dont-distribute-packages: httpspec: [ i686-linux, x86_64-linux, x86_64-darwin ] htune: [ i686-linux, x86_64-linux, x86_64-darwin ] htzaar: [ i686-linux, x86_64-linux, x86_64-darwin ] + hub: [ i686-linux, x86_64-linux, x86_64-darwin ] hubigraph: [ i686-linux, x86_64-linux, x86_64-darwin ] hubris: [ i686-linux, x86_64-linux, x86_64-darwin ] HueAPI: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4702,11 +4725,18 @@ dont-distribute-packages: huttons-razor: [ i686-linux, x86_64-linux, x86_64-darwin ] huzzy: [ i686-linux, x86_64-linux, x86_64-darwin ] hVOIDP: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-balancedparens: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-eliasfano: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-excess: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-json-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-json: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-packed-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-rankselect-base: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-rankselect: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-succinct: [ i686-linux, x86_64-linux, x86_64-darwin ] + hw-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] hwall-auth-iitk: [ i686-linux, x86_64-linux, x86_64-darwin ] hworker-ses: [ i686-linux, x86_64-linux, x86_64-darwin ] hworker: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4719,6 +4749,7 @@ dont-distribute-packages: hxournal: [ i686-linux, x86_64-linux, x86_64-darwin ] HXQ: [ i686-linux, x86_64-linux, x86_64-darwin ] hxt-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] + hxt-expat: [ i686-linux, x86_64-linux, x86_64-darwin ] hxt-filter: [ i686-linux, x86_64-linux, x86_64-darwin ] hxthelper: [ i686-linux, x86_64-linux, x86_64-darwin ] hxweb: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4737,6 +4768,7 @@ dont-distribute-packages: hydrogen-util: [ i686-linux, x86_64-linux, x86_64-darwin ] hydrogen: [ i686-linux, x86_64-linux, x86_64-darwin ] hyena: [ i686-linux, x86_64-linux, x86_64-darwin ] + hylolib: [ i686-linux, x86_64-linux, x86_64-darwin ] hylotab: [ i686-linux, x86_64-linux, x86_64-darwin ] hyloutils: [ i686-linux, x86_64-linux, x86_64-darwin ] hyperdrive: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4848,6 +4880,7 @@ dont-distribute-packages: IORefCAS: [ i686-linux, x86_64-linux, x86_64-darwin ] iothread: [ i686-linux, x86_64-linux, x86_64-darwin ] iotransaction: [ i686-linux, x86_64-linux, x86_64-darwin ] + ip2location: [ i686-linux, x86_64-linux, x86_64-darwin ] ip: [ i686-linux, x86_64-linux, x86_64-darwin ] ipatch: [ i686-linux, x86_64-linux, x86_64-darwin ] ipc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4913,6 +4946,7 @@ dont-distribute-packages: jcdecaux-vls: [ i686-linux, x86_64-linux, x86_64-darwin ] jdi: [ i686-linux, x86_64-linux, x86_64-darwin ] jespresso: [ i686-linux, x86_64-linux, x86_64-darwin ] + jni: [ i686-linux, x86_64-linux, x86_64-darwin ] jobqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] join: [ i686-linux, x86_64-linux, x86_64-darwin ] joinlist: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4954,6 +4988,7 @@ dont-distribute-packages: jspath: [ i686-linux, x86_64-linux, x86_64-darwin ] juandelacosa: [ i686-linux, x86_64-linux, x86_64-darwin ] judy: [ i686-linux, x86_64-linux, x86_64-darwin ] + juicy-gcode: [ i686-linux, x86_64-linux, x86_64-darwin ] JuicyPixels-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] JuicyPixels-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] JuicyPixels-repa: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4961,6 +4996,7 @@ dont-distribute-packages: JunkDB-driver-hashtables: [ i686-linux, x86_64-linux, x86_64-darwin ] JunkDB: [ i686-linux, x86_64-linux, x86_64-darwin ] jupyter: [ i686-linux, x86_64-linux, x86_64-darwin ] + jvm: [ i686-linux, x86_64-linux, x86_64-darwin ] JYU-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] kafka-client: [ i686-linux, x86_64-linux, x86_64-darwin ] kaleidoscope: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5108,6 +5144,7 @@ dont-distribute-packages: learn-physics-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] learn-physics: [ i686-linux, x86_64-linux, x86_64-darwin ] leetify: [ i686-linux, x86_64-linux, x86_64-darwin ] + legion-discovery: [ i686-linux, x86_64-linux, x86_64-darwin ] legion-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] legion: [ i686-linux, x86_64-linux, x86_64-darwin ] leksah: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5212,6 +5249,7 @@ dont-distribute-packages: list-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] list-zip-def: [ i686-linux, x86_64-linux, x86_64-darwin ] listlike-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] + ListTree: [ i686-linux, x86_64-linux, x86_64-darwin ] lit: [ i686-linux, x86_64-linux, x86_64-darwin ] literals: [ i686-linux, x86_64-linux, x86_64-darwin ] live-sequencer: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5346,6 +5384,7 @@ dont-distribute-packages: marmalade-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] marquise: [ i686-linux, x86_64-linux, x86_64-darwin ] mars: [ i686-linux, x86_64-linux, x86_64-darwin ] + marvin: [ i686-linux, x86_64-linux, x86_64-darwin ] marxup: [ i686-linux, x86_64-linux, x86_64-darwin ] masakazu-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] MASMGen: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5549,6 +5588,7 @@ dont-distribute-packages: mulang: [ i686-linux, x86_64-linux, x86_64-darwin ] multext-east-msd: [ i686-linux, x86_64-linux, x86_64-darwin ] multi-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] + multifile: [ i686-linux, x86_64-linux, x86_64-darwin ] multifocal: [ i686-linux, x86_64-linux, x86_64-darwin ] multihash: [ i686-linux, x86_64-linux, x86_64-darwin ] multipass: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5594,6 +5634,7 @@ dont-distribute-packages: n-m: [ i686-linux, x86_64-linux, x86_64-darwin ] nagios-plugin-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] named-lock: [ i686-linux, x86_64-linux, x86_64-darwin ] + NameGenerator: [ i686-linux, x86_64-linux, x86_64-darwin ] namelist: [ i686-linux, x86_64-linux, x86_64-darwin ] nano-cryptr: [ i686-linux, x86_64-linux, x86_64-darwin ] nano-hmac: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5634,8 +5675,10 @@ dont-distribute-packages: nettle-frp: [ i686-linux, x86_64-linux, x86_64-darwin ] nettle-netkit: [ i686-linux, x86_64-linux, x86_64-darwin ] nettle-openflow: [ i686-linux, x86_64-linux, x86_64-darwin ] + nettle: [ i686-linux, x86_64-linux, x86_64-darwin ] netwire-input-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] netwire-input: [ i686-linux, x86_64-linux, x86_64-darwin ] + netwire-vinylglfw-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] netwire: [ i686-linux, x86_64-linux, x86_64-darwin ] network-address: [ i686-linux, x86_64-linux, x86_64-darwin ] network-anonymous-i2p: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5707,6 +5750,7 @@ dont-distribute-packages: notzero: [ i686-linux, x86_64-linux, x86_64-darwin ] np-linear: [ i686-linux, x86_64-linux, x86_64-darwin ] nptools: [ i686-linux, x86_64-linux, x86_64-darwin ] + ntrip-client: [ i686-linux, x86_64-linux, x86_64-darwin ] NTRU: [ i686-linux, x86_64-linux, x86_64-darwin ] null-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] nullary: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5724,6 +5768,7 @@ dont-distribute-packages: nylas: [ i686-linux, x86_64-linux, x86_64-darwin ] nymphaea: [ i686-linux, x86_64-linux, x86_64-darwin ] oauthenticated: [ i686-linux, x86_64-linux, x86_64-darwin ] + obd: [ i686-linux, x86_64-linux, x86_64-darwin ] oberon0: [ i686-linux, x86_64-linux, x86_64-darwin ] obj: [ i686-linux, x86_64-linux, x86_64-darwin ] Object: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5945,6 +5990,7 @@ dont-distribute-packages: pipes-errors: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-files: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-interleave: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-key-value-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-network-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-p2p-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6114,6 +6160,7 @@ dont-distribute-packages: puppetresources: [ i686-linux, x86_64-linux, x86_64-darwin ] pure-priority-queue-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] pure-priority-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] + pure-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] purescript-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] push-notify-ccs: [ i686-linux, x86_64-linux, x86_64-darwin ] push-notify-general: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6204,6 +6251,7 @@ dont-distribute-packages: Ranka: [ i686-linux, x86_64-linux, x86_64-darwin ] rascal: [ i686-linux, x86_64-linux, x86_64-darwin ] Rasenschach: [ i686-linux, x86_64-linux, x86_64-darwin ] + rattletrap: [ i686-linux, x86_64-linux, x86_64-darwin ] raven-haskell-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] raw-feldspar: [ i686-linux, x86_64-linux, x86_64-darwin ] rawr: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6223,6 +6271,8 @@ dont-distribute-packages: reactive-banana-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-fieldtrip: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] + reactive-jack: [ i686-linux, x86_64-linux, x86_64-darwin ] + reactive-midyim: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-thread: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] reactor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6485,6 +6535,7 @@ dont-distribute-packages: Scurry: [ i686-linux, x86_64-linux, x86_64-darwin ] scyther-proof: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-compositor: [ i686-linux, x86_64-linux, x86_64-darwin ] + sdl2-gfx: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-image: [ i686-linux, x86_64-linux, x86_64-darwin ] sdr: [ i686-linux, x86_64-linux, x86_64-darwin ] seacat: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6504,6 +6555,7 @@ dont-distribute-packages: selenium: [ i686-linux, x86_64-linux, x86_64-darwin ] selinux: [ i686-linux, x86_64-linux, x86_64-darwin ] Semantique: [ i686-linux, x86_64-linux, x86_64-darwin ] + semdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] semi-iso: [ i686-linux, x86_64-linux, x86_64-darwin ] semigroupoids-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] semigroups-actions: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6523,10 +6575,15 @@ dont-distribute-packages: serv-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] serv: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-aeson-specs: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-auth-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-auth-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-hmac: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-auth-server: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token-api: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-csharp: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-db-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-elm: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6596,6 +6653,7 @@ dont-distribute-packages: showdown: [ i686-linux, x86_64-linux, x86_64-darwin ] shpider: [ i686-linux, x86_64-linux, x86_64-darwin ] Shu-thing: [ i686-linux, x86_64-linux, x86_64-darwin ] + sibe: [ i686-linux, x86_64-linux, x86_64-darwin ] sifflet-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] sifflet: [ i686-linux, x86_64-linux, x86_64-darwin ] signals: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6634,6 +6692,7 @@ dont-distribute-packages: simseq: [ i686-linux, x86_64-linux, x86_64-darwin ] sindre: [ i686-linux, x86_64-linux, x86_64-darwin ] sink: [ i686-linux, x86_64-linux, x86_64-darwin ] + siphon: [ i686-linux, x86_64-linux, x86_64-darwin ] sirkel: [ i686-linux, x86_64-linux, x86_64-darwin ] sixfiguregroup: [ i686-linux, x86_64-linux, x86_64-darwin ] sized-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6987,6 +7046,7 @@ dont-distribute-packages: teams: [ i686-linux, x86_64-linux, x86_64-darwin ] teeth: [ i686-linux, x86_64-linux, x86_64-darwin ] telegram-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + telegram-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] telegram: [ i686-linux, x86_64-linux, x86_64-darwin ] tellbot: [ i686-linux, x86_64-linux, x86_64-darwin ] template-default: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7224,6 +7284,7 @@ dont-distribute-packages: type-sub-th: [ i686-linux, x86_64-linux, x86_64-darwin ] typeable-th: [ i686-linux, x86_64-linux, x86_64-darwin ] TypeClass: [ i686-linux, x86_64-linux, x86_64-darwin ] + typed-process: [ i686-linux, x86_64-linux, x86_64-darwin ] typed-spreadsheet: [ i686-linux, x86_64-linux, x86_64-darwin ] typed-wire-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] typed-wire: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7318,6 +7379,7 @@ dont-distribute-packages: var: [ i686-linux, x86_64-linux, x86_64-darwin ] variable-precision: [ i686-linux, x86_64-linux, x86_64-darwin ] variables: [ i686-linux, x86_64-linux, x86_64-darwin ] + vault-tool-server: [ i686-linux, x86_64-linux, x86_64-darwin ] vaultaire-common: [ i686-linux, x86_64-linux, x86_64-darwin ] vcsgui: [ i686-linux, x86_64-linux, x86_64-darwin ] Vec-Boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7341,6 +7403,7 @@ dont-distribute-packages: verdict-json: [ i686-linux, x86_64-linux, x86_64-darwin ] verdict: [ i686-linux, x86_64-linux, x86_64-darwin ] verilog: [ i686-linux, x86_64-linux, x86_64-darwin ] + vgrep: [ i686-linux, x86_64-linux, x86_64-darwin ] views: [ i686-linux, x86_64-linux, x86_64-darwin ] vigilance: [ i686-linux, x86_64-linux, x86_64-darwin ] vimeta: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7536,6 +7599,7 @@ dont-distribute-packages: xml-push: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-query-xml-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-query-xml-types: [ i686-linux, x86_64-linux, x86_64-darwin ] + xml-to-json: [ i686-linux, x86_64-linux, x86_64-darwin ] xml2json: [ i686-linux, x86_64-linux, x86_64-darwin ] xml2x: [ i686-linux, x86_64-linux, x86_64-darwin ] XmlHtmlWriter: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7598,6 +7662,7 @@ dont-distribute-packages: yesod-auth-pam: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-smbclient: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-zendesk: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-comments: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-content-pdf: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-continuations: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 9020f1ee467..673099e0dc4 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, ghc +{ pkgs, stdenv, ghc, all-cabal-hashes , compilerConfig ? (self: super: {}) , packageSetConfig ? (self: super: {}) , overrides ? (self: super: {}) @@ -6,14 +6,6 @@ let - allCabalFiles = stdenv.mkDerivation { - name = "all-cabal-hashes-0"; - buildCommand = '' - mkdir -p $out - tar -C $out --strip-components=1 -x -f ${builtins.fetchurl "https://github.com/commercialhaskell/all-cabal-hashes/archive/hackage.tar.gz"} - ''; - }; - inherit (stdenv.lib) fix' extends; haskellPackages = self: @@ -69,8 +61,8 @@ let installPhase = '' export HOME="$TMP" mkdir $out - hash=$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' ${allCabalFiles}/${name}/${version}/${name}.json) - cabal2nix --compiler=${self.ghc.name} --system=${stdenv.system} --sha256=$hash ${allCabalFiles}/${name}/${version}/${name}.cabal >$out/default.nix + hash=$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' ${all-cabal-hashes}/${name}/${version}/${name}.json) + cabal2nix --compiler=${self.ghc.name} --system=${stdenv.system} --sha256=$hash ${all-cabal-hashes}/${name}/${version}/${name}.cabal >$out/default.nix ''; }; @@ -88,7 +80,6 @@ let packages = selectFrom self; hoogle = callPackage ./hoogle.nix { inherit packages; - hoogle = self.hoogle_5_0_4; }; in withPackages (packages ++ [ hoogle ]); diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 114c40d6179..45839074b79 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2308,7 +2308,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Cabal_1_24_0_0" = callPackage + "Cabal_1_24_1_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, old-time, pretty , process, QuickCheck, regex-posix, tagged, tasty, tasty-hunit @@ -2316,8 +2316,8 @@ self: { }: mkDerivation { pname = "Cabal"; - version = "1.24.0.0"; - sha256 = "c00e9d372adb49ce1bd5b62ff049cf49adc4a312a271b238894e50eb707297aa"; + version = "1.24.1.0"; + sha256 = "dd2085dafae5cb2b5f8f0ef068ad66a779fb1bf2d68642d3906ac0c666a96a6b"; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath pretty process time unix @@ -2487,8 +2487,8 @@ self: { }: mkDerivation { pname = "Chart"; - version = "1.8"; - sha256 = "7181289529ba96df4946c2e9018cabf3d8566da1a11a2a7e0f0eb8c39e9e70dc"; + version = "1.8.1"; + sha256 = "635241e4b6b8aa1ddeb244c94002edc21603617fadeaf50aa7f52e28493ba15e"; libraryHaskellDepends = [ array base colour data-default-class lens mtl old-locale operational time vector @@ -2504,8 +2504,8 @@ self: { }: mkDerivation { pname = "Chart-cairo"; - version = "1.8"; - sha256 = "05cf006424750562dc786cc5eb169474759932c05da6ec08a44b932b72b620ec"; + version = "1.8.1"; + sha256 = "b21494feb055a55674b66d51f0522af9c06094ed86ba62db93fba54179c47c14"; libraryHaskellDepends = [ array base cairo Chart colour data-default-class lens mtl old-locale operational time @@ -2523,8 +2523,8 @@ self: { }: mkDerivation { pname = "Chart-diagrams"; - version = "1.8"; - sha256 = "d5c3e7235a98683337dc44127bc19998d747e37fa2d4211f2142ac51a5288558"; + version = "1.8.1"; + sha256 = "1c2e12d7719e6798721a3957e6df6ea772dff0bd7d6900e5a1f5c009cd5635bb"; libraryHaskellDepends = [ base blaze-markup bytestring Chart colour containers data-default-class diagrams-core diagrams-lib diagrams-postscript @@ -2542,8 +2542,8 @@ self: { }: mkDerivation { pname = "Chart-gtk"; - version = "1.8"; - sha256 = "2bf9b59cf417a263cfe29fdc18135c8abfb997d5468e47ccaf9a756afde61aec"; + version = "1.8.1"; + sha256 = "964a8dd5b23d86f4a0d91fde5d1144fba8dd29d2810a05864ce0e795c2f7056a"; libraryHaskellDepends = [ array base cairo Chart Chart-cairo colour data-default-class gtk mtl old-locale time @@ -2551,6 +2551,7 @@ self: { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Utility functions for using the chart library with GTK"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Chart-simple" = callPackage @@ -5093,6 +5094,7 @@ self: { homepage = "https://github.com/yuhangwang/Files#readme"; description = "File content extraction/rearrangement"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Finance-Quote-Yahoo" = callPackage @@ -6721,8 +6723,8 @@ self: { }: mkDerivation { pname = "HDBC-mysql"; - version = "0.7.0.0"; - sha256 = "cc46b7ae684062998a3eb4f8e710436d5e2ced94e09d40777116cf20a43df1e4"; + version = "0.7.1.0"; + sha256 = "81c985d4a243c965930fb412b3175ca799ba66985f8b6844014fd600df1da7cf"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring HDBC time utf8-string ]; librarySystemDepends = [ mysqlclient openssl zlib ]; @@ -10710,8 +10712,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "List"; - version = "0.5.2"; - sha256 = "27ddf9a9b348c3a2fc72ba8bed78ecacd32f26cc7ae1b8de8a066bd14ec8eaac"; + version = "0.6.0"; + sha256 = "03de2236b8802ddc76ff22d6de0037855d00790d0f4071b3467b419521a29889"; libraryHaskellDepends = [ base transformers ]; homepage = "http://github.com/yairchu/generator/tree"; description = "List monad transformer and class"; @@ -10752,6 +10754,7 @@ self: { homepage = "http://github.com/yairchu/generator/tree"; description = "Trees and monadic trees expressed as monadic lists where the underlying monad is a list"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ListWriter" = callPackage @@ -10950,6 +10953,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "MBot" = callPackage + ({ mkDerivation, base, bytestring, hidapi, mtl }: + mkDerivation { + pname = "MBot"; + version = "0.1.0.2"; + sha256 = "147655ce2a168c963fa04130b0f6196cb3679dbc8512d04dbff3c12406d16ec2"; + libraryHaskellDepends = [ base bytestring hidapi mtl ]; + description = "Haskell interface for controlling the mBot educational robot"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "MC-Fold-DP" = callPackage ({ mkDerivation, base, Biobase, cmdargs, PrimitiveArray, split , tuple, vector @@ -11909,6 +11923,7 @@ self: { homepage = "http://github.com/pommicket/name-generator-haskell"; description = "A name generator written in Haskell"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "NanoProlog" = callPackage @@ -14862,12 +14877,13 @@ self: { }) {}; "STMonadTrans" = callPackage - ({ mkDerivation, array, base, mtl }: + ({ mkDerivation, array, base, Cabal, mtl }: mkDerivation { pname = "STMonadTrans"; - version = "0.3.3"; - sha256 = "d9911c7634c42b94f57ac7c2a6d523f6d7124870b35fc3030cb72109ba3aa315"; + version = "0.3.4"; + sha256 = "44935ff710369da1614e00a40dabea6ba3a4dd02959d7b0e5ed17a915c3f0210"; libraryHaskellDepends = [ array base mtl ]; + testHaskellDepends = [ array base Cabal mtl ]; description = "A monad transformer version of the ST monad"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -15044,18 +15060,19 @@ self: { "SciFlow" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, directory - , executable-path, fgl, graphviz, lens, lifted-async, mtl - , optparse-applicative, rainbow, shelly, split, sqlite-simple + , exceptions, executable-path, fgl, graphviz, lens, lifted-async + , mtl, optparse-applicative, rainbow, shelly, split, sqlite-simple , template-haskell, text, th-lift, transformers, yaml }: mkDerivation { pname = "SciFlow"; - version = "0.5.1"; - sha256 = "bbd6d78dae17138dcd6e9849c156402bf1e65b71cc6bbfe3ca6bc64acc99422d"; + version = "0.5.3.1"; + sha256 = "8d8408047e57b245ea66577ded733244959c507ff1e2d014b3d3d9cfd66fdbf0"; libraryHaskellDepends = [ - base bytestring cereal containers directory executable-path fgl - graphviz lens lifted-async mtl optparse-applicative rainbow shelly - split sqlite-simple template-haskell text th-lift transformers yaml + base bytestring cereal containers directory exceptions + executable-path fgl graphviz lens lifted-async mtl + optparse-applicative rainbow shelly split sqlite-simple + template-haskell text th-lift transformers yaml ]; description = "Scientific workflow management system"; license = stdenv.lib.licenses.mit; @@ -15172,31 +15189,6 @@ self: { }) {}; "ShellCheck" = callPackage - ({ mkDerivation, base, containers, directory, json, mtl, parsec - , process, QuickCheck, regex-tdfa - }: - mkDerivation { - pname = "ShellCheck"; - version = "0.4.4"; - sha256 = "6cc50790d25b6f330037c3612c21460aa75839cc32c65e10ea6b35f9f4488768"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers directory json mtl parsec process QuickCheck - regex-tdfa - ]; - executableHaskellDepends = [ - base containers directory json mtl parsec QuickCheck regex-tdfa - ]; - testHaskellDepends = [ - base containers directory json mtl parsec QuickCheck regex-tdfa - ]; - homepage = "http://www.shellcheck.net/"; - description = "Shell script analysis tool"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "ShellCheck_0_4_5" = callPackage ({ mkDerivation, base, containers, directory, json, mtl, parsec , process, QuickCheck, regex-tdfa }: @@ -15219,7 +15211,6 @@ self: { homepage = "http://www.shellcheck.net/"; description = "Shell script analysis tool"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Shellac" = callPackage @@ -17509,6 +17500,25 @@ self: { }) {advapi32 = null; gdi32 = null; shell32 = null; shfolder = null; user32 = null; winmm = null;}; + "Win32_2_4_0_0" = callPackage + ({ mkDerivation, advapi32, base, bytestring, gdi32, shell32 + , shfolder, shlwapi, user32, winmm + }: + mkDerivation { + pname = "Win32"; + version = "2.4.0.0"; + sha256 = "e99e020ddd510f3b7012e15346284288a4535c88b369fafa91584e0d9a86cecb"; + libraryHaskellDepends = [ base bytestring ]; + librarySystemDepends = [ + advapi32 gdi32 shell32 shfolder shlwapi user32 winmm + ]; + homepage = "https://github.com/haskell/win32"; + description = "A binding to part of the Win32 library"; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.none; + }) {advapi32 = null; gdi32 = null; shell32 = null; + shfolder = null; shlwapi = null; user32 = null; winmm = null;}; + "Win32-console" = callPackage ({ mkDerivation, base, Win32 }: mkDerivation { @@ -21010,6 +21020,7 @@ self: { ]; description = "utility library for Alfred version 2"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alga" = callPackage @@ -21611,7 +21622,7 @@ self: { license = "unknown"; }) {}; - "amazonka_1_4_4_1" = callPackage + "amazonka_1_4_4_2" = callPackage ({ mkDerivation, amazonka-core, base, bytestring, conduit , conduit-extra, directory, exceptions, http-conduit, ini, mmorph , monad-control, mtl, resourcet, retry, tasty, tasty-hunit, text @@ -21619,8 +21630,8 @@ self: { }: mkDerivation { pname = "amazonka"; - version = "1.4.4.1"; - sha256 = "0c0937d745ad39d34e1e6588497311721e4c7f995d0beab313def44893e47ede"; + version = "1.4.4.2"; + sha256 = "c0880ecc8794f71d1e7a9a3e6aae4e788430c7a8beeb0fae75f6b779ffd8640f"; libraryHaskellDepends = [ amazonka-core base bytestring conduit conduit-extra directory exceptions http-conduit ini mmorph monad-control mtl resourcet @@ -23082,6 +23093,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Load Balancing SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-emr" = callPackage @@ -23433,6 +23445,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis Analytics SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-kinesis-firehose" = callPackage @@ -23933,6 +23946,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Service Catalog SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ses" = callPackage @@ -23988,6 +24002,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Import/Export Snowball SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sns" = callPackage @@ -24272,7 +24287,7 @@ self: { license = "unknown"; }) {}; - "amazonka-test_1_4_4" = callPackage + "amazonka-test_1_4_4_2" = callPackage ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring , case-insensitive, conduit, conduit-extra, groom, http-client , http-types, process, resourcet, tasty, tasty-hunit @@ -24281,8 +24296,8 @@ self: { }: mkDerivation { pname = "amazonka-test"; - version = "1.4.4"; - sha256 = "5491b4cc27f41dd85daacaab0cc5e6b8630c5bb1581e3997f65d0b7b2ef6e5f0"; + version = "1.4.4.2"; + sha256 = "aff0b797f4d00a89d6f0a97e662157f8c510ea8585db26a8f8c2ad2ee37fdd46"; libraryHaskellDepends = [ aeson amazonka-core base bifunctors bytestring case-insensitive conduit conduit-extra groom http-client http-types process @@ -26672,29 +26687,6 @@ self: { }) {}; "asciidiagram" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative - , rasterific-svg, svg-tree, text, vector - }: - mkDerivation { - pname = "asciidiagram"; - version = "1.3.1.2"; - sha256 = "dafcfba0d75da40e33bc3270b25c8cdd48f1cf07cc64d21f8eac4024d7ddddba"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers FontyFruity JuicyPixels lens linear mtl - rasterific-svg svg-tree text vector - ]; - executableHaskellDepends = [ - base bytestring directory filepath FontyFruity JuicyPixels - optparse-applicative rasterific-svg svg-tree text - ]; - description = "Pretty rendering of Ascii diagram into svg or png"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "asciidiagram_1_3_2" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative , rasterific-svg, svg-tree, text, vector @@ -26715,7 +26707,6 @@ self: { ]; description = "Pretty rendering of Ascii diagram into svg or png"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "asic" = callPackage @@ -27956,6 +27947,7 @@ self: { homepage = "https://qlfiles.net/the-ql-files/next-nearest-neighbors-cellular-automata"; description = "Generates and displays patterns from next nearest neighbors cellular automata"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "automitive-cse" = callPackage @@ -28095,18 +28087,18 @@ self: { "avers" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, clock, containers, cryptohash, filepath, hspec - , inflections, MonadRandom, mtl, network, network-uri - , resource-pool, rethinkdb-client-driver, safe, scrypt, stm - , template-haskell, text, time, unordered-containers, vector + , bytestring, clock, containers, cryptohash, cryptonite, filepath + , hspec, inflections, memory, MonadRandom, mtl, network + , network-uri, resource-pool, rethinkdb-client-driver, safe, scrypt + , stm, template-haskell, text, time, unordered-containers, vector }: mkDerivation { pname = "avers"; - version = "0.0.16"; - sha256 = "04221c75c07aa82789ce79674a0ba5add253855087fd42c123f1d77fb94f1c85"; + version = "0.0.17.0"; + sha256 = "3e6b4a39ccb99373a1a574625b86d4948f4ba4a747652e3c5ddd8d8b09fe212d"; libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring bytestring clock containers - cryptohash filepath inflections MonadRandom mtl network network-uri + aeson attoparsec base bytestring clock containers cryptonite + filepath inflections memory MonadRandom mtl network network-uri resource-pool rethinkdb-client-driver safe scrypt stm template-haskell text time unordered-containers vector ]; @@ -28127,8 +28119,8 @@ self: { }: mkDerivation { pname = "avers-api"; - version = "0.0.5"; - sha256 = "469fa007854e5836e816cdf66d650f7b89601dd9644cf859ff680bb6b69d124c"; + version = "0.0.17.0"; + sha256 = "affeffe0ac3c3eb15823fdb4c61654783ef8aff076bfb20b55c3df34be088182"; libraryHaskellDepends = [ aeson avers base bytestring cookie http-api-data servant text time vector @@ -28139,21 +28131,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "avers-api-docs" = callPackage + ({ mkDerivation, aeson, avers, avers-api, base, cookie, lens + , servant, servant-swagger, swagger2, text, unordered-containers + }: + mkDerivation { + pname = "avers-api-docs"; + version = "0.0.17.0"; + sha256 = "24029af182f7eff072fa05615cea5cf69ab2c5b481f1b2df5f7a606714ca716f"; + libraryHaskellDepends = [ + aeson avers avers-api base cookie lens servant servant-swagger + swagger2 text unordered-containers + ]; + homepage = "http://github.com/wereHamster/avers-api-docs"; + description = "Swagger documentation for the Avers API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "avers-server" = callPackage ({ mkDerivation, aeson, avers, avers-api, base, base64-bytestring - , bytestring, bytestring-conversion, containers, cookie, cryptohash - , either, http-types, mtl, resource-pool, rethinkdb-client-driver - , servant, servant-server, stm, text, time, transformers, wai - , wai-websockets, websockets + , bytestring, bytestring-conversion, containers, cookie, cryptonite + , either, http-types, memory, mtl, resource-pool + , rethinkdb-client-driver, servant, servant-server, stm, text, time + , transformers, wai, wai-websockets, websockets }: mkDerivation { pname = "avers-server"; - version = "0.0.5"; - sha256 = "c72bd19a4f46c733875c887a0efcc7340f9c5b4571a5f74773d3d835297b2176"; + version = "0.0.17.0"; + sha256 = "6da0c28f2b75989805cb4c2c7bf10b1b6ac4211f310d2bb902a4a7725ce05c3c"; libraryHaskellDepends = [ aeson avers avers-api base base64-bytestring bytestring - bytestring-conversion containers cookie cryptohash either - http-types mtl resource-pool rethinkdb-client-driver servant + bytestring-conversion containers cookie cryptonite either + http-types memory mtl resource-pool rethinkdb-client-driver servant servant-server stm text time transformers wai wai-websockets websockets ]; @@ -28743,6 +28753,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "axiomatic-classes" = callPackage + ({ mkDerivation, base, containers, control-invariants, lens + , monad-loops, mtl, portable-template-haskell-lens, QuickCheck + , quickcheck-report, semigroups, template-haskell, th-printf + , transformers + }: + mkDerivation { + pname = "axiomatic-classes"; + version = "0.1.0.0"; + sha256 = "d0ca9598451c66a2070a33fea29a7479acd9f742455c95b3fbfd0005375e0929"; + libraryHaskellDepends = [ + base containers control-invariants lens monad-loops mtl + portable-template-haskell-lens QuickCheck quickcheck-report + semigroups template-haskell th-printf transformers + ]; + description = "Specify axioms for type classes and quickCheck all available instances"; + license = stdenv.lib.licenses.mit; + broken = true; + }) {control-invariants = null;}; + "azure-acs" = callPackage ({ mkDerivation, attoparsec, base, bytestring, conduit , conduit-extra, connection, http-conduit, http-types, network @@ -30309,21 +30339,21 @@ self: { }) {}; "bibdb" = callPackage - ({ mkDerivation, alex, array, base, bibtex, bytestring, containers - , curl, download-curl, filepath, happy, microlens, microlens-mtl - , microlens-th, mtl, optparse-applicative, parsec, pretty - , transformers + ({ mkDerivation, alex, array, async, base, bibtex, bytestring + , containers, curl, download-curl, filepath, happy, microlens + , microlens-mtl, microlens-th, mtl, optparse-applicative, parsec + , pretty, transformers }: mkDerivation { pname = "bibdb"; - version = "0.4.2"; - sha256 = "6f741fe0e4b1adacee03f7ca2a71c5727709e105dee5a67431b2c298233ca446"; + version = "0.5.2"; + sha256 = "afe2b25a3544994f32c62975f7eddeec5a690562e7ed234b9fb851aef0f7bc80"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array base bibtex bytestring containers curl download-curl filepath - microlens microlens-mtl microlens-th mtl optparse-applicative - parsec pretty transformers + array async base bibtex bytestring containers curl download-curl + filepath microlens microlens-mtl microlens-th mtl + optparse-applicative parsec pretty transformers ]; executableToolDepends = [ alex happy ]; homepage = "https://github.com/cacay/bibdb"; @@ -32030,33 +32060,26 @@ self: { }) {}; "bioinformatics-toolkit" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, binary, bytestring - , bytestring-lexing, case-insensitive, clustering, colour, conduit + ({ mkDerivation, aeson, aeson-pretty, base, bytestring + , bytestring-lexing, case-insensitive, clustering, conduit , conduit-combinators, containers, data-default-class - , double-conversion, hexpat, http-conduit, IntervalMap - , math-functions, matrices, mtl, optparse-applicative, palette - , parallel, primitive, random, shelly, split, statistics, tasty - , tasty-golden, tasty-hunit, text, transformers + , double-conversion, hexpat, HsHTSLib, http-conduit, IntervalMap + , math-functions, matrices, mtl, parallel, primitive, random, split + , statistics, tasty, tasty-golden, tasty-hunit, text, transformers , unordered-containers, vector, vector-algorithms, word8 }: mkDerivation { pname = "bioinformatics-toolkit"; - version = "0.2.4"; - sha256 = "e9ef7a074e8d7fd0d6fb7270f18010dd3d61c69bb06f421acf0930010181a25c"; - isLibrary = true; - isExecutable = true; + version = "0.3.1"; + sha256 = "f453503831f8a495bcc39e6fe3275f26bd2d50916b09415551b41a316998d543"; libraryHaskellDepends = [ - aeson aeson-pretty base binary bytestring bytestring-lexing - case-insensitive clustering colour conduit-combinators containers - data-default-class double-conversion hexpat http-conduit - IntervalMap math-functions matrices mtl palette parallel primitive - split statistics text transformers unordered-containers vector + aeson aeson-pretty base bytestring bytestring-lexing + case-insensitive clustering conduit-combinators containers + data-default-class double-conversion hexpat HsHTSLib http-conduit + IntervalMap math-functions matrices mtl parallel primitive split + statistics text transformers unordered-containers vector vector-algorithms word8 ]; - executableHaskellDepends = [ - base bytestring clustering data-default-class double-conversion - optparse-applicative shelly split text - ]; testHaskellDepends = [ base bytestring conduit conduit-combinators data-default-class matrices mtl random tasty tasty-golden tasty-hunit @@ -34309,8 +34332,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.11"; - sha256 = "783192383bf8c2887a5b99aca4c8ec48a6ba91f3ee11591a7d8d98734eead2a5"; + version = "0.13"; + sha256 = "5e5687cdb05065e564140d1970d737f8c8a73f57b321fb522cc7b32c96765ee7"; libraryHaskellDepends = [ base containers contravariant data-default deepseq microlens microlens-mtl microlens-th template-haskell text text-zipper @@ -34898,8 +34921,8 @@ self: { }: mkDerivation { pname = "byline"; - version = "0.2.2.0"; - sha256 = "f1a00142d77643a3da1ddabf9d9f1308e7ee1d8ea758d8161ed118a3d7c4123a"; + version = "0.2.3.0"; + sha256 = "964668e4e3eec9807e64c739a4a215c8e07800661c6d34ad2bd258e08872845c"; libraryHaskellDepends = [ ansi-terminal base colour containers exceptions haskeline mtl terminfo-hs text transformers @@ -35849,10 +35872,10 @@ self: { }: mkDerivation { pname = "cabal-install"; - version = "1.24.0.0"; - sha256 = "d840ecfd0a95a96e956b57fb2f3e9c81d9fc160e1fd0ea350b0d37d169d9e87e"; + version = "1.24.0.1"; + sha256 = "09f5fd8a2aa7f9565800a711a133f8142d36d59b38f59da09c25045b83ee9ecc"; revision = "1"; - editedCabalFile = "375b1a073b68c5531b11f70cdcf55a9add6f8337d9ff0c850c1da7e7bf7bbf39"; + editedCabalFile = "bf42e042bf673561d1d6c2c82d5679e1d0972e6ba8ee2d76604fd188174fa797"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -36634,8 +36657,8 @@ self: { }: mkDerivation { pname = "cairo"; - version = "0.13.3.0"; - sha256 = "fe895ad001228f56b167ab76de1d645f46966062544bf831b0fb9fa7e938ff08"; + version = "0.13.3.1"; + sha256 = "a3ca197c6d63875686ed8129530771f945fbd954ab8283841ad238da233d675a"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base bytestring mtl text utf8-string @@ -37621,8 +37644,8 @@ self: { }: mkDerivation { pname = "casr-logbook-html"; - version = "0.0.2"; - sha256 = "0a9cadd97d0b821a78e262b858b6ab650c7e72274d640ec8d6c8806f9aa090bd"; + version = "0.0.3"; + sha256 = "3eb3cd24aa8ec50bc83a3e0e1b0864050d7d3e7d601a67c033ae88be362494bb"; libraryHaskellDepends = [ base casr-logbook-types digit lens lucid text time ]; @@ -38103,16 +38126,16 @@ self: { }) {}; "cayley-client" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, exceptions - , hspec, http-client, http-conduit, lens, lens-aeson, mtl, text - , transformers, unordered-containers, vector + ({ mkDerivation, aeson, attoparsec, base, binary, bytestring + , exceptions, hspec, http-client, http-conduit, lens, lens-aeson + , mtl, text, transformers, unordered-containers, vector }: mkDerivation { pname = "cayley-client"; - version = "0.2.0.0"; - sha256 = "f42cff8dd066f219c8dca8e43cd2b6e29265d9064c8751873d22db7888e761fb"; + version = "0.2.1.0"; + sha256 = "670264faf8ac3366ffe40d22fae24fde437d60fffbff6f1753a92aef798a1c19"; libraryHaskellDepends = [ - aeson attoparsec base bytestring exceptions http-client + aeson attoparsec base binary bytestring exceptions http-client http-conduit lens lens-aeson mtl text transformers unordered-containers vector ]; @@ -39205,6 +39228,7 @@ self: { homepage = "https://github.com/marcusbuffett/chitauri"; description = "Helper for the Major System"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "choose" = callPackage @@ -39371,8 +39395,8 @@ self: { }: mkDerivation { pname = "chronos"; - version = "0.1.0"; - sha256 = "ce21a30d63f79e8885ff45248b7578a8d02ce7ed562a7f3cebb302be64d092b3"; + version = "0.2.0"; + sha256 = "229742c16772aa4befe5b37c4f6862b128ef51fbdcef07ac856f3349d4b7dd70"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable primitive text vector ]; @@ -39381,7 +39405,7 @@ self: { test-framework-hunit test-framework-quickcheck2 text ]; homepage = "https://github.com/andrewthad/chronos#readme"; - description = "Initial project template from stack"; + description = "A time library, encoding, decoding, and instances"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -40258,6 +40282,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "clay_0_12" = callPackage + ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }: + mkDerivation { + pname = "clay"; + version = "0.12"; + sha256 = "7bef7e086e7e3cd9f35c2e9b8ea7f6e7428e65090ea824cf680c645a350825e9"; + 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; + }) {}; + "clckwrks" = callPackage ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base , blaze-html, bytestring, cereal, containers, directory, filepath @@ -41640,6 +41678,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cold-widow" = callPackage + ({ mkDerivation, base, bytestring, hspec }: + mkDerivation { + pname = "cold-widow"; + version = "0.1.2"; + sha256 = "2452aff29af68c8c093ebf492e5e6598a90bac3be64f48c081864dd7c02515e4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring ]; + executableHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base bytestring hspec ]; + homepage = "https://github.com/mihaigiurgeanu/cold-widow#readme"; + description = "File transfer via QR Codes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "collada-output" = callPackage ({ mkDerivation, base, collada-types, containers, SVGPath, time , vector, xml @@ -41772,6 +41826,7 @@ self: { homepage = "https://github.com/andrewthad/colonnade#readme"; description = "Generic types and functions for columnar encoding and decoding"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "color-counter" = callPackage @@ -42930,8 +42985,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "concurrent-split"; - version = "0.0.0.1"; - sha256 = "4b7f4a40bc8dbbd3437f460a2eabe78fed84c900ca2912e523b281c311e03177"; + version = "0.0.1"; + sha256 = "60793c8eeff1fa0fe03910951d1925f3c66aec61ead64bf3f98dd6110a05b8e7"; libraryHaskellDepends = [ base ]; description = "MVars and Channels with distinguished input and output side"; license = stdenv.lib.licenses.bsd3; @@ -43622,8 +43677,8 @@ self: { }: mkDerivation { pname = "configurator-ng"; - version = "0.0.0.0"; - sha256 = "4995a132a0fcbf80c47198daab2530dd09ff87f227b265354236e188d8ec8aa5"; + version = "0.0.0.1"; + sha256 = "3a367ad5dd04bddb891600899b99cbefa4bb53e44c83ebab114dacd1b68f012b"; libraryHaskellDepends = [ attoparsec base bytestring critbit data-ordlist directory dlist fail hashable scientific text unix-compat unordered-containers @@ -45206,8 +45261,8 @@ self: { }: mkDerivation { pname = "cplex-hs"; - version = "0.5.0.0"; - sha256 = "22a3fbe663b18effaff54269d16e76aa9513d8a00d4773c3f5555d1a2f5d1567"; + version = "0.5.0.2"; + sha256 = "f39aa34ede9d79444fd6b4d8a3ca492bdce1b16054df5fa11b76acdb7eb81616"; libraryHaskellDepends = [ base containers hashable mtl primitive transformers unordered-containers vector @@ -47397,6 +47452,7 @@ self: { homepage = "https://github.com/mgattozzi/curryrs#readme"; description = "Easy to use FFI Bridge for using Rust in Haskell"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cursedcsv" = callPackage @@ -49995,6 +50051,7 @@ self: { ]; description = "The dbmigrations tool built for MySQL databases"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dbmigrations-postgresql" = callPackage @@ -50013,6 +50070,7 @@ self: { ]; description = "The dbmigrations tool built for PostgreSQL databases"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dbmigrations-sqlite" = callPackage @@ -50643,8 +50701,8 @@ self: { }: mkDerivation { pname = "declarative"; - version = "0.2.2"; - sha256 = "2201fb8299231ad5017a4ebf429d5036f7d3950df8cf3e684173fa7d658cac8e"; + version = "0.2.3"; + sha256 = "f6b0a65295f59d9c696257d667fa9995d9ebefc38b6d98a354fdc428d65d65aa"; libraryHaskellDepends = [ base hasty-hamiltonian lens mcmc-types mighty-metropolis mwc-probability pipes primitive speedy-slice transformers @@ -51908,6 +51966,7 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "hint-based build service for the diagrams graphics EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-cairo" = callPackage @@ -52907,8 +52966,8 @@ self: { }: mkDerivation { pname = "digestive-functors"; - version = "0.8.1.0"; - sha256 = "3c2bba9783279cb52d7fdbd03f0cea46b6f2c23f788953016568cd8f0a389c8a"; + version = "0.8.1.1"; + sha256 = "3c42b7b8b89369d305621a7753c245a6250deb58bc848dd3d757e06d69f842a8"; libraryHaskellDepends = [ base bytestring containers mtl old-locale text time ]; @@ -52930,8 +52989,8 @@ self: { }: mkDerivation { pname = "digestive-functors-aeson"; - version = "1.1.19"; - sha256 = "eb58a68fee918486e6ef884e946898427a75ddc6c3d1d509dd9a475341b6daa7"; + version = "1.1.20"; + sha256 = "017594d7489f33a2d162eb83f4f64bc110b3bd0cfb54982e3220ac3abc440bcc"; libraryHaskellDepends = [ aeson base containers digestive-functors lens lens-aeson safe text vector @@ -52952,8 +53011,8 @@ self: { }: mkDerivation { pname = "digestive-functors-blaze"; - version = "0.6.0.6"; - sha256 = "b11b6c0268a31353b915894452d0a78162e0ead933baeb4e6e49b384b869a8cf"; + version = "0.6.1.0"; + sha256 = "4be758620386fc395367b15b81b9fb7373e5ee370ab9af52fa03b2c24c579f0d"; libraryHaskellDepends = [ base blaze-html blaze-markup digestive-functors text ]; @@ -53365,8 +53424,8 @@ self: { }: mkDerivation { pname = "direct-sqlite"; - version = "2.3.17"; - sha256 = "fade7c52d157cf145380a4818fa2e03163fa104fadf43d580c1d475b6b6fffc4"; + version = "2.3.18"; + sha256 = "47311cb4070220012f6a7e3e75c04ba1da6e4c1975cdf823a1e13bee72dc433d"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base base16-bytestring bytestring directory HUnit temporary text @@ -55060,8 +55119,8 @@ self: { ({ mkDerivation, base, bytestring, feed, hspec, tagsoup, xml }: mkDerivation { pname = "download"; - version = "0.3.2.4"; - sha256 = "f8ef9cca18a4829ab640c6f00ed7e707e29e0ed40bc662dfaa1ef42d7ee358bc"; + version = "0.3.2.5"; + sha256 = "9ae6d92ae4fe7ec4ff7281896254a7794e4caf85b6743280afd2074865dd99c0"; libraryHaskellDepends = [ base bytestring feed tagsoup xml ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/psibi/download"; @@ -55076,8 +55135,8 @@ self: { pname = "download-curl"; version = "0.1.4"; sha256 = "950ede497ff41d72875337861fa41ca3e151b691ad53a9ddddd2443285bbc3f1"; - revision = "1"; - editedCabalFile = "7e6df1d4f39879e9b031c8ff5e2f6fd5be3729cc40f7515e117ac0b47ed3f675"; + revision = "2"; + editedCabalFile = "d4df109a694aacf11814f7d0ea8df2aa6b187ea894f1e6ae1bddae635f0a4e0c"; libraryHaskellDepends = [ base bytestring curl feed tagsoup xml ]; homepage = "http://code.haskell.org/~dons/code/download-curl"; description = "High-level file download based on URLs"; @@ -56849,22 +56908,23 @@ self: { ({ mkDerivation, array, base, containers, directory, filepath, ghc , ghc-paths, Glob, haskeline, HUnit, mtl, parsec, process, random , regex-tdfa, test-framework, test-framework-hunit, text - , transformers, unordered-containers + , transformers, unordered-containers, vector }: mkDerivation { pname = "egison"; - version = "3.6.0"; - sha256 = "16ef278a19fdd9bbc7d58fa8864049b17c47f6ad236e020d00927467726833b2"; + version = "3.6.1"; + sha256 = "937ab976c09bf6c4b4376d9cb30504055814ad4079f15319c9126abf74cdbac9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base containers directory ghc ghc-paths haskeline mtl parsec process random regex-tdfa text transformers unordered-containers + vector ]; executableHaskellDepends = [ array base containers directory filepath ghc ghc-paths haskeline mtl parsec process regex-tdfa text transformers - unordered-containers + unordered-containers vector ]; testHaskellDepends = [ base Glob HUnit mtl test-framework test-framework-hunit @@ -58947,6 +59007,7 @@ self: { homepage = "https://github.com/EarthCitizen/escape-artist#readme"; description = "ANSI Escape Sequence Text Decoration Made Easy"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "esotericbot" = callPackage @@ -59842,20 +59903,26 @@ self: { }) {}; "existential" = callPackage - ({ mkDerivation, base, lens, QuickCheck, template-haskell }: + ({ mkDerivation, base, cereal, constraints, control-invariants + , lens, portable-template-haskell-lens, QuickCheck + , quickcheck-report, serialize-instances, tagged, template-haskell + , th-printf, unordered-containers + }: mkDerivation { pname = "existential"; - version = "0.1.0.0"; - sha256 = "1aea3b930ba0343fb9f3d8bef2d96dde79b9fb353ce80b6a93c9d99599c6b46a"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base lens QuickCheck template-haskell ]; - executableHaskellDepends = [ base lens ]; - homepage = "https://bitbucket.org/cipher2048/existential/wiki/Home"; - description = "A library for existential types"; + version = "0.2.0.0"; + sha256 = "756bf090bdf84aae4ffb8f3f7ceefe95eb772853d71edc369dd789d9fde6136e"; + libraryHaskellDepends = [ + base cereal constraints control-invariants lens + portable-template-haskell-lens QuickCheck quickcheck-report + serialize-instances tagged template-haskell th-printf + unordered-containers + ]; + description = "Existential types with lens-like accessors"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + broken = true; + }) {control-invariants = null;}; "exists" = callPackage ({ mkDerivation, base, contravariant }: @@ -61052,12 +61119,13 @@ self: { ({ mkDerivation, fay-base }: mkDerivation { pname = "fay-simplejson"; - version = "0.1.1.0"; - sha256 = "78dbb8ad24149e93706d3630d5c9dcab9b263c0614e437eb14a6983953833c04"; + version = "0.1.3.0"; + sha256 = "b8d711a62c40b587b9266eef199ad83e2f0403c5883a8e1c75f5dc34e8368033"; libraryHaskellDepends = [ fay-base ]; homepage = "https://github.com/Lupino/fay-simplejson"; description = "SimpleJSON library for Fay"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-text" = callPackage @@ -61423,8 +61491,8 @@ self: { }: mkDerivation { pname = "feed-gipeda"; - version = "0.3.0.0"; - sha256 = "8a440f45d32a3eb0db3785b20601bd3031560da5776569d4c20762de3c44a98d"; + version = "0.3.0.1"; + sha256 = "5fa85807a74e5759635106deef4509e807d42f61d108d91645fe9cd0fec7a8cf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62928,20 +62996,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "flat-mcmc_1_1_1" = callPackage - ({ mkDerivation, base, mcmc-types, monad-par, monad-par-extras - , mwc-probability, pipes, primitive, transformers, vector + "flat-mcmc_1_2_2" = callPackage + ({ mkDerivation, base, formatting, mcmc-types, monad-par + , monad-par-extras, mwc-probability, pipes, primitive, text + , transformers, vector }: mkDerivation { pname = "flat-mcmc"; - version = "1.1.1"; - sha256 = "24e2bc1b4728dd54326908332322f227cc2bf3548e6e1b07f0695a1c3167a88c"; + version = "1.2.2"; + sha256 = "c70914ac35058f847e5faf173076403b8feb7bb8c8c96c34ba728aca031f6937"; libraryHaskellDepends = [ - base mcmc-types monad-par monad-par-extras mwc-probability pipes - primitive transformers vector + base formatting mcmc-types monad-par monad-par-extras + mwc-probability pipes primitive text transformers vector ]; testHaskellDepends = [ base vector ]; - homepage = "http://jtobin.github.com/flat-mcmc"; + homepage = "https://github.com/jtobin/flat-mcmc"; description = "Painless general-purpose sampling"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -64061,8 +64130,8 @@ self: { }: mkDerivation { pname = "formatting"; - version = "6.2.2"; - sha256 = "4fdcd7e30c48e67e64be04bbf4fc315996898aba9fcdb2491f4bcd3f3fba3412"; + version = "6.2.3"; + sha256 = "81eaab0d9a6a3a402344c1a97e54eccca2c4efd795e376e87de38f699d1c79bc"; libraryHaskellDepends = [ base clock old-locale scientific text text-format time ]; @@ -65075,12 +65144,12 @@ self: { }) {}; "from-sum" = callPackage - ({ mkDerivation, base, doctest, Glob }: + ({ mkDerivation, base, doctest, Glob, mtl }: mkDerivation { pname = "from-sum"; - version = "0.1.2.0"; - sha256 = "29449f195710ecdc601375ad0f853666bb93baf11f279b6f9f31783455cc51d9"; - libraryHaskellDepends = [ base ]; + version = "0.2.0.0"; + sha256 = "9ab7657f3da6ccc4d22a1ebf7ad2b35f6040d9a5013ed47a4e56d71a52008aa4"; + libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/cdepillabout/from-sum"; description = "Canonical fromMaybeM and fromEitherM functions"; @@ -67708,6 +67777,8 @@ self: { pname = "ghc-mod"; version = "5.6.0.0"; sha256 = "69b880410c028e9b7bf60c67120eeb567927fc6fba4df5400b057eba9efaa20e"; + revision = "3"; + editedCabalFile = "d21d034e1e1df7a5b478e2fd8dad0e11e01e46ce095ea39a90acacfdd34661ea"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ @@ -69366,8 +69437,8 @@ self: { }: mkDerivation { pname = "ginger"; - version = "0.3.5.0"; - sha256 = "8a410a6b65ad7753cc6fc4dba17258a0e818451aa42130b29e335bb6989495fe"; + version = "0.3.5.3"; + sha256 = "2999e909ccd45cee6ce517a74fa2ad8f3f06611ec9945c1c0b04f114ed6cbf26"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69419,8 +69490,8 @@ self: { }: mkDerivation { pname = "gio"; - version = "0.13.3.0"; - sha256 = "f20d17c56ee29cdd102234c00be1cdf0e5c12b7abe6c0a9723668a6f72a57417"; + version = "0.13.3.1"; + sha256 = "ac63f42321800731b9dc1f753f27ee877c04fdf7bcbcab0e2c57348a4739d827"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base bytestring containers glib mtl @@ -69589,8 +69660,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20161027"; - sha256 = "1e4d859434d5175bbe29843e3be03350e7412063bc340d12a1e31e04c80791cf"; + version = "6.20161031"; + sha256 = "6de3751f361d730e4a69106443b747a45e27aaeabf51ea999c41bd92fd2c71ce"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -69913,17 +69984,17 @@ self: { }) {}; "gitcache" = callPackage - ({ mkDerivation, base, cryptohash, directory, filepath, process + ({ mkDerivation, base, cryptonite, directory, filepath, process , utf8-string }: mkDerivation { pname = "gitcache"; - version = "0.2"; - sha256 = "fe69fd3f8ec4bff1dfb85d67279d71161c6cf6e6f05fe93df33776162640a56d"; + version = "0.3"; + sha256 = "52d2a4243eb1a385bee7665259efbba41a33e1ad57e59c59912b56d469a21e5d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base cryptohash directory filepath process utf8-string + base cryptonite directory filepath process utf8-string ]; homepage = "https://github.com/vincenthz/gitcache"; description = "Simple git utility to use and manage clone cache"; @@ -69952,27 +70023,25 @@ self: { }) {}; "github" = callPackage - ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat + ({ mkDerivation, aeson, aeson-compat, base, base-compat , base16-bytestring, binary, binary-orphans, byteable, bytestring , containers, cryptohash, deepseq, deepseq-generics, exceptions , file-embed, hashable, hspec, http-client, http-client-tls , http-link-header, http-types, iso8601-time, mtl, network-uri - , semigroups, text, time, transformers, transformers-compat + , semigroups, text, time, tls, transformers, transformers-compat , unordered-containers, vector, vector-instances }: mkDerivation { pname = "github"; - version = "0.14.1"; - sha256 = "fcd5f8957855e4a110db2dc411916309fd7afb7105534ebe378a5698f409fa7d"; - revision = "1"; - editedCabalFile = "a03fc2c579eb4451933e82486f705a81480c030eb17c47c4bccd07fb1e302584"; + version = "0.15.0"; + sha256 = "f091c35c446619bace51bd4d3831563cccfbda896954ed98d2aed818feead609"; libraryHaskellDepends = [ - aeson aeson-compat attoparsec base base-compat base16-bytestring - binary binary-orphans byteable bytestring containers cryptohash - deepseq deepseq-generics exceptions hashable http-client - http-client-tls http-link-header http-types iso8601-time mtl - network-uri semigroups text time transformers transformers-compat - unordered-containers vector vector-instances + aeson aeson-compat base base-compat base16-bytestring binary + binary-orphans byteable bytestring containers cryptohash deepseq + deepseq-generics exceptions hashable http-client http-client-tls + http-link-header http-types iso8601-time mtl network-uri semigroups + text time tls transformers transformers-compat unordered-containers + vector vector-instances ]; testHaskellDepends = [ aeson-compat base base-compat file-embed hspec unordered-containers @@ -70103,8 +70172,8 @@ self: { }: mkDerivation { pname = "github-webhook-handler-snap"; - version = "0.0.6"; - sha256 = "ec62b61aeb429492b347ed327b14a4c1bcf44d3791ac61ee6989f8a0a608a80e"; + version = "0.0.7"; + sha256 = "d4f526f4027a0c1cd9bdf455fbfb0c1742539eb3379b22ba59f1647133202c91"; libraryHaskellDepends = [ base bytestring case-insensitive github-types github-webhook-handler snap-core uuid @@ -70456,21 +70525,22 @@ self: { "glabrous" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , directory, either, hspec, text, unordered-containers + , cereal, cereal-text, directory, either, hspec, text + , unordered-containers }: mkDerivation { pname = "glabrous"; - version = "0.1.2.0"; - sha256 = "ae66cf3c83a8da0095715aee111cd6e834c37501128e39adfb0e0eb2a90a70ad"; + version = "0.1.3.0"; + sha256 = "a9afb52cb80e5a9a1ef6bd77897229e7aa29d8fb2b863019d346357792600576"; libraryHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring either text - unordered-containers + aeson aeson-pretty attoparsec base bytestring cereal cereal-text + either text unordered-containers ]; testHaskellDepends = [ base directory either hspec text unordered-containers ]; homepage = "https://github.com/MichelBoucey/glabrous"; - description = "A template library"; + description = "A template DSL library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -70563,8 +70633,8 @@ self: { }: mkDerivation { pname = "glib"; - version = "0.13.4.0"; - sha256 = "8bbc24b8a7f4de0fc02d60f12bf1b5154a151ffcad25964b65e958977100a0d9"; + version = "0.13.4.1"; + sha256 = "f57202ed4094cc50caa8b390c8b78a1620b3c43b913edb1e5bda0f3c5be32630"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base bytestring containers text utf8-string @@ -70683,6 +70753,7 @@ self: { homepage = "https://github.com/rdnetto/glob-posix#readme"; description = "Haskell bindings for POSIX glob library"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "global" = callPackage @@ -71215,8 +71286,8 @@ self: { }: mkDerivation { pname = "gnss-converters"; - version = "0.1.17"; - sha256 = "4f40d2896ac66c3a42daaa8849639e4a98bc8152c1d28933a6aaaceb8679dfe6"; + version = "0.1.18"; + sha256 = "4c86a04bef399c6d73217b6ea4953d8c90224d844b65453b8a18e3749ee1f86a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71462,6 +71533,31 @@ self: { license = "unknown"; }) {}; + "gogol_0_1_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit + , conduit-extra, cryptonite, directory, exceptions, filepath + , gogol-core, http-client, http-conduit, http-media, http-types + , lens, memory, mime-types, monad-control, mtl, resourcet, text + , time, transformers, transformers-base, unordered-containers, x509 + , x509-store + }: + mkDerivation { + pname = "gogol"; + version = "0.1.1"; + sha256 = "1dee6d069d6c239c8afa2240bdfc4e9674e9e648822617574732e4dc74834db2"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive conduit conduit-extra + cryptonite directory exceptions filepath gogol-core http-client + http-conduit http-media http-types lens memory mime-types + monad-control mtl resourcet text time transformers + transformers-base unordered-containers x509 x509-store + ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Comprehensive Google Services SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-adexchange-buyer" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71474,6 +71570,19 @@ self: { license = "unknown"; }) {}; + "gogol-adexchange-buyer_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-adexchange-buyer"; + version = "0.1.1"; + sha256 = "d4c9ce149988ca4b2abce408785bfd43da80b55f125a6fc17b639fa4bb8c9a59"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Ad Exchange Buyer SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-adexchange-seller" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71486,6 +71595,19 @@ self: { license = "unknown"; }) {}; + "gogol-adexchange-seller_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-adexchange-seller"; + version = "0.1.1"; + sha256 = "43b6f2037ef3cb44caf371f7639a7e024f27ee13f3d72c1497e0fe05d8c5920b"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Ad Exchange Seller SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-admin-datatransfer" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71498,6 +71620,19 @@ self: { license = "unknown"; }) {}; + "gogol-admin-datatransfer_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-admin-datatransfer"; + version = "0.1.1"; + sha256 = "4c90607116ed177c84c4980c0f14f50873fff2dcae611e3b620457608f1537a9"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Admin Data Transfer SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-admin-directory" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71510,6 +71645,19 @@ self: { license = "unknown"; }) {}; + "gogol-admin-directory_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-admin-directory"; + version = "0.1.1"; + sha256 = "7898cdfac19619b73175762cce67d30baf9d1772524daf72b000e834a0cd6ef2"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Admin Directory SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-admin-emailmigration" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71522,6 +71670,19 @@ self: { license = "unknown"; }) {}; + "gogol-admin-emailmigration_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-admin-emailmigration"; + version = "0.1.1"; + sha256 = "61e9ccb239c95b1ff9da6d4fe9d6c234468a4c21e13b92f6bff65e9831a15990"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Email Migration API v2 SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-admin-reports" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71534,6 +71695,19 @@ self: { license = "unknown"; }) {}; + "gogol-admin-reports_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-admin-reports"; + version = "0.1.1"; + sha256 = "5621ea9daeb864dcd0c5bb576645bbf5b6726da2e9313cd6b2514c7e2e394ccd"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Admin Reports SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-adsense" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71546,6 +71720,19 @@ self: { license = "unknown"; }) {}; + "gogol-adsense_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-adsense"; + version = "0.1.1"; + sha256 = "725fda77a7215af5828d7f97236b25faf4e1f2120aba1006ede26fcd4c6dd1bc"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google AdSense Management SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-adsense-host" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71558,6 +71745,19 @@ self: { license = "unknown"; }) {}; + "gogol-adsense-host_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-adsense-host"; + version = "0.1.1"; + sha256 = "305e3f7df6b3bcca19810ebbf954178f066fb227c7dbf68c16a49ad691578112"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google AdSense Host SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-affiliates" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71570,6 +71770,19 @@ self: { license = "unknown"; }) {}; + "gogol-affiliates_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-affiliates"; + version = "0.1.1"; + sha256 = "b90d360660ecd0ac990fa387575a9c32232a885a7b3ecc8fd3c3cf677e469a1c"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Affiliate Network SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-analytics" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71582,6 +71795,19 @@ self: { license = "unknown"; }) {}; + "gogol-analytics_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-analytics"; + version = "0.1.1"; + sha256 = "7a557b0fabb3697434ba97aeae564d2a428b19b701dced5176822c0a388d1922"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Analytics SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-android-enterprise" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71594,6 +71820,19 @@ self: { license = "unknown"; }) {}; + "gogol-android-enterprise_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-android-enterprise"; + version = "0.1.1"; + sha256 = "bc669a71e754e18c3c52099e6101cf882288c365e388cd5f4c208c576aaae124"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Play EMM SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-android-publisher" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71606,6 +71845,19 @@ self: { license = "unknown"; }) {}; + "gogol-android-publisher_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-android-publisher"; + version = "0.1.1"; + sha256 = "0e199dffb26576d64183fd0aa40fc16f4cd2fd1e0ee3b7b083002784c03e1efc"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Play Developer SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-appengine" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71618,6 +71870,19 @@ self: { license = "unknown"; }) {}; + "gogol-appengine_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-appengine"; + version = "0.1.1"; + sha256 = "cbf11c854ea9ba24012260cb0e78c3e09b918a05d5569f39633523852ecd9561"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google App Engine Admin SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-apps-activity" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71630,6 +71895,19 @@ self: { license = "unknown"; }) {}; + "gogol-apps-activity_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-apps-activity"; + version = "0.1.1"; + sha256 = "bb9c6aed68dc586ede859a2e71c48037c260fc6df2b1a4d4df22dfd411a0eb13"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Apps Activity SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-apps-calendar" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71642,6 +71920,19 @@ self: { license = "unknown"; }) {}; + "gogol-apps-calendar_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-apps-calendar"; + version = "0.1.1"; + sha256 = "cbebf7557345799436351e27485f8b4add43e2c449eb0fccb727d921ca16bc67"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Calendar SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-apps-licensing" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71654,6 +71945,19 @@ self: { license = "unknown"; }) {}; + "gogol-apps-licensing_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-apps-licensing"; + version = "0.1.1"; + sha256 = "dcc448bef918990ea339cdf1ac1cf46a5665254c7aab5e1a12d637c31f0c3bca"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Enterprise License Manager SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-apps-reseller" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71666,6 +71970,19 @@ self: { license = "unknown"; }) {}; + "gogol-apps-reseller_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-apps-reseller"; + version = "0.1.1"; + sha256 = "70dd84674f162012bf0767fdd610bfd85cac9fb083112e38023a44eab6ceee7b"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Enterprise Apps Reseller SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-apps-tasks" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71678,6 +71995,19 @@ self: { license = "unknown"; }) {}; + "gogol-apps-tasks_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-apps-tasks"; + version = "0.1.1"; + sha256 = "dc68e8b33ec9f34b4b35af210c05fa5b70aadf0b6d7ee634eda5b1dbc5e9feda"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Tasks SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-appstate" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71690,6 +72020,19 @@ self: { license = "unknown"; }) {}; + "gogol-appstate_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-appstate"; + version = "0.1.1"; + sha256 = "489c7b6ff30176dbf470509864c1820186cd9c435daef45542dc2d95e429f6e5"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google App State SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-autoscaler" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71702,6 +72045,19 @@ self: { license = "unknown"; }) {}; + "gogol-autoscaler_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-autoscaler"; + version = "0.1.1"; + sha256 = "cb9f8bfdb42a3d8a019d006a54b0c94242c029831fc89c3b16cf89c9e0ab69b9"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Compute Engine Autoscaler SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-bigquery" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71714,6 +72070,19 @@ self: { license = "unknown"; }) {}; + "gogol-bigquery_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-bigquery"; + version = "0.1.1"; + sha256 = "0943370cc3d7932bb813156c17bef39e0cb4b7db73ccf4471e114ede297da2d3"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google BigQuery SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-billing" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71726,6 +72095,19 @@ self: { license = "unknown"; }) {}; + "gogol-billing_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-billing"; + version = "0.1.1"; + sha256 = "09903877b7e6c3a87e345a26fca0fb7e1da8751f5b19aeb940479dd3f289a9e8"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud Billing SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-blogger" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71738,6 +72120,19 @@ self: { license = "unknown"; }) {}; + "gogol-blogger_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-blogger"; + version = "0.1.1"; + sha256 = "561dac9e87c7cf0930854e42ef9eb71ae3352a1267896dbee3c63cbcbadd326e"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Blogger SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-books" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71750,6 +72145,19 @@ self: { license = "unknown"; }) {}; + "gogol-books_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-books"; + version = "0.1.1"; + sha256 = "0d6e9b1cecf375bc6503ece1582ffc55e151f182497ac5f6da7a1a8312356926"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Books SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-civicinfo" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71762,6 +72170,19 @@ self: { license = "unknown"; }) {}; + "gogol-civicinfo_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-civicinfo"; + version = "0.1.1"; + sha256 = "53c354c9219c87c2864f9da2883657773c4e13aa635d51164bf89fc5e6d5d442"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Civic Information SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-classroom" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71774,6 +72195,19 @@ self: { license = "unknown"; }) {}; + "gogol-classroom_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-classroom"; + version = "0.1.1"; + sha256 = "7e61a1725d1864df86e00eaadc9c94d885015c5d1310a1374b7cc8e4b2c9769a"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Classroom SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-cloudmonitoring" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71786,6 +72220,19 @@ self: { license = "unknown"; }) {}; + "gogol-cloudmonitoring_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-cloudmonitoring"; + version = "0.1.1"; + sha256 = "da90cc22762d8d9b145f06ce2d4861c7b97004730f64a3f7c84b0b0b35c64daa"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud Monitoring SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-cloudtrace" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71798,6 +72245,19 @@ self: { license = "unknown"; }) {}; + "gogol-cloudtrace_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-cloudtrace"; + version = "0.1.1"; + sha256 = "8977ed4b61beed09daab23f5f2d1ab5495de96963970164153640a4af2e9f095"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud Trace SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-compute" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71810,6 +72270,19 @@ self: { license = "unknown"; }) {}; + "gogol-compute_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-compute"; + version = "0.1.1"; + sha256 = "8b84d7cea48923e3df6221ec28ed6f62a31803036cae73449ee16680b6fa51aa"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Compute Engine SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-container" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71822,6 +72295,31 @@ self: { license = "unknown"; }) {}; + "gogol-container_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-container"; + version = "0.1.1"; + sha256 = "9b0eaa239338f3a1c23ef6e7fd1587284060419e91cd13dccf7be088d81923b1"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Container Engine SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "gogol-containerbuilder" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-containerbuilder"; + version = "0.1.1"; + sha256 = "7362d60cf98c8856351669c0c27fb6945098f598f6de55dd17aed817a7547df8"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud Container Builder SDK"; + license = "unknown"; + }) {}; + "gogol-core" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring , case-insensitive, conduit, dlist, exceptions, hashable @@ -71847,6 +72345,30 @@ self: { license = "unknown"; }) {}; + "gogol-core_0_1_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring + , case-insensitive, conduit, dlist, exceptions, hashable + , http-api-data, http-client, http-media, http-types, lens, memory + , resourcet, scientific, servant, tasty, text, time + , unordered-containers + }: + mkDerivation { + pname = "gogol-core"; + version = "0.1.1"; + sha256 = "8f6c7dee658281c5d006c5ec4b475665544989c4d9141737e040857e15f3d483"; + libraryHaskellDepends = [ + aeson attoparsec base bifunctors bytestring case-insensitive + conduit dlist exceptions hashable http-api-data http-client + http-media http-types lens memory resourcet scientific servant text + time unordered-containers + ]; + testHaskellDepends = [ base tasty ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Core data types and functionality for Gogol libraries"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-customsearch" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71859,6 +72381,19 @@ self: { license = "unknown"; }) {}; + "gogol-customsearch_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-customsearch"; + version = "0.1.1"; + sha256 = "f90d8c865d67c75dea23df6e073c63958ffba49326c72b18b5c0ad50b4c17879"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google CustomSearch SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-dataflow" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71871,6 +72406,19 @@ self: { license = "unknown"; }) {}; + "gogol-dataflow_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-dataflow"; + version = "0.1.1"; + sha256 = "b7903a479c90d03b778d868da6ae2e4a9603203a19dac3fc875195e99ef6b75c"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Dataflow SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-dataproc" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71883,6 +72431,19 @@ self: { license = "unknown"; }) {}; + "gogol-dataproc_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-dataproc"; + version = "0.1.1"; + sha256 = "39fae5e8e1b91b22f1548238cf7974b2c103ade75a8ac138cf203cf8dcde4b8b"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud Dataproc SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-datastore" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71895,6 +72456,19 @@ self: { license = "unknown"; }) {}; + "gogol-datastore_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-datastore"; + version = "0.1.1"; + sha256 = "bbf5137dc5f4a43c17b65f2320eb075b7a61e8e85f7ebaffbcffe929d8134175"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud Datastore SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-debugger" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71907,6 +72481,19 @@ self: { license = "unknown"; }) {}; + "gogol-debugger_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-debugger"; + version = "0.1.1"; + sha256 = "51edec5d57f76a4be8769983831ae655332e55f3fec90bd4bdc22a0644bfbca2"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Stackdriver Debugger SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-deploymentmanager" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71919,6 +72506,19 @@ self: { license = "unknown"; }) {}; + "gogol-deploymentmanager_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-deploymentmanager"; + version = "0.1.1"; + sha256 = "73da04a5597395624bf6dfb3d5c73775dab4e8ef857a282efa25f5eaa2439b03"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud Deployment Manager SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-dfareporting" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71931,6 +72531,19 @@ self: { license = "unknown"; }) {}; + "gogol-dfareporting_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-dfareporting"; + version = "0.1.1"; + sha256 = "241afa2485a43ee29a93142fc931d8fa4b723389efa99a9c9b8e6f26f278d522"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google DCM/DFA Reporting And Trafficking SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-discovery" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71943,6 +72556,19 @@ self: { license = "unknown"; }) {}; + "gogol-discovery_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-discovery"; + version = "0.1.1"; + sha256 = "5b8ed6b1ea962001f9b64584aa2334987d974b10073e3211f2f1a510f2dd1bfe"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google APIs Discovery Service SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-dns" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71955,6 +72581,19 @@ self: { license = "unknown"; }) {}; + "gogol-dns_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-dns"; + version = "0.1.1"; + sha256 = "77448be65e876e0ab9c9bdc2db24a7847eda846a567ed9f9c63b844917d97136"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud DNS SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-doubleclick-bids" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71967,6 +72606,19 @@ self: { license = "unknown"; }) {}; + "gogol-doubleclick-bids_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-doubleclick-bids"; + version = "0.1.1"; + sha256 = "a0e899ecc589df89980868be218741fb2e7ece21e0837ea46618fd970339de2a"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google DoubleClick Bid Manager SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-doubleclick-search" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71979,6 +72631,19 @@ self: { license = "unknown"; }) {}; + "gogol-doubleclick-search_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-doubleclick-search"; + version = "0.1.1"; + sha256 = "15a954b3e17f5592d787ada7997cca04d9249e0ccfd432c1e52ae1d83769af60"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google DoubleClick Search SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-drive" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -71991,6 +72656,31 @@ self: { license = "unknown"; }) {}; + "gogol-drive_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-drive"; + version = "0.1.1"; + sha256 = "6e46b5ba960ef8481fdcaba84ef006169ff075d63fc6e4dc6cd84e0805e6d46c"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Drive SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "gogol-firebase-dynamiclinks" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-firebase-dynamiclinks"; + version = "0.1.1"; + sha256 = "e98604b85e66579ee99073ed335032e7983db5948f2a8c427be78b00b96ab24f"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Firebase Dynamic Links SDK"; + license = "unknown"; + }) {}; + "gogol-firebase-rules" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72003,6 +72693,19 @@ self: { license = "unknown"; }) {}; + "gogol-firebase-rules_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-firebase-rules"; + version = "0.1.1"; + sha256 = "981f91ad921d35eb303fb3d9c6d77c7d507ee89bece51baa7d8b8c7951e25fc2"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Firebase Rules SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-fitness" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72015,6 +72718,19 @@ self: { license = "unknown"; }) {}; + "gogol-fitness_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-fitness"; + version = "0.1.1"; + sha256 = "0826b140ea187306c0d22fc444b98b060191d185ed125f89044d4c56eeec5601"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Fitness SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-fonts" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72027,6 +72743,19 @@ self: { license = "unknown"; }) {}; + "gogol-fonts_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-fonts"; + version = "0.1.1"; + sha256 = "57f3e537cf035d7fe0355be1014f3df559caec6f736badfcb86e91a58b084167"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Fonts Developer SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-freebasesearch" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72039,6 +72768,19 @@ self: { license = "unknown"; }) {}; + "gogol-freebasesearch_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-freebasesearch"; + version = "0.1.1"; + sha256 = "0bc23693f49976034cba11ad70a00a76625907856f02c4d9931f1d01cb51751c"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Freebase Search SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-fusiontables" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72051,6 +72793,19 @@ self: { license = "unknown"; }) {}; + "gogol-fusiontables_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-fusiontables"; + version = "0.1.1"; + sha256 = "dda5ab1f88dd93e0bfe8acf046d2feaccb0d3d999dd81b3d06c7e2a5cc7c4a14"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Fusion Tables SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-games" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72063,6 +72818,19 @@ self: { license = "unknown"; }) {}; + "gogol-games_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-games"; + version = "0.1.1"; + sha256 = "1292b79718319d125e61ebf1a514c52f72d524c867fce7a8e04b40c98529e0ca"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Play Game Services SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-games-configuration" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72075,6 +72843,19 @@ self: { license = "unknown"; }) {}; + "gogol-games-configuration_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-games-configuration"; + version = "0.1.1"; + sha256 = "3abec569eb661666b51ca5585b64adbef3990d8db5991516d6414d6c2068b35f"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Play Game Services Publishing SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-games-management" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72087,6 +72868,19 @@ self: { license = "unknown"; }) {}; + "gogol-games-management_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-games-management"; + version = "0.1.1"; + sha256 = "ebd148164e36e7d6f42066bce24055029044af1022c906c1f63f99af6dd25e78"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Play Game Services Management SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-genomics" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72099,6 +72893,19 @@ self: { license = "unknown"; }) {}; + "gogol-genomics_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-genomics"; + version = "0.1.1"; + sha256 = "9adf145bd9534fac9b3a16d177099fc50ba0d914635817e16cd51dfaac578c80"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Genomics SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-gmail" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72111,6 +72918,19 @@ self: { license = "unknown"; }) {}; + "gogol-gmail_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-gmail"; + version = "0.1.1"; + sha256 = "7459c4abfdbe582f3027fda96821cf0c2baa93cdc4c00a4c3303b0aedf7886f5"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Gmail SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-groups-migration" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72123,6 +72943,19 @@ self: { license = "unknown"; }) {}; + "gogol-groups-migration_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-groups-migration"; + version = "0.1.1"; + sha256 = "2670e78a424cac61d6fc948f4fa0d64bfd878878f0130263b74ac22737e385fd"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Groups Migration SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-groups-settings" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72135,6 +72968,31 @@ self: { license = "unknown"; }) {}; + "gogol-groups-settings_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-groups-settings"; + version = "0.1.1"; + sha256 = "c8e5efeb91f968fbe5ebe7183f7a2ff362589de03bfa4917417d9707fe6ce1ed"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Groups Settings SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "gogol-iam" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-iam"; + version = "0.1.1"; + sha256 = "ec66ff6403ce2b59308703c8dbc47b9609d1a9029cae9b77c2137be336c783b9"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Identity and Access Management (IAM) SDK"; + license = "unknown"; + }) {}; + "gogol-identity-toolkit" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72147,6 +73005,19 @@ self: { license = "unknown"; }) {}; + "gogol-identity-toolkit_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-identity-toolkit"; + version = "0.1.1"; + sha256 = "25e5c7eba65629c70297c05327cd9321bef58ec3ad5b58559b0064fc8de7915b"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Identity Toolkit SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-kgsearch" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72159,6 +73030,19 @@ self: { license = "unknown"; }) {}; + "gogol-kgsearch_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-kgsearch"; + version = "0.1.1"; + sha256 = "851191e764c93914fcda810cd103a4fbaca3b45c6a47c2a1d699198a81d5f337"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Knowledge Graph Search SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-latencytest" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72171,6 +73055,19 @@ self: { license = "unknown"; }) {}; + "gogol-latencytest_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-latencytest"; + version = "0.1.1"; + sha256 = "90caade46451279a4645a71dba459c807d35ded423413e2e2f45078a538ef3cd"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud Network Performance Monitoring SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-logging" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72183,6 +73080,19 @@ self: { license = "unknown"; }) {}; + "gogol-logging_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-logging"; + version = "0.1.1"; + sha256 = "2320ad07e231bdbdcb0e39f702917224e29999041266e9b3a4a67b5ee0854456"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Stackdriver Logging SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-maps-coordinate" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72195,6 +73105,19 @@ self: { license = "unknown"; }) {}; + "gogol-maps-coordinate_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-maps-coordinate"; + version = "0.1.1"; + sha256 = "5b60120062e741337e299724aa09153f9c7985fff4fb25486a9f7c57df5e8b89"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Maps Coordinate SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-maps-engine" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72207,6 +73130,19 @@ self: { license = "unknown"; }) {}; + "gogol-maps-engine_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-maps-engine"; + version = "0.1.1"; + sha256 = "fb267eb453a2d915629882f448f28488c6d60ccbd8a64071723e5da566616ef4"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Maps Engine SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-mirror" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72219,6 +73155,31 @@ self: { license = "unknown"; }) {}; + "gogol-mirror_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-mirror"; + version = "0.1.1"; + sha256 = "0fb991b8d71f238d3706d7d944271a291aa41172f3a6730fbd2e411128f44eed"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Mirror SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "gogol-ml" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-ml"; + version = "0.1.1"; + sha256 = "bee43d94edd81a53f387bfcf76c6679d91c36bfe50e11dd26f8bd047c758709c"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud Machine Learning SDK"; + license = "unknown"; + }) {}; + "gogol-monitoring" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72231,6 +73192,19 @@ self: { license = "unknown"; }) {}; + "gogol-monitoring_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-monitoring"; + version = "0.1.1"; + sha256 = "906a513ac17c82c932b50045ca61bf91625d88a8cc962a4d9b0831a218ca3e61"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Stackdriver Monitoring SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-oauth2" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72243,6 +73217,19 @@ self: { license = "unknown"; }) {}; + "gogol-oauth2_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-oauth2"; + version = "0.1.1"; + sha256 = "d2c60dc2976a6d32f980d67d60e54735ac45e265c73956d7b32fa29918c10207"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google OAuth2 SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-pagespeed" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72255,6 +73242,19 @@ self: { license = "unknown"; }) {}; + "gogol-pagespeed_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-pagespeed"; + version = "0.1.1"; + sha256 = "a2071deb9101e80f6ffdf6d1945d21df433a256f666e7e0a8e3f1642817c2dd1"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google PageSpeed Insights SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-partners" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72267,6 +73267,19 @@ self: { license = "unknown"; }) {}; + "gogol-partners_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-partners"; + version = "0.1.1"; + sha256 = "a292356748aa7e00c35f755e1515409b2848244926630902f5ded0773048c8bc"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Partners SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-people" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72279,6 +73292,19 @@ self: { license = "unknown"; }) {}; + "gogol-people_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-people"; + version = "0.1.1"; + sha256 = "adbb0f4b9df631ddca20f269f7a3518aeefbaab8b0ae51e0568a4e1d0e5abc76"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google People SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-play-moviespartner" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72291,6 +73317,19 @@ self: { license = "unknown"; }) {}; + "gogol-play-moviespartner_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-play-moviespartner"; + version = "0.1.1"; + sha256 = "d674196adb4deb01578cb93290953c8d8fb88a741937f8f5a53ebc57e8552623"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Play Movies Partner SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-plus" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72303,6 +73342,19 @@ self: { license = "unknown"; }) {}; + "gogol-plus_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-plus"; + version = "0.1.1"; + sha256 = "a8f2751e8b1c2b55481592b7644672972f3d983fc2c7d3ede9ac696e9c3626d1"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google + SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-plus-domains" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72315,6 +73367,19 @@ self: { license = "unknown"; }) {}; + "gogol-plus-domains_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-plus-domains"; + version = "0.1.1"; + sha256 = "7ccfb46bec79938344629a2199df912e6279d8da06f449a16faa69309e49afea"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google + Domains SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-prediction" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72327,6 +73392,19 @@ self: { license = "unknown"; }) {}; + "gogol-prediction_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-prediction"; + version = "0.1.1"; + sha256 = "7317244d941417971e93b42bc6a4a87220bafdc943e3ab752890380875a37e58"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Prediction SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-proximitybeacon" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72339,6 +73417,19 @@ self: { license = "unknown"; }) {}; + "gogol-proximitybeacon_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-proximitybeacon"; + version = "0.1.1"; + sha256 = "96ef7f2878d294e0d08b2cef02106c40cfc19774dabdee37890b359579d54fb2"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Proximity Beacon SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-pubsub" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72351,6 +73442,19 @@ self: { license = "unknown"; }) {}; + "gogol-pubsub_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-pubsub"; + version = "0.1.1"; + sha256 = "ffc159c780ed332cc287ecc953501f405d77c9cb69074601b51f7e36b1d61d18"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud Pub/Sub SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-qpxexpress" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72363,6 +73467,19 @@ self: { license = "unknown"; }) {}; + "gogol-qpxexpress_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-qpxexpress"; + version = "0.1.1"; + sha256 = "436863f8807d67f615ff615f3c7a3b38f50f1fbdb3ae9351391c4a559aca24be"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google QPX Express SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-replicapool" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72375,6 +73492,19 @@ self: { license = "unknown"; }) {}; + "gogol-replicapool_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-replicapool"; + version = "0.1.1"; + sha256 = "e2a0a6a0da1ffc95eee4d233d85bbb6097466fc644ae73c7600477d2b2845b75"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Compute Engine Instance Group Manager SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-replicapool-updater" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72387,6 +73517,19 @@ self: { license = "unknown"; }) {}; + "gogol-replicapool-updater_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-replicapool-updater"; + version = "0.1.1"; + sha256 = "2cb4678f91f2c8eff2ebf9c84bcdef003abb3e1fcc120dc4d36879e676c71927"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Compute Engine Instance Group Updater SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-resourcemanager" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72399,6 +73542,19 @@ self: { license = "unknown"; }) {}; + "gogol-resourcemanager_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-resourcemanager"; + version = "0.1.1"; + sha256 = "b111d37b51d11631d32c0ba201d0483a4693a33d4b805038a74ddca049618577"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud Resource Manager SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-resourceviews" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72411,6 +73567,43 @@ self: { license = "unknown"; }) {}; + "gogol-resourceviews_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-resourceviews"; + version = "0.1.1"; + sha256 = "76457816587d173633ae5e421617e384599f104079a7f5db3ce954174a59b823"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Compute Engine Instance Groups SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "gogol-runtimeconfig" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-runtimeconfig"; + version = "0.1.1"; + sha256 = "44efa4354d6cd66ccf7a49d4af0b2243eeac2ad375b3ba6a394abdb65f4d4e5c"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud RuntimeConfig SDK"; + license = "unknown"; + }) {}; + + "gogol-safebrowsing" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-safebrowsing"; + version = "0.1.1"; + sha256 = "fb510fb5f125c02f768f3b0653fe2c8a65776a0f81b989906867004aaed31de8"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Safe Browsing APIs SDK"; + license = "unknown"; + }) {}; + "gogol-script" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72423,6 +73616,43 @@ self: { license = "unknown"; }) {}; + "gogol-script_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-script"; + version = "0.1.1"; + sha256 = "30b61c4088de0564cafe8fea83d9bd3666db7c3236b6c7b153b6794007f1dd0f"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Apps Script Execution SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "gogol-servicecontrol" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-servicecontrol"; + version = "0.1.1"; + sha256 = "1f8da851a8d5056c67fd9f3fdba2269dde07c1ef65572aeb77a74194066b8e77"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Service Control SDK"; + license = "unknown"; + }) {}; + + "gogol-servicemanagement" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-servicemanagement"; + version = "0.1.1"; + sha256 = "4a8ed16569b5e342181a91a07479da3fa50e3c00ab12c4dc27313455fd64c4ac"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Service Management SDK"; + license = "unknown"; + }) {}; + "gogol-sheets" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72435,6 +73665,19 @@ self: { license = "unknown"; }) {}; + "gogol-sheets_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-sheets"; + version = "0.1.1"; + sha256 = "44b3028332b6bbfa3243e3085777b5a85a3361a75b6733c563b2462a764da678"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Sheets SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-shopping-content" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72447,6 +73690,19 @@ self: { license = "unknown"; }) {}; + "gogol-shopping-content_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-shopping-content"; + version = "0.1.1"; + sha256 = "28c77ade1591d243933517cda460edf2f30b2682ccd3e14007cc5383bc65551f"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Content API for Shopping SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-siteverification" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72459,6 +73715,19 @@ self: { license = "unknown"; }) {}; + "gogol-siteverification_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-siteverification"; + version = "0.1.1"; + sha256 = "eb2d75deeb35168af169ed77ce69d1e12e888128c3a3a77df7e0fcc98b0cfbe1"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Site Verification SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-spectrum" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72471,6 +73740,19 @@ self: { license = "unknown"; }) {}; + "gogol-spectrum_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-spectrum"; + version = "0.1.1"; + sha256 = "31329fe1e2304d729bc1c36204d466140ebf6ed68183a22f3527eb609ef82ec1"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Spectrum Database SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-sqladmin" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72483,6 +73765,19 @@ self: { license = "unknown"; }) {}; + "gogol-sqladmin_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-sqladmin"; + version = "0.1.1"; + sha256 = "6f7baa334dfe6e2cc430a1692d48ca20ec656ab10ff504f8f77dbde382c241bf"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud SQL Administration SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-storage" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72495,6 +73790,19 @@ self: { license = "unknown"; }) {}; + "gogol-storage_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-storage"; + version = "0.1.1"; + sha256 = "7af4f34560e37bbcd7dfb6a872225806afec7736322f20a99497e3817486aa72"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud Storage JSON SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-storage-transfer" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72507,6 +73815,19 @@ self: { license = "unknown"; }) {}; + "gogol-storage-transfer_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-storage-transfer"; + version = "0.1.1"; + sha256 = "7f32157f51d3b5d3946a70d8015d03004f9d35c7aa5ef614249e516b9acca745"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Storage Transfer SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-tagmanager" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72519,6 +73840,19 @@ self: { license = "unknown"; }) {}; + "gogol-tagmanager_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-tagmanager"; + version = "0.1.1"; + sha256 = "8dfe4001b9df03cc812ae11d7c9f91dd063da3fc26242426b409b5dd6ae420ee"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Tag Manager SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-taskqueue" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72531,6 +73865,19 @@ self: { license = "unknown"; }) {}; + "gogol-taskqueue_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-taskqueue"; + version = "0.1.1"; + sha256 = "4797b39b38fb82fc7edf0314d2b168d78c05494c68fa81ef0c978e172452de1c"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google TaskQueue SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-translate" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72543,6 +73890,19 @@ self: { license = "unknown"; }) {}; + "gogol-translate_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-translate"; + version = "0.1.1"; + sha256 = "208cf8e92f66cfe35502a07eceb929a63f836af5802344d0b43796cf81c4edaa"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Translate SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-urlshortener" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72555,6 +73915,19 @@ self: { license = "unknown"; }) {}; + "gogol-urlshortener_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-urlshortener"; + version = "0.1.1"; + sha256 = "d958cba0e06b15512713ad893ae1a8a47f0654b2b734d06c91f23dd781fa7cf8"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google URL Shortener SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-useraccounts" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72567,6 +73940,19 @@ self: { license = "unknown"; }) {}; + "gogol-useraccounts_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-useraccounts"; + version = "0.1.1"; + sha256 = "4064ad99cea0db098c6f74fd36b1ba6167354a0e889f7bbc773b08a045ef8647"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud User Accounts SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-vision" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72579,6 +73965,19 @@ self: { license = "unknown"; }) {}; + "gogol-vision_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-vision"; + version = "0.1.1"; + sha256 = "e6046ce0d2c131eb0d5c0366577a638eb59e536eb4c4e462a27b0bb05090a565"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Cloud Vision SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-webmaster-tools" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72591,6 +73990,19 @@ self: { license = "unknown"; }) {}; + "gogol-webmaster-tools_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-webmaster-tools"; + version = "0.1.1"; + sha256 = "cfe78f510843473f6195b870de4de782cb5309e58f85af4afcb015c889fc9608"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google Search Console SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-youtube" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72603,6 +74015,19 @@ self: { license = "unknown"; }) {}; + "gogol-youtube_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-youtube"; + version = "0.1.1"; + sha256 = "a9a9b267bef13f1dcfebd49a2d049a125c5774eba6774e1c8384570e80404f8b"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google YouTube Data SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-youtube-analytics" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72615,6 +74040,19 @@ self: { license = "unknown"; }) {}; + "gogol-youtube-analytics_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-youtube-analytics"; + version = "0.1.1"; + sha256 = "98297021605ee870f20dcd4c8d8724d8390f9564a4acac237210632b70f7c91b"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google YouTube Analytics SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gogol-youtube-reporting" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { @@ -72627,6 +74065,19 @@ self: { license = "unknown"; }) {}; + "gogol-youtube-reporting_0_1_1" = callPackage + ({ mkDerivation, base, gogol-core }: + mkDerivation { + pname = "gogol-youtube-reporting"; + version = "0.1.1"; + sha256 = "96d1bf151a30efa99e0ee01407ed1d3356bbc61bf696e691ba344a2eeae35e2c"; + libraryHaskellDepends = [ base gogol-core ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Google YouTube Reporting SDK"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gooey" = callPackage ({ mkDerivation, base, renderable, transformers, varying }: mkDerivation { @@ -72753,8 +74204,8 @@ self: { }: mkDerivation { pname = "google-oauth2-jwt"; - version = "0.1.2.0"; - sha256 = "894d233d8253a69643aaeb2f230dbe6984cac4cdaf45c939835a523fadca66bf"; + version = "0.1.2.1"; + sha256 = "1a727b31280b53cb9db6531b8580dba8843a4beba0e866f34ff0231e7590b72b"; libraryHaskellDepends = [ base base64-bytestring bytestring HsOpenSSL RSA text unix-time ]; @@ -73827,13 +75278,13 @@ self: { }: mkDerivation { pname = "gray-extended"; - version = "1.5.1"; - sha256 = "588c64add3715a78cac2e80ccd37ba501d03d27f43acbf8b98a4a5cb2c8a55d1"; + version = "1.5.2"; + sha256 = "d56ae799ff03d5c4a4350d260be822cd3b3ff6fc8ed5e4b04f513579485fc9ca"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 ]; - homepage = "https://github.com/mhwombat/gray-extended"; + homepage = "https://github.com/mhwombat/gray-extended#readme"; description = "Gray encoding schemes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -73956,14 +75407,14 @@ self: { }: mkDerivation { pname = "grid"; - version = "7.8.6"; - sha256 = "a511a0146446018536176c84e5a134c9bc5ad477717c24bff3e92d52d40bf352"; + version = "7.8.7"; + sha256 = "5369d0ab7b98b926951e81a65a349f11ab6badd71f65555d713428664c1e017c"; libraryHaskellDepends = [ base cereal containers ]; testHaskellDepends = [ base containers QuickCheck test-framework test-framework-quickcheck2 ]; - homepage = "https://github.com/mhwombat/grid"; + homepage = "https://github.com/mhwombat/grid#readme"; description = "Tools for working with regular grids (graphs, lattices)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -74439,8 +75890,8 @@ self: { }: mkDerivation { pname = "gtk"; - version = "0.14.5"; - sha256 = "ffdfb54247dfbdf3b9936504802e3e0d2238cf5a0c145e745899d2c17f7c7001"; + version = "0.14.6"; + sha256 = "707906120cb8f0aa704fb2045a33600b7636166d74442a9c27c4262bac708327"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base bytestring cairo containers gio glib mtl pango text @@ -74501,8 +75952,8 @@ self: { }: mkDerivation { pname = "gtk-mac-integration"; - version = "0.3.3.0"; - sha256 = "639a8f6993a902346555f0cef188418fadb8f272f98d5f1f485e4c2b832641c3"; + version = "0.3.3.1"; + sha256 = "af651245db161e1b46f5a54ec04f908c40bbd7dc1f73df7531da8c78d2716b39"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base containers glib gtk mtl ]; libraryPkgconfigDepends = [ gtk-mac-integration-gtk2 ]; @@ -74737,8 +76188,8 @@ self: { }: mkDerivation { pname = "gtk3"; - version = "0.14.5"; - sha256 = "be24beff4a7fc08e7cb9b4e8d623f3ae884730c8dc22af12ab65efd362b0bc48"; + version = "0.14.6"; + sha256 = "f4c0d3c51a5e06e5f6a8fcfc2a1303e0a3ed0242309fc6c1b9603be9de1f4258"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base bytestring cairo containers gio glib mtl pango text @@ -74755,8 +76206,8 @@ self: { }: mkDerivation { pname = "gtk3-mac-integration"; - version = "0.3.3.0"; - sha256 = "c55a0c38dca1904bef528568d914a76f349ba87279b4a8ed3997bb9ac6b0a2e3"; + version = "0.3.3.1"; + sha256 = "a5ba824ffc75f48c35e779f045cae753a0cdee9f78d69bbd9b9c5260d54ee0fc"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base containers glib gtk3 mtl ]; libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ]; @@ -74767,16 +76218,16 @@ self: { }) {gtk-mac-integration-gtk3 = null;}; "gtkglext" = callPackage - ({ mkDerivation, base, glib, gtk, gtk2hs-buildtools, gtkglext - , pango + ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools + , gtkglext, pango }: mkDerivation { pname = "gtkglext"; - version = "0.12.5.0"; - sha256 = "13424d5f80e0ba22f2caf233f5a68a07635f6f77c4f48e6fe3fab28216a30af6"; + version = "0.13.1.1"; + sha256 = "70f0b6e42dd8635d5c4d852e497b0bd34683a363e7c016bfc8e5d11e84036497"; + setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base glib gtk pango ]; libraryPkgconfigDepends = [ gtkglext ]; - libraryToolDepends = [ gtk2hs-buildtools ]; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GTK+ OpenGL Extension"; license = stdenv.lib.licenses.lgpl21; @@ -74827,8 +76278,8 @@ self: { }: mkDerivation { pname = "gtksourceview2"; - version = "0.13.3.0"; - sha256 = "20747e2bff7b9e49bc4952a4ba706c72c02edafdb7eb86e00038dd438b5937cc"; + version = "0.13.3.1"; + sha256 = "a1c5ebc07faa5b2809d424b3ded5e9cfa0a5338b51c7989e2a0271d016c5fe53"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base containers glib gtk mtl text @@ -74845,8 +76296,8 @@ self: { }: mkDerivation { pname = "gtksourceview3"; - version = "0.13.3.0"; - sha256 = "c260f3d49e3ee2e3da2e9884f948e904b7e376bb885d0ce7da346bcab58042f2"; + version = "0.13.3.1"; + sha256 = "9a7e12fda53d532668ee7f830c0aacf43c8a0c9a65f571fa81088a7372383b7b"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base containers glib gtk3 mtl text @@ -75205,6 +76656,7 @@ self: { homepage = "http://floss.scru.org/hOpenPGP/"; description = "native Haskell implementation of OpenPGP (RFC4880)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hPDB" = callPackage @@ -75367,8 +76819,8 @@ self: { ({ mkDerivation, base, containers, hmatrix, random }: mkDerivation { pname = "hTensor"; - version = "0.9.0"; - sha256 = "0abf643e33f0cc10c652d871390e8c5b07f6e549dd0f1bb44f159d61596c0c6a"; + version = "0.9.1"; + sha256 = "b342d7c115af9b33a18b22b439ffc86d9141027a5ce657f6f95ee3bdf8fff523"; libraryHaskellDepends = [ base containers hmatrix random ]; homepage = "http://perception.inf.um.es/tensor"; description = "Multidimensional arrays and simple tensor computations"; @@ -76881,8 +78333,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.9.0.0"; - sha256 = "6c21697efaf30166a1afc508f1122e2b828ade9d8d4d53408b13c1216337295e"; + version = "4.9.1.0"; + sha256 = "47f5b2eb038be6cf8a2fbb0eb3fa012b687ed06104b59169c39bf4662c87bf84"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77117,8 +78569,8 @@ self: { }: mkDerivation { pname = "hakyll-sass"; - version = "0.2.1"; - sha256 = "859f91a9fe1d0f4a0bc75c1cd49bf2246aca8d45381f9405068d8588d6533039"; + version = "0.2.2"; + sha256 = "14e3076b7921f37ecd0edf736be931536705461b66755387ec7813aa5e3e8302"; libraryHaskellDepends = [ aeson-pretty base data-default-class filepath hakyll hsass ]; @@ -77128,6 +78580,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hakyll-series" = callPackage + ({ mkDerivation, base, containers, hakyll }: + mkDerivation { + pname = "hakyll-series"; + version = "0.1.0.1"; + sha256 = "5dc50cd068aa082a2b5bf7d0beb6114ff1b0d7cd817b5ce0ef439798dda706b1"; + libraryHaskellDepends = [ base containers hakyll ]; + homepage = "https://github.com/oisdk/hakyll-series"; + description = "Adds series functionality to hakyll"; + license = stdenv.lib.licenses.mit; + }) {}; + "hakyll-shakespeare" = callPackage ({ mkDerivation, base, blaze-html, containers, hakyll, shakespeare , text @@ -79208,8 +80672,8 @@ self: { }: mkDerivation { pname = "haskdogs"; - version = "0.4.4"; - sha256 = "7bd450caafb4220aa6e0e86bd4a03815d8a903204f2bb79fb89a60e3a6902d5c"; + version = "0.4.5"; + sha256 = "910043c589d093935d99d060f110482b13c76496d215de4d49a276237d8331cc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -79631,8 +81095,8 @@ self: { }: mkDerivation { pname = "haskell-igraph"; - version = "0.1.0"; - sha256 = "fc335506a48d1479ed59eeaf5c073e682c380c61360293188d84d5c0a232e21f"; + version = "0.2.2"; + sha256 = "33673e6369f2b83c9103367af9b4050c3a6ed71ebbb3033a601a1e4c65f57a7d"; libraryHaskellDepends = [ base binary bytestring bytestring-lexing colour data-default-class hashable hxt primitive split unordered-containers @@ -80142,6 +81606,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-src-exts_1_19_0" = callPackage + ({ mkDerivation, array, base, containers, cpphs, directory + , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck + , tasty, tasty-golden, tasty-smallcheck + }: + mkDerivation { + pname = "haskell-src-exts"; + version = "1.19.0"; + sha256 = "da2b747a26e5b8ba9d41f5b6e1d821ed184f0f002c120f88af1f3e9e51e6ac47"; + libraryHaskellDepends = [ array base cpphs ghc-prim pretty ]; + libraryToolDepends = [ happy ]; + testHaskellDepends = [ + base containers directory filepath mtl pretty-show smallcheck tasty + tasty-golden tasty-smallcheck + ]; + doCheck = false; + homepage = "https://github.com/haskell-suite/haskell-src-exts"; + description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-src-exts-prisms" = callPackage ({ mkDerivation, base, haskell-src-exts, lens, template-haskell }: mkDerivation { @@ -80265,8 +81751,8 @@ self: { }: mkDerivation { pname = "haskell-tools-ast"; - version = "0.2.0.0"; - sha256 = "146c5b9501b6ee3d48085531afdca768f25448771ab1f35565dd336b22e3421b"; + version = "0.3.0.1"; + sha256 = "5eab56307a8f415114da1c891e1753ccfe7febe8fe04c0280a8eb5b4e20c8728"; libraryHaskellDepends = [ base ghc mtl references template-haskell uniplate ]; @@ -80330,63 +81816,83 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-backend-ghc" = callPackage + ({ mkDerivation, base, bytestring, containers, ghc + , haskell-tools-ast, mtl, references, safe, split, template-haskell + , transformers, uniplate + }: + mkDerivation { + pname = "haskell-tools-backend-ghc"; + version = "0.3.0.1"; + sha256 = "a63cd589f21a534bd0e68f27307a791f2257ab6e8eca7c76832a26e2b17868a3"; + libraryHaskellDepends = [ + base bytestring containers ghc haskell-tools-ast mtl references + safe split template-haskell transformers uniplate + ]; + homepage = "https://github.com/nboldi/haskell-tools"; + description = "Creating the Haskell-Tools AST from GHC's representations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-tools-cli" = callPackage - ({ mkDerivation, base, containers, directory, ghc, ghc-paths - , haskell-tools-ast, haskell-tools-prettyprint - , haskell-tools-refactor, mtl, references, split + ({ mkDerivation, base, containers, directory, filepath, ghc + , ghc-paths, haskell-tools-ast, haskell-tools-prettyprint + , haskell-tools-refactor, HUnit, mtl, references, split }: mkDerivation { pname = "haskell-tools-cli"; - version = "0.2.0.0"; - sha256 = "fb59c74aae296cf598e7dd19634aa57037966e4a3cace373ed6abd449229f44d"; - isLibrary = false; + version = "0.3.0.1"; + sha256 = "0e60a276383fff8b9cceda6fe82d45001156db5d3888b1914b16b04280f697b2"; + isLibrary = true; isExecutable = true; - executableHaskellDepends = [ + libraryHaskellDepends = [ base containers directory ghc ghc-paths haskell-tools-ast haskell-tools-prettyprint haskell-tools-refactor mtl references split ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base directory filepath HUnit ]; homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Command-line frontend for Haskell-tools Refact"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-demo" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, ghc, ghc-paths, haskell-tools-ast - , haskell-tools-ast-fromghc, haskell-tools-ast-trf - , haskell-tools-prettyprint, haskell-tools-refactor, http-types - , mtl, references, transformers, wai, wai-websockets, warp - , websockets + , haskell-tools-backend-ghc, haskell-tools-prettyprint + , haskell-tools-refactor, http-types, mtl, references, transformers + , wai, wai-websockets, warp, websockets }: mkDerivation { pname = "haskell-tools-demo"; - version = "0.2.0.0"; - sha256 = "2c70c5dc92fd4ce296a6035a7a4d2471cbc372a4dcf5735590082cbd9e926dd4"; + version = "0.3.0.1"; + sha256 = "9c85cd53b3cb18a1f6355b1d7f9c9f702ad82cead9f6b2e2d20d4ff1de5ca744"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base bytestring containers directory filepath ghc ghc-paths - haskell-tools-ast haskell-tools-ast-fromghc haskell-tools-ast-trf + haskell-tools-ast haskell-tools-backend-ghc haskell-tools-prettyprint haskell-tools-refactor http-types mtl references transformers wai wai-websockets warp websockets ]; homepage = "https://github.com/haskell-tools/haskell-tools"; description = "A web-based demo for Haskell-tools Refactor"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tools-prettyprint" = callPackage - ({ mkDerivation, base, containers, ghc, haskell-tools-ast - , haskell-tools-ast-trf, mtl, references, split + ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl + , references, split, uniplate }: mkDerivation { pname = "haskell-tools-prettyprint"; - version = "0.2.0.0"; - sha256 = "ae846bb46ae3c42de8393eb1341b66d654f3a672f3ec7fc0bac3c24d0dbdd76e"; + version = "0.3.0.1"; + sha256 = "13356a19d14a0d0c6a95b0ec56600fd4166dcee23ddef80fe0913b5d734ade5c"; libraryHaskellDepends = [ - base containers ghc haskell-tools-ast haskell-tools-ast-trf mtl - references split + base containers ghc haskell-tools-ast mtl references split uniplate ]; homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Pretty printing of Haskell-Tools AST"; @@ -80397,26 +81903,26 @@ self: { "haskell-tools-refactor" = callPackage ({ mkDerivation, base, Cabal, containers, directory, either , filepath, ghc, ghc-paths, haskell-tools-ast - , haskell-tools-ast-fromghc, haskell-tools-ast-gen - , haskell-tools-ast-trf, haskell-tools-prettyprint, HUnit, mtl - , polyparse, references, split, template-haskell, time - , transformers, uniplate + , haskell-tools-backend-ghc, haskell-tools-prettyprint + , haskell-tools-rewrite, HUnit, mtl, old-time, polyparse + , references, split, template-haskell, time, transformers, uniplate }: mkDerivation { pname = "haskell-tools-refactor"; - version = "0.2.0.0"; - sha256 = "1572b88c516512d5d5cb2c94f25ef90cc17dac8db121f374551f4eabc9979723"; + version = "0.3.0.1"; + sha256 = "0fc7d41b05d130f57681f90a571ad9e112186a3fe5395c6ecc4575814aa8b2f5"; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths - haskell-tools-ast haskell-tools-ast-fromghc haskell-tools-ast-gen - haskell-tools-ast-trf haskell-tools-prettyprint mtl references + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-rewrite mtl references split template-haskell transformers uniplate ]; testHaskellDepends = [ base Cabal containers directory either filepath ghc ghc-paths - haskell-tools-ast haskell-tools-ast-fromghc haskell-tools-ast-gen - haskell-tools-ast-trf haskell-tools-prettyprint HUnit mtl polyparse - references split template-haskell time transformers uniplate + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-rewrite HUnit mtl old-time + polyparse references split template-haskell time transformers + uniplate ]; homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Refactoring Tool for Haskell"; @@ -80424,6 +81930,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-rewrite" = callPackage + ({ mkDerivation, base, containers, ghc, haskell-tools-ast + , haskell-tools-prettyprint, mtl, references + }: + mkDerivation { + pname = "haskell-tools-rewrite"; + version = "0.3.0.1"; + sha256 = "190e3aaa5a2a77e4106dd7ae243605b5036b82848197d0ab747c91b89a6b3aa6"; + libraryHaskellDepends = [ + base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl + references + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Facilities for generating new parts of the Haskell-Tools AST"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-tor" = callPackage ({ mkDerivation, array, asn1-encoding, asn1-types, async , attoparsec, base, base64-bytestring, binary, bytestring, cereal @@ -82004,8 +83527,8 @@ self: { }: mkDerivation { pname = "hasty-hamiltonian"; - version = "1.1.3"; - sha256 = "15fe3075dc4cf9a5ea9875cb15da469ee414223696c0e9eb3163a44d23c38463"; + version = "1.1.4"; + sha256 = "595b3cde3461f81df391c9d5335695fbf64a80187fb52036b75b495da74a92ed"; libraryHaskellDepends = [ base lens mcmc-types mwc-probability pipes primitive transformers ]; @@ -84329,6 +85852,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Hexpat/"; description = "XML parser/formatter based on expat"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hexpat-iteratee" = callPackage @@ -84382,6 +85906,7 @@ self: { homepage = "http://code.haskell.org/hexpat-pickle/"; description = "XML picklers based on hexpat, source-code-similar to those of the HXT package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hexpat-pickle-generic" = callPackage @@ -84411,6 +85936,7 @@ self: { libraryHaskellDepends = [ base hexpat tagsoup ]; description = "Parse (possibly malformed) HTML to hexpat tree"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hexpr" = callPackage @@ -86355,44 +87881,6 @@ self: { }) {}; "hledger" = callPackage - ({ mkDerivation, base, base-compat, cmdargs, containers, csv - , directory, filepath, haskeline, hledger-lib, HUnit, mtl - , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa - , safe, shakespeare, split, tabular, terminfo, test-framework - , test-framework-hunit, text, time, unordered-containers - , utf8-string, wizards - }: - mkDerivation { - pname = "hledger"; - version = "0.27.1"; - sha256 = "f85b8d7ea7a2c7ef1ba1fa4645df951a7bf2f83e4117fdc34d9dacfa7d17376e"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat cmdargs containers csv directory filepath - haskeline hledger-lib HUnit mtl mtl-compat old-time parsec - pretty-show process regex-tdfa safe shakespeare split tabular - terminfo text time unordered-containers utf8-string wizards - ]; - executableHaskellDepends = [ - base base-compat cmdargs containers csv directory filepath - haskeline hledger-lib HUnit mtl mtl-compat old-time parsec - pretty-show process regex-tdfa safe shakespeare split tabular - terminfo text time unordered-containers utf8-string wizards - ]; - testHaskellDepends = [ - base base-compat cmdargs containers csv directory filepath - haskeline hledger-lib HUnit mtl mtl-compat old-time parsec - pretty-show process regex-tdfa safe shakespeare split tabular - terminfo test-framework test-framework-hunit text time - unordered-containers utf8-string wizards - ]; - homepage = "http://hledger.org"; - description = "Command-line interface for the hledger accounting tool"; - license = "GPL"; - }) {}; - - "hledger_1_0_1" = callPackage ({ mkDerivation, base, base-compat, bytestring, cmdargs, containers , csv, data-default, directory, file-embed, filepath, hashable , haskeline, hledger-lib, HUnit, megaparsec, mtl, mtl-compat @@ -86432,7 +87920,6 @@ self: { homepage = "http://hledger.org"; description = "Command-line interface for the hledger accounting tool"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-api" = callPackage @@ -86474,7 +87961,6 @@ self: { homepage = "http://hledger.org"; description = "A pie chart image generator for the hledger accounting tool"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-diff" = callPackage @@ -86493,23 +87979,6 @@ self: { }) {}; "hledger-interest" = callPackage - ({ mkDerivation, base, Cabal, Decimal, hledger-lib, mtl, time }: - mkDerivation { - pname = "hledger-interest"; - version = "1.4.4"; - sha256 = "d6ad4a75d810d64c9f70a19ff2b51fe37d79313c4bb1b78d95e5ddcc5998769a"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base Cabal Decimal hledger-lib mtl time - ]; - homepage = "http://github.com/peti/hledger-interest"; - description = "computes interest for a given account"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {}; - - "hledger-interest_1_5" = callPackage ({ mkDerivation, base, Cabal, Decimal, hledger-lib, mtl, text, time }: mkDerivation { @@ -86524,7 +87993,6 @@ self: { homepage = "http://github.com/peti/hledger-interest"; description = "computes interest for a given account"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -86546,34 +88014,6 @@ self: { }) {}; "hledger-lib" = callPackage - ({ mkDerivation, array, base, base-compat, blaze-markup, bytestring - , cmdargs, containers, csv, Decimal, deepseq, directory, filepath - , HUnit, mtl, mtl-compat, old-time, parsec, pretty-show, regex-tdfa - , safe, split, test-framework, test-framework-hunit, time - , transformers, uglymemo, utf8-string - }: - mkDerivation { - pname = "hledger-lib"; - version = "0.27.1"; - sha256 = "de9780b2d5a88d1f9518bb02bfda27cc55352f5f0b7f43770906a43e0601465f"; - libraryHaskellDepends = [ - array base base-compat blaze-markup bytestring cmdargs containers - csv Decimal deepseq directory filepath HUnit mtl mtl-compat - old-time parsec pretty-show regex-tdfa safe split time transformers - uglymemo utf8-string - ]; - testHaskellDepends = [ - array base base-compat blaze-markup bytestring cmdargs containers - csv Decimal deepseq directory filepath HUnit mtl mtl-compat - old-time parsec pretty-show regex-tdfa safe split test-framework - test-framework-hunit time transformers uglymemo utf8-string - ]; - homepage = "http://hledger.org"; - description = "Core data types, parsers and functionality for the hledger accounting tools"; - license = "GPL"; - }) {}; - - "hledger-lib_1_0_1" = callPackage ({ mkDerivation, array, base, base-compat, blaze-markup, bytestring , cmdargs, containers, csv, data-default, Decimal, deepseq , directory, doctest, filepath, Glob, HUnit, megaparsec, mtl @@ -86601,7 +88041,6 @@ self: { homepage = "http://hledger.org"; description = "Core data types, parsers and functionality for the hledger accounting tools"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-ui" = callPackage @@ -86612,8 +88051,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.0.2"; - sha256 = "0a1ec9ecb14bfe6726cc7d27a8adf1f4ea198362423a024402975f79f30e2b2c"; + version = "1.0.4"; + sha256 = "f45d4afe158924f59691885bb87e52816fe80525252400d2840761a2e0d4e64d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -86625,7 +88064,6 @@ self: { homepage = "http://hledger.org"; description = "Curses-style user interface for the hledger accounting tool"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-vty" = callPackage @@ -86644,7 +88082,6 @@ self: { homepage = "http://hledger.org"; description = "A curses-style console interface for the hledger accounting tool"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-web" = callPackage @@ -86689,7 +88126,6 @@ self: { homepage = "http://hledger.org"; description = "Web interface for the hledger accounting tool"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hlibBladeRF" = callPackage @@ -86933,6 +88369,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) openblasCompat;}; + "hmatrix_0_18_0_0" = callPackage + ({ mkDerivation, array, base, binary, bytestring, deepseq + , openblasCompat, random, split, storable-complex, vector + }: + mkDerivation { + pname = "hmatrix"; + version = "0.18.0.0"; + sha256 = "35766dfb4af7227a881ef1c8b740a9b5c09253f21e23ae295a5341511a913cfe"; + configureFlags = [ "-fopenblas" ]; + libraryHaskellDepends = [ + array base binary bytestring deepseq random split storable-complex + vector + ]; + librarySystemDepends = [ openblasCompat ]; + preConfigure = "sed -i hmatrix.cabal -e 's@/usr/@/dont/hardcode/paths/@'"; + homepage = "https://github.com/albertoruiz/hmatrix"; + description = "Numeric Linear Algebra"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) openblasCompat;}; + "hmatrix-banded" = callPackage ({ mkDerivation, base, hmatrix, liblapack, transformers }: mkDerivation { @@ -86963,8 +88420,8 @@ self: { ({ mkDerivation, base, containers, glpk, hmatrix }: mkDerivation { pname = "hmatrix-glpk"; - version = "0.5.0.0"; - sha256 = "ca90e4f1b8e95547ad70bf16c4334504ec2d5d446dad8b0fd0d4929e4ccbc551"; + version = "0.6.0.0"; + sha256 = "c1ca26cf362f5255dc9d399615c683f1fd7de9154f3202468edf6c9c4184af74"; libraryHaskellDepends = [ base containers hmatrix ]; librarySystemDepends = [ glpk ]; homepage = "https://github.com/albertoruiz/hmatrix"; @@ -86988,14 +88445,31 @@ self: { license = "GPL"; }) {inherit (pkgs) gsl;}; + "hmatrix-gsl_0_18_0_1" = callPackage + ({ mkDerivation, array, base, gsl, hmatrix, process, random, vector + }: + mkDerivation { + pname = "hmatrix-gsl"; + version = "0.18.0.1"; + sha256 = "fda5c3b067bb2e47fac80995c0722bdbdf9f9320ea8a04fc2eca30f3fea9d455"; + libraryHaskellDepends = [ + array base hmatrix process random vector + ]; + libraryPkgconfigDepends = [ gsl ]; + homepage = "https://github.com/albertoruiz/hmatrix"; + description = "Numerical computation"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gsl;}; + "hmatrix-gsl-stats" = callPackage ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex , vector }: mkDerivation { pname = "hmatrix-gsl-stats"; - version = "0.4.1.3"; - sha256 = "d4852352ed9b5ee4b8e7f519d512047e5976804563151c3bd092589248fc7738"; + version = "0.4.1.4"; + sha256 = "98fe0e49be78a1ff7e5ca44ab086d57bafcf97b86bc249d940501a28dacffafa"; libraryHaskellDepends = [ base binary hmatrix storable-complex vector ]; @@ -87061,8 +88535,8 @@ self: { ({ mkDerivation, base, hmatrix, hmatrix-gsl }: mkDerivation { pname = "hmatrix-special"; - version = "0.4.0.0"; - sha256 = "1fba0cc75e22df1655ac5771180b26f8ce706783363c825aa6fac8cff5f02933"; + version = "0.4.0.1"; + sha256 = "72a9c9c559da6b6314e6042ddfd53d638fdf1b819978a630fc339e0859c3ec4e"; libraryHaskellDepends = [ base hmatrix hmatrix-gsl ]; homepage = "https://github.com/albertoruiz/hmatrix"; description = "Interface to GSL special functions"; @@ -87118,15 +88592,15 @@ self: { }) {}; "hmatrix-tests" = callPackage - ({ mkDerivation, base, deepseq, hmatrix, hmatrix-gsl, HUnit + ({ mkDerivation, base, binary, deepseq, hmatrix, hmatrix-gsl, HUnit , QuickCheck, random }: mkDerivation { pname = "hmatrix-tests"; - version = "0.5.0.0"; - sha256 = "a47819899e6eb7844ad6b863dece79d347cf897cb313f59ee62bbeb608661634"; + version = "0.6.0.0"; + sha256 = "30a61b749705b0291ffe03514545ecf24989554f6a4632b5a73f72daade1c4d7"; libraryHaskellDepends = [ - base deepseq hmatrix hmatrix-gsl HUnit QuickCheck random + base binary deepseq hmatrix hmatrix-gsl HUnit QuickCheck random ]; testHaskellDepends = [ base HUnit QuickCheck random ]; homepage = "https://github.com/albertoruiz/hmatrix"; @@ -88208,74 +89682,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hoogle_4_2_43" = callPackage - ({ mkDerivation, aeson, array, base, binary, blaze-builder - , bytestring, Cabal, case-insensitive, cmdargs, conduit, containers - , deepseq, directory, filepath, haskell-src-exts, http-types - , old-locale, parsec, process, QuickCheck, random, resourcet, safe - , shake, tagsoup, temporary, text, time, transformers, uniplate - , unix, vector, vector-algorithms, wai, warp - }: - mkDerivation { - pname = "hoogle"; - version = "4.2.43"; - sha256 = "eb30df565d363cd5d98821c51b0daf93493dec3bfe95c016922c95a20efa7c17"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary blaze-builder bytestring case-insensitive conduit - containers deepseq directory filepath haskell-src-exts http-types - parsec process QuickCheck random resourcet safe text transformers - uniplate unix vector vector-algorithms wai - ]; - executableHaskellDepends = [ - aeson array base binary blaze-builder bytestring Cabal - case-insensitive cmdargs conduit containers deepseq directory - filepath haskell-src-exts http-types old-locale parsec process - QuickCheck random resourcet safe shake tagsoup text time - transformers uniplate unix vector vector-algorithms wai warp - ]; - testHaskellDepends = [ base directory filepath process temporary ]; - testTarget = "--test-option=--no-net"; - homepage = "http://www.haskell.org/hoogle/"; - description = "Haskell API Search"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hoogle" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit - , conduit-extra, connection, containers, deepseq, directory, extra - , filepath, haskell-src-exts, http-conduit, http-types, js-flot - , js-jquery, mmap, network, network-uri, network-uri-flag - , old-locale, process, QuickCheck, resourcet, tar, template-haskell - , text, time, transformers, uniplate, utf8-string, vector, wai - , wai-logger, warp, warp-tls, zlib - }: - mkDerivation { - pname = "hoogle"; - version = "5.0.1"; - sha256 = "7aea6d779e14574f78f4506949f96a020ac1f8273b84f418094197366cc3112e"; - revision = "1"; - editedCabalFile = "f4c60280f4b1981d841303c3ee7902cc5c35779eef469f521aa6e590450f5b21"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base binary bytestring cmdargs conduit conduit-extra - connection containers deepseq directory extra filepath - haskell-src-exts http-conduit http-types js-flot js-jquery mmap - network network-uri network-uri-flag old-locale process QuickCheck - resourcet tar template-haskell text time transformers uniplate - utf8-string vector wai wai-logger warp warp-tls zlib - ]; - executableHaskellDepends = [ base ]; - testTarget = "--test-option=--no-net"; - homepage = "http://hoogle.haskell.org/"; - description = "Haskell API Search"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hoogle_5_0_4" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit , conduit-extra, connection, containers, deepseq, directory, extra , filepath, haskell-src-exts, http-conduit, http-types, js-flot @@ -88303,7 +89710,6 @@ self: { homepage = "http://hoogle.haskell.org/"; description = "Haskell API Search"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hoogle-index" = callPackage @@ -88470,6 +89876,7 @@ self: { homepage = "http://floss.scru.org/hopenpgp-tools"; description = "hOpenPGP-based command-line tools"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hopenssl" = callPackage @@ -89293,37 +90700,6 @@ self: { }) {}; "hpio" = callPackage - ({ mkDerivation, async, base, base-compat, bytestring, containers - , directory, doctest, exceptions, filepath, hlint, hspec, mtl - , mtl-compat, optparse-applicative, QuickCheck, text, transformers - , transformers-compat, unix, unix-bytestring - }: - mkDerivation { - pname = "hpio"; - version = "0.8.0.3"; - sha256 = "699fc04179a479e2b1560122166c6687cd7214d2fa7376c14210465625657974"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat bytestring containers directory exceptions - filepath mtl mtl-compat QuickCheck text transformers - transformers-compat unix unix-bytestring - ]; - executableHaskellDepends = [ - async base base-compat exceptions mtl mtl-compat - optparse-applicative transformers transformers-compat - ]; - testHaskellDepends = [ - async base base-compat bytestring containers directory doctest - exceptions filepath hlint hspec mtl mtl-compat QuickCheck text - transformers transformers-compat unix unix-bytestring - ]; - homepage = "https://github.com/dhess/hpio"; - description = "Monads for GPIO in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hpio_0_8_0_4" = callPackage ({ mkDerivation, async, base, base-compat, bytestring, containers , directory, doctest, exceptions, filepath, hlint, hspec, mtl , mtl-compat, optparse-applicative, QuickCheck, text, transformers @@ -89352,7 +90728,6 @@ self: { homepage = "https://github.com/dhess/hpio"; description = "Monads for GPIO in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hplayground" = callPackage @@ -92002,16 +93377,17 @@ self: { }: mkDerivation { pname = "hspec"; - version = "2.2.3"; - sha256 = "511e994ee86d85c610bf20a3eb8309e79816e984dc46f4d0f95bd7dc676f6210"; + version = "2.2.4"; + sha256 = "724b0af9c871711f10a414d335a2ed0caabb94efb8576f94b43386b7f103c9b1"; revision = "1"; - editedCabalFile = "8e446bc3a3332ce9d5dc255a32682b735c8352b187e71f228f529e2fa79e6473"; + editedCabalFile = "eb22cb737adc3312b21699b6ac4137489590ada1ee9ee9ae21aae3c342b3880f"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations HUnit QuickCheck transformers ]; testHaskellDepends = [ - base directory hspec-core hspec-meta stringbuilder + base directory hspec-core hspec-discover hspec-expectations + hspec-meta HUnit QuickCheck stringbuilder transformers ]; homepage = "http://hspec.github.io/"; description = "A Testing Framework for Haskell"; @@ -92094,10 +93470,10 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.2.3"; - sha256 = "01fa6959921ae0ed3de5e3f612451fe788800f9670c7f425a241f5f0dec99652"; + version = "2.2.4"; + sha256 = "328ac2525b9eb0fe4807d5ae10fe2d846220f9a8b5ac6b5d316e1bea9e2d0475"; revision = "1"; - editedCabalFile = "9ff10012fa0457540d12846b875dd747a73a65aa8ba08876c473f42b7ac27c07"; + editedCabalFile = "9a0c9fc612eb71ee55ebcaacbce010b87ffef8a535ed6ee1f50d8bd952dc86c3"; libraryHaskellDepends = [ ansi-terminal async base deepseq hspec-expectations HUnit QuickCheck quickcheck-io random setenv tf-random time transformers @@ -92142,8 +93518,8 @@ self: { ({ mkDerivation, base, directory, filepath, hspec-meta }: mkDerivation { pname = "hspec-discover"; - version = "2.2.3"; - sha256 = "dc6053d7ad628a133fab01f11ad6d7dfecd23873e2bbe9419d30ee0318b5a92f"; + version = "2.2.4"; + sha256 = "bb8ddb3c53d4c0cc3829c60d9b848aa19d843b19f22ef26355a12fb0d1e2e7af"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -92215,15 +93591,12 @@ self: { }) {}; "hspec-expectations-lifted" = callPackage - ({ mkDerivation, base, hspec, hspec-expectations, transformers }: + ({ mkDerivation, base, hspec-expectations, transformers }: mkDerivation { pname = "hspec-expectations-lifted"; - version = "0.5.0"; - sha256 = "0b5511f1e4728f3b7b0eba53812319959009ab1277d14eede50f73d9f9eb6e30"; - revision = "1"; - editedCabalFile = "43e88e0e7587ba1965ba3f2416500c239ad44ba19043bb249c6f307665e85208"; + version = "0.8.2"; + sha256 = "2b629013b07f69b2dbbe1462f067f097a9f28beae2eb222b1255ff45327cecef"; libraryHaskellDepends = [ base hspec-expectations transformers ]; - testHaskellDepends = [ base hspec ]; description = "A version of hspec-expectations generalized to MonadIO"; license = stdenv.lib.licenses.mit; }) {}; @@ -93291,6 +94664,7 @@ self: { homepage = "http://hstox.github.io"; description = "A Tox protocol implementation in Haskell"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hstradeking" = callPackage @@ -93883,6 +95257,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "htoml_1_0_0_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, file-embed + , old-locale, parsec, tasty, tasty-hspec, tasty-hunit, text, time + , unordered-containers, vector + }: + mkDerivation { + pname = "htoml"; + version = "1.0.0.3"; + sha256 = "08f8d88a326f80fb55c0abb9431941c3a2a30f2d58f49c94349961ceeb4c856f"; + libraryHaskellDepends = [ + aeson base containers old-locale parsec text time + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers file-embed parsec tasty + tasty-hspec tasty-hunit text time unordered-containers vector + ]; + homepage = "https://github.com/cies/htoml"; + description = "Parser for TOML files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "htrace" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -94072,7 +95469,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-client_0_5_3_3" = callPackage + "http-client_0_5_3_4" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , deepseq, directory, exceptions, filepath, ghc-prim, hspec @@ -94081,8 +95478,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.5.3.3"; - sha256 = "8faeb55e45f578c9aa7a17dab5a6cb4aa858fb8d64a18c18497c3af4569164ce"; + version = "0.5.3.4"; + sha256 = "34e9fee9939668a056dc0f8193cfd1906209a51a31853e7ee57f5a7548dd2689"; libraryHaskellDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath @@ -94742,33 +96139,6 @@ self: { }) {}; "http-reverse-proxy" = callPackage - ({ mkDerivation, async, base, blaze-builder, bytestring - , case-insensitive, conduit, conduit-extra, containers - , data-default-class, hspec, http-client, http-conduit, http-types - , lifted-base, monad-control, network, resourcet, streaming-commons - , text, transformers, wai, wai-logger, warp, word8 - }: - mkDerivation { - pname = "http-reverse-proxy"; - version = "0.4.3.1"; - sha256 = "579285aa58836631f8393f733b524a8c74591ed0318632bed97d4eaa090783eb"; - libraryHaskellDepends = [ - async base blaze-builder bytestring case-insensitive conduit - conduit-extra containers data-default-class http-client http-types - lifted-base monad-control network resourcet streaming-commons text - transformers wai wai-logger word8 - ]; - testHaskellDepends = [ - base blaze-builder bytestring conduit conduit-extra hspec - http-conduit http-types lifted-base network resourcet - streaming-commons transformers wai warp - ]; - homepage = "https://github.com/fpco/http-reverse-proxy"; - description = "Reverse proxy HTTP requests, either over raw sockets or with WAI"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http-reverse-proxy_0_4_3_2" = callPackage ({ mkDerivation, async, base, blaze-builder, bytestring , case-insensitive, conduit, conduit-extra, containers , data-default-class, hspec, http-client, http-conduit, http-types @@ -94793,7 +96163,6 @@ self: { homepage = "https://github.com/fpco/http-reverse-proxy"; description = "Reverse proxy HTTP requests, either over raw sockets or with WAI"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-server" = callPackage @@ -95069,6 +96438,7 @@ self: { homepage = "http://justhub.org"; description = "For multiplexing GHC installations and providing development sandboxes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hubigraph" = callPackage @@ -95567,6 +96937,7 @@ self: { homepage = "http://github.com/haskell-works/hw-balancedparens#readme"; description = "Balanced parentheses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-bits" = callPackage @@ -95657,22 +97028,6 @@ self: { }) {}; "hw-diagnostics" = callPackage - ({ mkDerivation, base, hspec, QuickCheck }: - mkDerivation { - pname = "hw-diagnostics"; - version = "0.0.0.4"; - sha256 = "63c07c2c6b5e8d6bda8b50070594b0f31549ed7758384c122ae74016ca984c17"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "http://github.com/haskell-works/hw-diagnostics#readme"; - description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hw-diagnostics_0_0_0_5" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "hw-diagnostics"; @@ -95682,7 +97037,6 @@ self: { homepage = "http://github.com/haskell-works/hw-diagnostics#readme"; description = "Diagnostics library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-eliasfano" = callPackage @@ -95702,6 +97056,7 @@ self: { homepage = "http://github.com/haskell-works/hw-eliasfano#readme"; description = "Elias-Fano"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-excess" = callPackage @@ -95721,6 +97076,7 @@ self: { homepage = "http://github.com/haskell-works/hw-excess#readme"; description = "Excess"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-int" = callPackage @@ -95800,6 +97156,7 @@ self: { homepage = "http://github.com/haskell-works/hw-json-lens#readme"; description = "Lens for hw-json"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-mquery" = callPackage @@ -95835,6 +97192,7 @@ self: { homepage = "http://github.com/haskell-works/hw-packed-vector#readme"; description = "Packed Vector"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-parser" = callPackage @@ -95944,6 +97302,7 @@ self: { homepage = "http://github.com/haskell-works/hw-rankselect-base#readme"; description = "Rank-select base"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-string-parse" = callPackage @@ -96047,6 +97406,7 @@ self: { homepage = "http://github.com/haskell-works/hw-xml#readme"; description = "Conduits for tokenizing streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hwall-auth-iitk" = callPackage @@ -96347,6 +97707,7 @@ self: { homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html"; description = "Expat parser for HXT"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hxt-extras" = callPackage @@ -96842,8 +98203,8 @@ self: { }: mkDerivation { pname = "hylide"; - version = "0.1.4.1"; - sha256 = "e0c98883073da1513757698c2c70cee419db20e351127e83c31e01239c66a94e"; + version = "0.1.5.1"; + sha256 = "160e2d915caa220b410f5e1ccbbaaa215c6cf1390a51ff2b1d27bccceb82df67"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hylogen vector-space ]; @@ -96851,8 +98212,8 @@ self: { aeson base bytestring filepath fsnotify hint http-types hylogen process text wai warp websockets ]; - homepage = "https://github.com/sleexyz/hylide"; - description = "WebGL renderer for livecoding shaders with Hylogen"; + homepage = "https://github.com/sleexyz/hylogen"; + description = "WebGL live-coding environment for writing shaders with Hylogen"; license = stdenv.lib.licenses.mit; }) {}; @@ -96860,11 +98221,11 @@ self: { ({ mkDerivation, base, data-reify, vector-space }: mkDerivation { pname = "hylogen"; - version = "0.1.4.1"; - sha256 = "dc78062033fd5f6c4c4f1faed5229fe79a249f063c50d826dbd3b5af5ebfc4d3"; + version = "0.1.5.1"; + sha256 = "3d07172627f22cfba684d15fcbf27079b5542a049734f67fbf1c7b5c8f5d4941"; libraryHaskellDepends = [ base data-reify vector-space ]; homepage = "https://github.com/sleexyz/hylogen"; - description = "Purely functional GLSL embedded in Haskell"; + description = "GLSL embedded in Haskell"; license = stdenv.lib.licenses.mit; }) {}; @@ -96881,6 +98242,7 @@ self: { ]; description = "Tools for hybrid logics related programs"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hylotab" = callPackage @@ -99528,6 +100890,8 @@ self: { pname = "instant-generics"; version = "0.6"; sha256 = "b15e0566c0b060341e11ddd6bae9550c9a73c1b75c0e9acd6dc9092f4ce7ef15"; + revision = "1"; + editedCabalFile = "1c1174f7546fceb789fcc40882eb731a21cb88165dac4e59129ff2ec1a11a2fc"; libraryHaskellDepends = [ base containers syb template-haskell ]; homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics"; description = "Generic programming library with a sum of products view"; @@ -99786,29 +101150,6 @@ self: { }) {}; "intero" = callPackage - ({ mkDerivation, array, base, bytestring, containers, directory - , filepath, ghc, ghc-boot-th, ghc-paths, ghci, haskeline, hspec - , process, regex-compat, syb, temporary, time, transformers, unix - }: - mkDerivation { - pname = "intero"; - version = "0.1.18"; - sha256 = "7e546a35df019149e38bf2a33cd977c2143e650b45a3c7835a42fd1c7099c570"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - array base bytestring containers directory filepath ghc ghc-boot-th - ghc-paths ghci haskeline process syb time transformers unix - ]; - testHaskellDepends = [ - base directory hspec process regex-compat temporary transformers - ]; - homepage = "https://github.com/commercialhaskell/intero"; - description = "Complete interactive development program for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "intero_0_1_19" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , filepath, ghc, ghc-boot-th, ghc-paths, ghci, haskeline, hspec , process, regex-compat, syb, temporary, time, transformers, unix @@ -99829,7 +101170,6 @@ self: { homepage = "https://github.com/commercialhaskell/intero"; description = "Complete interactive development program for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "interpol" = callPackage @@ -100394,13 +101734,13 @@ self: { }: mkDerivation { pname = "ip"; - version = "0.8.6"; - sha256 = "e8e53531f7165234845a58f2a6b893dbf0bbb75ac3f08870005f9c3fd67c4d6b"; + version = "0.8.7"; + sha256 = "f33f12745defa0ac5aa72f8bfd1b48d905c6ece9a228c9a2209b2943c2f2c690"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable primitive text vector ]; testHaskellDepends = [ - base bytestring doctest HUnit QuickCheck test-framework + attoparsec base bytestring doctest HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; homepage = "https://github.com/andrewthad/haskell-ip#readme"; @@ -100434,6 +101774,7 @@ self: { homepage = "http://www.ip2location.com"; description = "IP2Location Haskell package for IP geolocation"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ip6addr" = callPackage @@ -100645,25 +101986,6 @@ self: { }) {}; "irc-client" = callPackage - ({ mkDerivation, base, bytestring, conduit, connection, irc-conduit - , irc-ctcp, network-conduit-tls, old-locale, stm, stm-conduit, text - , time, tls, transformers, x509, x509-store, x509-validation - }: - mkDerivation { - pname = "irc-client"; - version = "0.4.4.0"; - sha256 = "b5299e0b5d47f32828b5bb0a23a872105f6c778b8a6c15cf4ce8a7691c69ab3a"; - libraryHaskellDepends = [ - base bytestring conduit connection irc-conduit irc-ctcp - network-conduit-tls old-locale stm stm-conduit text time tls - transformers x509 x509-store x509-validation - ]; - homepage = "https://github.com/barrucadu/irc-client"; - description = "An IRC client library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "irc-client_0_4_4_1" = callPackage ({ mkDerivation, base, bytestring, conduit, connection, irc-conduit , irc-ctcp, network-conduit-tls, old-locale, stm, stm-conduit, text , time, tls, transformers, x509, x509-store, x509-validation @@ -100680,7 +102002,6 @@ self: { homepage = "https://github.com/barrucadu/irc-client"; description = "An IRC client library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-colors" = callPackage @@ -100695,24 +102016,6 @@ self: { }) {}; "irc-conduit" = callPackage - ({ mkDerivation, async, base, bytestring, conduit, conduit-extra - , connection, irc, irc-ctcp, network-conduit-tls, text, time, tls - , transformers, x509-validation - }: - mkDerivation { - pname = "irc-conduit"; - version = "0.2.1.0"; - sha256 = "c363a8096e15459c379cfb73e025c1102b4c6e367716c1408216977401b6445c"; - libraryHaskellDepends = [ - async base bytestring conduit conduit-extra connection irc irc-ctcp - network-conduit-tls text time tls transformers x509-validation - ]; - homepage = "https://github.com/barrucadu/irc-conduit"; - description = "Streaming IRC message library using conduits"; - license = stdenv.lib.licenses.mit; - }) {}; - - "irc-conduit_0_2_1_1" = callPackage ({ mkDerivation, async, base, bytestring, conduit, conduit-extra , connection, irc, irc-ctcp, network-conduit-tls, text, time, tls , transformers, x509-validation @@ -100728,7 +102031,6 @@ self: { homepage = "https://github.com/barrucadu/irc-conduit"; description = "Streaming IRC message library using conduits"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-core" = callPackage @@ -101397,16 +102699,14 @@ self: { }: mkDerivation { pname = "ivory"; - version = "0.1.0.3"; - sha256 = "e842ec8c195c2f148c393d09471c96bcae09c1fd5260f102df6b26b591da91e6"; - revision = "1"; - editedCabalFile = "2149b10ef5f9149f362f51960ddd252205c4ee348869741e70d3a33892fe66be"; + version = "0.1.0.4"; + sha256 = "96a056e1f3d766223d93dcd3aaedd6619aa1806f31903c3f46e30a058705583f"; libraryHaskellDepends = [ array base base-compat containers dlist filepath monadLib pretty template-haskell text th-lift ]; libraryToolDepends = [ alex happy ]; - homepage = "http://smaccmpilot.org/languages/ivory-introduction.html"; + homepage = "http://ivorylang.org"; description = "Safe embedded C programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -101418,8 +102718,8 @@ self: { }: mkDerivation { pname = "ivory-artifact"; - version = "0.1.0.3"; - sha256 = "375a287288e9886bc9055c128e0d2d4cddab985baf8e52a82176c323b98f401e"; + version = "0.1.0.4"; + sha256 = "a2aa0b21fa58c5f87d5001f74fcbfda439a6dbfb56577214447c75f3b204ce8c"; libraryHaskellDepends = [ base directory filepath HStringTemplate text utf8-string ]; @@ -101436,14 +102736,14 @@ self: { }: mkDerivation { pname = "ivory-backend-c"; - version = "0.1.0.3"; - sha256 = "44e43e14e1951c4703c99bf116d6951eff575124d92f58dd7450f19ec14aa33e"; + version = "0.1.0.4"; + sha256 = "1515d217549af8189b83a5963ddfd6d202b58cdb9f98644a41988e7b67884caf"; libraryHaskellDepends = [ base base-compat bytestring containers directory filepath ivory ivory-artifact ivory-opts language-c-quote mainland-pretty monadLib process srcloc template-haskell ]; - homepage = "http://smaccmpilot.org/languages/ivory-introduction.html"; + homepage = "http://ivorylang.org"; description = "Ivory C backend"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -101475,15 +102775,15 @@ self: { }: mkDerivation { pname = "ivory-eval"; - version = "0.1.0.3"; - sha256 = "94acbed559f5567d291f95fb3ce70e9487cbf31bfc4721030017bbc5f078b958"; + version = "0.1.0.4"; + sha256 = "dd4f92558eea73265d680963bfad48112c782ed144726ee001f547216368e020"; libraryHaskellDepends = [ base base-compat containers ivory monadLib ]; testHaskellDepends = [ base base-compat containers ivory monadLib tasty tasty-hunit ]; - homepage = "http://smaccmpilot.org/languages/ivory-introduction.html"; + homepage = "http://ivorylang.org"; description = "Simple concrete evaluator for Ivory programs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -101496,31 +102796,29 @@ self: { }: mkDerivation { pname = "ivory-examples"; - version = "0.1.0.3.1"; - sha256 = "f73720e850410a0d3ab4acfc6fe478c2d475f9e2e12c6782ec9f8a1236690f82"; + version = "0.1.0.4"; + sha256 = "d61091b079166b06537feb0a719d7e4e09718732df3f1f264167af800f72900a"; + revision = "2"; + editedCabalFile = "7b0f9b186a1356c9210ecfe4ae198b1fa3056f1c78188126b83fbd39c09e253f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base base-compat ivory ivory-backend-c ivory-opts ivory-stdlib monadLib pretty QuickCheck template-haskell ]; - homepage = "http://smaccmpilot.org/languages/ivory-introduction.html"; + homepage = "http://ivorylang.org/"; description = "Ivory examples"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ivory-hw" = callPackage - ({ mkDerivation, base, filepath, ivory, ivory-artifact - , ivory-backend-c - }: + ({ mkDerivation, base, filepath, ivory, ivory-artifact }: mkDerivation { pname = "ivory-hw"; - version = "0.1.0.3"; - sha256 = "0dec96122661a8f281daf7e52f8e7dcc80481090518115a8c6e0859d919f64b2"; - libraryHaskellDepends = [ - base filepath ivory ivory-artifact ivory-backend-c - ]; + version = "0.1.0.4"; + sha256 = "d441e06d61ffaada4719d6b274d090308accba9e71f49bd3d31be608f26193dc"; + libraryHaskellDepends = [ base filepath ivory ivory-artifact ]; homepage = "http://ivorylang.org"; description = "Ivory hardware model (STM32F4)"; license = stdenv.lib.licenses.bsd3; @@ -101533,8 +102831,8 @@ self: { }: mkDerivation { pname = "ivory-opts"; - version = "0.1.0.3"; - sha256 = "caaf34f5b38ec88fe422cc367f28ab8b98b1a3b131dadaffcd8000b438562eb3"; + version = "0.1.0.4"; + sha256 = "14c1337cdd8f4a06ff6e99e050fb5d9bd98ec221c77de510368cb8aa4f7b7019"; libraryHaskellDepends = [ base base-compat containers data-reify dlist fgl filepath ivory monadLib pretty @@ -101552,8 +102850,8 @@ self: { }: mkDerivation { pname = "ivory-quickcheck"; - version = "0.2.0.3"; - sha256 = "ca005a77265d6140cabe7796062d145ae8be185123db1095c957aee76aec56f4"; + version = "0.2.0.4"; + sha256 = "c7c3e1dcf2c3bbf21612445155f1e869576e5dcd9099b7d4eea0694b327d63a5"; libraryHaskellDepends = [ base base-compat ivory ivory-backend-c ivory-eval monadLib QuickCheck random @@ -101574,8 +102872,8 @@ self: { }: mkDerivation { pname = "ivory-serialize"; - version = "0.1.0.3"; - sha256 = "bb07a4218c8e6d314ee5aa0bdf75891a9f9b7a106020f4bb439bfe26053610eb"; + version = "0.1.0.4"; + sha256 = "bf73dccdcac406b7adc8981e01d9b363df6411ce7e7bb70daf2f6065f17abc12"; libraryHaskellDepends = [ base base-compat filepath ivory ivory-artifact monadLib ]; @@ -101588,10 +102886,10 @@ self: { ({ mkDerivation, base, filepath, ivory, ivory-artifact }: mkDerivation { pname = "ivory-stdlib"; - version = "0.1.0.3"; - sha256 = "0ff865b14e046a9caffd1ac79e256568bd3bf60aa648e673582d7009bdcc635c"; + version = "0.1.0.4"; + sha256 = "912b78ed7b5143ff54517f3c483dd73dab9401cfce2c0a4f43fcdc9ca7413c5b"; libraryHaskellDepends = [ base filepath ivory ivory-artifact ]; - homepage = "http://smaccmpilot.org/languages/ivory-introduction.html"; + homepage = "http://ivorylang.org"; description = "Ivory standard library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -101874,8 +103172,8 @@ self: { }: mkDerivation { pname = "jammittools"; - version = "0.5.1"; - sha256 = "b3a5069b8725f7ace65f2e921d0451f42996bd6e198d38e32ef948b44ec90349"; + version = "0.5.2"; + sha256 = "cf7b09b08144d7cdc35111a07a1374b08b099a4d639da12bcad9502a830bcebc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102208,6 +103506,7 @@ self: { homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme"; description = "Complete JNI raw bindings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {jvm = null;}; "jobqueue" = callPackage @@ -103346,6 +104645,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {Judy = null;}; + "juicy-gcode" = callPackage + ({ mkDerivation, base, configurator, lens, linear, matrix + , optparse-applicative, svg-tree, text + }: + mkDerivation { + pname = "juicy-gcode"; + version = "0.1.0.1"; + sha256 = "4393aae302e034c95e2c3cff57f432c322db7ecf21580295310648c73bc09bbf"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base configurator lens linear matrix optparse-applicative svg-tree + text + ]; + homepage = "https://github.com/domoszlai/juicy-gcode"; + description = "SVG to G-Code converter"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jukebox" = callPackage ({ mkDerivation, alex, array, base, containers, directory, dlist , filepath, minisat, pretty, process, symbol, transformers @@ -103438,6 +104757,7 @@ self: { homepage = "http://github.com/tweag/inline-java/tree/master/jvm#readme"; description = "Call JVM methods from Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jvm-parser" = callPackage @@ -103724,25 +105044,26 @@ self: { ({ mkDerivation, aeson, auto-update, base, bytestring, containers , directory, either, exceptions, hostname, microlens, microlens-th , monad-control, mtl, old-locale, quickcheck-instances, regex-tdfa - , resourcet, semigroups, string-conv, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, temporary, text, time - , time-locale-compat, transformers, transformers-base + , resourcet, semigroups, string-conv, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, template-haskell, temporary, text + , time, time-locale-compat, transformers, transformers-base , transformers-compat, unix, unordered-containers }: mkDerivation { pname = "katip"; - version = "0.3.0.0"; - sha256 = "6e828cdeaff7e569f19b5b40c8409cf549d53556341e7064272ee1a7a3ab907e"; + version = "0.3.1.0"; + sha256 = "bd7ba7fcab3a6cd5ed9a1e38f750c06e7fed53d549c9fe974fb74b4a6446ced3"; libraryHaskellDepends = [ aeson auto-update base bytestring containers either exceptions hostname microlens microlens-th monad-control mtl old-locale resourcet semigroups string-conv template-haskell text time - time-locale-compat transformers transformers-base - transformers-compat unix unordered-containers + transformers transformers-base transformers-compat unix + unordered-containers ]; testHaskellDepends = [ - aeson base directory quickcheck-instances regex-tdfa tasty - tasty-hunit tasty-quickcheck template-haskell temporary text time + aeson base bytestring directory microlens quickcheck-instances + regex-tdfa tasty tasty-golden tasty-hunit tasty-quickcheck + template-haskell temporary text time time-locale-compat unordered-containers ]; homepage = "https://github.com/Soostone/katip"; @@ -106029,8 +107350,8 @@ self: { }: mkDerivation { pname = "language-c-inline"; - version = "0.7.9.2"; - sha256 = "da975b3d40de997e4f21a47867894aa0208e8581015bed70b903fe199eb1f62d"; + version = "0.7.10.0"; + sha256 = "d1d882c8312bcbc37869b96a5c5a16733db9c917566f11a18a4799fcc6814b94"; libraryHaskellDepends = [ array base containers filepath language-c-quote mainland-pretty template-haskell @@ -106126,31 +107447,6 @@ self: { }) {}; "language-dockerfile" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, free, Glob - , hspec, HUnit, mtl, parsec, pretty, process, QuickCheck - , ShellCheck, split, template-haskell, test-framework - , test-framework-hunit, th-lift, th-lift-instances, transformers - }: - mkDerivation { - pname = "language-dockerfile"; - version = "0.3.4.0"; - sha256 = "94e6996d5e56b6fb73f967e09d47d1aa2dc5a8e31ce991f27b49f28a3d8953d0"; - libraryHaskellDepends = [ - base bytestring free mtl parsec pretty ShellCheck split - template-haskell th-lift th-lift-instances transformers - ]; - testHaskellDepends = [ - base bytestring directory filepath free Glob hspec HUnit mtl parsec - pretty process QuickCheck ShellCheck split template-haskell - test-framework test-framework-hunit th-lift th-lift-instances - transformers - ]; - homepage = "https://github.com/beijaflor-io/language-dockerfile#readme"; - description = "Dockerfile linter, parser, pretty-printer and embedded DSL"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "language-dockerfile_0_3_5_0" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, free, Glob , hspec, HUnit, mtl, parsec, pretty, process, QuickCheck , ShellCheck, split, template-haskell, test-framework @@ -106173,7 +107469,6 @@ self: { homepage = "https://github.com/beijaflor-io/language-dockerfile#readme"; description = "Dockerfile linter, parser, pretty-printer and embedded DSL"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-dot" = callPackage @@ -106415,6 +107710,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-javascript_0_6_0_9" = callPackage + ({ mkDerivation, alex, array, base, blaze-builder, bytestring + , Cabal, containers, happy, hspec, mtl, QuickCheck, text + , utf8-light, utf8-string + }: + mkDerivation { + pname = "language-javascript"; + version = "0.6.0.9"; + sha256 = "a86b98d4fb8c27bbe54f7bedecde2acfea7e7d8e30a55434fd971b15238932cc"; + libraryHaskellDepends = [ + array base blaze-builder bytestring containers mtl text utf8-string + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + array base blaze-builder bytestring Cabal containers hspec mtl + QuickCheck utf8-light utf8-string + ]; + homepage = "https://github.com/erikd/language-javascript"; + description = "Parser for JavaScript"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-kort" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, QuickCheck , random, razom-text-util, regex-applicative, smaoin, text @@ -107555,8 +108873,8 @@ self: { }: mkDerivation { pname = "legion"; - version = "0.6.0.0"; - sha256 = "dab609f13594fd58d78ac5775d9e1027247d17ef5a29ca319140afa2f05f49d2"; + version = "0.7.0.0"; + sha256 = "c2dddc486653344bfe1c5c38c279f5fe8800f725d8778d8df4ef25856d6aed27"; libraryHaskellDepends = [ aeson attoparsec base binary binary-conduit bytestring canteven-http canteven-log conduit conduit-extra containers @@ -107594,6 +108912,7 @@ self: { homepage = "https://github.com/owensmurray/legion-discovery#readme"; description = "Initial project template from stack"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "legion-discovery-client" = callPackage @@ -107621,8 +108940,8 @@ self: { }: mkDerivation { pname = "legion-extra"; - version = "0.1.0.4"; - sha256 = "6961f3d40eac0bef0a6aa9301e6057ee79bf92ccec82cd6f60957b759dc1c048"; + version = "0.1.0.5"; + sha256 = "f61dc20ac3380725dbf34b934623131c37c4072f081d6d649ffb2a6d4be007f6"; libraryHaskellDepends = [ aeson base bytestring canteven-log containers data-default-class legion network safe split yaml @@ -108029,6 +109348,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lens-xml" = callPackage + ({ mkDerivation, base, lens, xml }: + mkDerivation { + pname = "lens-xml"; + version = "0.1.0.0"; + sha256 = "21ef72a6579a56528fd158aa9594e50257224cf77dcc303a5fd153a2097a1ba8"; + revision = "1"; + editedCabalFile = "5e9b888e270e22fee6210c9a6f329e31e80d4c0a54d064ef29ef969bc443b21d"; + libraryHaskellDepends = [ base lens xml ]; + testHaskellDepends = [ base lens xml ]; + homepage = "https://github.com/nkpart/lens-xml#readme"; + description = "Lenses for the xml package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lenses" = callPackage ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { @@ -108878,8 +110212,8 @@ self: { }: mkDerivation { pname = "libsystemd-journal"; - version = "1.4.0"; - sha256 = "31b20c903a6662eb2bbcf9aa2998936bc216e0711587134325bbe12fb615efd2"; + version = "1.4.1"; + sha256 = "6d23d1a7ba6cf2bb014955ce13b482f422f75264185b86323dc100aa288e3a1b"; libraryHaskellDepends = [ base bytestring hashable hsyslog pipes pipes-safe text transformers uniplate unix-bytestring unordered-containers uuid vector @@ -109198,16 +110532,15 @@ self: { }: mkDerivation { pname = "lightning-haskell"; - version = "0.1.0.2"; - sha256 = "f6616270f8a15bc6a1efb5fe3431f97112c6c2a144c0f90f88e9df6a931b04d7"; + version = "0.1.0.3"; + sha256 = "1930569f4d52ead5c72f3a8beeb9c9ba3cc805cb7d89832ffbcae997ead275c0"; libraryHaskellDepends = [ aeson api-builder base blaze-html bytestring data-default-class free http-client http-client-tls http-types mtl network text transformers ]; testHaskellDepends = [ - aeson api-builder base bytestring hspec http-client http-client-tls - http-types network text transformers + aeson api-builder base bytestring hspec text transformers ]; homepage = "https://github.com/cmoresid/lightning-haskell#readme"; description = "Haskell client for lightning-viz REST API"; @@ -109302,8 +110635,8 @@ self: { ({ mkDerivation, base, NumInstances, vector }: mkDerivation { pname = "lin-alg"; - version = "0.1.0.2"; - sha256 = "0cdf23a797b4e11be1a2b5c6b7c6228a6372b7ad2930e36b3214d763d21c22a4"; + version = "0.1.0.3"; + sha256 = "3e9622c7353f03d6a097ec4d12a5ba571d5c580811293c72ec8088434315dc79"; libraryHaskellDepends = [ base NumInstances vector ]; description = "Low-dimensional matrices and vectors for graphics and physics"; license = stdenv.lib.licenses.bsd3; @@ -111889,6 +113222,8 @@ self: { pname = "lowgl"; version = "0.3.1.1"; sha256 = "85f5a954970634aa41bc77b6a2932ed935b1411be4ad7badab31dad45b2365b0"; + revision = "1"; + editedCabalFile = "d16861021ff55cbb15185537758b01c3bf1eddf910c2dfd57cb3e51d73f5e591"; libraryHaskellDepends = [ base data-default gl linear vector ]; description = "Basic gl wrapper and reference"; license = stdenv.lib.licenses.bsd2; @@ -112129,8 +113464,8 @@ self: { }: mkDerivation { pname = "lua-bc"; - version = "0.1.0.1"; - sha256 = "c0f92db8b4c0bdc2d188c1f17833fb684489ab3147837e68bffa96375c7fa89a"; + version = "0.1.0.2"; + sha256 = "b507d95739cf149ea5fa321b53182c53cdf89d9726c494734092da19f7dfb515"; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 pretty text vector @@ -113665,7 +115000,7 @@ self: { version = "0.2.0.1"; sha256 = "f45f0e09da98dc749eae15f403e30674e874c57f81c4bdd8db818028a25b5c55"; revision = "1"; - editedCabalFile = "1e17d3b0d97cd033dd95b227ab387d6c3118a9b3191a290a593542f2ef0c4698"; + editedCabalFile = "98d6cd8739a862600633098d811286237e263dcb7edbc99557aaeea4cd108076"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers deepseq hspec HUnit mtl QuickCheck transformers @@ -113990,6 +115325,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "marvin" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, classy-prelude + , configurator, directory, filepath, hslogger, lens, mtl, mustache + , network-uri, optparse-generic, random, template-haskell + , text-format, text-icu, vector, websockets, wreq, wuss + }: + mkDerivation { + pname = "marvin"; + version = "0.0.1"; + sha256 = "ba51c4f1559352f14821486200f931c6a8e2b5670a3b3e435574c2ce014fe614"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring classy-prelude configurator hslogger + lens mtl network-uri optparse-generic random template-haskell + text-format text-icu vector websockets wreq wuss + ]; + executableHaskellDepends = [ + base classy-prelude directory filepath mustache optparse-generic + ]; + homepage = "https://github.com/JustusAdam/marvin#readme"; + description = "A modular bot for slack"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "marxup" = callPackage ({ mkDerivation, base, configurator, containers, cubicbezier , directory, dlist, filepath, glpk-hs, graphviz, labeled-tree, lens @@ -114132,6 +115493,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mathexpr" = callPackage + ({ mkDerivation, base, data-default-class }: + mkDerivation { + pname = "mathexpr"; + version = "0.3.0.0"; + sha256 = "23c30ae0c962a7858d57bed320be6421baeb82fa795260e1eea0bc8fcc4871ad"; + libraryHaskellDepends = [ base data-default-class ]; + homepage = "https://github.com/mdibaiee/mathexpr"; + description = "Parse and evaluate math expressions with variables and functions"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "mathgenealogy" = callPackage ({ mkDerivation, base, binary, bytestring, cmdargs, containers , directory, fgl, filepath, graphviz, HTTP, process, safe, tagsoup @@ -114482,8 +115855,8 @@ self: { ({ mkDerivation, base, containers, mwc-probability, transformers }: mkDerivation { pname = "mcmc-types"; - version = "1.0.1"; - sha256 = "04e11474719161813da8ce505a7052853a26a237d5ddee99ed198a3326b246e0"; + version = "1.0.2"; + sha256 = "5d2fd31114e45516b2437827e89b0572e9e9db87a7201d77b437de6e2bba54f3"; libraryHaskellDepends = [ base containers mwc-probability transformers ]; @@ -114919,8 +116292,8 @@ self: { }: mkDerivation { pname = "memcache"; - version = "0.2.0.0"; - sha256 = "348f9f78616185655b96b281a9436522a711349fc51c093dd6fc6a41bfdde3cf"; + version = "0.2.0.1"; + sha256 = "0f77d99f49158ed2e715d52dc25260fb9fffe094300900cf0234745b02f7d85c"; libraryHaskellDepends = [ base binary blaze-builder bytestring data-default-class hashable network resource-pool time vector @@ -115901,8 +117274,8 @@ self: { }: mkDerivation { pname = "mighty-metropolis"; - version = "1.0.2"; - sha256 = "639c560cdb6d4f1d793cf9baf02dca60ca290a6d1831e463f6c92458bd83c0f2"; + version = "1.0.3"; + sha256 = "29b68aecb78fbe97cfcba96ba09dbd69b6e2b7df1cdb073a7be90ecf23db7e80"; libraryHaskellDepends = [ base mcmc-types mwc-probability pipes primitive transformers ]; @@ -115918,6 +117291,8 @@ self: { pname = "mikmod"; version = "0.2.0.1"; sha256 = "b7d2b0aa2288f5874aad326043676f667bc61e930d0a5e9c5a90243807e023ed"; + revision = "1"; + editedCabalFile = "6b9bdb1899839287cfa2e355f5836d9d36a8f84a2adce83ec34aef2e6ad3d22a"; libraryHaskellDepends = [ base bytestring ]; homepage = "https://github.com/evanrinehart/mikmod"; description = "MikMod bindings"; @@ -116651,8 +118026,8 @@ self: { }: mkDerivation { pname = "mockery"; - version = "0.3.3"; - sha256 = "61157a39a3123001e0b8c7714e171980e879d01bf43f7b171e393ecab6c0fad4"; + version = "0.3.4"; + sha256 = "30fe35f4f9cfd1b85a4ccc514a25ef066148364886e53538d50e5e760a582938"; libraryHaskellDepends = [ base base-compat bytestring directory filepath logging-facade temporary @@ -116931,8 +118306,8 @@ self: { }: mkDerivation { pname = "mole"; - version = "0.0.3"; - sha256 = "dd9dd149f4c5ce0e9e9bec0c75277b9a4fad51ff6a1545f0231ba94e0b51469e"; + version = "0.0.5"; + sha256 = "0b0735bcd5afc88f192457a6b7dd3266d3341ec911d31a2fcd67acaf2b517893"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -119500,20 +120875,22 @@ self: { "multifile" = callPackage ({ mkDerivation, base, directory, HaXml, optparse-applicative - , pretty + , pretty, process, transformers }: mkDerivation { pname = "multifile"; - version = "0.1.0.2"; - sha256 = "acfcdc40b0ec9a11cd0de2efaa6fb1b4164907b24d3326ea78b5576ee51ac784"; + version = "0.1.0.4"; + sha256 = "0c6224001af91ba477e08c774212ae48fd94cdc86666b2a686fe414ee8ac4973"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base directory HaXml optparse-applicative pretty + base directory HaXml optparse-applicative pretty process + transformers ]; homepage = "xy30.com"; description = "create many files from one"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multifocal" = callPackage @@ -119626,6 +121003,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "multipath" = callPackage + ({ mkDerivation, base, parsec, utf8-string }: + mkDerivation { + pname = "multipath"; + version = "0.1.0.0"; + sha256 = "c33ea7b02ac8a409826b05900c103e2bdaffc0187808f93b0eafac180bac9c54"; + libraryHaskellDepends = [ base parsec utf8-string ]; + homepage = "https://github.com/SupraSummus/haskell-multipath"; + description = "Parser and builder for unix-path-like objects"; + license = stdenv.lib.licenses.mit; + }) {}; + "multiplate" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -120344,18 +121733,6 @@ self: { }) {}; "mwc-probability" = callPackage - ({ mkDerivation, base, mwc-random, primitive, transformers }: - mkDerivation { - pname = "mwc-probability"; - version = "1.2.1"; - sha256 = "c06d839399b1bd64db11288f017badb13bea2e87afb22bd3ff1888a6171574fd"; - libraryHaskellDepends = [ base mwc-random primitive transformers ]; - homepage = "http://github.com/jtobin/mwc-probability"; - description = "Sampling function-based probability distributions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mwc-probability_1_2_2" = callPackage ({ mkDerivation, base, mwc-random, primitive, transformers }: mkDerivation { pname = "mwc-probability"; @@ -120365,7 +121742,6 @@ self: { homepage = "http://github.com/jtobin/mwc-probability"; description = "Sampling function-based probability distributions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mwc-random" = callPackage @@ -120501,8 +121877,8 @@ self: { }: mkDerivation { pname = "mysql"; - version = "0.1.3"; - sha256 = "282e9dc78d9b0f8f4e99ef7d1cd257a3a41a66a4e890bc6823dade4af6317a0d"; + version = "0.1.4"; + sha256 = "9b8675db208851524a77b6e5c4278e6bc29eab16d970a9dda312ae366bdb668e"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring containers ]; librarySystemDepends = [ mysql ]; @@ -121793,6 +123169,7 @@ self: { homepage = "https://github.com/stbuehler/haskell-nettle"; description = "safe nettle binding"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) nettle;}; "nettle-frp" = callPackage @@ -121928,6 +123305,7 @@ self: { ]; description = "Netwire/GLFW/VinylGL input handling demo"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network" = callPackage @@ -122404,8 +123782,8 @@ self: { ({ mkDerivation, base, network }: mkDerivation { pname = "network-multicast"; - version = "0.1.2"; - sha256 = "82dcd07dd7f62d0ba23f4b37469768f07bcf6bd888dd54ebe61603f6fd2ccefb"; + version = "0.2.0"; + sha256 = "0f3b50abc3a401c20cc6a0ec51a49d2a48e5b467d9fbd63b7cf803165fe975f2"; libraryHaskellDepends = [ base network ]; description = "Simple multicast library"; license = stdenv.lib.licenses.publicDomain; @@ -123055,8 +124433,8 @@ self: { ({ mkDerivation, async, base, bytestring, template-haskell, unix }: mkDerivation { pname = "ngx-export"; - version = "0.2.2.0"; - sha256 = "d9d97e8b1f7ce0dd3c183dabe9b1856e4c0594617a1da5a22e34782648deadef"; + version = "0.2.4.0"; + sha256 = "83423a70e9d066a02ea3931b96de18cfcdc9866a47bd7a00c5b82a96f436d99c"; libraryHaskellDepends = [ async base bytestring template-haskell unix ]; @@ -123614,6 +124992,8 @@ self: { pname = "normalization-insensitive"; version = "2.0"; sha256 = "8f8ab5ae70a07a2d65fd0a46dbd8ed5cc3f3af5e95aa074e5a12b312a4dd4e29"; + revision = "1"; + editedCabalFile = "0f02d93794b029d48c4cd5564f7f357efba43bd13e33a51044994d487e274fc2"; libraryHaskellDepends = [ base bytestring deepseq hashable text unicode-transforms ]; @@ -123892,6 +125272,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ntrip-client" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, basic-prelude + , bytestring, case-insensitive, conduit, conduit-extra, exceptions + , http-types, lens, lifted-async, monad-control, optparse-generic + , uri-bytestring + }: + mkDerivation { + pname = "ntrip-client"; + version = "0.1.4"; + sha256 = "e1c1dda1e00e2b195d0c326ccf0bc23f122c4337d68056a6fc66646ee05aec2f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base base64-bytestring basic-prelude bytestring + case-insensitive conduit conduit-extra exceptions http-types lens + lifted-async monad-control uri-bytestring + ]; + executableHaskellDepends = [ + base basic-prelude bytestring conduit optparse-generic + ]; + description = "NTRIP client"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "null-canvas" = callPackage ({ mkDerivation, aeson, base, containers, filepath, scotty, split , stm, text, transformers, wai-extra, warp @@ -124427,6 +125832,7 @@ self: { homepage = "https://github.com/hverr/haskell-obd#readme"; description = "Communicate to OBD interfaces over ELM327"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "obdd" = callPackage @@ -124765,8 +126171,8 @@ self: { }: mkDerivation { pname = "oidc-client"; - version = "0.2.0.0"; - sha256 = "b2d7daa84844d0cc1057bbaffc836bb52ff2992b98a17b4b285778bacdefc03c"; + version = "0.3.0.0"; + sha256 = "fcc89cd54d2493bfabbb4e5d76dd77c0f6dc3005207566cc5cf89272979daf4c"; libraryHaskellDepends = [ aeson attoparsec base bytestring exceptions http-client http-client-tls jose-jwt network network-uri text time tls @@ -126454,6 +127860,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "org2anki" = callPackage + ({ mkDerivation, base, parsec, regex-compat }: + mkDerivation { + pname = "org2anki"; + version = "0.1.0"; + sha256 = "389acfbf0d308073dced89c63be5b8ae21d6343970b4700abb31fa6cb6f4053b"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base parsec regex-compat ]; + homepage = "https://github.com/M42/org2anki"; + description = "Basic org to anki exporter"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "organize-imports" = callPackage ({ mkDerivation, attoparsec, base, text }: mkDerivation { @@ -127232,39 +128652,6 @@ self: { }) {}; "pandoc-citeproc" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , containers, data-default, directory, filepath, hs-bibutils, mtl - , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 - , setenv, split, syb, tagsoup, temporary, text, time - , unordered-containers, vector, xml-conduit, yaml - }: - mkDerivation { - pname = "pandoc-citeproc"; - version = "0.10.1.2"; - sha256 = "be7b3776a338c4fc46565978bc8c89783e90c3853fe5bc447ddc9bf053bf5f39"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 - setenv split syb tagsoup text time unordered-containers vector - xml-conduit yaml - ]; - executableHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring filepath pandoc - pandoc-types syb text yaml - ]; - testHaskellDepends = [ - aeson base bytestring directory filepath pandoc pandoc-types - process temporary text yaml - ]; - doCheck = false; - homepage = "https://github.com/jgm/pandoc-citeproc"; - description = "Supports using pandoc with citeproc"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pandoc-citeproc_0_10_2_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , containers, data-default, directory, filepath, hs-bibutils, mtl , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 @@ -127295,7 +128682,6 @@ self: { homepage = "https://github.com/jgm/pandoc-citeproc"; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-citeproc-preamble" = callPackage @@ -127535,8 +128921,8 @@ self: { }: mkDerivation { pname = "pango"; - version = "0.13.3.0"; - sha256 = "a2c44f889674add7c65326144420d68d47dcdcd511d5c251022fa7a97a60755c"; + version = "0.13.3.1"; + sha256 = "306a4f17d2fe4053b2ddd841a48720513fe391df49080ce61a31b8a0f0633fbb"; setupHaskellDepends = [ base Cabal filepath gtk2hs-buildtools ]; libraryHaskellDepends = [ array base cairo containers directory glib mtl pretty process text @@ -128437,18 +129823,6 @@ self: { }) {}; "partial-handler" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "partial-handler"; - version = "1.0.1"; - sha256 = "e54eb9814d52e384dac62b8e365fafe9fb7319b5d4325d4bd76e4c17662b26f7"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/nikita-volkov/partial-handler"; - description = "A composable exception handler"; - license = stdenv.lib.licenses.mit; - }) {}; - - "partial-handler_1_0_2" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "partial-handler"; @@ -128458,7 +129832,6 @@ self: { homepage = "https://github.com/nikita-volkov/partial-handler"; description = "A composable exception handler"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "partial-isomorphisms" = callPackage @@ -128626,8 +129999,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.3.2.0"; - sha256 = "be251bdd996fe8bc89dfe95fb86d9abeda2cd6b6b6044a7ab79900f6c8d27e0b"; + version = "0.3.3.0"; + sha256 = "63e9aa04425cada935fa4959b7e474c2d9c8b857a3ca84e6499e376c69729132"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -129591,8 +130964,8 @@ self: { }: mkDerivation { pname = "period"; - version = "0.1.0.4"; - sha256 = "f1f0d37ee4e6e31fc448e6f552105d20c3a9359f8af8780d52eeb980d313715c"; + version = "0.1.0.5"; + sha256 = "b66ede8f1609d026cf43b7083fe0f824cb45bea53712632958161884a68cd5f8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129687,8 +131060,8 @@ self: { }: mkDerivation { pname = "persistable-record"; - version = "0.4.0.3"; - sha256 = "0a25f3cfec301e9124293e8f38ad55fba5d18d3d7a9371a971ee17b6152ad360"; + version = "0.4.1.0"; + sha256 = "5bf42a49a7efa127b5f5308ed812c367d3fe1afe499f32e24d0ac0f846df7619"; libraryHaskellDepends = [ array base containers dlist names-th template-haskell th-data-compat transformers @@ -129895,8 +131268,8 @@ self: { }: mkDerivation { pname = "persistent-iproute"; - version = "0.2.2"; - sha256 = "b3f9e7dd28e263230b8b5230ad450178202f544ebd01517ff21940a331e36eb1"; + version = "0.2.3"; + sha256 = "f595a11ceaa1c19e11d6f4fc58ec2834eb100791ae82626912115f1d79edbfaa"; libraryHaskellDepends = [ aeson aeson-iproute base bytestring http-api-data iproute path-pieces persistent text @@ -130091,6 +131464,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persistent-relational-record" = callPackage + ({ mkDerivation, base, conduit, containers, hlint, HUnit, mtl + , persistable-record, persistent, persistent-template + , relational-query, resourcet, template-haskell, test-framework + , test-framework-hunit, test-framework-th, text, time + }: + mkDerivation { + pname = "persistent-relational-record"; + version = "0.1.0.0"; + sha256 = "b2b5858bcabf3c889e9c30dbb5d12dd45f48683036e565ceebfc245e2c5a8870"; + libraryHaskellDepends = [ + base conduit containers mtl persistable-record persistent + relational-query resourcet template-haskell text + ]; + testHaskellDepends = [ + base hlint HUnit persistent-template relational-query + test-framework test-framework-hunit test-framework-th text time + ]; + homepage = "http://github.com/himura/persistent-relational-record"; + description = "relational-record on persisten backends"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "persistent-sqlite_2_2_1" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , hspec, monad-control, monad-logger, old-locale, persistent @@ -130889,8 +132285,8 @@ self: { ({ mkDerivation, base, cli, hmatrix, JuicyPixels, vector }: mkDerivation { pname = "picedit"; - version = "0.1.1.0"; - sha256 = "4219089f3375925f413111d05ce9087b1f4aca01f43d64ddd3fc2931c52d7740"; + version = "0.1.1.1"; + sha256 = "29cb93ae27ac980884f4a8db3896ae8e7d2b2bcf1b77d368a9ff9a3fb9a7bfcd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hmatrix JuicyPixels vector ]; @@ -131630,6 +133026,7 @@ self: { homepage = "http://github.com/bgamari/pipes-interleave"; description = "Interleave and merge streams of elements"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-io" = callPackage @@ -132200,6 +133597,29 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "pkcs10_0_2_0_0" = callPackage + ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base + , bytestring, cryptonite, pem, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, transformers, x509 + }: + mkDerivation { + pname = "pkcs10"; + version = "0.2.0.0"; + sha256 = "896e923f67bac4c7f0e48c9afca60f9ef5178e00fca9f179e8fdae3c12476294"; + libraryHaskellDepends = [ + asn1-encoding asn1-parse asn1-types base bytestring cryptonite pem + x509 + ]; + testHaskellDepends = [ + asn1-encoding asn1-parse asn1-types base bytestring cryptonite pem + QuickCheck tasty tasty-hunit tasty-quickcheck transformers x509 + ]; + homepage = "https://github.com/fcomb/pkcs10-hs#readme"; + description = "PKCS#10 library"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pkcs7" = callPackage ({ mkDerivation, base, bytestring, Cabal, HUnit, QuickCheck }: mkDerivation { @@ -133922,8 +135342,8 @@ self: { }: mkDerivation { pname = "postgresql-simple-bind"; - version = "0.2.0.0"; - sha256 = "9e9f91c1b8b41ad19ebd01416435007e847560e840f62e4d5187185d051936fb"; + version = "0.3.0.0"; + sha256 = "d80ea7b091a66eac0e3da8fc22804a39ccbb1ca6e4cfa0f2b3b2ffd569e0999a"; libraryHaskellDepends = [ attoparsec base bytestring data-default exceptions heredoc postgresql-simple template-haskell text time @@ -133932,7 +135352,7 @@ self: { attoparsec base bytestring case-conversion data-default hspec postgresql-simple text ]; - description = "A FFI-like bindings for PostgreSQL stored functions"; + description = "FFI-like bindings for PostgreSQL stored functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -135090,8 +136510,8 @@ self: { }: mkDerivation { pname = "pringletons"; - version = "0.3"; - sha256 = "2d9587e66b232f66ec7821df4c5999d48883a7f06daf4a39ad1f770b92baecd7"; + version = "0.4"; + sha256 = "1f64cc8a021bcd9f535928e1ed2907df1f556359c28c1a3f4d61f3e1eb0e66fb"; libraryHaskellDepends = [ aeson base hashable singletons template-haskell text unordered-containers vector vinyl @@ -135606,25 +137026,6 @@ self: { }) {}; "profiteur" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, filepath - , text, unordered-containers, vector - }: - mkDerivation { - pname = "profiteur"; - version = "0.3.0.2"; - sha256 = "43df79a7d3b0a9562658367a46016c361522ea07ac67fb5ad65d891ad77bfbaf"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson attoparsec base bytestring filepath text unordered-containers - vector - ]; - homepage = "http://github.com/jaspervdj/profiteur"; - description = "Treemap visualiser for GHC prof files"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "profiteur_0_3_0_3" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, filepath , text, unordered-containers, vector }: @@ -135641,7 +137042,6 @@ self: { homepage = "http://github.com/jaspervdj/profiteur"; description = "Treemap visualiser for GHC prof files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "profunctor-extras" = callPackage @@ -136353,8 +137753,8 @@ self: { }: mkDerivation { pname = "protolude"; - version = "0.1.8"; - sha256 = "014d3a551d4e0929df615ff2df7e0215d67e34af8f03928e98bbaffec98860bc"; + version = "0.1.10"; + sha256 = "163296a518f0d7329dcdf040bf0eddb1fb804eee198405801fab8f192ce1c7a5"; libraryHaskellDepends = [ async base bytestring containers deepseq ghc-prim mtl safe stm text transformers @@ -136613,12 +138013,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "publicsuffix_0_20161014" = callPackage + "publicsuffix_0_20161104" = callPackage ({ mkDerivation, base, filepath, hspec, template-haskell }: mkDerivation { pname = "publicsuffix"; - version = "0.20161014"; - sha256 = "7fe7abfe8727dc20951c6c7dec35c8ca71ddc34972615f5abe24ae7d3ce99622"; + version = "0.20161104"; + sha256 = "b80360a305ae44f92548195e699751a00df1c812546453c1b415058ac00e24f4"; libraryHaskellDepends = [ base filepath template-haskell ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; @@ -136756,8 +138156,8 @@ self: { }: mkDerivation { pname = "pugixml"; - version = "0.3.2"; - sha256 = "91247ef3eb722e917e5ec4b078b66ff3be0dee41848694ae644799d0d8e97b5f"; + version = "0.3.3"; + sha256 = "2b8b6db68f0cb2987d1804537f7b81523af0a357ea3a08a940302120804ede9b"; libraryHaskellDepends = [ base bytestring data-default-class template-haskell ]; @@ -137023,6 +138423,7 @@ self: { homepage = "http://github.com/GaloisInc/pure-zlib"; description = "A Haskell-only implementation of zlib / DEFLATE"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pureMD5" = callPackage @@ -138257,6 +139658,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-special" = callPackage + ({ mkDerivation, base, bytestring, nats, QuickCheck + , quickcheck-instances, scientific, text + }: + mkDerivation { + pname = "quickcheck-special"; + version = "0.1.0.0"; + sha256 = "70883efb33e6b072b016ef2df32c90f30e01c3f015c4095374fdf6451cb60113"; + libraryHaskellDepends = [ + base bytestring nats QuickCheck quickcheck-instances scientific + text + ]; + homepage = "https://github.com/minad/quickcheck-special#readme"; + description = "Edge cases and special values for QuickCheck Arbitrary instances"; + license = stdenv.lib.licenses.mit; + }) {}; + "quickcheck-text" = callPackage ({ mkDerivation, base, binary, bytestring, QuickCheck, text }: mkDerivation { @@ -139481,6 +140899,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rating-systems" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "rating-systems"; + version = "0.1"; + sha256 = "099c4472a4251af6ac01c77535d05ac85ef25512206fb0f46971a7023776b89e"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/mightybyte/rating-systems"; + description = "Implementations of several rating systems: Elo, Glicko, etc"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ratio-int" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -139496,18 +140926,18 @@ self: { "rattletrap" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bimap, binary , binary-bits, bytestring, containers, data-binary-ieee754 - , filepath, hlint, regex-compat, tasty, tasty-hspec - , template-haskell, text, vector + , filepath, hlint, tasty, tasty-hspec, template-haskell, text + , vector }: mkDerivation { pname = "rattletrap"; - version = "0.1.0"; - sha256 = "4a2b0ca12153d467d09c623a09a497028346f8838cbb0ce45c333f812539cfe9"; + version = "0.2.0"; + sha256 = "874bb97133deed106534ab4a8b387d3bb14a7ad89504a9e2767301491bc3c077"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bimap binary binary-bits bytestring containers - data-binary-ieee754 regex-compat text vector + data-binary-ieee754 text vector ]; executableHaskellDepends = [ aeson aeson-casing base binary bytestring template-haskell @@ -139515,8 +140945,10 @@ self: { testHaskellDepends = [ base binary bytestring filepath hlint tasty tasty-hspec ]; + homepage = "https://github.com/tfausak/rattletrap#readme"; description = "Parse and generate Rocket League replays"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "raven-haskell" = callPackage @@ -140124,6 +141556,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa"; description = "Process MIDI events via reactive-banana and JACK"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-midyim" = callPackage @@ -140142,6 +141575,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa"; description = "Process MIDI events via reactive-banana"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-thread" = callPackage @@ -141372,6 +142806,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "regex-do" = callPackage + ({ mkDerivation, array, base, bytestring, hspec, QuickCheck + , regex-base, regex-pcre, stringsearch, text + }: + mkDerivation { + pname = "regex-do"; + version = "1.1"; + sha256 = "655a035f10fdb6a9db733d28a63b4f8a943224c14c3811779539112796689edc"; + revision = "1"; + editedCabalFile = "407ea11d3fe9a9307983b11124fab217db7d02bf36498b4953b1cf8e25323f77"; + libraryHaskellDepends = [ + array base bytestring regex-base regex-pcre stringsearch text + ]; + testHaskellDepends = [ + array base bytestring hspec QuickCheck regex-base regex-pcre + stringsearch text + ]; + homepage = "https://github.com/ciez/regex-do"; + description = "PCRE regex wrapper functions"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "regex-easy" = callPackage ({ mkDerivation, array, base, bytestring, regex-pcre , string-conversions @@ -141860,6 +143316,8 @@ self: { pname = "regular"; version = "0.3.4.4"; sha256 = "85f22409b4a5413a7180286caada7375deca4d16010f4681fe343175841c5684"; + revision = "1"; + editedCabalFile = "3ce38f1af2edc138b690a138e776637e5fd1ede9ee5151a31c4be77a73133943"; libraryHaskellDepends = [ base template-haskell ]; description = "Generic programming library for regular datatypes"; license = stdenv.lib.licenses.bsd3; @@ -141948,8 +143406,8 @@ self: { }: mkDerivation { pname = "rei"; - version = "0.3.7"; - sha256 = "97577658fa9d9801ae3dda8ef3b75e8f59bae547b6dc7e91003381fc639d3e0c"; + version = "0.4.0.1"; + sha256 = "108fcfa34f91486946a25d5a1df58e8d2bb6930c852ea8ae4dc5ff81d882ed75"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -142989,8 +144447,8 @@ self: { }: mkDerivation { pname = "resolve-trivial-conflicts"; - version = "0.3.2.2"; - sha256 = "2d68535d32943a6640845c86de751ab5185c687a2604c3435e4d757a2a263c1b"; + version = "0.3.2.3"; + sha256 = "12459698d44496475f48a5f62a8fba5cd746b0aa7552fa577304ee875f85c596"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -145034,22 +146492,23 @@ self: { }) {}; "rss2irc" = callPackage - ({ mkDerivation, base, bytestring, cabal-file-th, cmdargs - , containers, deepseq, feed, http-client, http-conduit, http-types - , io-storage, irc, network, old-locale, parsec, regexpr, resourcet - , safe, split, text, time, transformers, utf8-string + ({ mkDerivation, base, bytestring, cmdargs, containers, deepseq + , feed, http-client, http-conduit, http-types, io-storage, irc + , network, network-uri, old-locale, parsec, regexpr, resourcet + , safe, SafeSemaphore, split, stm, text, time, transformers + , utf8-string }: mkDerivation { pname = "rss2irc"; - version = "1.0.6"; - sha256 = "bca14708ca66719261c36d328e6e3801b01b0a62a5525560aad70b7f5276d43d"; + version = "1.1"; + sha256 = "583826c4cb2204034d866f6bab85132b1484e70901b5244e8f76cfe020a60cde"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring cabal-file-th cmdargs containers deepseq feed - http-client http-conduit http-types io-storage irc network - old-locale parsec regexpr resourcet safe split text time - transformers utf8-string + base bytestring cmdargs containers deepseq feed http-client + http-conduit http-types io-storage irc network network-uri + old-locale parsec regexpr resourcet safe SafeSemaphore split stm + text time transformers utf8-string ]; homepage = "http://hackage.haskell.org/package/rss2irc"; description = "watches an RSS/Atom feed and writes it to an IRC channel"; @@ -145590,8 +147049,8 @@ self: { }: mkDerivation { pname = "safecopy"; - version = "0.9.1"; - sha256 = "f480750c1d970c339a0c432ef216b3fff28c15b35b021192cc221f2a5df6dd6b"; + version = "0.9.2"; + sha256 = "ba666b242653d6b23fc9bc19dfa9d4367148aeb9235baf3738b91150ac9b6ed3"; libraryHaskellDepends = [ array base bytestring cereal containers old-time template-haskell text time vector @@ -145601,7 +147060,7 @@ self: { quickcheck-instances tasty tasty-quickcheck template-haskell time vector ]; - homepage = "http://acid-state.seize.it/safecopy"; + homepage = "https://github.com/acid-state/safecopy"; description = "Binary serialization with version control"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -146233,8 +147692,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "1.2.2"; - sha256 = "2629bbcc34c50544b451567c6b314837209e4199133154cab9c0f07803231e16"; + version = "1.2.8"; + sha256 = "b7e68ecae34b6437ece2f340f1260123fa384828e362371a1035620ab8c1ae09"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146304,6 +147763,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sbv_5_13" = callPackage + ({ mkDerivation, array, async, base, base-compat, containers + , crackNum, data-binary-ieee754, deepseq, directory, filepath, ghc + , HUnit, mtl, old-time, pretty, process, QuickCheck, random, syb + }: + mkDerivation { + pname = "sbv"; + version = "5.13"; + sha256 = "65d1bb21c19ddad03a9dcf19f18d6221c8633428adeda7de11214468c984afbe"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array async base base-compat containers crackNum + data-binary-ieee754 deepseq directory filepath ghc mtl old-time + pretty process QuickCheck random syb + ]; + executableHaskellDepends = [ + base data-binary-ieee754 directory filepath HUnit process syb + ]; + testHaskellDepends = [ + base data-binary-ieee754 directory filepath HUnit syb + ]; + homepage = "http://leventerkok.github.com/sbv/"; + description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sbvPlugin" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , ghc-prim, mtl, process, sbv, tasty, tasty-golden @@ -147478,6 +148965,7 @@ self: { executableHaskellDepends = [ base linear sdl2 vector ]; description = "Bindings to SDL2_gfx"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_gfx;}; "sdl2-image" = callPackage @@ -147959,6 +149447,7 @@ self: { homepage = "https://toktok.github.io/semdoc"; description = "Evaluate code snippets in Literate Haskell"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "semi-iso" = callPackage @@ -148081,6 +149570,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "semiring-num" = callPackage + ({ mkDerivation, base, containers, doctest, smallcheck }: + mkDerivation { + pname = "semiring-num"; + version = "0.3.0.0"; + sha256 = "75178637123f1d7bcef23346065aae3a4d57ac4a0aba7ad8fb9f78c98f0f08ec"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers doctest smallcheck ]; + homepage = "https://github.com/oisdk/semiring-num"; + description = "Basic semiring class and instances"; + license = stdenv.lib.licenses.mit; + }) {}; + "semiring-simple" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -148524,6 +150026,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "serialize-instances" = callPackage + ({ mkDerivation, base, cereal, hashable, semigroups + , unordered-containers + }: + mkDerivation { + pname = "serialize-instances"; + version = "0.1.0.0"; + sha256 = "9c3207fc4cad06fbe76c860820fc48f967494b73ce892efe997723c34b9308d5"; + revision = "2"; + editedCabalFile = "f95554330e4ab10ef1c1a3f291f41ce19bfa4be3c056466a410fbc0f980977c9"; + libraryHaskellDepends = [ + base cereal hashable semigroups unordered-containers + ]; + description = "Instances for Serialize of cereal"; + license = stdenv.lib.licenses.mit; + }) {}; + "serialport" = callPackage ({ mkDerivation, base, bytestring, HUnit, unix }: mkDerivation { @@ -148537,6 +150056,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "serokell-util" = callPackage + ({ mkDerivation, acid-state, aeson, aeson-extra, base + , base16-bytestring, base64-bytestring, binary, binary-orphans + , bytestring, cereal, cereal-vector, clock, containers + , data-msgpack, deepseq, directory, either, exceptions, extra + , filepath, formatting, hashable, hspec, lens, mtl + , optparse-applicative, parsec, QuickCheck, quickcheck-instances + , safecopy, scientific, semigroups, template-haskell, text + , text-format, time-units, transformers, unordered-containers + , vector, yaml + }: + mkDerivation { + pname = "serokell-util"; + version = "0.1.1.1"; + sha256 = "8411ea10fcff87ce1d2fbe177cf2b3d6d254dc66cded2f49867daeed8334e427"; + libraryHaskellDepends = [ + acid-state aeson aeson-extra base base16-bytestring + base64-bytestring binary binary-orphans bytestring cereal + cereal-vector clock containers data-msgpack deepseq directory + either exceptions extra filepath formatting hashable lens mtl + optparse-applicative parsec QuickCheck quickcheck-instances + safecopy scientific semigroups template-haskell text text-format + time-units transformers unordered-containers vector yaml + ]; + testHaskellDepends = [ + aeson base binary bytestring cereal data-msgpack hspec QuickCheck + quickcheck-instances safecopy scientific text text-format + unordered-containers vector + ]; + homepage = "https://github.com/serokell/serokell-util"; + description = "General-purpose functions by Serokell"; + license = stdenv.lib.licenses.mit; + }) {}; + "serpentine" = callPackage ({ mkDerivation, base, pringletons, singletons, template-haskell , text, vinyl @@ -148712,6 +150265,7 @@ self: { homepage = "http://github.com/plow-technologies/servant-auth#readme"; description = "Authentication combinators for servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-client" = callPackage @@ -148735,6 +150289,7 @@ self: { homepage = "http://github.com/plow-technologies/servant-auth#readme"; description = "servant-client/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-cookie" = callPackage @@ -148813,6 +150368,7 @@ self: { homepage = "http://github.com/plow-technologies/servant-auth#readme"; description = "servant-docs/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-hmac" = callPackage @@ -148887,6 +150443,7 @@ self: { homepage = "http://github.com/plow-technologies/servant-auth#readme"; description = "servant-server/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-token" = callPackage @@ -149066,6 +150623,7 @@ self: { ]; description = "Derive a postgres client to database API specified by servant-db"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-docs" = callPackage @@ -149378,8 +150936,8 @@ self: { }: mkDerivation { pname = "servant-matrix-param"; - version = "0.3.1"; - sha256 = "2559133dee1629ddfca41aca6d7ac0f3b0283ae3470228bd5bd71ce4c79f6641"; + version = "0.3.3"; + sha256 = "679e8f5a6e77c1022ae4b23555fbbca2b34d1fd249ab459c670db5c98eb988b3"; libraryHaskellDepends = [ base servant ]; testHaskellDepends = [ aeson base bytestring containers doctest hspec http-client @@ -151442,6 +153000,7 @@ self: { homepage = "https://github.com/mdibaiee/sibe"; description = "Machine Learning algorithms"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sieve" = callPackage @@ -152598,6 +154157,8 @@ self: { pname = "siphash"; version = "1.0.3"; sha256 = "cf81ce41c6ca40c4fec9add5dcebc161cb2d31f522f9ad727df23d30ac6a05f3"; + revision = "1"; + editedCabalFile = "d629325f124617deeb6f1b172c8cbb30556090b32f3533cf8ea93ecb3df04de0"; libraryHaskellDepends = [ base bytestring cpu ]; testHaskellDepends = [ base bytestring QuickCheck test-framework @@ -152629,6 +154190,7 @@ self: { homepage = "https://github.com/andrewthad/colonnade#readme"; description = "Generic types and functions for columnar encoding and decoding"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sirkel" = callPackage @@ -155203,19 +156765,19 @@ self: { }) {}; "socket-sctp" = callPackage - ({ mkDerivation, base, bytestring, sctp, socket }: + ({ mkDerivation, base, bytestring, lksctp-tools, socket }: mkDerivation { pname = "socket-sctp"; version = "0.1.0.0"; sha256 = "48ef7cae7ac4ed6674173716a598b611f704c38e14c1ac1006f1f730da60b9f5"; libraryHaskellDepends = [ base bytestring socket ]; - librarySystemDepends = [ sctp ]; + librarySystemDepends = [ lksctp-tools ]; testHaskellDepends = [ base bytestring socket ]; homepage = "https://github.com/lpeterse/haskell-socket-sctp"; description = "STCP socket extensions library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {sctp = null;}; + }) {inherit (pkgs) lksctp-tools;}; "socketio" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base @@ -155778,16 +157340,16 @@ self: { "sparse-linear-algebra" = callPackage ({ mkDerivation, base, containers, criterion, hspec, mtl - , mwc-random, primitive, QuickCheck + , mwc-random, primitive, QuickCheck, vector }: mkDerivation { pname = "sparse-linear-algebra"; - version = "0.2.0.9"; - sha256 = "e71d62721edb02d38e578d6c286af76ad7a98638a8b4e398efd3ca7e280371de"; + version = "0.2.1.1"; + sha256 = "7a5c11c8cf52b79e141388583731ec35b74958c681eef57300e82ef507278253"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers hspec mtl mwc-random primitive QuickCheck + base containers hspec mtl mwc-random primitive QuickCheck vector ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -156014,8 +157576,8 @@ self: { }: mkDerivation { pname = "speedy-slice"; - version = "0.1.3"; - sha256 = "8be147fe85bf02f1e5bb7cc32e3a61c418354af8875fadb0cd20e4fe804f3992"; + version = "0.1.4"; + sha256 = "b400e6475d77de2c4dbaf09ee0a3581fd8f34b44c7952e3108ab27960960ea92"; libraryHaskellDepends = [ base lens mcmc-types mwc-probability pipes primitive transformers ]; @@ -156064,23 +157626,6 @@ self: { }) {}; "sphinx" = callPackage - ({ mkDerivation, base, binary, bytestring, data-binary-ieee754 - , network, text, text-icu, xml - }: - mkDerivation { - pname = "sphinx"; - version = "0.6.0.1"; - sha256 = "28496ed2f52d5934de64cbb6b045a37848d2590a65b756000280d132932795dd"; - libraryHaskellDepends = [ - base binary bytestring data-binary-ieee754 network text text-icu - xml - ]; - homepage = "https://github.com/gregwebs/haskell-sphinx-client"; - description = "Haskell bindings to the Sphinx full-text searching daemon"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "sphinx_0_6_0_2" = callPackage ({ mkDerivation, base, binary, bytestring, data-binary-ieee754 , network, text, text-icu, xml }: @@ -156095,7 +157640,6 @@ self: { homepage = "https://github.com/gregwebs/haskell-sphinx-client"; description = "Haskell bindings to the Sphinx full-text searching daemon"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sphinx-cli" = callPackage @@ -157065,8 +158609,8 @@ self: { }: mkDerivation { pname = "stache"; - version = "0.1.7"; - sha256 = "3c34eec3b6b8cfc1b3c5887ab2b209e277938e897c7b3787c3baf9f7a9d0ae30"; + version = "0.1.8"; + sha256 = "a8617924e087b02c3afb3308a8a1102828e352dba7545648703e5d0c2c3c35b2"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory exceptions filepath megaparsec mtl template-haskell text unordered-containers @@ -158001,21 +159545,26 @@ self: { }) {}; "staversion" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, filepath - , hspec, optparse-applicative, text, unordered-containers, yaml + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, hspec, http-client, http-client-tls, http-types + , optparse-applicative, QuickCheck, text, transformers + , transformers-compat, unordered-containers, yaml }: mkDerivation { pname = "staversion"; - version = "0.1.0.0"; - sha256 = "df252adb8010dbe2553fcd467044a6f99b43ce0ad223762ead0f755484806073"; + version = "0.1.1.0"; + sha256 = "1c44ee900e27ef1988a4875c39b2ceb32d116ad45dc1c95a8adecfa39e0e3857"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring directory filepath optparse-applicative text - unordered-containers yaml + aeson base bytestring containers directory filepath http-client + http-client-tls http-types optparse-applicative text transformers + transformers-compat unordered-containers yaml ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ base filepath hspec text ]; + testHaskellDepends = [ + base bytestring filepath hspec QuickCheck text + ]; homepage = "https://github.com/debug-ito/staversion"; description = "What version is the package X in stackage lts-Y.ZZ?"; license = stdenv.lib.licenses.bsd3; @@ -158446,8 +159995,8 @@ self: { ({ mkDerivation, base, stm }: mkDerivation { pname = "stm-split"; - version = "0.0.0.1"; - sha256 = "88f3bd9b210377919218a117fd27d1b8350af6aaf65b2f2df2be72e896456314"; + version = "0.0.1"; + sha256 = "001c3ceeb61498b11791225c4985cf6a9fa7e218a9b0631d54b57cc4837421b9"; libraryHaskellDepends = [ base stm ]; description = "TMVars, TVars and TChans with distinguished input and output side"; license = stdenv.lib.licenses.bsd3; @@ -159815,6 +161364,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stt" = callPackage + ({ mkDerivation, base, mtl, primitive, tasty, tasty-hunit + , tasty-quickcheck, transformers + }: + mkDerivation { + pname = "stt"; + version = "0.2.1"; + sha256 = "dbb5d53d9486c9375c52cbe9a3d3d53f52d9ed882cecc31b5564be9dddb5b176"; + libraryHaskellDepends = [ base mtl primitive ]; + testHaskellDepends = [ + base tasty tasty-hunit tasty-quickcheck transformers + ]; + description = "A monad transformer version of the ST monad"; + license = stdenv.lib.licenses.mit; + }) {}; + "stunclient" = callPackage ({ mkDerivation, base, bytestring, cereal, crypto-api, cryptohash , cryptohash-cryptoapi, digest, network, QuickCheck, random @@ -160472,8 +162037,8 @@ self: { }: mkDerivation { pname = "svgcairo"; - version = "0.13.1.0"; - sha256 = "055adbb80d21091be3703215f1d210f5b40c762adc8450a45a9a39bdc20315a5"; + version = "0.13.1.1"; + sha256 = "cda662acf9084ef1d16da987bde2fa01c9efc87101e7179da0f566ab05c3a54f"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base cairo glib mtl text ]; libraryPkgconfigDepends = [ librsvg ]; @@ -162080,6 +163645,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tagged-identity" = callPackage + ({ mkDerivation, base, mtl, transformers }: + mkDerivation { + pname = "tagged-identity"; + version = "0.1.1"; + sha256 = "dcf0676dca1422165d48795ab1e4a512a6fd678aef685c85c00b5fcaba001aa8"; + libraryHaskellDepends = [ base mtl transformers ]; + homepage = "https://github.com/mrkkrp/tagged-identity"; + description = "Trivial monad transformer that allows identical monad stacks have different types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tagged-list" = callPackage ({ mkDerivation, AbortT-transformers, base, binary, natural-number , type-equality, type-level-natural-number @@ -162601,6 +164178,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tar-conduit" = callPackage + ({ mkDerivation, base, bytestring, conduit-combinators }: + mkDerivation { + pname = "tar-conduit"; + version = "0.1.0"; + sha256 = "64cd8ea8d072b3a43e539e3c8d1f9e0936430ad9f9ff3a54d1e237c077878e2f"; + libraryHaskellDepends = [ base bytestring conduit-combinators ]; + homepage = "https://github.com/snoyberg/tar-conduit#readme"; + description = "Parse tar files using conduit for streaming"; + license = stdenv.lib.licenses.mit; + }) {}; + "tardis" = callPackage ({ mkDerivation, base, mmorph, mtl }: mkDerivation { @@ -162770,6 +164359,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-discover" = callPackage + ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec + , tasty-hunit, tasty-quickcheck, tasty-th + }: + mkDerivation { + pname = "tasty-discover"; + version = "1.0.0"; + sha256 = "a4c4a3fcf1a3908ebd8f3dbbf1714b2dd50026285f4ba73bc868f79533c0e0a0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory filepath tasty tasty-hspec tasty-hunit + tasty-quickcheck tasty-th + ]; + executableHaskellDepends = [ base directory filepath tasty-th ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/lwm/tasty-discover/"; + description = "Automatically discover and run Tasty framework tests"; + license = "GPL"; + }) {}; + "tasty-expected-failure" = callPackage ({ mkDerivation, base, tagged, tasty }: mkDerivation { @@ -163398,6 +165008,7 @@ self: { homepage = "https://github.com/akru/telegram-bot#readme"; description = "Telegram Bot microframework for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "teleport" = callPackage @@ -164543,8 +166154,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.8.6.6"; - sha256 = "9c78e53e685b4537a39a4d2bc785df1d0d0ee775085bd532d8ae88d10d4c58b4"; + version = "0.8.6.7"; + sha256 = "9e5fd9571a7257bdc8cfa6e0da077b16e867011a9f813065d68dd046bd358c88"; libraryHaskellDepends = [ base containers mtl pandoc-types parsec syb xml ]; @@ -165192,8 +166803,8 @@ self: { ({ mkDerivation, base, deepseq, text, vector }: mkDerivation { pname = "text-zipper"; - version = "0.8.1"; - sha256 = "8bedb4c3aa8b998508d1af4f65e99f4ca53dc3803e58375c324bbff3f5542b6d"; + version = "0.8.3"; + sha256 = "3baf7623d26dc96f19e30c1c54e3be19607b8bd7917ea62e8d35a2b233e4e09f"; libraryHaskellDepends = [ base deepseq text vector ]; homepage = "https://github.com/jtdaugherty/text-zipper/"; description = "A text editor zipper library"; @@ -166299,13 +167910,14 @@ self: { ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, dbus, directory, filepath, gi-gdk, gi-gio, gi-glib , gi-gtk, gi-webkit2, gtk3, haskell-gi-base, http-types, lens - , mime-types, mtl, network, process, random, split, text - , transformers, utf8-string, xdg-basedir, xmonad, xmonad-contrib + , mime-types, mtl, network, process, random, scientific, split + , tasty, tasty-quickcheck, text, transformers, unordered-containers + , utf8-string, vector, xdg-basedir, xmonad, xmonad-contrib }: mkDerivation { pname = "tianbar"; - version = "1.1.1.1"; - sha256 = "0cc35cd49ab80f083091dc085e942e1b3b0c5bf37aeab54e402b9dbc6aff9927"; + version = "1.2.0.0"; + sha256 = "f822b063d0c213ee931b75d13ec39a23f135fa08172bd6aeac3222db5cec9456"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166314,10 +167926,17 @@ self: { executableHaskellDepends = [ aeson base bytestring containers dbus directory filepath gi-gdk gi-gio gi-glib gi-gtk gi-webkit2 haskell-gi-base http-types lens - mime-types mtl network process random split text transformers - utf8-string xdg-basedir + mime-types mtl network process random scientific split text + transformers unordered-containers utf8-string vector xdg-basedir ]; executablePkgconfigDepends = [ gtk3 ]; + testHaskellDepends = [ + aeson base bytestring containers dbus directory filepath gi-gdk + gi-gio gi-glib gi-gtk gi-webkit2 haskell-gi-base http-types lens + mime-types mtl network process random scientific split tasty + tasty-quickcheck text transformers unordered-containers utf8-string + vector xdg-basedir + ]; homepage = "https://github.com/koterpillar/tianbar"; description = "A desktop bar based on WebKit"; license = stdenv.lib.licenses.mit; @@ -166862,12 +168481,13 @@ self: { ({ mkDerivation, base, process, time }: mkDerivation { pname = "timeconsole"; - version = "0.1.0.0"; - sha256 = "807921c815ca23a86691ae47c445fa9ea2c5cae6aa3ad748debd4314b3f6b97e"; + version = "0.1.0.1"; + sha256 = "519f2c90f2ee0b8d58f26fa67fecb83dc77002ed1ea94007b5c256155e9ff022"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base process time ]; - description = "Time commands by lines of STDOUT"; + homepage = "https://github.com/xpika/Time-Console"; + description = "time each line of terminal output"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -169397,6 +171017,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tw" = callPackage + ({ mkDerivation, base, bytestring }: + mkDerivation { + pname = "tw"; + version = "0.1.0.0"; + sha256 = "032194b50fe6b6e53c591df2e58c416244f21a59e5d699724e7ec9f4ce2a2511"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base bytestring ]; + homepage = "https://github.com/lovasko/tw"; + description = "Trailing Whitespace"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tweak" = callPackage ({ mkDerivation, base, containers, lens, stm, transformers }: mkDerivation { @@ -170211,6 +171845,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "type-level-kv-list" = callPackage + ({ mkDerivation, base, doctest, Glob }: + mkDerivation { + pname = "type-level-kv-list"; + version = "1.1.0"; + sha256 = "4ff032e59108edc7dd27309ac0ee8987cc41ffba695d9699700bd37c6e7f7d73"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/arowM/type-level-kv-list#readme"; + description = "A module for hash map like object with type level keys"; + license = stdenv.lib.licenses.mit; + }) {}; + "type-level-natural-number" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -170527,6 +172174,7 @@ self: { homepage = "https://github.com/fpco/typed-process#readme"; description = "Run external processes, with strong typing of streams"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "typed-spreadsheet" = callPackage @@ -173963,6 +175611,7 @@ self: { homepage = "https://github.com/bitc/hs-vault-tool"; description = "Utility library for spawning a HashiCorp Vault process"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vaultaire-common" = callPackage @@ -174475,8 +176124,8 @@ self: { ({ mkDerivation, base, deepseq, vector }: mkDerivation { pname = "vector-sized"; - version = "0.3.3.0"; - sha256 = "902cc55e930ba703334425adc6090ce1ad4db38f01143fd9b92eba904c2bc58b"; + version = "0.4.0.0"; + sha256 = "4f13d24329b6a60eebfe4d31026cf3b489c622b8afad4f30650f6664f61f1061"; libraryHaskellDepends = [ base deepseq vector ]; homepage = "http://github.com/expipiplus1/vector-sized#readme"; description = "Size tagged vectors"; @@ -174728,6 +176377,7 @@ self: { homepage = "http://github.com/fmthoma/vgrep#readme"; description = "A pager for grep"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vhd" = callPackage @@ -175255,8 +176905,8 @@ self: { }: mkDerivation { pname = "vte"; - version = "0.13.1.0"; - sha256 = "6dc78551c75c393f2c8b9c463539293214ee788ad73c0623adc69f10b36f4a9d"; + version = "0.13.1.1"; + sha256 = "c38699a626af47be2c15ddcc7c9070fe5b9999fee73e3b479d1bafb96cdd5231"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base glib gtk pango ]; libraryPkgconfigDepends = [ vte ]; @@ -175272,8 +176922,8 @@ self: { }: mkDerivation { pname = "vtegtk3"; - version = "0.13.1.0"; - sha256 = "9da47c606db50183e1d9c19dc6626864a50c2838623836e65084951416452dfe"; + version = "0.13.1.1"; + sha256 = "5a61fe264daddeafe4ef47e6a09a00d323abe16bc8bef23441ac818284623067"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base glib gtk3 pango ]; libraryPkgconfigDepends = [ vte ]; @@ -175284,42 +176934,6 @@ self: { }) {inherit (pkgs.gnome2) vte;}; "vty" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers - , data-default, deepseq, directory, filepath, hashable, HUnit - , microlens, microlens-mtl, microlens-th, mtl, parallel, parsec - , QuickCheck, quickcheck-assertions, random, smallcheck, stm - , string-qq, terminfo, test-framework, test-framework-hunit - , test-framework-smallcheck, text, transformers, unix, utf8-string - , vector - }: - mkDerivation { - pname = "vty"; - version = "5.11.1"; - sha256 = "4d6fa0bd9ad3f53c87cca1d02dab246326a9d79737b4861674ba4ff68646d23a"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-builder bytestring containers data-default deepseq - directory filepath hashable microlens microlens-mtl microlens-th - mtl parallel parsec stm terminfo text transformers unix utf8-string - vector - ]; - executableHaskellDepends = [ - base containers data-default microlens microlens-mtl mtl - ]; - testHaskellDepends = [ - base blaze-builder bytestring Cabal containers data-default deepseq - HUnit microlens microlens-mtl mtl QuickCheck quickcheck-assertions - random smallcheck stm string-qq terminfo test-framework - test-framework-hunit test-framework-smallcheck text unix - utf8-string vector - ]; - homepage = "https://github.com/coreyoconnor/vty"; - description = "A simple terminal UI library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vty_5_11_3" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers , data-default, deepseq, directory, filepath, hashable, HUnit , microlens, microlens-mtl, microlens-th, mtl, parallel, parsec @@ -175353,7 +176967,6 @@ self: { homepage = "https://github.com/coreyoconnor/vty"; description = "A simple terminal UI library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vty-examples" = callPackage @@ -177479,12 +179092,13 @@ self: { }: mkDerivation { pname = "web-routes-th"; - version = "0.22.5"; - sha256 = "1a4d3d51e67abb9c0906fbc586c2f8fa1fc2e251e944eb918ba38dd6796b3355"; + version = "0.22.6"; + sha256 = "e67472973238f1a6ed31c909e1021311da00a47f9d1c4dd0279bd1fca43eb9fb"; libraryHaskellDepends = [ base parsec split template-haskell text web-routes ]; testHaskellDepends = [ base hspec HUnit QuickCheck web-routes ]; + homepage = "https://github.com/happstack/web-routes-th"; description = "Support for deriving PathInfo using Template Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -177809,8 +179423,8 @@ self: { }: mkDerivation { pname = "webkit"; - version = "0.14.2.0"; - sha256 = "3fdfe31a039f6168b0a694963fcdf2014e8928955b6fb88f0ef8f2c403473f51"; + version = "0.14.2.1"; + sha256 = "b80ef2a7d9def4245ec85f6065f62fc19fafe7ca3379a5def86e98eeaea1f550"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base bytestring cairo glib gtk mtl pango text transformers @@ -177825,8 +179439,8 @@ self: { ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit }: mkDerivation { pname = "webkit-javascriptcore"; - version = "0.14.2.0"; - sha256 = "e0add063357a0798d6b40b9f8bab83395094199de3432570e4632a8d71a624e2"; + version = "0.14.2.1"; + sha256 = "ab36d0b283d6126826352fcfdc94a14073c05ad63818b4e3f2806707dc3e3f06"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ webkit ]; @@ -177841,8 +179455,8 @@ self: { }: mkDerivation { pname = "webkitgtk3"; - version = "0.14.2.0"; - sha256 = "dd3e3bc62b31616681ffcee07df11b30155433a2cc7eea0560af53c7560f1a86"; + version = "0.14.2.1"; + sha256 = "6a71c475efbbfdac1c6d2fec12fb3c986dc13e09e1abdbde3dcf7a20421ab4f6"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base bytestring cairo glib gtk3 mtl pango text transformers @@ -177857,8 +179471,8 @@ self: { ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit }: mkDerivation { pname = "webkitgtk3-javascriptcore"; - version = "0.14.2.0"; - sha256 = "0eba3872499ca6fc54b24a8205297f01498eca2c7622e76c92458bc018ee1edc"; + version = "0.14.2.1"; + sha256 = "922080150c96c9276ea3ddd9ef19d867f5e179017b56e8fec02e2606d4cc924d"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ webkit ]; @@ -178505,19 +180119,6 @@ self: { }) {}; "withdependencies" = callPackage - ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl }: - mkDerivation { - pname = "withdependencies"; - version = "0.2.3"; - sha256 = "eae91b83a4e93c9e31ba5aca90607234708cb65f247e8bc6813b6f25d3ddb8b7"; - libraryHaskellDepends = [ base conduit containers mtl ]; - testHaskellDepends = [ base conduit hspec HUnit mtl ]; - homepage = "https://github.com/bartavelle/withdependencies"; - description = "Run computations that depend on one or more elements in a stream"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "withdependencies_0_2_4" = callPackage ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl , profunctors }: @@ -178532,7 +180133,6 @@ self: { homepage = "https://github.com/bartavelle/withdependencies"; description = "Run computations that depend on one or more elements in a stream"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "witherable" = callPackage @@ -180340,14 +181940,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "xlsx-tabular_0_1_1" = callPackage + "xlsx-tabular_0_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , lens, text, xlsx }: mkDerivation { pname = "xlsx-tabular"; - version = "0.1.1"; - sha256 = "b266fd453913fede59a1d27122b675035829de7e7037eaa92de8a1e40f942f7d"; + version = "0.2.0"; + sha256 = "95ee0e839d58131a296580fdb73884a208ed017c9b1bfbda1ad05227ec54db77"; libraryHaskellDepends = [ aeson base bytestring containers data-default lens text xlsx ]; @@ -180830,6 +182430,7 @@ self: { homepage = "https://github.com/sinelaw/xml-to-json"; description = "Library and command line tool for converting XML files to json"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-to-json-fast" = callPackage @@ -182715,6 +184316,7 @@ self: { homepage = "https://github.com/andrewthad/colonnade#readme"; description = "Helper functions for using yesod with colonnade"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-comments" = callPackage @@ -183025,30 +184627,6 @@ self: { }) {}; "yesod-form" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, containers, data-default - , email-validate, hspec, network-uri, persistent, resourcet - , semigroups, shakespeare, template-haskell, text, time - , transformers, wai, xss-sanitize, yesod-core, yesod-persistent - }: - mkDerivation { - pname = "yesod-form"; - version = "1.4.7.1"; - sha256 = "66f1672c7aaec0b4c93f5cfc20593a4fb92d779d90d55ee5ebd1f7ae6a6e8dac"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder blaze-html blaze-markup - byteable bytestring containers data-default email-validate - network-uri persistent resourcet semigroups shakespeare - template-haskell text time transformers wai xss-sanitize yesod-core - yesod-persistent - ]; - testHaskellDepends = [ base hspec text time ]; - homepage = "http://www.yesodweb.com/"; - description = "Form handling support for Yesod Web Framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-form_1_4_8" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, containers, data-default , email-validate, hspec, network-uri, persistent, resourcet @@ -183070,7 +184648,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Form handling support for Yesod Web Framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-form-json" = callPackage @@ -183757,29 +185334,29 @@ self: { ({ mkDerivation, async, attoparsec, base, base64-bytestring , blaze-builder, byteable, bytestring, conduit, conduit-extra , containers, cryptohash, cryptohash-conduit, css-text - , data-default, directory, file-embed, filepath, hashable, hjsmin - , hspec, http-types, HUnit, mime-types, old-time, process - , resourcet, template-haskell, text, transformers, unix-compat - , unordered-containers, wai, wai-app-static, wai-extra, yesod-core - , yesod-test + , data-default, directory, exceptions, file-embed, filepath + , hashable, hjsmin, hspec, http-types, HUnit, mime-types, old-time + , process, resourcet, template-haskell, text, transformers + , unix-compat, unordered-containers, wai, wai-app-static, wai-extra + , yesod-core, yesod-test }: mkDerivation { pname = "yesod-static"; - version = "1.5.0.5"; - sha256 = "3cf3f0a1da82caf974343fe03c8efa7794f56d13c6747846fa746f16b029f459"; + version = "1.5.1.1"; + sha256 = "cdb50763c4cbd2b8fcdb2b9f2f2526648e82454c62d49bfd6d165af80a192a92"; libraryHaskellDepends = [ async attoparsec base base64-bytestring blaze-builder byteable bytestring conduit conduit-extra containers cryptohash - cryptohash-conduit css-text data-default directory file-embed - filepath hashable hjsmin http-types mime-types old-time process - resourcet template-haskell text transformers unix-compat + cryptohash-conduit css-text data-default directory exceptions + file-embed filepath hashable hjsmin http-types mime-types old-time + process resourcet template-haskell text transformers unix-compat unordered-containers wai wai-app-static yesod-core ]; testHaskellDepends = [ async base base64-bytestring byteable bytestring conduit conduit-extra containers cryptohash cryptohash-conduit data-default - directory file-embed filepath hjsmin hspec http-types HUnit - mime-types old-time process resourcet template-haskell text + directory exceptions file-embed filepath hjsmin hspec http-types + HUnit mime-types old-time process resourcet template-haskell text transformers unix-compat unordered-containers wai wai-app-static wai-extra yesod-core yesod-test ]; @@ -185383,25 +186960,6 @@ self: { }) {inherit (pkgs) zlib;}; "zlib" = callPackage - ({ mkDerivation, base, bytestring, HUnit, QuickCheck, tasty - , tasty-hunit, tasty-quickcheck, zlib - }: - mkDerivation { - pname = "zlib"; - version = "0.6.1.1"; - sha256 = "c5f5b4285473657a7997d74f7642f3e7bda40f92c3c5d49471a899e27a4ba735"; - revision = "3"; - editedCabalFile = "b5fff98d06289c9c16ab78d994f88f18345ccf7d0ef3e5334bb417d763b07046"; - libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ zlib ]; - testHaskellDepends = [ - base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck - ]; - description = "Compression and decompression in the gzip and zlib formats"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) zlib;}; - - "zlib_0_6_1_2" = callPackage ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit , tasty-quickcheck, zlib }: @@ -185416,7 +186974,6 @@ self: { ]; description = "Compression and decompression in the gzip and zlib formats"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) zlib;}; "zlib-bindings" = callPackage diff --git a/pkgs/development/haskell-modules/patches/hdbus-semicolons.patch b/pkgs/development/haskell-modules/patches/hdbus-semicolons.patch new file mode 100644 index 00000000000..dc7ece8f3e8 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/hdbus-semicolons.patch @@ -0,0 +1,34 @@ +From 8fd84b4d6ba257ac93a61bce3378777840e8bf80 Mon Sep 17 00:00:00 2001 +From: Nikolay Amiantov +Date: Sat, 5 Nov 2016 14:27:04 +0300 +Subject: [PATCH] getSessionAddress: take first bus address from + semicolon-separated variable + +--- + lib/DBus/Address.hs | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/DBus/Address.hs b/lib/DBus/Address.hs +index 72ac99d..596b18c 100644 +--- a/lib/DBus/Address.hs ++++ b/lib/DBus/Address.hs +@@ -18,6 +18,7 @@ module DBus.Address where + import qualified Control.Exception + import Data.Char (digitToInt, ord, chr) + import Data.List (intercalate) ++import Data.Maybe (listToMaybe) + import qualified Data.Map + import Data.Map (Map) + import qualified System.Environment +@@ -152,7 +153,7 @@ getSystemAddress = do + getSessionAddress :: IO (Maybe Address) + getSessionAddress = do + env <- getenv "DBUS_SESSION_BUS_ADDRESS" +- return (env >>= parseAddress) ++ return $ maybe Nothing listToMaybe (env >>= parseAddresses) + + -- | Returns the address in the environment variable + -- @DBUS_STARTER_ADDRESS@, which must be set. +-- +2.10.1 + diff --git a/pkgs/development/interpreters/erlang/R14.nix b/pkgs/development/interpreters/erlang/R14.nix index be7d775a668..0a93726fc0a 100644 --- a/pkgs/development/interpreters/erlang/R14.nix +++ b/pkgs/development/interpreters/erlang/R14.nix @@ -60,6 +60,5 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 27368580de0..78d154bb654 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -15,8 +15,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out + mkdir -p $out/share/doc/groovy rm bin/*.bat - mv * $out + mv {bin,conf,embeddable,grooid,indy,lib} $out + mv {licenses,LICENSE,NOTICE} $out/share/doc/groovy sed -i 's#which#${which}/bin/which#g' $out/bin/startGroovy @@ -27,8 +29,6 @@ stdenv.mkDerivation rec { done ''; - phases = "unpackPhase installPhase"; - meta = with stdenv.lib; { description = "An agile dynamic language for the Java Platform"; homepage = http://groovy-lang.org/; diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 3389620cdd9..226f819ded9 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull -, libsndfile, libX11, graphicsmagick, pcre, pkgconfig, mesa, fltk +, libsndfile, portaudio, libX11, graphicsmagick, pcre, pkgconfig, mesa, fltk , fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas, arpack, libwebp , qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null , suitesparse ? null, gnuplot ? null, jdk ? null, python ? null, overridePlatforms ? null @@ -18,16 +18,16 @@ let in stdenv.mkDerivation rec { - version = "4.0.1"; + version = "4.0.3"; name = "octave-${version}"; src = fetchurl { url = "mirror://gnu/octave/${name}.tar.xz"; - sha256 = "11y2w6jgngj4rxiy136mkcs02l52rxk60kapyfc4rgrxz5hli3ym"; + sha256 = "11day29k4yfvxh4101x5yf26ld992x5n6qvmhjjk6mzsd26fqayw"; }; - buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11 - graphicsmagick pcre pkgconfig mesa fltk zlib curl openblas libsndfile - fftw fftwSinglePrec qrupdate arpack libwebp ] + buildInputs = [ gfortran readline ncurses perl flex texinfo qhull + graphicsmagick pcre pkgconfig fltk zlib curl openblas libsndfile fftw + fftwSinglePrec portaudio qrupdate arpack libwebp ] ++ (stdenv.lib.optional (qt != null) qt) ++ (stdenv.lib.optional (qscintilla != null) qscintilla) ++ (stdenv.lib.optional (ghostscript != null) ghostscript) @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ++ (stdenv.lib.optional (jdk != null) jdk) ++ (stdenv.lib.optional (gnuplot != null) gnuplot) ++ (stdenv.lib.optional (python != null) python) - ++ (stdenv.lib.optionals (!stdenv.isDarwin) [mesa libX11]) + ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ mesa libX11 ]) ; doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 8e462ffaacc..c7472076814 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -32,11 +32,11 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "6.6"; + version = "6.7"; src = fetchurl { url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - sha256 = "1kzdi1n6h6hmz8zd9k8r5a5yp2ryi4w3c2fjm1k6cqicn18cwaxz"; + sha256 = "0v1nz07vzz0c7rwyz15kbagpl4l42n871vbwij4wrbk2lx22ksgy"; }; FONTCONFIG_FILE = fontsConf; diff --git a/pkgs/development/libraries/audio/lv2/unstable.nix b/pkgs/development/libraries/audio/lv2/unstable.nix new file mode 100644 index 00000000000..034282c4f3a --- /dev/null +++ b/pkgs/development/libraries/audio/lv2/unstable.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, gtk2, libsndfile, pkgconfig, python }: + +stdenv.mkDerivation rec { + name = "lv2-unstable-${version}"; + version = "2016-10-23"; + + src = fetchgit { + url = "http://lv2plug.in/git/cgit.cgi/lv2.git"; + rev = "b36868f3b96a436961c0c51b5b2dd71d05da9b12"; + sha256 = "1sx39j0gary2nayzv7xgqcra7z1rcw9hrafkji05aksdwf7q0pdm"; + }; + + buildInputs = [ gtk2 libsndfile pkgconfig python ]; + + configurePhase = "${python.interpreter} waf configure --prefix=$out"; + + buildPhase = "${python.interpreter} waf"; + + installPhase = "${python.interpreter} waf install"; + + meta = with stdenv.lib; { + homepage = http://lv2plug.in; + description = "A plugin standard for audio systems"; + license = licenses.mit; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix index 3f3627b6b23..7aa7244e234 100644 --- a/pkgs/development/libraries/audio/zita-resampler/default.nix +++ b/pkgs/development/libraries/audio/zita-resampler/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "zita-resampler-${version}"; - version = "1.3.0"; + version = "1.6.0"; src = fetchurl { url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; - sha256 = "0r9ary5sc3y8vba5pad581ha7mgsrlyai83w7w4x2fmhfy64q0wq"; + sha256 = "1w48lp99jn4wh687cvbnbnjgaraqzkb4bgir16cp504x55v8v20h"; }; makeFlags = [ diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index fc3b060b35e..71aa1874951 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, libiconv, libintlOrEmpty -, expat, zlib, libpng, pixman, fontconfig, freetype, xorg +{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, libiconv +, libintlOrEmpty, expat, zlib, libpng, pixman, fontconfig, freetype, xorg , gobjectSupport ? true, glib , xcbSupport ? true # no longer experimental since 1.12 , glSupport ? true, mesa_noglu ? null # mesa is no longer a big dependency @@ -26,6 +26,15 @@ stdenv.mkDerivation rec { sha256 = "1hbrdpm6xcczs2c2iid7by8h7dsd0jcf7an88s150njyqnjzxjg7"; }; + patches = [ + # from https://bugs.freedesktop.org/show_bug.cgi?id=98165 + (fetchpatch { + name = "cairo-CVE-2016-9082.patch"; + url = "https://bugs.freedesktop.org/attachment.cgi?id=127421"; + sha256 = "03sfyaclzlglip4pvfjb4zj4dmm8mlphhxl30mb6giinkc74bfri"; + }) + ]; + prePatch = '' patches="$patches $(echo $infinality/*_cairo-iu/*.patch)" ''; diff --git a/pkgs/development/libraries/clanlib/default.nix b/pkgs/development/libraries/clanlib/default.nix deleted file mode 100644 index d4d46dd696c..00000000000 --- a/pkgs/development/libraries/clanlib/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ -stdenv, fetchurl, zlib, -libpng, libjpeg, libvorbis, libogg, -libX11, xf86vidmodeproto, libXxf86vm, libXmu, mesa -}: - -stdenv.mkDerivation { - name = "clanlib-0.8.0"; - src = fetchurl { - url = http://www.clanlib.org/download/releases-0.8/ClanLib-0.8.0.tgz; - sha256 = "1rjr601h3hisrhvpkrj00wirx5hyfbppv9rla400wx7a42xvvyfy"; - }; - - buildInputs = [zlib libpng libjpeg - libvorbis libogg libX11 - xf86vidmodeproto libXmu - mesa libXxf86vm - ]; -} diff --git a/pkgs/development/libraries/dxflib/default.nix b/pkgs/development/libraries/dxflib/default.nix index f9c58857731..832b013123d 100644 --- a/pkgs/development/libraries/dxflib/default.nix +++ b/pkgs/development/libraries/dxflib/default.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "2.5.0.0-1"; + version = "3.12.2"; name = "dxflib-${version}"; src = fetchurl { url = "http://www.qcad.org/archives/dxflib/${name}.src.tar.gz"; diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index 99cb8aae323..6f906d52502 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -21,6 +21,8 @@ composableDerivation.composableDerivation {} { --replace 'class Fl_XFont_On_Demand' 'class FL_EXPORT Fl_XFont_On_Demand' ''; + patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ inputproto ] ++ (if stdenv.isDarwin diff --git a/pkgs/development/libraries/fltk/nsosv.patch b/pkgs/development/libraries/fltk/nsosv.patch new file mode 100644 index 00000000000..9e55b011b57 --- /dev/null +++ b/pkgs/development/libraries/fltk/nsosv.patch @@ -0,0 +1,20 @@ +diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm +index 6f5b8b1..2c7763d 100644 +--- a/src/Fl_cocoa.mm ++++ b/src/Fl_cocoa.mm +@@ -4074,15 +4074,6 @@ Window fl_xid(const Fl_Window* w) + static int calc_mac_os_version() { + int M, m, b = 0; + NSAutoreleasePool *localPool = [[NSAutoreleasePool alloc] init]; +-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10 +- if ([NSProcessInfo instancesRespondToSelector:@selector(operatingSystemVersion)]) { +- NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion]; +- M = version.majorVersion; +- m = version.minorVersion; +- b = version.patchVersion; +- } +- else +-#endif + { + NSDictionary * sv = [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"]; + const char *s = [[sv objectForKey:@"ProductVersion"] UTF8String]; diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix index 6af09bd5179..7530d82a7e3 100644 --- a/pkgs/development/libraries/ganv/default.nix +++ b/pkgs/development/libraries/ganv/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchsvn, graphviz, gtkmm2, pkgconfig, python }: +{ stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkgconfig, python }: stdenv.mkDerivation rec { - name = "ganv-svn-${rev}"; - rev = "5675"; + name = "ganv-unstable-${rev}"; + rev = "2016-10-15"; - src = fetchsvn { - url = "http://svn.drobilla.net/lad/trunk/ganv"; - rev = rev; - sha256 = "0klzng3jvc09lj4hxnzlb8z5s5qp8rj16b1x1j6hcbqdja54fccj"; + src = fetchgit { + url = "http://git.drobilla.net/cgit.cgi/ganv.git"; + rev = "31685d283e9b811b61014f820c42807f4effa071"; + sha256 = "0xmbykdl42jn9cgzrqrys5lng67d26nk5xq10wkkvjqldiwdck56"; }; - buildInputs = [ graphviz gtkmm2 pkgconfig python ]; + buildInputs = [ graphviz gtk2 gtkmm2 pkgconfig python ]; - configurePhase = "python waf configure --prefix=$out"; + configurePhase = "${python.interpreter} waf configure --prefix=$out"; - buildPhase = "python waf"; + buildPhase = "${python.interpreter} waf"; - installPhase = "python waf install"; + installPhase = "${python.interpreter} waf install"; meta = with stdenv.lib; { description = "An interactive Gtk canvas widget for graph-based interfaces"; diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/development/libraries/gsoap/default.nix index d1140319611..bf1d29dae0e 100644 --- a/pkgs/development/libraries/gsoap/default.nix +++ b/pkgs/development/libraries/gsoap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gsoap-${version}"; - version = "2.8.16"; + version = "2.8.37"; src = fetchurl { - url = "mirror://sourceforge/project/gsoap2/gSOAP/gsoap_${version}.zip"; - sha256 = "00lhhysa9f9ychkvn1ij0ngr54l1dl9ww801yrliwq5c05gql7a6"; + url = "mirror://sourceforge/project/gsoap2/gsoap-2.8/gsoap_${version}.zip"; + sha256 = "1nvf5hgwff1agqdzbn3qc5569jzm14qkwqws0673z6hv2l3lijx3"; }; buildInputs = [ unzip m4 bison flex openssl zlib ]; diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index da15755355d..da6a8c7a74a 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { ''; postInstall = '' - for prog in "$out/bin/"*; do - wrapProgram "$prog" --prefix GST_PLUGIN_SYSTEM_PATH : "\$(unset _tmp; for profile in \$NIX_PROFILES; do _tmp="\$profile/lib/gstreamer-1.0''$\{_tmp:+:\}\$_tmp"; done; printf "\$_tmp")" + for prog in "$dev/bin/"*; do + wrapProgram "$prog" --suffix GST_PLUGIN_SYSTEM_PATH : "\$(unset _tmp; for profile in \$NIX_PROFILES; do _tmp="\$profile/lib/gstreamer-1.0''$\{_tmp:+:\}\$_tmp"; done; printf "\$_tmp")" done ''; diff --git a/pkgs/development/libraries/iksemel/default.nix b/pkgs/development/libraries/iksemel/default.nix deleted file mode 100644 index 7e8061ee8bb..00000000000 --- a/pkgs/development/libraries/iksemel/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnutls, zlib }: - -stdenv.mkDerivation rec { - name = "iksemel-${version}"; - version = "1.4"; - - src = fetchurl { - url = "https://iksemel.googlecode.com/files/${name}.tar.gz"; - sha1 = "722910b99ce794fd3f6f0e5f33fa804732cf46db"; - }; - - preConfigure = '' - sed -i -e '/if.*gnutls_check_version/,/return 1;/c return 0;' configure - export LIBGNUTLS_CONFIG="${pkgconfig}/bin/pkg-config gnutls" - ''; - - buildInputs = [ pkgconfig gnutls zlib ]; - - meta = { - homepage = "https://code.google.com/p/iksemel/"; - license = stdenv.lib.licenses.lgpl21Plus; - description = "Fast and portable XML parser and Jabber protocol library"; - }; -} diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index e2061df88f0..895d72dd7a0 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -1,27 +1,13 @@ { stdenv, fetchurl, fetchpatch, libjpeg, autoreconfHook }: stdenv.mkDerivation rec { - name = "jasper-1.900.2"; + name = "jasper-1.900.21"; src = fetchurl { url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.tar.gz"; - sha256 = "0bkibjhq3js2ldxa2f9pss84lcx4f5d3v0qis3ifi11ciy7a6c9a"; + sha256 = "1cypmlzq5vmbacsn8n3ls9p7g64scv3fzx88qf8c270dz10s5j79"; }; - patches = [ - ./jasper-CVE-2014-8137-variant2.diff - ./jasper-CVE-2014-8137-noabort.diff - - (fetchpatch { # CVE-2016-2089 - url = "https://github.com/mdadams/jasper/commit/aa6d9c2bbae9155f8e1466295373a68fa97291c3.patch"; - sha256 = "1pxnm86zmbq6brfwsm5wx3iv7s92n4xilc52lzp61q266jmlggrf"; - }) - (fetchpatch { # CVE-2015-5203 - url = "https://github.com/mdadams/jasper/commit/e73bb58f99fec0bf9c5d8866e010fcf736a53b9a.patch"; - sha256 = "1r6hxbnhpnb7q6p2kbdxc1cpph3ic851x2hy477yv5c3qmrbx9bk"; - }) - ]; - # newer reconf to recognize a multiout flag nativeBuildInputs = [ autoreconfHook ]; propagatedBuildInputs = [ libjpeg ]; diff --git a/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-noabort.diff b/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-noabort.diff deleted file mode 100644 index 47b57d5c809..00000000000 --- a/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-noabort.diff +++ /dev/null @@ -1,16 +0,0 @@ -From RedHat: https://bugzilla.redhat.com/attachment.cgi?id=967284&action=diff - ---- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:30:54.193209780 +0100 -+++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:36:46.313217814 +0100 -@@ -291,7 +291,10 @@ jas_image_t *jp2_decode(jas_stream_t *in - case JP2_COLR_ICC: - iccprof = jas_iccprof_createfrombuf(dec->colr->data.colr.iccp, - dec->colr->data.colr.iccplen); -- assert(iccprof); -+ if (!iccprof) { -+ jas_eprintf("error: failed to parse ICC profile\n"); -+ goto error; -+ } - jas_iccprof_gethdr(iccprof, &icchdr); - jas_eprintf("ICC Profile CS %08x\n", icchdr.colorspc); - jas_image_setclrspc(dec->image, fromiccpcs(icchdr.colorspc)); diff --git a/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-variant2.diff b/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-variant2.diff deleted file mode 100644 index 243300dd70e..00000000000 --- a/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-variant2.diff +++ /dev/null @@ -1,45 +0,0 @@ -From RedHat: https://bugzilla.redhat.com/attachment.cgi?id=967283&action=diff - ---- jasper-1.900.1.orig/src/libjasper/base/jas_icc.c 2014-12-11 14:06:44.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/base/jas_icc.c 2014-12-11 15:16:37.971272386 +0100 -@@ -1009,7 +1009,6 @@ static int jas_icccurv_input(jas_iccattr - return 0; - - error: -- jas_icccurv_destroy(attrval); - return -1; - } - -@@ -1127,7 +1126,6 @@ static int jas_icctxtdesc_input(jas_icca - #endif - return 0; - error: -- jas_icctxtdesc_destroy(attrval); - return -1; - } - -@@ -1206,8 +1204,6 @@ static int jas_icctxt_input(jas_iccattrv - goto error; - return 0; - error: -- if (txt->string) -- jas_free(txt->string); - return -1; - } - -@@ -1328,7 +1324,6 @@ static int jas_icclut8_input(jas_iccattr - goto error; - return 0; - error: -- jas_icclut8_destroy(attrval); - return -1; - } - -@@ -1497,7 +1492,6 @@ static int jas_icclut16_input(jas_iccatt - goto error; - return 0; - error: -- jas_icclut16_destroy(attrval); - return -1; - } - diff --git a/pkgs/development/libraries/jasper/jasper-CVE-2014-8138.diff b/pkgs/development/libraries/jasper/jasper-CVE-2014-8138.diff deleted file mode 100644 index cbf0899d807..00000000000 --- a/pkgs/development/libraries/jasper/jasper-CVE-2014-8138.diff +++ /dev/null @@ -1,16 +0,0 @@ -From RedHat: https://bugzilla.redhat.com/attachment.cgi?id=967280&action=diff - ---- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:06:44.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:06:26.000000000 +0100 -@@ -386,6 +386,11 @@ jas_image_t *jp2_decode(jas_stream_t *in - /* Determine the type of each component. */ - if (dec->cdef) { - for (i = 0; i < dec->numchans; ++i) { -+ /* Is the channel number reasonable? */ -+ if (dec->cdef->data.cdef.ents[i].channo >= dec->numchans) { -+ jas_eprintf("error: invalid channel number in CDEF box\n"); -+ goto error; -+ } - jas_image_setcmpttype(dec->image, - dec->chantocmptlut[dec->cdef->data.cdef.ents[i].channo], - jp2_getct(jas_image_clrspc(dec->image), diff --git a/pkgs/development/libraries/jasper/jasper-CVE-2014-8157.diff b/pkgs/development/libraries/jasper/jasper-CVE-2014-8157.diff deleted file mode 100644 index ebfc1b2d0f2..00000000000 --- a/pkgs/development/libraries/jasper/jasper-CVE-2014-8157.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -up jasper-1.900.1/src/libjasper/jpc/jpc_dec.c.CVE-2014-8157 jasper-1.900.1/src/libjasper/jpc/jpc_dec.c ---- jasper-1.900.1/src/libjasper/jpc/jpc_dec.c.CVE-2014-8157 2015-01-19 16:59:36.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/jpc/jpc_dec.c 2015-01-19 17:07:41.609863268 +0100 -@@ -489,7 +489,7 @@ static int jpc_dec_process_sot(jpc_dec_t - dec->curtileendoff = 0; - } - -- if (JAS_CAST(int, sot->tileno) > dec->numtiles) { -+ if (JAS_CAST(int, sot->tileno) >= dec->numtiles) { - jas_eprintf("invalid tile number in SOT marker segment\n"); - return -1; - } diff --git a/pkgs/development/libraries/jasper/jasper-CVE-2014-8158.diff b/pkgs/development/libraries/jasper/jasper-CVE-2014-8158.diff deleted file mode 100644 index ce9e4b497f3..00000000000 --- a/pkgs/development/libraries/jasper/jasper-CVE-2014-8158.diff +++ /dev/null @@ -1,329 +0,0 @@ -diff -up jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c.CVE-2014-8158 jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c ---- jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c.CVE-2014-8158 2015-01-19 17:25:28.730195502 +0100 -+++ jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c 2015-01-19 17:27:20.214663127 +0100 -@@ -306,11 +306,7 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in - { - - int bufsize = JPC_CEILDIVPOW2(numcols, 1); --#if !defined(HAVE_VLA) - jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE]; --#else -- jpc_fix_t splitbuf[bufsize]; --#endif - jpc_fix_t *buf = splitbuf; - register jpc_fix_t *srcptr; - register jpc_fix_t *dstptr; -@@ -318,7 +314,6 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in - register int m; - int hstartcol; - --#if !defined(HAVE_VLA) - /* Get a buffer. */ - if (bufsize > QMFB_SPLITBUFSIZE) { - if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { -@@ -326,7 +321,6 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in - abort(); - } - } --#endif - - if (numcols >= 2) { - hstartcol = (numcols + 1 - parity) >> 1; -@@ -360,12 +354,10 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in - } - } - --#if !defined(HAVE_VLA) - /* If the split buffer was allocated on the heap, free this memory. */ - if (buf != splitbuf) { - jas_free(buf); - } --#endif - - } - -@@ -374,11 +366,7 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in - { - - int bufsize = JPC_CEILDIVPOW2(numrows, 1); --#if !defined(HAVE_VLA) - jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE]; --#else -- jpc_fix_t splitbuf[bufsize]; --#endif - jpc_fix_t *buf = splitbuf; - register jpc_fix_t *srcptr; - register jpc_fix_t *dstptr; -@@ -386,7 +374,6 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in - register int m; - int hstartcol; - --#if !defined(HAVE_VLA) - /* Get a buffer. */ - if (bufsize > QMFB_SPLITBUFSIZE) { - if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { -@@ -394,7 +381,6 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in - abort(); - } - } --#endif - - if (numrows >= 2) { - hstartcol = (numrows + 1 - parity) >> 1; -@@ -428,12 +414,10 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in - } - } - --#if !defined(HAVE_VLA) - /* If the split buffer was allocated on the heap, free this memory. */ - if (buf != splitbuf) { - jas_free(buf); - } --#endif - - } - -@@ -442,11 +426,7 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a, - { - - int bufsize = JPC_CEILDIVPOW2(numrows, 1); --#if !defined(HAVE_VLA) - jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE * JPC_QMFB_COLGRPSIZE]; --#else -- jpc_fix_t splitbuf[bufsize * JPC_QMFB_COLGRPSIZE]; --#endif - jpc_fix_t *buf = splitbuf; - jpc_fix_t *srcptr; - jpc_fix_t *dstptr; -@@ -457,7 +437,6 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a, - int m; - int hstartcol; - --#if !defined(HAVE_VLA) - /* Get a buffer. */ - if (bufsize > QMFB_SPLITBUFSIZE) { - if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { -@@ -465,7 +444,6 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a, - abort(); - } - } --#endif - - if (numrows >= 2) { - hstartcol = (numrows + 1 - parity) >> 1; -@@ -517,12 +495,10 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a, - } - } - --#if !defined(HAVE_VLA) - /* If the split buffer was allocated on the heap, free this memory. */ - if (buf != splitbuf) { - jas_free(buf); - } --#endif - - } - -@@ -531,11 +507,7 @@ void jpc_qmfb_split_colres(jpc_fix_t *a, - { - - int bufsize = JPC_CEILDIVPOW2(numrows, 1); --#if !defined(HAVE_VLA) - jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE * JPC_QMFB_COLGRPSIZE]; --#else -- jpc_fix_t splitbuf[bufsize * numcols]; --#endif - jpc_fix_t *buf = splitbuf; - jpc_fix_t *srcptr; - jpc_fix_t *dstptr; -@@ -546,7 +518,6 @@ void jpc_qmfb_split_colres(jpc_fix_t *a, - int m; - int hstartcol; - --#if !defined(HAVE_VLA) - /* Get a buffer. */ - if (bufsize > QMFB_SPLITBUFSIZE) { - if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { -@@ -554,7 +525,6 @@ void jpc_qmfb_split_colres(jpc_fix_t *a, - abort(); - } - } --#endif - - if (numrows >= 2) { - hstartcol = (numrows + 1 - parity) >> 1; -@@ -606,12 +576,10 @@ void jpc_qmfb_split_colres(jpc_fix_t *a, - } - } - --#if !defined(HAVE_VLA) - /* If the split buffer was allocated on the heap, free this memory. */ - if (buf != splitbuf) { - jas_free(buf); - } --#endif - - } - -@@ -619,18 +587,13 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int - { - - int bufsize = JPC_CEILDIVPOW2(numcols, 1); --#if !defined(HAVE_VLA) - jpc_fix_t joinbuf[QMFB_JOINBUFSIZE]; --#else -- jpc_fix_t joinbuf[bufsize]; --#endif - jpc_fix_t *buf = joinbuf; - register jpc_fix_t *srcptr; - register jpc_fix_t *dstptr; - register int n; - int hstartcol; - --#if !defined(HAVE_VLA) - /* Allocate memory for the join buffer from the heap. */ - if (bufsize > QMFB_JOINBUFSIZE) { - if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { -@@ -638,7 +601,6 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int - abort(); - } - } --#endif - - hstartcol = (numcols + 1 - parity) >> 1; - -@@ -670,12 +632,10 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int - ++srcptr; - } - --#if !defined(HAVE_VLA) - /* If the join buffer was allocated on the heap, free this memory. */ - if (buf != joinbuf) { - jas_free(buf); - } --#endif - - } - -@@ -684,18 +644,13 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int - { - - int bufsize = JPC_CEILDIVPOW2(numrows, 1); --#if !defined(HAVE_VLA) - jpc_fix_t joinbuf[QMFB_JOINBUFSIZE]; --#else -- jpc_fix_t joinbuf[bufsize]; --#endif - jpc_fix_t *buf = joinbuf; - register jpc_fix_t *srcptr; - register jpc_fix_t *dstptr; - register int n; - int hstartcol; - --#if !defined(HAVE_VLA) - /* Allocate memory for the join buffer from the heap. */ - if (bufsize > QMFB_JOINBUFSIZE) { - if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) { -@@ -703,7 +658,6 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int - abort(); - } - } --#endif - - hstartcol = (numrows + 1 - parity) >> 1; - -@@ -735,12 +689,10 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int - ++srcptr; - } - --#if !defined(HAVE_VLA) - /* If the join buffer was allocated on the heap, free this memory. */ - if (buf != joinbuf) { - jas_free(buf); - } --#endif - - } - -@@ -749,11 +701,7 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, - { - - int bufsize = JPC_CEILDIVPOW2(numrows, 1); --#if !defined(HAVE_VLA) - jpc_fix_t joinbuf[QMFB_JOINBUFSIZE * JPC_QMFB_COLGRPSIZE]; --#else -- jpc_fix_t joinbuf[bufsize * JPC_QMFB_COLGRPSIZE]; --#endif - jpc_fix_t *buf = joinbuf; - jpc_fix_t *srcptr; - jpc_fix_t *dstptr; -@@ -763,7 +711,6 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, - register int i; - int hstartcol; - --#if !defined(HAVE_VLA) - /* Allocate memory for the join buffer from the heap. */ - if (bufsize > QMFB_JOINBUFSIZE) { - if (!(buf = jas_alloc2(bufsize, JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) { -@@ -771,7 +718,6 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, - abort(); - } - } --#endif - - hstartcol = (numrows + 1 - parity) >> 1; - -@@ -821,12 +767,10 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, - srcptr += JPC_QMFB_COLGRPSIZE; - } - --#if !defined(HAVE_VLA) - /* If the join buffer was allocated on the heap, free this memory. */ - if (buf != joinbuf) { - jas_free(buf); - } --#endif - - } - -@@ -835,11 +779,7 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, - { - - int bufsize = JPC_CEILDIVPOW2(numrows, 1); --#if !defined(HAVE_VLA) - jpc_fix_t joinbuf[QMFB_JOINBUFSIZE * JPC_QMFB_COLGRPSIZE]; --#else -- jpc_fix_t joinbuf[bufsize * numcols]; --#endif - jpc_fix_t *buf = joinbuf; - jpc_fix_t *srcptr; - jpc_fix_t *dstptr; -@@ -849,7 +789,6 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, - register int i; - int hstartcol; - --#if !defined(HAVE_VLA) - /* Allocate memory for the join buffer from the heap. */ - if (bufsize > QMFB_JOINBUFSIZE) { - if (!(buf = jas_alloc3(bufsize, numcols, sizeof(jpc_fix_t)))) { -@@ -857,7 +796,6 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, - abort(); - } - } --#endif - - hstartcol = (numrows + 1 - parity) >> 1; - -@@ -907,12 +845,10 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, - srcptr += numcols; - } - --#if !defined(HAVE_VLA) - /* If the join buffer was allocated on the heap, free this memory. */ - if (buf != joinbuf) { - jas_free(buf); - } --#endif - - } - diff --git a/pkgs/development/libraries/jasper/jasper-CVE-2014-9029.diff b/pkgs/development/libraries/jasper/jasper-CVE-2014-9029.diff deleted file mode 100644 index 01db7f03cdf..00000000000 --- a/pkgs/development/libraries/jasper/jasper-CVE-2014-9029.diff +++ /dev/null @@ -1,31 +0,0 @@ -From RedHat: https://bugzilla.redhat.com/attachment.cgi?id=961994&action=diff - ---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c 2014-11-27 12:45:44.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/jpc/jpc_dec.c 2014-11-27 12:44:58.000000000 +0100 -@@ -1281,7 +1281,7 @@ static int jpc_dec_process_coc(jpc_dec_t - jpc_coc_t *coc = &ms->parms.coc; - jpc_dec_tile_t *tile; - -- if (JAS_CAST(int, coc->compno) > dec->numcomps) { -+ if (JAS_CAST(int, coc->compno) >= dec->numcomps) { - jas_eprintf("invalid component number in COC marker segment\n"); - return -1; - } -@@ -1307,7 +1307,7 @@ static int jpc_dec_process_rgn(jpc_dec_t - jpc_rgn_t *rgn = &ms->parms.rgn; - jpc_dec_tile_t *tile; - -- if (JAS_CAST(int, rgn->compno) > dec->numcomps) { -+ if (JAS_CAST(int, rgn->compno) >= dec->numcomps) { - jas_eprintf("invalid component number in RGN marker segment\n"); - return -1; - } -@@ -1356,7 +1356,7 @@ static int jpc_dec_process_qcc(jpc_dec_t - jpc_qcc_t *qcc = &ms->parms.qcc; - jpc_dec_tile_t *tile; - -- if (JAS_CAST(int, qcc->compno) > dec->numcomps) { -+ if (JAS_CAST(int, qcc->compno) >= dec->numcomps) { - jas_eprintf("invalid component number in QCC marker segment\n"); - return -1; - } diff --git a/pkgs/development/libraries/jasper/jasper-CVE-2016-1867.diff b/pkgs/development/libraries/jasper/jasper-CVE-2016-1867.diff deleted file mode 100644 index b2dce8d8e70..00000000000 --- a/pkgs/development/libraries/jasper/jasper-CVE-2016-1867.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c 2007-01-19 22:43:07.000000000 +0100 -+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c 2016-01-14 14:22:24.569056412 +0100 -@@ -429,7 +429,7 @@ - } - - for (pi->compno = pchg->compnostart, pi->picomp = -- &pi->picomps[pi->compno]; pi->compno < JAS_CAST(int, pchg->compnoend); ++pi->compno, -+ &pi->picomps[pi->compno]; pi->compno < JAS_CAST(int, pchg->compnoend) && pi->compno < pi->numcomps; ++pi->compno, - ++pi->picomp) { - pirlvl = pi->picomp->pirlvls; - pi->xstep = pi->picomp->hsamp * (1 << (pirlvl->prcwidthexpn + \ No newline at end of file diff --git a/pkgs/development/libraries/java/jetty-gwt/default.nix b/pkgs/development/libraries/java/jetty-gwt/default.nix deleted file mode 100644 index 03433048270..00000000000 --- a/pkgs/development/libraries/java/jetty-gwt/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "jetty-gwt-6.1.14"; - src = fetchurl { - url = http://repository.codehaus.org/org/mortbay/jetty/jetty-gwt/6.1.14/jetty-gwt-6.1.14.jar; - sha256 = "17x8ss75rx9xjn93rq861mdn9d6gw87rbrf24blawa6ahhb56ppf"; - }; - buildCommand = '' - mkdir -p $out/share/java - cp $src $out/share/java/$name.jar - ''; -} diff --git a/pkgs/development/libraries/java/jetty-util/default.nix b/pkgs/development/libraries/java/jetty-util/default.nix deleted file mode 100644 index 349339aad44..00000000000 --- a/pkgs/development/libraries/java/jetty-util/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "jetty-util-6.1.16"; - src = fetchurl { - url = http://repository.codehaus.org/org/mortbay/jetty/jetty-util/6.1.16/jetty-util-6.1.16.jar; - sha256 = "1ld94lb5dk7y6sjg1rq8zdk97wiy56ik5vbgy7yjj4f6rz5pxbyq"; - }; - buildCommand = '' - mkdir -p $out/share/java - cp $src $out/share/java/$name.jar - ''; -} diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix index 464776569cb..1677376230b 100644 --- a/pkgs/development/libraries/java/saxon/default.nix +++ b/pkgs/development/libraries/java/saxon/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{ stdenv, fetchurl, unzip }: stdenv.mkDerivation { name = "saxon-6.5.3"; @@ -8,8 +8,13 @@ stdenv.mkDerivation { md5 = "7b8c7c187473c04d2abdb40d8ddab5c6"; }; - inherit unzip; - buildInputs = [unzip]; + nativeBuildInputs = [ unzip ]; + + # still leaving in root as well, in case someone is relying on that + preFixup = '' + mkdir -p "$out/share/java" + cp -s "$out"/*.jar "$out/share/java/" + ''; meta = { platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/java/saxon/unzip-builder.sh b/pkgs/development/libraries/java/saxon/unzip-builder.sh index 48b3d4509d0..8ac35568f0b 100755 --- a/pkgs/development/libraries/java/saxon/unzip-builder.sh +++ b/pkgs/development/libraries/java/saxon/unzip-builder.sh @@ -1,3 +1,6 @@ source $stdenv/setup unzip $src -d $out + +fixupPhase + diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix index f05da98f553..631cac4217c 100644 --- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix +++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix @@ -1,11 +1,14 @@ -{ kdeFramework, lib -, ecm -, ilmbase +{ + kdeFramework, lib, + ecm, + ilmbase, karchive }: kdeFramework { name = "kimageformats"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ ecm ]; + buildInputs = [ ilmbase ]; + propagatedBuildInputs = [ karchive ]; NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; } diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix index 60910b0d678..fe5ba503a40 100644 --- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix +++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, ecm, kactivities, karchive +{ kdeFramework, lib, fetchurl, ecm, kactivities, karchive , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative , kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio , knotifications, kpackage, kservice, kwindowsystem, kxmlgui @@ -8,6 +8,13 @@ kdeFramework { name = "plasma-framework"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + patches = [ + (fetchurl { + url = "https://cgit.kde.org/plasma-framework.git/patch/?id=62b0865492d863cd000814054681ba6a97972cd5"; + sha256 = "1ipz79apa9lkvcyfm5pap6v67hzncfz60z7s00zi6rnlbz96cy5f"; + name = "plasma-framework-osd-no-dialog.patch"; + }) + ]; nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index 01dd6b0d49e..496306c254d 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -1,14 +1,19 @@ -{ stdenv, fetchurl, libtiff }: +{ stdenv, fetchurl, libtiff, libjpeg, proj, zlib}: -stdenv.mkDerivation { - name = "libgeotiff-1.2.5"; +stdenv.mkDerivation rec { + version = "1.4.2"; + name = "libgeotiff-${version}"; src = fetchurl { - url = http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.2.5.tar.gz; - sha256 = "0z2yx77pm0zs81hc0b4lwzdd5s0rxcbylnscgq80b649src1fyzj"; + url = "http://download.osgeo.org/geotiff/libgeotiff/${name}.tar.gz"; + sha256 = "0vjy3bwfhljjx66p9w999i4mdhsf7vjshx29yc3pn5livf5091xd"; }; - buildInputs = [ libtiff ]; + configureFlags = [ + "--with-jpeg=${libjpeg.dev}" + "--with-zlib=${zlib.dev}" + ]; + buildInputs = [ libtiff proj ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix index 99f94bb8225..efe93ec02df 100644 --- a/pkgs/development/libraries/liblastfmSF/default.nix +++ b/pkgs/development/libraries/liblastfmSF/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, curl, openssl }: stdenv.mkDerivation rec { - name = "liblastfm-SF-0.3.2"; + name = "liblastfm-SF-0.5"; buildInputs = [ pkgconfig ]; propagatedBuildInputs = [ curl openssl ]; src = fetchurl { - url = "mirror://sourceforge/liblastfm/liblastfm-0.3.2.tar.gz"; - sha256 = "1hk62giysi96h6cyjyph69nlv1v4vw45w3sx7i2m89i9aysd6qp7"; + url = "mirror://sourceforge/liblastfm/libclastfm-0.5.tar.gz"; + sha256 = "0hpfflvfx6r4vvsbvdc564gkby8kr07p8ma7hgpxiy2pnlbpian9"; }; meta = { diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix index a35ab14e253..788a5db13cd 100644 --- a/pkgs/development/libraries/libsoundio/default.nix +++ b/pkgs/development/libraries/libsoundio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2-git, libpulseaudio }: +{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2Unstable, libpulseaudio }: stdenv.mkDerivation rec { version = "1.1.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0mw197l4bci1cjc2z877gxwsvk8r43dr7qiwci2hwl2cjlcnqr2p"; }; - buildInputs = [ cmake alsaLib libjack2-git libpulseaudio ]; + buildInputs = [ cmake alsaLib libjack2Unstable libpulseaudio ]; meta = with stdenv.lib; { description = "Cross platform audio input and output"; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index b632b910f01..394e6c2c170 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -2,6 +2,7 @@ let version = "4.0.6"; + debversion = "3"; in stdenv.mkDerivation rec { name = "libtiff-${version}"; @@ -19,36 +20,47 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = [ - (fetchpatch { - url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/01-CVE-2015-8665_and_CVE-2015-8683.patch"; - sha256 = "1c4zmvxj124873al8fvkiv8zq7wx5mv2vd4f1y9w8liv92cm7hkc"; + patches = let p = "https://sources.debian.net/data/main/t/tiff/${version}-${debversion}/debian/patches"; in [ + (fetchurl { + url = "${p}/01-CVE-2015-8665_and_CVE-2015-8683.patch"; + sha256 = "0qiiqpbbsf01b59x01z38cg14pmg1ggcsqm9n1gsld6rr5wm3ryz"; }) - (fetchpatch { - url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/02-fix_potential_out-of-bound_writes_in_decode_functions.patch"; - sha256 = "0rsc7zh7cdhgcmx2vbjfaqrb0g93a3924ngqkrzb14w5j2fqfbxv"; + (fetchurl { + url = "${p}/02-fix_potential_out-of-bound_writes_in_decode_functions.patch"; + sha256 = "1ph057w302i2s94rhdw6ksyvpsmg1nlanvc0251x01s23gkdbakv"; }) - (fetchpatch { - url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/03-fix_potential_out-of-bound_write_in_NeXTDecode.patch"; - sha256 = "1s01xhp4sl04yhqhqwp50gh43ykcqk230mmbv62vhy2jh7v0ky3a"; + (fetchurl { + url = "${p}/03-fix_potential_out-of-bound_write_in_NeXTDecode.patch"; + sha256 = "1nhjg2gdvyzi4wa2g7nwmzm7nssz9dpdfkwms1rp8i1034qdlgc6"; }) - (fetchpatch { - url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/04-CVE-2016-5314_CVE-2016-5316_CVE-2016-5320_CVE-2016-5875.patch"; - sha256 = "0by35qxpzv9ib3mnh980gd30jf3qmsfp2kl730rq4pq66wpzg9m8"; + (fetchurl { + url = "${p}/04-CVE-2016-5314_CVE-2016-5316_CVE-2016-5320_CVE-2016-5875.patch"; + sha256 = "0n47yk9wcvc9j72yvm5bhpaqq0yfz8jnq9zxbnzx5id9gdxmrkn3"; }) - (fetchpatch { - url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/05-CVE-2016-6223.patch"; - sha256 = "0rh8ia0wsf5yskzwdjrlbiilc9m0lq0igs42k6922pl3sa1lxzv1"; + (fetchurl { + url = "${p}/05-CVE-2016-6223.patch"; + sha256 = "0r80hil9k6scdjppgyljhm0s2z6c8cm259f0ic0xvxidfaim6g2r"; }) - (fetchpatch { - url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/06-CVE-2016-5321.patch"; - sha256 = "0n0igfxbd3kqvvj2k2xgysrp63l4v2gd110fwkk4apfpm0hvzwh0"; + (fetchurl { + url = "${p}/06-CVE-2016-5321.patch"; + sha256 = "1aacymlqv6cam8i4nbma9v05r3v3xjpagns7q0ii268h0mhzq6qg"; }) - (fetchpatch { - url = "https://sources.debian.net/data/main/t/tiff/4.0.6-2/debian/patches/07-CVE-2016-5323.patch"; - sha256 = "1j6w8g6qizkx5h4aq95kxzx6bgkn4jhc8l22swwhvlkichsh4910"; + (fetchurl { + url = "${p}/07-CVE-2016-5323.patch"; + sha256 = "1xr5hy2fxa71j3fcc1l998pxyblv207ygzyhibwb1lia5zjgblch"; + }) + (fetchurl { + url = "${p}/08-CVE-2016-3623_CVE-2016-3624.patch"; + sha256 = "1xnvwjvgyxi387h1sdiyp4360a3176jmipb7ghm8vwiz7cisdn9z"; + }) + (fetchurl { + url = "${p}/09-CVE-2016-5652.patch"; + sha256 = "1yqfq32gzh21ab2jfqkq13gaz0nin0492l06adzsyhr5brvdhnx8"; + }) + (fetchurl { + url = "${p}/10-CVE-2016-3658.patch"; + sha256 = "01kb8rfk30fgjf1hy0m088yhjfld1yyh4bk3gkg8jx3dl9bd076d"; }) - ]; doCheck = true; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 577006f9014..4831f150f45 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -12,6 +12,14 @@ in stdenv.mkDerivation rec { sha256 = "0g336cr0bw6dax1q48bblphmchgihx9p1pjmxdnrd6sh3qci3fgz"; }; + patches = [ + (fetchpatch { + name = "CVE-2016-4658.patch"; + url = "https://git.gnome.org/browse/libxml2/patch/?id=c1d1f7121194036608bf555f08d3062a36fd344b"; + sha256 = "0q7i5qgwgzp2x4r820mqq3nx69bgkd7n0v00j28wa6hndbfaaxmb"; + }) + ]; + # https://bugzilla.gnome.org/show_bug.cgi?id=766834#c5 postPatch = "patch -R < " + fetchpatch { name = "schemas-validity.patch"; diff --git a/pkgs/development/libraries/minmay/default.nix b/pkgs/development/libraries/minmay/default.nix deleted file mode 100644 index 4518b4dd760..00000000000 --- a/pkgs/development/libraries/minmay/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, cmake, openssl }: - -stdenv.mkDerivation rec { - name = "minmay-${version}"; - version = "1.0.0"; - - src = fetchurl { - url = "https://github.com/mazhe/minmay/archive/1.0.0.tar.gz"; - sha256 = "1amycxvhbd0lv6j5zsvxiwrx29jvndcy856j3b3bisys24h95zw2"; - }; - - buildInputs = [ cmake openssl ]; - - meta = { - homepage = "https://github.com/mazhe/minmay"; - license = stdenv.lib.licenses.lgpl21Plus; - description = "An XMPP library (forked from the iksemel project)"; - }; -} diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix index f35d363e575..a010ae9bd1a 100644 --- a/pkgs/development/libraries/nvidia-texture-tools/default.nix +++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix @@ -1,43 +1,41 @@ -{ stdenv, fetchsvn, cmake, libpng, ilmbase, libtiff, zlib, libjpeg -, mesa, libX11 -}: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - # No support yet for cg, cuda, glew, glut, openexr. + name = "nvidia-texture-tools-${version}"; + version = "2.1.0"; - name = "nvidia-texture-tools-1388"; - - src = fetchsvn { - url = "http://nvidia-texture-tools.googlecode.com/svn/trunk"; - rev = "1388"; - sha256 = "0pwxqx5l16nqidzm6mwd3rd4gbbknkz6q8cxnvf7sggjpbcvm2d6"; + src = fetchFromGitHub { + owner = "castano"; + repo = "nvidia-texture-tools"; + rev = version; + sha256 = "0p8ja0k323nkgm07z0qlslg6743vimy9rf3wad2968az0vwzjjyx"; }; - buildInputs = [ cmake libpng ilmbase libtiff zlib libjpeg mesa libX11 ]; + nativeBuildInputs = [ cmake ]; - hardeningDisable = [ "format" ]; - - patchPhase = '' - # Fix build due to missing dependnecies. - echo 'target_link_libraries(bc7 nvmath)' >> src/nvtt/bc7/CMakeLists.txt - echo 'target_link_libraries(bc6h nvmath)' >> src/nvtt/bc6h/CMakeLists.txt + outputs = [ "out" "dev" "lib" ]; + postPatch = '' # Make a recently added pure virtual function just virtual, # to keep compatibility. sed -i 's/virtual void endImage() = 0;/virtual void endImage() {}/' src/nvtt/nvtt.h - - # Fix building shared libraries. - sed -i 's/SET(NVIMAGE_SHARED TRUE)/SET(NVIMAGE_SHARED TRUE)\nSET(NVTHREAD_SHARED TRUE)/' CMakeLists.txt ''; cmakeFlags = [ "-DNVTT_SHARED=TRUE" ]; - meta = { + postInstall = '' + moveToOutput include "$dev" + moveToOutput lib "$lib" + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { description = "A set of cuda-enabled texture tools and compressors"; - homepage = "http://developer.nvidia.com/object/texture_tools.html"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + homepage = "https://github.com/castano/nvidia-texture-tools"; + license = licenses.mit; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/openjpeg/2.0.nix b/pkgs/development/libraries/openjpeg/2.0.nix deleted file mode 100644 index dd30b18e97c..00000000000 --- a/pkgs/development/libraries/openjpeg/2.0.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "2.0.1"; - branch = "2"; - revision = "version.2.0.1"; - sha256 = "03d0r8x66cxri9i20nr9gm1jnkp85yyd8mkrbmawv5nvybd0r7wv"; -}) diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix index e69ae5f98f7..1d4da00bf4c 100644 --- a/pkgs/development/libraries/qjson/default.nix +++ b/pkgs/development/libraries/qjson/default.nix @@ -1,11 +1,14 @@ -{ stdenv, fetchurl, cmake, qt4 }: +{ stdenv, fetchFromGitHub, cmake, qt4 }: stdenv.mkDerivation rec { - name = "qjson-0.8.1"; + version = "0.8.1"; + name = "qjson-${version}"; - src = fetchurl { - url = "mirror://sourceforge/qjson/${name}.tar.bz2"; - sha256 = "1n8lr2ph08yhcgimf4q1pnkd4z15v895bsf3m68ljz14aswvakfd"; + src = fetchFromGitHub { + owner = "flavio"; + repo = "qjson"; + rev = "${version}"; + sha256 = "1rb3ydrhyd4bczqzfv0kqpi2mx4hlpq1k8jvnwpcmvyaypqpqg59"; }; buildInputs = [ cmake qt4 ]; diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 2112b29c729..0e40a7ac96d 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -94,7 +94,7 @@ let qttranslations = callPackage ./qttranslations.nix {}; qtwayland = callPackage ./qtwayland.nix {}; qtwebchannel = callPackage ./qtwebchannel.nix {}; - qtwebengine = callPackage ./qtwebengine.nix {}; + qtwebengine = callPackage ./qtwebengine {}; qtwebkit = callPackage ./qtwebkit {}; qtwebsockets = callPackage ./qtwebsockets.nix {}; /* qtwinextras = not packaged */ diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine/chromium-clang-update-py.patch b/pkgs/development/libraries/qt-5/5.6/qtwebengine/chromium-clang-update-py.patch new file mode 100644 index 00000000000..65a604d2534 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtwebengine/chromium-clang-update-py.patch @@ -0,0 +1,874 @@ +--- a/src/3rdparty/chromium/tools/clang/scripts/update.py 2016-05-26 04:58:54.000000000 -0800 ++++ b/src/3rdparty/chromium/tools/clang/scripts/update.py 2016-11-04 08:35:34.956154012 -0800 +@@ -3,12 +3,12 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-"""Windows can't run .sh files, so this is a Python implementation of +-update.sh. This script should replace update.sh on all platforms eventually.""" ++"""This script is used to download prebuilt clang binaries. ++ ++It is also used by package.py to build the prebuilt clang binaries.""" + + import argparse +-import contextlib +-import cStringIO ++import distutils.spawn + import glob + import os + import pipes +@@ -18,6 +18,7 @@ + import stat + import sys + import tarfile ++import tempfile + import time + import urllib2 + import zipfile +@@ -25,19 +26,16 @@ + # Do NOT CHANGE this if you don't know what you're doing -- see + # https://code.google.com/p/chromium/wiki/UpdatingClang + # Reverting problematic clang rolls is safe, though. +-# Note: this revision is only used for Windows. Other platforms use update.sh. +-# TODO(thakis): Use the same revision on Windows and non-Windows. +-# TODO(thakis): Remove update.sh, use update.py everywhere. +-LLVM_WIN_REVISION = '239674' ++CLANG_REVISION = '239674' + + use_head_revision = 'LLVM_FORCE_HEAD_REVISION' in os.environ + if use_head_revision: +- LLVM_WIN_REVISION = 'HEAD' ++ CLANG_REVISION = 'HEAD' + + # This is incremented when pushing a new build of Clang at the same revision. + CLANG_SUB_REVISION=1 + +-PACKAGE_VERSION = "%s-%s" % (LLVM_WIN_REVISION, CLANG_SUB_REVISION) ++PACKAGE_VERSION = "%s-%s" % (CLANG_REVISION, CLANG_SUB_REVISION) + + # Path constants. (All of these should be absolute paths.) + THIS_DIR = os.path.abspath(os.path.dirname(__file__)) +@@ -50,17 +48,26 @@ + CHROME_TOOLS_SHIM_DIR = os.path.join(LLVM_DIR, 'tools', 'chrometools') + LLVM_BUILD_DIR = os.path.join(CHROMIUM_DIR, 'third_party', 'llvm-build', + 'Release+Asserts') +-COMPILER_RT_BUILD_DIR = os.path.join(LLVM_BUILD_DIR, '32bit-compiler-rt') ++COMPILER_RT_BUILD_DIR = os.path.join(LLVM_BUILD_DIR, 'compiler-rt') + CLANG_DIR = os.path.join(LLVM_DIR, 'tools', 'clang') + LLD_DIR = os.path.join(LLVM_DIR, 'tools', 'lld') +-COMPILER_RT_DIR = os.path.join(LLVM_DIR, 'projects', 'compiler-rt') ++# compiler-rt is built as part of the regular LLVM build on Windows to get ++# the 64-bit runtime, and out-of-tree elsewhere. ++# TODO(thakis): Try to unify this. ++if sys.platform == 'win32': ++ COMPILER_RT_DIR = os.path.join(LLVM_DIR, 'projects', 'compiler-rt') ++else: ++ COMPILER_RT_DIR = os.path.join(LLVM_DIR, 'compiler-rt') + LIBCXX_DIR = os.path.join(LLVM_DIR, 'projects', 'libcxx') + LIBCXXABI_DIR = os.path.join(LLVM_DIR, 'projects', 'libcxxabi') + LLVM_BUILD_TOOLS_DIR = os.path.abspath( + os.path.join(LLVM_DIR, '..', 'llvm-build-tools')) +-STAMP_FILE = os.path.join(LLVM_DIR, '..', 'llvm-build', 'cr_build_revision') ++STAMP_FILE = os.path.normpath( ++ os.path.join(LLVM_DIR, '..', 'llvm-build', 'cr_build_revision')) + BINUTILS_DIR = os.path.join(THIRD_PARTY_DIR, 'binutils') +-VERSION = '3.7.0' ++VERSION = '3.8.0' ++ANDROID_NDK_DIR = os.path.join( ++ CHROMIUM_DIR, 'third_party', 'android_tools', 'ndk') + + # URL for pre-built binaries. + CDS_URL = 'https://commondatastorage.googleapis.com/chromium-browser-clang' +@@ -74,40 +81,75 @@ + """Download url into output_file.""" + CHUNK_SIZE = 4096 + TOTAL_DOTS = 10 +- sys.stdout.write('Downloading %s ' % url) +- sys.stdout.flush() +- response = urllib2.urlopen(url) +- total_size = int(response.info().getheader('Content-Length').strip()) +- bytes_done = 0 +- dots_printed = 0 ++ num_retries = 3 ++ retry_wait_s = 5 # Doubled at each retry. ++ + while True: +- chunk = response.read(CHUNK_SIZE) +- if not chunk: +- break +- output_file.write(chunk) +- bytes_done += len(chunk) +- num_dots = TOTAL_DOTS * bytes_done / total_size +- sys.stdout.write('.' * (num_dots - dots_printed)) +- sys.stdout.flush() +- dots_printed = num_dots +- print ' Done.' ++ try: ++ sys.stdout.write('Downloading %s ' % url) ++ sys.stdout.flush() ++ response = urllib2.urlopen(url) ++ total_size = int(response.info().getheader('Content-Length').strip()) ++ bytes_done = 0 ++ dots_printed = 0 ++ while True: ++ chunk = response.read(CHUNK_SIZE) ++ if not chunk: ++ break ++ output_file.write(chunk) ++ bytes_done += len(chunk) ++ num_dots = TOTAL_DOTS * bytes_done / total_size ++ sys.stdout.write('.' * (num_dots - dots_printed)) ++ sys.stdout.flush() ++ dots_printed = num_dots ++ if bytes_done != total_size: ++ raise urllib2.URLError("only got %d of %d bytes" % ++ (bytes_done, total_size)) ++ print ' Done.' ++ return ++ except urllib2.URLError as e: ++ sys.stdout.write('\n') ++ print e ++ if num_retries == 0 or isinstance(e, urllib2.HTTPError) and e.code == 404: ++ raise e ++ num_retries -= 1 ++ print 'Retrying in %d s ...' % retry_wait_s ++ time.sleep(retry_wait_s) ++ retry_wait_s *= 2 ++ ++ ++def EnsureDirExists(path): ++ if not os.path.exists(path): ++ print "Creating directory %s" % path ++ os.makedirs(path) ++ ++ ++def DownloadAndUnpack(url, output_dir): ++ with tempfile.TemporaryFile() as f: ++ DownloadUrl(url, f) ++ f.seek(0) ++ EnsureDirExists(output_dir) ++ if url.endswith('.zip'): ++ zipfile.ZipFile(f).extractall(path=output_dir) ++ else: ++ tarfile.open(mode='r:gz', fileobj=f).extractall(path=output_dir) + + + def ReadStampFile(): + """Return the contents of the stamp file, or '' if it doesn't exist.""" + try: + with open(STAMP_FILE, 'r') as f: +- return f.read() ++ return f.read().rstrip() + except IOError: + return '' + + + def WriteStampFile(s): + """Write s to the stamp file.""" +- if not os.path.exists(os.path.dirname(STAMP_FILE)): +- os.makedirs(os.path.dirname(STAMP_FILE)) ++ EnsureDirExists(os.path.dirname(STAMP_FILE)) + with open(STAMP_FILE, 'w') as f: + f.write(s) ++ f.write('\n') + + + def GetSvnRevision(svn_repo): +@@ -129,6 +171,13 @@ + shutil.rmtree(dir, onerror=ChmodAndRetry) + + ++def RmCmakeCache(dir): ++ """Delete CMakeCache.txt files under dir recursively.""" ++ for dirpath, _, files in os.walk(dir): ++ if 'CMakeCache.txt' in files: ++ os.remove(os.path.join(dirpath, 'CMakeCache.txt')) ++ ++ + def RunCommand(command, msvc_arch=None, env=None, fail_hard=True): + """Run command and return success (True) or failure; or if fail_hard is + True, exit on failure. If msvc_arch is set, runs the command in a +@@ -170,8 +219,8 @@ + def CopyDirectoryContents(src, dst, filename_filter=None): + """Copy the files from directory src to dst + with an optional filename filter.""" +- if not os.path.exists(dst): +- os.makedirs(dst) ++ dst = os.path.realpath(dst) # realpath() in case dst ends in /.. ++ EnsureDirExists(dst) + for root, _, files in os.walk(src): + for f in files: + if filename_filter and not re.match(filename_filter, f): +@@ -181,9 +230,9 @@ + + def Checkout(name, url, dir): + """Checkout the SVN module at url into dir. Use name for the log message.""" +- print "Checking out %s r%s into '%s'" % (name, LLVM_WIN_REVISION, dir) ++ print "Checking out %s r%s into '%s'" % (name, CLANG_REVISION, dir) + +- command = ['svn', 'checkout', '--force', url + '@' + LLVM_WIN_REVISION, dir] ++ command = ['svn', 'checkout', '--force', url + '@' + CLANG_REVISION, dir] + if RunCommand(command, fail_hard=False): + return + +@@ -195,120 +244,9 @@ + RunCommand(command) + + +-def RevertPreviouslyPatchedFiles(): +- print 'Reverting previously patched files' +- files = [ +- '%(clang)s/test/Index/crash-recovery-modules.m', +- '%(clang)s/unittests/libclang/LibclangTest.cpp', +- '%(compiler_rt)s/lib/asan/asan_rtl.cc', +- '%(compiler_rt)s/test/asan/TestCases/Linux/new_array_cookie_test.cc', +- '%(llvm)s/test/DebugInfo/gmlt.ll', +- '%(llvm)s/lib/CodeGen/SpillPlacement.cpp', +- '%(llvm)s/lib/CodeGen/SpillPlacement.h', +- '%(llvm)s/lib/Transforms/Instrumentation/MemorySanitizer.cpp', +- '%(clang)s/test/Driver/env.c', +- '%(clang)s/lib/Frontend/InitPreprocessor.cpp', +- '%(clang)s/test/Frontend/exceptions.c', +- '%(clang)s/test/Preprocessor/predefined-exceptions.m', +- '%(llvm)s/test/Bindings/Go/go.test', +- '%(clang)s/lib/Parse/ParseExpr.cpp', +- '%(clang)s/lib/Parse/ParseTemplate.cpp', +- '%(clang)s/lib/Sema/SemaDeclCXX.cpp', +- '%(clang)s/lib/Sema/SemaExprCXX.cpp', +- '%(clang)s/test/SemaCXX/default2.cpp', +- '%(clang)s/test/SemaCXX/typo-correction-delayed.cpp', +- '%(compiler_rt)s/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc', +- '%(compiler_rt)s/test/tsan/signal_segv_handler.cc', +- '%(compiler_rt)s/lib/sanitizer_common/sanitizer_coverage_libcdep.cc', +- '%(compiler_rt)s/cmake/config-ix.cmake', +- '%(compiler_rt)s/CMakeLists.txt', +- '%(compiler_rt)s/lib/ubsan/ubsan_platform.h', +- ] +- for f in files: +- f = f % { +- 'clang': CLANG_DIR, +- 'compiler_rt': COMPILER_RT_DIR, +- 'llvm': LLVM_DIR, +- } +- if os.path.exists(f): +- os.remove(f) # For unversioned files. +- RunCommand(['svn', 'revert', f]) +- +- +-def ApplyLocalPatches(): +- # There's no patch program on Windows by default. We don't need patches on +- # Windows yet, and maybe this not working on Windows will motivate us to +- # remove patches over time. +- assert sys.platform != 'win32' +- +- # Apply patch for tests failing with --disable-pthreads (llvm.org/PR11974) +- clang_patches = [ r"""\ +---- test/Index/crash-recovery-modules.m (revision 202554) +-+++ test/Index/crash-recovery-modules.m (working copy) +-@@ -12,6 +12,8 @@ +- +- // REQUIRES: crash-recovery +- // REQUIRES: shell +-+// XFAIL: * +-+// (PR11974) +- +- @import Crash; +-""", r"""\ +---- unittests/libclang/LibclangTest.cpp (revision 215949) +-+++ unittests/libclang/LibclangTest.cpp (working copy) +-@@ -431,7 +431,7 @@ +- EXPECT_EQ(0U, clang_getNumDiagnostics(ClangTU)); +- } +- +--TEST_F(LibclangReparseTest, ReparseWithModule) { +-+TEST_F(LibclangReparseTest, DISABLED_ReparseWithModule) { +- const char *HeaderTop = "#ifndef H\n#define H\nstruct Foo { int bar;"; +- const char *HeaderBottom = "\n};\n#endif\n"; +- const char *MFile = "#include \"HeaderFile.h\"\nint main() {" +-""" +- ] +- +- # This Go bindings test doesn't work after bootstrap on Linux, PR21552. +- llvm_patches = [ r"""\ +---- test/Bindings/Go/go.test (revision 223109) +-+++ test/Bindings/Go/go.test (working copy) +-@@ -1,3 +1,3 @@ +--; RUN: llvm-go test llvm.org/llvm/bindings/go/llvm +-+; RUN: true +- +- ; REQUIRES: shell +-""" +- ] +- +- # The UBSan run-time, which is now bundled with the ASan run-time, doesn't +- # work on Mac OS X 10.8 (PR23539). +- compiler_rt_patches = [ r"""\ +---- CMakeLists.txt (revision 241602) +-+++ CMakeLists.txt (working copy) +-@@ -305,6 +305,7 @@ +- list(APPEND SANITIZER_COMMON_SUPPORTED_OS iossim) +- endif() +- endif() +-+ set(SANITIZER_MIN_OSX_VERSION "10.7") +- if(SANITIZER_MIN_OSX_VERSION VERSION_LESS "10.7") +- message(FATAL_ERROR "Too old OS X version: ${SANITIZER_MIN_OSX_VERSION}") +- endif() +-""" +- ] +- +- for path, patches in [(LLVM_DIR, llvm_patches), +- (CLANG_DIR, clang_patches), +- (COMPILER_RT_DIR, compiler_rt_patches)]: +- print 'Applying patches in', path +- for patch in patches: +- print patch +- p = subprocess.Popen( ['patch', '-p0', '-d', path], stdin=subprocess.PIPE) +- (stdout, stderr) = p.communicate(input=patch) +- if p.returncode != 0: +- raise RuntimeError('stdout %s, stderr %s' % (stdout, stderr)) +- +- + def DeleteChromeToolsShim(): ++ OLD_SHIM_DIR = os.path.join(LLVM_DIR, 'tools', 'zzz-chrometools') ++ shutil.rmtree(OLD_SHIM_DIR, ignore_errors=True) + shutil.rmtree(CHROME_TOOLS_SHIM_DIR, ignore_errors=True) + + +@@ -337,6 +275,25 @@ + f.write('endif (CHROMIUM_TOOLS_SRC)\n') + + ++def MaybeDownloadHostGcc(args): ++ """Downloads gcc 4.8.2 if needed and makes sure args.gcc_toolchain is set.""" ++ if not sys.platform.startswith('linux') or args.gcc_toolchain: ++ return ++ ++ if subprocess.check_output(['gcc', '-dumpversion']).rstrip() < '4.7.0': ++ # We need a newer gcc version. ++ gcc_dir = os.path.join(LLVM_BUILD_TOOLS_DIR, 'gcc482precise') ++ if not os.path.exists(gcc_dir): ++ print 'Downloading pre-built GCC 4.8.2...' ++ DownloadAndUnpack( ++ CDS_URL + '/tools/gcc482precise.tgz', LLVM_BUILD_TOOLS_DIR) ++ args.gcc_toolchain = gcc_dir ++ else: ++ # Always set gcc_toolchain; llvm-symbolizer needs the bundled libstdc++. ++ args.gcc_toolchain = \ ++ os.path.dirname(os.path.dirname(distutils.spawn.find_executable('gcc'))) ++ ++ + def AddCMakeToPath(): + """Download CMake and add it to PATH.""" + if sys.platform == 'win32': +@@ -345,20 +302,10 @@ + 'cmake-3.2.2-win32-x86', 'bin') + else: + suffix = 'Darwin' if sys.platform == 'darwin' else 'Linux' +- zip_name = 'cmake310_%s.tgz' % suffix +- cmake_dir = os.path.join(LLVM_BUILD_TOOLS_DIR, 'cmake310', 'bin') ++ zip_name = 'cmake322_%s.tgz' % suffix ++ cmake_dir = os.path.join(LLVM_BUILD_TOOLS_DIR, 'cmake322', 'bin') + if not os.path.exists(cmake_dir): +- if not os.path.exists(LLVM_BUILD_TOOLS_DIR): +- os.makedirs(LLVM_BUILD_TOOLS_DIR) +- # The cmake archive is smaller than 20 MB, small enough to keep in memory: +- with contextlib.closing(cStringIO.StringIO()) as f: +- DownloadUrl(CDS_URL + '/tools/' + zip_name, f) +- f.seek(0) +- if zip_name.endswith('.zip'): +- zipfile.ZipFile(f).extractall(path=LLVM_BUILD_TOOLS_DIR) +- else: +- tarfile.open(mode='r:gz', fileobj=f).extractall(path= +- LLVM_BUILD_TOOLS_DIR) ++ DownloadAndUnpack(CDS_URL + '/tools/' + zip_name, LLVM_BUILD_TOOLS_DIR) + os.environ['PATH'] = cmake_dir + os.pathsep + os.environ.get('PATH', '') + + vs_version = None +@@ -383,37 +330,61 @@ + + def UpdateClang(args): + print 'Updating Clang to %s...' % PACKAGE_VERSION +- if ReadStampFile() == PACKAGE_VERSION: +- print 'Already up to date.' +- return 0 ++ ++ need_gold_plugin = 'LLVM_DOWNLOAD_GOLD_PLUGIN' in os.environ or ( ++ sys.platform.startswith('linux') and ++ 'buildtype=Official' in os.environ.get('GYP_DEFINES', '') and ++ 'branding=Chrome' in os.environ.get('GYP_DEFINES', '')) ++ ++ if ReadStampFile() == PACKAGE_VERSION and not args.force_local_build: ++ print 'Clang is already up to date.' ++ if not need_gold_plugin or os.path.exists( ++ os.path.join(LLVM_BUILD_DIR, "lib/LLVMgold.so")): ++ return 0 + + # Reset the stamp file in case the build is unsuccessful. + WriteStampFile('') + + if not args.force_local_build: + cds_file = "clang-%s.tgz" % PACKAGE_VERSION +- cds_full_url = CDS_URL + '/Win/' + cds_file ++ if sys.platform == 'win32': ++ cds_full_url = CDS_URL + '/Win/' + cds_file ++ elif sys.platform == 'darwin': ++ cds_full_url = CDS_URL + '/Mac/' + cds_file ++ else: ++ assert sys.platform.startswith('linux') ++ cds_full_url = CDS_URL + '/Linux_x64/' + cds_file + +- # Check if there's a prebuilt binary and if so just fetch that. That's +- # faster, and goma relies on having matching binary hashes on client and +- # server too. +- print 'Trying to download prebuilt clang' +- +- # clang packages are smaller than 50 MB, small enough to keep in memory. +- with contextlib.closing(cStringIO.StringIO()) as f: +- try: +- DownloadUrl(cds_full_url, f) +- f.seek(0) +- tarfile.open(mode='r:gz', fileobj=f).extractall(path=LLVM_BUILD_DIR) +- print 'clang %s unpacked' % PACKAGE_VERSION +- WriteStampFile(PACKAGE_VERSION) +- return 0 +- except urllib2.HTTPError: +- print 'Did not find prebuilt clang %s, building locally' % cds_file ++ print 'Downloading prebuilt clang' ++ if os.path.exists(LLVM_BUILD_DIR): ++ RmTree(LLVM_BUILD_DIR) ++ try: ++ DownloadAndUnpack(cds_full_url, LLVM_BUILD_DIR) ++ print 'clang %s unpacked' % PACKAGE_VERSION ++ # Download the gold plugin if requested to by an environment variable. ++ # This is used by the CFI ClusterFuzz bot, and it's required for official ++ # builds on linux. ++ if need_gold_plugin: ++ RunCommand(['python', CHROMIUM_DIR+'/build/download_gold_plugin.py']) ++ WriteStampFile(PACKAGE_VERSION) ++ return 0 ++ except urllib2.URLError: ++ print 'Failed to download prebuilt clang %s' % cds_file ++ print 'Use --force-local-build if you want to build locally.' ++ print 'Exiting.' ++ return 1 ++ ++ if args.with_android and not os.path.exists(ANDROID_NDK_DIR): ++ print 'Android NDK not found at ' + ANDROID_NDK_DIR ++ print 'The Android NDK is needed to build a Clang whose -fsanitize=address' ++ print 'works on Android. See ' ++ print 'http://code.google.com/p/chromium/wiki/AndroidBuildInstructions' ++ print 'for how to install the NDK, or pass --without-android.' ++ return 1 + ++ MaybeDownloadHostGcc(args) + AddCMakeToPath() + +- RevertPreviouslyPatchedFiles() + DeleteChromeToolsShim() + + Checkout('LLVM', LLVM_REPO_URL + '/llvm/trunk', LLVM_DIR) +@@ -429,10 +400,24 @@ + # into it too (since OS X 10.6 doesn't have libc++abi.dylib either). + Checkout('libcxxabi', LLVM_REPO_URL + '/libcxxabi/trunk', LIBCXXABI_DIR) + +- if args.with_patches and sys.platform != 'win32': +- ApplyLocalPatches() +- + cc, cxx = None, None ++ libstdcpp = None ++ if args.gcc_toolchain: # This option is only used on Linux. ++ # Use the specified gcc installation for building. ++ cc = os.path.join(args.gcc_toolchain, 'bin', 'gcc') ++ cxx = os.path.join(args.gcc_toolchain, 'bin', 'g++') ++ ++ if not os.access(cc, os.X_OK): ++ print 'Invalid --gcc-toolchain: "%s"' % args.gcc_toolchain ++ print '"%s" does not appear to be valid.' % cc ++ return 1 ++ ++ # Set LD_LIBRARY_PATH to make auxiliary targets (tablegen, bootstrap ++ # compiler, etc.) find the .so. ++ libstdcpp = subprocess.check_output( ++ [cxx, '-print-file-name=libstdc++.so.6']).rstrip() ++ os.environ['LD_LIBRARY_PATH'] = os.path.dirname(libstdcpp) ++ + cflags = cxxflags = ldflags = [] + + # LLVM uses C++11 starting in llvm 3.5. On Linux, this means libstdc++4.7+ is +@@ -462,8 +447,7 @@ + + if args.bootstrap: + print 'Building bootstrap compiler' +- if not os.path.exists(LLVM_BOOTSTRAP_DIR): +- os.makedirs(LLVM_BOOTSTRAP_DIR) ++ EnsureDirExists(LLVM_BOOTSTRAP_DIR) + os.chdir(LLVM_BOOTSTRAP_DIR) + bootstrap_args = base_cmake_args + [ + '-DLLVM_TARGETS_TO_BUILD=host', +@@ -473,11 +457,16 @@ + ] + if cc is not None: bootstrap_args.append('-DCMAKE_C_COMPILER=' + cc) + if cxx is not None: bootstrap_args.append('-DCMAKE_CXX_COMPILER=' + cxx) ++ RmCmakeCache('.') + RunCommand(['cmake'] + bootstrap_args + [LLVM_DIR], msvc_arch='x64') + RunCommand(['ninja'], msvc_arch='x64') + if args.run_tests: + RunCommand(['ninja', 'check-all'], msvc_arch='x64') + RunCommand(['ninja', 'install'], msvc_arch='x64') ++ if args.gcc_toolchain: ++ # Copy that gcc's stdlibc++.so.6 to the build dir, so the bootstrap ++ # compiler can start. ++ CopyFile(libstdcpp, os.path.join(LLVM_BOOTSTRAP_INSTALL_DIR, 'lib')) + + if sys.platform == 'win32': + cc = os.path.join(LLVM_BOOTSTRAP_INSTALL_DIR, 'bin', 'clang-cl.exe') +@@ -489,6 +478,12 @@ + else: + cc = os.path.join(LLVM_BOOTSTRAP_INSTALL_DIR, 'bin', 'clang') + cxx = os.path.join(LLVM_BOOTSTRAP_INSTALL_DIR, 'bin', 'clang++') ++ ++ if args.gcc_toolchain: ++ # Tell the bootstrap compiler to use a specific gcc prefix to search ++ # for standard library headers and shared object files. ++ cflags = ['--gcc-toolchain=' + args.gcc_toolchain] ++ cxxflags = ['--gcc-toolchain=' + args.gcc_toolchain] + print 'Building final compiler' + + if sys.platform == 'darwin': +@@ -543,7 +538,7 @@ + binutils_incdir = os.path.join(BINUTILS_DIR, 'Linux_x64/Release/include') + + # If building at head, define a macro that plugins can use for #ifdefing +- # out code that builds at head, but not at LLVM_WIN_REVISION or vice versa. ++ # out code that builds at head, but not at CLANG_REVISION or vice versa. + if use_head_revision: + cflags += ['-DLLVM_FORCE_HEAD_REVISION'] + cxxflags += ['-DLLVM_FORCE_HEAD_REVISION'] +@@ -555,8 +550,15 @@ + deployment_env = os.environ.copy() + deployment_env['MACOSX_DEPLOYMENT_TARGET'] = deployment_target + +- cmake_args = base_cmake_args + [ ++ cmake_args = [] ++ # TODO(thakis): Unconditionally append this to base_cmake_args instead once ++ # compiler-rt can build with clang-cl on Windows (http://llvm.org/PR23698) ++ cc_args = base_cmake_args if sys.platform != 'win32' else cmake_args ++ if cc is not None: cc_args.append('-DCMAKE_C_COMPILER=' + cc) ++ if cxx is not None: cc_args.append('-DCMAKE_CXX_COMPILER=' + cxx) ++ cmake_args += base_cmake_args + [ + '-DLLVM_BINUTILS_INCDIR=' + binutils_incdir, ++ '-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly', + '-DCMAKE_C_FLAGS=' + ' '.join(cflags), + '-DCMAKE_CXX_FLAGS=' + ' '.join(cxxflags), + '-DCMAKE_EXE_LINKER_FLAGS=' + ' '.join(ldflags), +@@ -565,35 +567,44 @@ + '-DCMAKE_INSTALL_PREFIX=' + LLVM_BUILD_DIR, + '-DCHROMIUM_TOOLS_SRC=%s' % os.path.join(CHROMIUM_DIR, 'tools', 'clang'), + '-DCHROMIUM_TOOLS=%s' % ';'.join(args.tools)] +- # TODO(thakis): Unconditionally append this to base_cmake_args instead once +- # compiler-rt can build with clang-cl on Windows (http://llvm.org/PR23698) +- cc_args = base_cmake_args if sys.platform != 'win32' else cmake_args +- if cc is not None: cc_args.append('-DCMAKE_C_COMPILER=' + cc) +- if cxx is not None: cc_args.append('-DCMAKE_CXX_COMPILER=' + cxx) + +- if not os.path.exists(LLVM_BUILD_DIR): +- os.makedirs(LLVM_BUILD_DIR) ++ EnsureDirExists(LLVM_BUILD_DIR) + os.chdir(LLVM_BUILD_DIR) ++ RmCmakeCache('.') + RunCommand(['cmake'] + cmake_args + [LLVM_DIR], + msvc_arch='x64', env=deployment_env) +- RunCommand(['ninja'], msvc_arch='x64') ++ ++ if args.gcc_toolchain: ++ # Copy in the right stdlibc++.so.6 so clang can start. ++ if not os.path.exists(os.path.join(LLVM_BUILD_DIR, 'lib')): ++ os.mkdir(os.path.join(LLVM_BUILD_DIR, 'lib')) ++ libstdcpp = subprocess.check_output( ++ [cxx] + cxxflags + ['-print-file-name=libstdc++.so.6']).rstrip() ++ CopyFile(libstdcpp, os.path.join(LLVM_BUILD_DIR, 'lib')) ++ ++ # TODO(thakis): Remove "-d explain" once http://crbug.com/569337 is fixed. ++ RunCommand(['ninja', '-d', 'explain'], msvc_arch='x64') + + if args.tools: + # If any Chromium tools were built, install those now. + RunCommand(['ninja', 'cr-install'], msvc_arch='x64') + + if sys.platform == 'darwin': +- CopyFile(os.path.join(LLVM_BUILD_DIR, 'libc++.1.dylib'), ++ CopyFile(os.path.join(libcxxbuild, 'libc++.1.dylib'), + os.path.join(LLVM_BUILD_DIR, 'bin')) + # See http://crbug.com/256342 + RunCommand(['strip', '-x', os.path.join(LLVM_BUILD_DIR, 'bin', 'clang')]) + elif sys.platform.startswith('linux'): + RunCommand(['strip', os.path.join(LLVM_BUILD_DIR, 'bin', 'clang')]) + +- # Do an x86 build of compiler-rt to get the 32-bit ASan run-time. ++ # Do an out-of-tree build of compiler-rt. ++ # On Windows, this is used to get the 32-bit ASan run-time. + # TODO(hans): Remove once the regular build above produces this. +- if not os.path.exists(COMPILER_RT_BUILD_DIR): +- os.makedirs(COMPILER_RT_BUILD_DIR) ++ # On Mac and Linux, this is used to get the regular 64-bit run-time. ++ # Do a clobbered build due to cmake changes. ++ if os.path.isdir(COMPILER_RT_BUILD_DIR): ++ RmTree(COMPILER_RT_BUILD_DIR) ++ os.makedirs(COMPILER_RT_BUILD_DIR) + os.chdir(COMPILER_RT_BUILD_DIR) + # TODO(thakis): Add this once compiler-rt can build with clang-cl (see + # above). +@@ -606,11 +617,17 @@ + '-DCMAKE_CXX_FLAGS=' + ' '.join(cxxflags)] + if sys.platform != 'win32': + compiler_rt_args += ['-DLLVM_CONFIG_PATH=' + +- os.path.join(LLVM_BUILD_DIR, 'bin', 'llvm-config')] +- RunCommand(['cmake'] + compiler_rt_args + [LLVM_DIR], +- msvc_arch='x86', env=deployment_env) ++ os.path.join(LLVM_BUILD_DIR, 'bin', 'llvm-config'), ++ '-DSANITIZER_MIN_OSX_VERSION="10.7"'] ++ # compiler-rt is part of the llvm checkout on Windows but a stand-alone ++ # directory elsewhere, see the TODO above COMPILER_RT_DIR. ++ RmCmakeCache('.') ++ RunCommand(['cmake'] + compiler_rt_args + ++ [LLVM_DIR if sys.platform == 'win32' else COMPILER_RT_DIR], ++ msvc_arch='x86', env=deployment_env) + RunCommand(['ninja', 'compiler-rt'], msvc_arch='x86') + ++ # Copy select output to the main tree. + # TODO(hans): Make this (and the .gypi and .isolate files) version number + # independent. + if sys.platform == 'win32': +@@ -620,17 +637,35 @@ + else: + assert sys.platform.startswith('linux') + platform = 'linux' +- asan_rt_lib_src_dir = os.path.join(COMPILER_RT_BUILD_DIR, 'lib', 'clang', +- VERSION, 'lib', platform) ++ asan_rt_lib_src_dir = os.path.join(COMPILER_RT_BUILD_DIR, 'lib', platform) ++ if sys.platform == 'win32': ++ # TODO(thakis): This too is due to compiler-rt being part of the checkout ++ # on Windows, see TODO above COMPILER_RT_DIR. ++ asan_rt_lib_src_dir = os.path.join(COMPILER_RT_BUILD_DIR, 'lib', 'clang', ++ VERSION, 'lib', platform) + asan_rt_lib_dst_dir = os.path.join(LLVM_BUILD_DIR, 'lib', 'clang', + VERSION, 'lib', platform) +- CopyDirectoryContents(asan_rt_lib_src_dir, asan_rt_lib_dst_dir, +- r'^.*-i386\.lib$') +- CopyDirectoryContents(asan_rt_lib_src_dir, asan_rt_lib_dst_dir, +- r'^.*-i386\.dll$') ++ # Blacklists: ++ CopyDirectoryContents(os.path.join(asan_rt_lib_src_dir, '..', '..'), ++ os.path.join(asan_rt_lib_dst_dir, '..', '..'), ++ r'^.*blacklist\.txt$') ++ # Headers: ++ if sys.platform != 'win32': ++ CopyDirectoryContents( ++ os.path.join(COMPILER_RT_BUILD_DIR, 'include/sanitizer'), ++ os.path.join(LLVM_BUILD_DIR, 'lib/clang', VERSION, 'include/sanitizer')) ++ # Static and dynamic libraries: ++ CopyDirectoryContents(asan_rt_lib_src_dir, asan_rt_lib_dst_dir) ++ if sys.platform == 'darwin': ++ for dylib in glob.glob(os.path.join(asan_rt_lib_dst_dir, '*.dylib')): ++ # Fix LC_ID_DYLIB for the ASan dynamic libraries to be relative to ++ # @executable_path. ++ # TODO(glider): this is transitional. We'll need to fix the dylib ++ # name either in our build system, or in Clang. See also ++ # http://crbug.com/344836. ++ subprocess.call(['install_name_tool', '-id', ++ '@executable_path/' + os.path.basename(dylib), dylib]) + +- CopyFile(os.path.join(asan_rt_lib_src_dir, '..', '..', 'asan_blacklist.txt'), +- os.path.join(asan_rt_lib_dst_dir, '..', '..')) + + if sys.platform == 'win32': + # Make an extra copy of the sanitizer headers, to be put on the include path +@@ -640,22 +675,67 @@ + aux_sanitizer_include_dir = os.path.join(LLVM_BUILD_DIR, 'lib', 'clang', + VERSION, 'include_sanitizer', + 'sanitizer') +- if not os.path.exists(aux_sanitizer_include_dir): +- os.makedirs(aux_sanitizer_include_dir) ++ EnsureDirExists(aux_sanitizer_include_dir) + for _, _, files in os.walk(sanitizer_include_dir): + for f in files: + CopyFile(os.path.join(sanitizer_include_dir, f), + aux_sanitizer_include_dir) + ++ if args.with_android: ++ make_toolchain = os.path.join( ++ ANDROID_NDK_DIR, 'build', 'tools', 'make-standalone-toolchain.sh') ++ for target_arch in ['aarch64', 'arm', 'i686']: ++ # Make standalone Android toolchain for target_arch. ++ toolchain_dir = os.path.join( ++ LLVM_BUILD_DIR, 'android-toolchain-' + target_arch) ++ RunCommand([ ++ make_toolchain, ++ '--platform=android-' + ('21' if target_arch == 'aarch64' else '19'), ++ '--install-dir="%s"' % toolchain_dir, ++ '--system=linux-x86_64', ++ '--stl=stlport', ++ '--toolchain=' + { ++ 'aarch64': 'aarch64-linux-android-4.9', ++ 'arm': 'arm-linux-androideabi-4.9', ++ 'i686': 'x86-4.9', ++ }[target_arch]]) ++ # Android NDK r9d copies a broken unwind.h into the toolchain, see ++ # http://crbug.com/357890 ++ for f in glob.glob(os.path.join(toolchain_dir, 'include/c++/*/unwind.h')): ++ os.remove(f) ++ ++ # Build ASan runtime for Android in a separate build tree. ++ build_dir = os.path.join(LLVM_BUILD_DIR, 'android-' + target_arch) ++ if not os.path.exists(build_dir): ++ os.mkdir(os.path.join(build_dir)) ++ os.chdir(build_dir) ++ cflags = ['--target=%s-linux-androideabi' % target_arch, ++ '--sysroot=%s/sysroot' % toolchain_dir, ++ '-B%s' % toolchain_dir] ++ android_args = base_cmake_args + [ ++ '-DCMAKE_C_COMPILER=' + os.path.join(LLVM_BUILD_DIR, 'bin/clang'), ++ '-DCMAKE_CXX_COMPILER=' + os.path.join(LLVM_BUILD_DIR, 'bin/clang++'), ++ '-DLLVM_CONFIG_PATH=' + os.path.join(LLVM_BUILD_DIR, 'bin/llvm-config'), ++ '-DCMAKE_C_FLAGS=' + ' '.join(cflags), ++ '-DCMAKE_CXX_FLAGS=' + ' '.join(cflags), ++ '-DANDROID=1'] ++ RmCmakeCache('.') ++ RunCommand(['cmake'] + android_args + [COMPILER_RT_DIR]) ++ RunCommand(['ninja', 'libclang_rt.asan-%s-android.so' % target_arch]) ++ ++ # And copy it into the main build tree. ++ runtime = 'libclang_rt.asan-%s-android.so' % target_arch ++ for root, _, files in os.walk(build_dir): ++ if runtime in files: ++ shutil.copy(os.path.join(root, runtime), asan_rt_lib_dst_dir) ++ + # Run tests. + if args.run_tests or use_head_revision: + os.chdir(LLVM_BUILD_DIR) +- RunCommand(GetVSVersion().SetupScript('x64') + +- ['&&', 'ninja', 'cr-check-all']) ++ RunCommand(['ninja', 'cr-check-all'], msvc_arch='x64') + if args.run_tests: + os.chdir(LLVM_BUILD_DIR) +- RunCommand(GetVSVersion().SetupScript('x64') + +- ['&&', 'ninja', 'check-all']) ++ RunCommand(['ninja', 'check-all'], msvc_arch='x64') + + WriteStampFile(PACKAGE_VERSION) + print 'Clang update was successful.' +@@ -663,31 +743,6 @@ + + + def main(): +- if not sys.platform in ['win32', 'cygwin']: +- # For non-Windows, fall back to update.sh. +- # TODO(hans): Make update.py replace update.sh completely. +- +- # This script is called by gclient. gclient opens its hooks subprocesses +- # with (stdout=subprocess.PIPE, stderr=subprocess.STDOUT) and then does +- # custom output processing that breaks printing '\r' characters for +- # single-line updating status messages as printed by curl and wget. +- # Work around this by setting stderr of the update.sh process to stdin (!): +- # gclient doesn't redirect stdin, and while stdin itself is read-only, a +- # dup()ed sys.stdin is writable, try +- # fd2 = os.dup(sys.stdin.fileno()); os.write(fd2, 'hi') +- # TODO: Fix gclient instead, http://crbug.com/95350 +- if '--no-stdin-hack' in sys.argv: +- sys.argv.remove('--no-stdin-hack') +- stderr = None +- else: +- try: +- stderr = os.fdopen(os.dup(sys.stdin.fileno())) +- except: +- stderr = sys.stderr +- return subprocess.call( +- [os.path.join(os.path.dirname(__file__), 'update.sh')] + sys.argv[1:], +- stderr=stderr) +- + parser = argparse.ArgumentParser(description='Build Clang.') + parser.add_argument('--bootstrap', action='store_true', + help='first build clang with CC, then with itself.') +@@ -695,26 +750,24 @@ + help="run only if the script thinks clang is needed") + parser.add_argument('--force-local-build', action='store_true', + help="don't try to download prebuild binaries") ++ parser.add_argument('--gcc-toolchain', help='set the version for which gcc ' ++ 'version be used for building; --gcc-toolchain=/opt/foo ' ++ 'picks /opt/foo/bin/gcc') + parser.add_argument('--print-revision', action='store_true', + help='print current clang revision and exit.') ++ parser.add_argument('--print-clang-version', action='store_true', ++ help='print current clang version (e.g. x.y.z) and exit.') + parser.add_argument('--run-tests', action='store_true', + help='run tests after building; only for local builds') + parser.add_argument('--tools', nargs='*', + help='select which chrome tools to build', + default=['plugins', 'blink_gc_plugin']) +- parser.add_argument('--without-patches', action='store_false', +- help="don't apply patches (default)", dest='with_patches', +- default=True) +- +- # For now, these flags are only used for the non-Windows flow, but argparser +- # gets mad if it sees a flag it doesn't recognize. +- parser.add_argument('--no-stdin-hack', action='store_true') +- ++ parser.add_argument('--without-android', action='store_false', ++ help='don\'t build Android ASan runtime (linux only)', ++ dest='with_android', ++ default=sys.platform.startswith('linux')) + args = parser.parse_args() + +- if re.search(r'\b(make_clang_dir)=', os.environ.get('GYP_DEFINES', '')): +- print 'Skipping Clang update (make_clang_dir= was set in GYP_DEFINES).' +- return 0 + if args.if_needed: + is_clang_required = False + # clang is always used on Mac and Linux. +@@ -730,8 +783,16 @@ + is_clang_required = True + if not is_clang_required: + return 0 ++ if re.search(r'\b(make_clang_dir)=', os.environ.get('GYP_DEFINES', '')): ++ print 'Skipping Clang update (make_clang_dir= was set in GYP_DEFINES).' ++ return 0 ++ ++ if use_head_revision: ++ # TODO(hans): Remove after the next roll. ++ global VERSION ++ VERSION = '3.9.0' + +- global LLVM_WIN_REVISION, PACKAGE_VERSION ++ global CLANG_REVISION, PACKAGE_VERSION + if args.print_revision: + if use_head_revision: + print GetSvnRevision(LLVM_DIR) +@@ -739,6 +800,10 @@ + print PACKAGE_VERSION + return 0 + ++ if args.print_clang_version: ++ sys.stdout.write(VERSION) ++ return 0 ++ + # Don't buffer stdout, so that print statements are immediately flushed. + # Do this only after --print-revision has been handled, else we'll get + # an error message when this script is run from gn for some reason. +@@ -747,12 +812,13 @@ + if use_head_revision: + # Use a real revision number rather than HEAD to make sure that the stamp + # file logic works. +- LLVM_WIN_REVISION = GetSvnRevision(LLVM_REPO_URL) +- PACKAGE_VERSION = LLVM_WIN_REVISION + '-0' ++ CLANG_REVISION = GetSvnRevision(LLVM_REPO_URL) ++ PACKAGE_VERSION = CLANG_REVISION + '-0' + + args.force_local_build = True +- # Skip local patches when using HEAD: they probably don't apply anymore. +- args.with_patches = False ++ if 'OS=android' not in os.environ.get('GYP_DEFINES', ''): ++ # Only build the Android ASan rt on ToT bots when targetting Android. ++ args.with_android = False + + return UpdateClang(args) + diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine.nix b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix similarity index 96% rename from pkgs/development/libraries/qt-5/5.6/qtwebengine.nix rename to pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix index 2a437e62eca..dba3611683e 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix @@ -53,6 +53,9 @@ qtSubmodule { libcap pciutils ]; + patches = [ + ./chromium-clang-update-py.patch + ]; postInstall = '' cat > $out/libexec/qt.conf < (ps != null); +assert stdenv ? cc; +assert stdenv.cc ? libc; let os = stdenv.lib.optionalString; @@ -31,9 +33,8 @@ stdenv.mkDerivation rec { url = "http://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug"; sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj"; })] ++ - # Don't search in non-Nix locations such as /usr, but do search in - # Nixpkgs' Glibc. - optional (stdenv ? glibc) ./search-path.patch ++ + # Don't search in non-Nix locations such as /usr, but do search in our libc. + [ ./search-path.patch ] ++ optional (stdenv ? cross) (fetchurl { name = "fix-darwin-cross-compile.patch"; url = "http://public.kitware.com/Bug/file_download.php?" @@ -50,22 +51,25 @@ stdenv.mkDerivation rec { CMAKE_PREFIX_PATH = concatStringsSep ":" (concatMap (p: [ (p.dev or p) (p.out or p) ]) buildInputs); - configureFlags = - "--docdir=/share/doc/${name} --mandir=/share/man --system-libs --no-system-libarchive" - + stdenv.lib.optionalString useQt4 " --qt-gui"; + configureFlags = [ + "--docdir=/share/doc/${name}" + "--mandir=/share/man" + "--system-libs" + "--no-system-libarchive" + ] ++ stdenv.lib.optional useQt4 "--qt-gui"; setupHook = ./setup-hook.sh; dontUseCmakeConfigure = true; - preConfigure = with stdenv; optionalString (stdenv ? glibc) - '' + preConfigure = with stdenv; '' source $setupHook fixCmakeFiles . substituteInPlace Modules/Platform/UnixPaths.cmake \ - --subst-var-by glibc_bin ${getBin glibc} \ - --subst-var-by glibc_dev ${getDev glibc} \ - --subst-var-by glibc_lib ${getLib glibc} + --subst-var-by libc_bin ${getBin cc.libc} \ + --subst-var-by libc_dev ${getDev cc.libc} \ + --subst-var-by libc_lib ${getLib cc.libc} + configureFlags="--parallel=''${NIX_BUILD_CORES:-1} $configureFlags" ''; meta = { diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 52822178c02..1e4bacb0725 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -7,11 +7,13 @@ with stdenv.lib; assert wantPS -> (ps != null); +assert stdenv ? cc; +assert stdenv.cc ? libc; let os = stdenv.lib.optionalString; majorVersion = "3.6"; - minorVersion = "0"; + minorVersion = "2"; version = "${majorVersion}.${minorVersion}"; in @@ -22,13 +24,11 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; - sha256 = "0w3n2i02jpbgai4dxsigm1c1i1qb5v70wyxckzwrxvs0ri0fs1gx"; + sha256 = "0imkz04ncz6cv5659qfd4scm99k3siq7zrrsa8pvp663d8mf76hq"; }; - patches = - # Don't search in non-Nix locations such as /usr, but do search in - # Nixpkgs' Glibc. - optional (stdenv ? glibc) ./search-path-3.2.patch + # Don't search in non-Nix locations such as /usr, but do search in our libc. + patches = [ ./search-path-3.2.patch ] ++ optional stdenv.isCygwin ./3.2.2-cygwin.patch; outputs = [ "out" ]; @@ -43,15 +43,15 @@ stdenv.mkDerivation rec { propagatedBuildInputs = optional wantPS ps; - preConfigure = with stdenv; optionalString (stdenv ? glibc) - '' + preConfigure = with stdenv; '' fixCmakeFiles . substituteInPlace Modules/Platform/UnixPaths.cmake \ - --subst-var-by glibc_bin ${getBin glibc} \ - --subst-var-by glibc_dev ${getDev glibc} \ - --subst-var-by glibc_lib ${getLib glibc} + --subst-var-by libc_bin ${getBin cc.libc} \ + --subst-var-by libc_dev ${getDev cc.libc} \ + --subst-var-by libc_lib ${getLib cc.libc} substituteInPlace Modules/FindCxxTest.cmake \ --replace "$""{PYTHON_EXECUTABLE}" ${stdenv.shell} + configureFlags="--parallel=''${NIX_BUILD_CORES:-1} $configureFlags" ''; configureFlags = [ "--docdir=share/doc/${name}" diff --git a/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch b/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch index b61982efb9a..ba7438d2c0f 100644 --- a/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch +++ b/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch @@ -25,7 +25,7 @@ diff -ru3 cmake-3.4.3/Modules/Platform/UnixPaths.cmake cmake-3.4.3-new/Modules/P - /usr/pkg/include - /opt/csw/include /opt/include - /usr/openwin/include -+ @glibc_dev@/include ++ @libc_dev@/include ) - list(APPEND CMAKE_SYSTEM_LIBRARY_PATH @@ -39,26 +39,26 @@ diff -ru3 cmake-3.4.3/Modules/Platform/UnixPaths.cmake cmake-3.4.3-new/Modules/P - /usr/pkg/lib - /opt/csw/lib /opt/lib - /usr/openwin/lib -+ @glibc_lib@/lib ++ @libc_lib@/lib ) list(APPEND CMAKE_SYSTEM_PROGRAM_PATH - /usr/pkg/bin -+ @glibc_bin@/bin ++ @libc_bin@/bin ) list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES - /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64 -+ @glibc_lib@/lib ++ @libc_lib@/lib ) list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES - /usr/include -+ @glibc_dev@/include ++ @libc_dev@/include ) list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES - /usr/include -+ @glibc_dev@/include ++ @libc_dev@/include ) # Enable use of lib64 search path variants by default. diff --git a/pkgs/development/tools/build-managers/cmake/search-path.patch b/pkgs/development/tools/build-managers/cmake/search-path.patch index 6d6ca74ccad..9fc94966168 100644 --- a/pkgs/development/tools/build-managers/cmake/search-path.patch +++ b/pkgs/development/tools/build-managers/cmake/search-path.patch @@ -53,7 +53,7 @@ diff -ru3 cmake-2.8.12.2/Modules/Platform/UnixPaths.cmake cmake-2.8.12.2-new/Mod - /usr/pkg/include - /opt/csw/include /opt/include - /usr/openwin/include -+ @glibc_dev@/include ++ @libc_dev@/include ) list(APPEND CMAKE_SYSTEM_LIBRARY_PATH @@ -67,26 +67,26 @@ diff -ru3 cmake-2.8.12.2/Modules/Platform/UnixPaths.cmake cmake-2.8.12.2-new/Mod - /usr/pkg/lib - /opt/csw/lib /opt/lib - /usr/openwin/lib -+ @glibc_lib@/lib ++ @libc_lib@/lib ) list(APPEND CMAKE_SYSTEM_PROGRAM_PATH - /usr/pkg/bin -+ @glibc_bin@/bin ++ @libc_bin@/bin ) list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES - /lib /usr/lib /usr/lib32 /usr/lib64 -+ @glibc_lib@/lib ++ @libc_lib@/lib ) list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES - /usr/include -+ @glibc_dev@/include ++ @libc_dev@/include ) list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES - /usr/include -+ @glibc_dev@/include ++ @libc_dev@/include ) # Enable use of lib64 search path variants by default. diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index 634427daaa2..7f178babf32 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "dub-${version}"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { - sha256 = "07s52hmh9jc3i4jfx4j4a91m44qrr933pwfwczzijhybj2wmpjhh"; + sha256 = "1smzlfs5gjmrlghccdgn04qzy5b8l0xm8y2virayb2adrwqviscm"; rev = "v${version}"; repo = "dub"; owner = "D-Programming-Language"; diff --git a/pkgs/development/tools/build-managers/remake/default.nix b/pkgs/development/tools/build-managers/remake/default.nix index 676354a6e8d..7a199cc925a 100644 --- a/pkgs/development/tools/build-managers/remake/default.nix +++ b/pkgs/development/tools/build-managers/remake/default.nix @@ -2,11 +2,13 @@ stdenv.mkDerivation rec { name = "remake-${version}"; - version = "3.82+dbg-0.6"; + remakeVersion = "4.1"; + dbgVersion = "1.1"; + version = "${remakeVersion}+dbg-${dbgVersion}"; src = fetchurl { - url = "mirror://sourceforge/project/bashdb/remake/${version}/${name}.tar.bz2"; - sha256 = "0i2g6vi9zya78d9zpigfnmzg2qcl93myjfibh3kfmjk7b9lajfyz"; + url = "mirror://sourceforge/project/bashdb/remake/${version}/remake-${remakeVersion}+dbg${dbgVersion}.tar.bz2"; + sha256 = "1zi16pl7sqn1aa8b7zqm9qnd9vjqyfywqm8s6iap4clf86l7kss2"; }; buildInputs = [ readline ]; diff --git a/pkgs/development/tools/haskell/tinc/default.nix b/pkgs/development/tools/haskell/tinc/default.nix index 81a3a20381e..82d6492ce18 100644 --- a/pkgs/development/tools/haskell/tinc/default.nix +++ b/pkgs/development/tools/haskell/tinc/default.nix @@ -7,12 +7,12 @@ }: mkDerivation { pname = "tinc"; - version = "20160924"; + version = "20161102"; src = fetchFromGitHub { owner = "sol"; repo = "tinc"; - rev = "f5ba99264930a2af2f24770a23af2613acdac631"; - sha256 = "19mvswpjak9dxpd4w86fz1wv0zkn6ippc37gdkhyg4xcj9jn21a9"; + rev = "411d0f319717d01dc71bd5c1faef8035656eaf3d"; + sha256 = "040vyg9n7ihnqs6fyhhr5p4xscfxhji02wsfw4nncpxflzaciji5"; }; isLibrary = false; isExecutable = true; diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix index 6db999eea54..ecc690ead05 100644 --- a/pkgs/development/tools/leaps/default.nix +++ b/pkgs/development/tools/leaps/default.nix @@ -1,26 +1,26 @@ -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "leaps-${version}"; - version = "20160626-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "5cf7328a8c498041d2a887e89f22f138498f4621"; + version = "0.5.1"; goPackagePath = "github.com/jeffail/leaps"; - src = fetchgit { - inherit rev; - url = "https://github.com/jeffail/leaps"; - sha256 = "1qbgz48x9yi0w9yz39zsnnhx5nx2xmrns9v8hx28jah2bvag6sq7"; - fetchSubmodules = false; + src = fetchFromGitHub { + owner = "jeffail"; + repo = "leaps"; + sha256 = "0w63y777h5qc8fwnkrbawn3an9px0l1zz3649x0n8lhk125fvchj"; + rev = "v${version}"; }; goDeps = ./deps.nix; + meta = { description = "A pair programming tool and library written in Golang"; homepage = "https://github.com/jeffail/leaps/"; license = "MIT"; maintainers = with stdenv.lib.maintainers; [ qknight ]; meta.platforms = stdenv.lib.platforms.linux; - broken = true; }; } + diff --git a/pkgs/development/tools/leaps/deps.nix b/pkgs/development/tools/leaps/deps.nix index 0a6214a76d0..d611d9b4954 100644 --- a/pkgs/development/tools/leaps/deps.nix +++ b/pkgs/development/tools/leaps/deps.nix @@ -1,11 +1,94 @@ [ { - goPackagePath = "golang.org/x/net"; + goPackagePath = "github.com/amir/raidman"; fetch = { type = "git"; - url = "https://go.googlesource.com/net"; - rev = "07b51741c1d6423d4a6abab1c49940ec09cb1aaf"; - sha256 = "12lvdj0k2gww4hw5f79qb9yswqpy4i3bgv1likmf3mllgdxfm20w"; + url = "https://github.com/amir/raidman"; + rev = "91c20f3f475cab75bb40ad7951d9bbdde357ade7"; + sha256 = "0pkqy5hzjkk04wj1ljq8jsyla358ilxi4lkmvkk73b3dh2wcqvpp"; + }; + } + { + goPackagePath = "github.com/elazarl/go-bindata-assetfs"; + fetch = { + type = "git"; + url = "https://github.com/elazarl/go-bindata-assetfs"; + rev = "57eb5e1fc594ad4b0b1dbea7b286d299e0cb43c2"; + sha256 = "1za29pa15y2xsa1lza97jlkax9qj93ks4a2j58xzmay6rczfkb9i"; + }; + } + { + goPackagePath = "github.com/garyburd/redigo"; + fetch = { + type = "git"; + url = "https://github.com/garyburd/redigo"; + rev = "8873b2f1995f59d4bcdd2b0dc9858e2cb9bf0c13"; + sha256 = "1lzhb99pcwwf5ddcs0bw00fwf9m1d0k7b92fqz2a01jlij4pm5l2"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "7ebe0a500653eeb1859664bed5e48dec1e164e73"; + sha256 = "1gyan3lyn2j00di9haq7zm3zcwckn922iigx3fvml6s2bsp6ljas"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "bf531ff1a004f24ee53329dfd5ce0b41bfdc17df"; + sha256 = "10lnvmq28jp2wk1xc32mdk4745lal2bmdvbjirckb9wlv07zzzf0"; + }; + } + { + goPackagePath = "github.com/jeffail/gabs"; + fetch = { + type = "git"; + url = "https://github.com/jeffail/gabs"; + rev = "ee1575a53249b51d636e62464ca43a13030afdb5"; + sha256 = "0svv57193n8m86r7v7n0y9lny0p6nzr7xvz98va87h00mg146351"; + }; + } + { + goPackagePath = "github.com/jeffail/util"; + fetch = { + type = "git"; + url = "https://github.com/jeffail/util"; + rev = "48ada8ff9fcae546b5986f066720daa9033ad523"; + sha256 = "0k8zz7gdv4hb691fdyb5mhlixppcq8x4ny84fanflypnv258a3i0"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "3cd0097429be7d611bb644ef85b42bfb102ceea4"; + sha256 = "1q7qfzyfgjk6rvid548r43fi4jhvsh4dhfvfjbp2pz4xqsvpsm7a"; + }; + } + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "f9ab0dce87d815821e221626b772e3475a0d2749"; + sha256 = "0z18j6zxq9kw4lgcpmhh3k7jrb9gy1lx252xz5qhs4ywi9w77xwi"; + }; + } + + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "07b51741c1d6423d4a6abab1c49940ec09cb1aaf"; + sha256 = "12lvdj0k2gww4hw5f79qb9yswqpy4i3bgv1likmf3mllgdxfm20w"; }; } ] + diff --git a/pkgs/development/tools/misc/xc3sprog/default.nix b/pkgs/development/tools/misc/xc3sprog/default.nix index 52471c30fd0..8f3f6c1b22a 100644 --- a/pkgs/development/tools/misc/xc3sprog/default.nix +++ b/pkgs/development/tools/misc/xc3sprog/default.nix @@ -4,12 +4,12 @@ # prebuilt binary subversion snapshots on sourceforge. stdenv.mkDerivation rec { - version = "748"; # latest @ 2013-10-26 + version = "787"; name = "xc3sprog-${version}"; src = fetchsvn rec { url = "https://svn.code.sf.net/p/xc3sprog/code/trunk"; - sha256 = "0wkz6094kkqz91qpa24pzlbhndc47sjmqhwk3p7ccabv0041rzk0"; + sha256 = "1rfhms3i7375kdlg0sdg5k52ix3xv5llj2dr30vamyg7pk74y8rx"; rev = "${version}"; }; diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 959681c7e1a..f8f9646182b 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -1,14 +1,19 @@ -{ stdenv, fetchgit, cmake, llvmPackages, openssl, writeScript, bash, emacs }: +{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, writeScript, apple_sdk, bash, emacs }: stdenv.mkDerivation rec { name = "rtags-${version}"; version = "2.3"; - buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ]; + buildInputs = [ cmake llvmPackages.llvm openssl llvmPackages.clang emacs ] + ++ lib.optional stdenv.isDarwin apple_sdk.sdk; preConfigure = '' - export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags)" \ - LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib" + export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags) " \ + LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib" \ + + '' + lib.optionalString stdenv.isDarwin '' + export CXXFLAGS="-isysroot ${apple_sdk.sdk}/" \ + MACOSX_DEPLOYMENT_TARGET="10.9" ''; src = fetchgit { diff --git a/pkgs/development/tools/selenium/remote-control/default.nix b/pkgs/development/tools/selenium/remote-control/default.nix deleted file mode 100644 index fbe11ed2bc0..00000000000 --- a/pkgs/development/tools/selenium/remote-control/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchurl, jre }: - -# let version = "1.0-beta-2"; -let version = "1.0-SNAPSHOT-standalone"; - -in stdenv.mkDerivation { - /* - - Use this if there is another release.. - - name = "selenium-remote-control-${version}-dist"; - src = fetchurl { - url = "http://release.seleniumhq.org/selenium-remote-control/${version}/selenium-remote-control-${version}-dist.zip"; - sha256 = "0ciyfqvnv0117l2rhw9dclv85mcf3czpimvybj38v3syl7m7yk41"; - }; - buildInputs = [unzip]; - phases = "unpackPhase buildPhase"; - buildPhase = '' - mkdir -p $out/{bin,lib} - mv * $out/lib - bin="$out/bin/selenium-remote-control" - cat >> "$bin" << EOF - #!/bin/sh - exec ${jre}/bin/java -jar $out/lib/selenium-server-${version}/selenium-server.jar "\$@" - EOF - chmod +x "$bin" - ''; - */ - - # this snapshot version starts a firefox from a script file. It only issues a warning about it - # you still have to pass -DfirefoxDefaultPath=/home/marc/.nix-profile/bin/firefox or such.. - name = "selenium-remote-control-${version}-dist"; - # this dist file has been created using mvn package -Dmaven.test.skip=true based on svn rev 2450 - src = fetchurl { - url = "http://mawercer.de/~nix/selenium-server-1.0-SNAPSHOT-standalone.jar"; - sha256 = "1lqr72a3lmmww1psl19pzp91c9q1dm0314b7y7mz1gnfpwc49y38"; - }; - phases = "buildPhase"; - buildPhase = '' - mkdir -p $out/{bin,lib} - cp $src $out/lib/ - bin="$out/bin/selenium-remote-control" - cat >> "$bin" << EOF - #!/bin/sh - exec ${jre}/bin/java -jar "$out/lib/$(basename $src)" "\$@" - EOF - chmod +x "$bin" - ''; -} diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 7c92df30311..a45a95680b1 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -1,67 +1,69 @@ { stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser -, pkgconfig, runCommand, which, libtool -, version -, sha256 ? null -, src ? fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; inherit sha256; } -, preBuild ? "" -, extraConfigFlags ? [] -, extraBuildInputs ? [] -, patches ? [], - ... +, pkgconfig, runCommand, which, libtool, fetchpatch +, callPackage +, darwin ? null +, enableNpm ? true }: -assert stdenv.system != "armv5tel-linux"; +with stdenv.lib; let - deps = { - inherit openssl zlib libuv; - } // (stdenv.lib.optionalAttrs (!stdenv.isDarwin) { - inherit http-parser; - }); + inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; - sharedConfigureFlags = name: [ + sharedLibDeps = { inherit openssl zlib libuv; } // (optionalAttrs (!stdenv.isDarwin) { inherit http-parser; }); + + sharedConfigureFlags = concatMap (name: [ "--shared-${name}" - "--shared-${name}-includes=${builtins.getAttr name deps}/include" - "--shared-${name}-libpath=${builtins.getAttr name deps}/lib" - ]; + "--shared-${name}-libpath=${getLib sharedLibDeps.${name}}/lib" + /** Closure notes: we explicitly avoid specifying --shared-*-includes, + * as that would put the paths into bin/nodejs. + * Including pkgconfig in build inputs would also have the same effect! + */ + ]) (builtins.attrNames sharedLibDeps); - inherit (stdenv.lib) concatMap optional optionals maintainers licenses platforms; + extraConfigFlags = optionals (!enableNpm) [ "--without-npm" ]; +in -in stdenv.mkDerivation { + rec { - inherit version src preBuild; - - name = "nodejs-${version}"; - - configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ] ++ extraConfigFlags; - dontDisableStatic = true; - prePatch = '' - patchShebangs . - sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py - ''; - - postInstall = '' - PATH=$out/bin:$PATH patchShebangs $out - ''; - - patches = patches ++ stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ]; - - buildInputs = extraBuildInputs + buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ] ++ [ python2 which zlib libuv openssl ] ++ optionals stdenv.isLinux [ utillinux http-parser ] ++ optionals stdenv.isDarwin [ pkgconfig libtool ]; - setupHook = ./setup-hook.sh; - enableParallelBuilding = true; + configureFlags = sharedConfigureFlags ++ [ "--without-dtrace" ] ++ extraConfigFlags; - passthru.interpreterName = "nodejs"; + dontDisableStatic = true; - meta = { - description = "Event-driven I/O framework for the V8 JavaScript engine"; - homepage = http://nodejs.org; - license = licenses.mit; - maintainers = [ maintainers.goibhniu maintainers.havvy maintainers.gilligan maintainers.cko ]; - platforms = platforms.linux ++ platforms.darwin; - }; + enableParallelBuilding = true; + + passthru.interpreterName = "nodejs"; + + + setupHook = ./setup-hook.sh; + + patches = optionals stdenv.isDarwin [ ./no-xcode.patch ]; + + preBuild = optionalString stdenv.isDarwin '' + sed -i -e "s|tr1/type_traits|type_traits|g" \ + -e "s|std::tr1|std|" src/util.h + ''; + + prePatch = '' + patchShebangs . + sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py + ''; + + postInstall = '' + PATH=$out/bin:$PATH patchShebangs $out + ''; + + meta = { + description = "Event-driven I/O framework for the V8 JavaScript engine"; + homepage = http://nodejs.org; + license = licenses.mit; + maintainers = with maintainers; [ goibhniu havvy gilligan cko ]; + platforms = platforms.linux ++ platforms.darwin; + }; } diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix index f0a505a683a..04ea7086f74 100644 --- a/pkgs/development/web/nodejs/v4.nix +++ b/pkgs/development/web/nodejs/v4.nix @@ -1,17 +1,20 @@ { stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser -, pkgconfig, runCommand, which, libtool +, pkgconfig, runCommand, which, libtool, fetchpatch , callPackage +, darwin ? null +, enableNpm ? true }@args: -import ./nodejs.nix (args // rec { - version = "4.6.0"; - src = fetchurl { - url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz"; - sha256 = "1566q1kkv8j30fgqx8sm2h8323f38wwpa1hfb10gr6z46jyhv4a2"; - }; +let + nodejs = import ./nodejs.nix args; + baseName = if enableNpm then "nodejs" else "nodejs-slim"; +in + stdenv.mkDerivation (nodejs // rec { + version = "4.6.0"; + name = "${baseName}-${version}"; + src = fetchurl { + url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz"; + sha256 = "1566q1kkv8j30fgqx8sm2h8323f38wwpa1hfb10gr6z46jyhv4a2"; + }; - preBuild = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace src/util.h \ - --replace "tr1/type_traits" "type_traits" - ''; -}) + }) diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix index a2213546ec4..50bd2cb672e 100644 --- a/pkgs/development/web/nodejs/v6.nix +++ b/pkgs/development/web/nodejs/v6.nix @@ -2,24 +2,27 @@ , pkgconfig, runCommand, which, libtool, fetchpatch , callPackage , darwin ? null +, enableNpm ? true }@args: let - inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; + nodejs = import ./nodejs.nix args; + baseName = if enableNpm then "nodejs" else "nodejs-slim"; +in + stdenv.mkDerivation (nodejs // rec { + version = "6.8.0"; + name = "${baseName}-${version}"; + src = fetchurl { + url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; + sha256 = "13arzwki13688hr1lh871y06lrk019g4hkasmg11arm8j1dcwcpq"; + }; + + patches = nodejs.patches ++ [ + (fetchpatch { + url = "https://github.com/nodejs/node/commit/fc164acbbb700fd50ab9c04b47fc1b2687e9c0f4.patch"; + sha256 = "1rms3n09622xmddn013yvf5c6p3s8w8s0d2h813zs8c1l15k4k1i"; + }) + ]; + + }) -in import ./nodejs.nix (args // rec { - version = "6.8.0"; - sha256 = "13arzwki13688hr1lh871y06lrk019g4hkasmg11arm8j1dcwcpq"; - extraBuildInputs = stdenv.lib.optionals stdenv.isDarwin - [ CoreServices ApplicationServices ]; - preBuild = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i -e "s|tr1/type_traits|type_traits|g" \ - -e "s|std::tr1|std|" src/util.h - ''; - patches = [ - (fetchpatch { - url = "https://github.com/nodejs/node/commit/fc164acbbb700fd50ab9c04b47fc1b2687e9c0f4.patch"; - sha256 = "1rms3n09622xmddn013yvf5c6p3s8w8s0d2h813zs8c1l15k4k1i"; - }) - ]; -}) diff --git a/pkgs/development/web/nodejs/v7.nix b/pkgs/development/web/nodejs/v7.nix new file mode 100644 index 00000000000..420f2b0412f --- /dev/null +++ b/pkgs/development/web/nodejs/v7.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, openssl, python2, zlib, libuv, v8, utillinux, http-parser +, pkgconfig, runCommand, which, libtool, fetchpatch +, callPackage +, darwin ? null +, enableNpm ? true +}@args: + +let + nodejs = import ./nodejs.nix args; + baseName = if enableNpm then "nodejs" else "nodejs-slim"; +in + stdenv.mkDerivation (nodejs // rec { + version = "7.0.0"; + name = "${baseName}-${version}"; + src = fetchurl { + url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; + sha256 = "16l9r91z4dxmgc01fs1y8jdh8xjnmyyrq60isyznnxfnq9v3qv71"; + }; + + patches = nodejs.patches ++ [ + (fetchpatch { + url = "https://github.com/nodejs/node/commit/fc164acbbb700fd50ab9c04b47fc1b2687e9c0f4.patch"; + sha256 = "1rms3n09622xmddn013yvf5c6p3s8w8s0d2h813zs8c1l15k4k1i"; + }) + ]; + + }) + diff --git a/pkgs/development/web/twitter-bootstrap/v3.nix b/pkgs/development/web/twitter-bootstrap/v3.nix new file mode 100644 index 00000000000..461a81db857 --- /dev/null +++ b/pkgs/development/web/twitter-bootstrap/v3.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "bootstrap-${version}"; + version = "3.3.7"; + + src = fetchurl { + url = "https://github.com/twbs/bootstrap/releases/download/v${version}/bootstrap-${version}-dist.zip"; + sha256 = "0yqvg72knl7a0rlszbpk7xf7f0cs3aqf9xbl42ff41yh5pzsi67l"; + }; + + buildInputs = [ unzip ]; + + dontBuild = true; + installPhase = '' + mkdir $out + cp -r * $out/ + ''; + + meta = { + description = "Front-end framework for faster and easier web development"; + homepage = http://getbootstrap.com/; + license = stdenv.lib.licenses.mit; + }; + +} diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix index aea36d211aa..6b4dface0e1 100644 --- a/pkgs/games/0ad/data.nix +++ b/pkgs/games/0ad/data.nix @@ -1,19 +1,25 @@ -{ stdenv, fetchurl, version, releaseType }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "0ad-data-${version}"; + version = "0.0.20"; src = fetchurl { - url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-data.tar.xz"; + url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"; sha256 = "1lzl8chfqbgs1n9vpn0xaqd70kpwiibfk196iblyq6qkms3v6pnv"; }; - patchPhase = '' + installPhase = '' rm binaries/data/tools/fontbuilder/fonts/*.txt + mkdir -p $out/share/0ad + cp -r binaries/data $out/share/0ad/ ''; - installPhase = '' - mkdir -p $out/share/0ad - cp -r binaries/data/* $out/share/0ad/ - ''; + meta = with stdenv.lib; { + description = "A free, open-source game of ancient warfare -- data files"; + homepage = "http://wildfiregames.com/0ad/"; + license = licenses.cc-by-sa-30; + platforms = platforms.linux; + hydraPlatforms = []; + }; } diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix index 0a2c342e8ed..983e8accc20 100644 --- a/pkgs/games/0ad/default.nix +++ b/pkgs/games/0ad/default.nix @@ -1,131 +1,14 @@ -{ stdenv, callPackage, fetchurl, python27 -, pkgconfig, spidermonkey_31, boost, icu, libxml2, libpng -, libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc -, openal, mesa, xproto, libX11, libXcursor, nspr, SDL, SDL2 -, gloox, nvidia-texture-tools -, withEditor ? true, wxGTK ? null -}: - -assert withEditor -> wxGTK != null; +{ newScope }: let - version = "0.0.20"; + callPackage = newScope self; - releaseType = "alpha"; + self = { + zeroad-unwrapped = callPackage ./game.nix { }; - zeroadData = callPackage ./data.nix { inherit version releaseType; }; + zeroad-data = callPackage ./data.nix { }; - archForPremake = - if stdenv.lib.hasPrefix "x86_64-" stdenv.system then "x64" else - if stdenv.lib.hasPrefix "i686-" stdenv.system then "x32" else "ERROR"; - -in -stdenv.mkDerivation rec { - name = "0ad-${version}"; - - src = fetchurl { - url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-build.tar.xz"; - sha256 = "13n61xhjsawda3kl7112la41bqkbqmq4yhr3slydsz856z5xb5m3"; + zeroad = callPackage ./wrapper.nix { }; }; - buildInputs = [ - zeroadData python27 pkgconfig spidermonkey_31 boost icu - libxml2 libpng libjpeg zlib curl libogg libvorbis enet - miniupnpc openal mesa xproto libX11 libXcursor nspr - SDL SDL2 gloox nvidia-texture-tools - ] ++ stdenv.lib.optional withEditor wxGTK; - - NIX_CFLAGS_COMPILE = [ - "-I${xproto}/include/X11" - "-I${libX11.dev}/include/X11" - "-I${libXcursor.dev}/include/X11" - "-I${SDL.dev}/include/SDL" - "-I${SDL2}/include/SDL2" - ]; - - patchPhase = '' - sed -i 's/MOZJS_MINOR_VERSION/false \&\& MOZJS_MINOR_VERSION/' source/scriptinterface/ScriptTypes.h - ''; - - configurePhase = '' - # Delete shipped libraries which we don't need. - rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey} - - # Build shipped premake. - make -C build/premake/premake4/build/gmake.unix - - # Run premake. - pushd build/premake - ./premake4/bin/release/premake4 \ - --file="premake4.lua" \ - --outpath="../workspaces/gcc/" \ - --platform=${archForPremake} \ - --os=linux \ - --with-system-nvtt \ - --with-system-enet \ - --with-system-miniupnpc \ - --with-system-mozjs31 \ - ${ if withEditor then "--atlas" else "" } \ - --collada \ - --bindir="$out"/bin \ - --libdir="$out"/lib/0ad \ - --datadir="$out"/share/0ad \ - --without-tests \ - gmake - popd - ''; - - buildPhase = '' - # Build bundled fcollada. - make -C libraries/source/fcollada/src - - # Build 0ad. - make -C build/workspaces/gcc verbose=1 - ''; - - installPhase = '' - # Copy executables. - mkdir -p "$out"/bin - cp binaries/system/pyrogenesis "$out"/bin/0ad - ((${ toString withEditor })) && cp binaries/system/ActorEditor "$out"/bin/ - - # Copy l10n data. - mkdir -p "$out"/share/0ad - cp -r binaries/data/l10n "$out"/share/0ad/ - - # Copy libraries. - mkdir -p "$out"/lib/0ad - cp binaries/system/libCollada.so "$out"/lib/0ad/ - ((${ toString withEditor })) && cp binaries/system/libAtlasUI.so "$out"/lib/0ad/ - - # Create links to data files. - ln -s -t "$out"/share/0ad "${zeroadData}"/share/0ad/* - - # Copy icon. - mkdir -p "$out"/share/icons - cp build/resources/0ad.png "$out"/share/icons/ - - # Copy/fix desktop item. - mkdir -p "$out"/share/applications - while read LINE; do - if [[ $LINE = "Exec=0ad" ]]; then - echo "Exec=$out/bin/zeroad" - elif [[ $LINE = "Icon=0ad" ]]; then - echo "Icon=$out/share/icons/0ad.png" - else - echo "$LINE" - fi - done "$out"/share/applications/0ad.desktop - ''; - - meta = with stdenv.lib; { - description = "A free, open-source game of ancient warfare"; - homepage = "http://wildfiregames.com/0ad/"; - license = with licenses; [ - gpl2 lgpl21 mit cc-by-sa-30 - licenses.zlib # otherwise masked by pkgs.zlib - ]; - platforms = [ "x86_64-linux" "i686-linux" ]; - hydraPlatforms = []; # the data are too big (~1.5 GB) - }; -} +in self diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix new file mode 100644 index 00000000000..e4d4e3cb8e4 --- /dev/null +++ b/pkgs/games/0ad/game.nix @@ -0,0 +1,96 @@ +{ stdenv, lib, callPackage, perl, fetchurl, python2 +, pkgconfig, spidermonkey_31, boost, icu, libxml2, libpng +, libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc +, openal, mesa, xproto, libX11, libXcursor, nspr, SDL, SDL2 +, gloox, nvidia-texture-tools +, withEditor ? true, wxGTK ? null +}: + +assert withEditor -> wxGTK != null; + +stdenv.mkDerivation rec { + name = "0ad-${version}"; + version = "0.0.20"; + + src = fetchurl { + url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz"; + sha256 = "13n61xhjsawda3kl7112la41bqkbqmq4yhr3slydsz856z5xb5m3"; + }; + + nativeBuildInputs = [ python2 perl pkgconfig ]; + + buildInputs = [ + spidermonkey_31 boost icu libxml2 libpng libjpeg + zlib curl libogg libvorbis enet miniupnpc openal + mesa xproto libX11 libXcursor nspr SDL2 gloox + nvidia-texture-tools + ] ++ lib.optional withEditor wxGTK; + + NIX_CFLAGS_COMPILE = [ + "-I${xproto}/include/X11" + "-I${libX11.dev}/include/X11" + "-I${libXcursor.dev}/include/X11" + "-I${SDL.dev}/include/SDL" + "-I${SDL2}/include/SDL2" + ]; + + patches = [ ./rootdir_env.patch ]; + + postPatch = '' + sed -i 's/MOZJS_MINOR_VERSION/false \&\& MOZJS_MINOR_VERSION/' source/scriptinterface/ScriptTypes.h + ''; + + configurePhase = '' + # Delete shipped libraries which we don't need. + rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey} + + # Update Makefiles + pushd build/workspaces + ./update-workspaces.sh \ + --with-system-nvtt \ + --with-system-mozjs31 \ + ${lib.optionalString withEditor "--enable-atlas"} \ + --bindir="$out"/bin \ + --libdir="$out"/lib/0ad \ + --without-tests \ + -j $NIX_BUILD_CORES + popd + + # Move to the build directory. + pushd build/workspaces/gcc + ''; + + enableParallelBuilding = true; + + installPhase = '' + popd + + # Copy executables. + install -Dm755 binaries/system/pyrogenesis "$out"/bin/0ad + ${lib.optionalString withEditor '' + install -Dm755 binaries/system/ActorEditor "$out"/bin/ActorEditor + ''} + + # Copy l10n data. + mkdir -p "$out"/share/0ad/data + cp -r binaries/data/l10n "$out"/share/0ad/data + + # Copy libraries. + mkdir -p "$out"/lib/0ad + cp binaries/system/*.so "$out"/lib/0ad/ + + # Copy icon. + install -D build/resources/0ad.png "$out"/share/icons/hicolor/128x128/0ad.png + install -D build/resources/0ad.desktop "$out"/share/applications/0ad.desktop + ''; + + meta = with stdenv.lib; { + description = "A free, open-source game of ancient warfare"; + homepage = "http://wildfiregames.com/0ad/"; + license = with licenses; [ + gpl2 lgpl21 mit cc-by-sa-30 + licenses.zlib # otherwise masked by pkgs.zlib + ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/games/0ad/rootdir_env.patch b/pkgs/games/0ad/rootdir_env.patch new file mode 100644 index 00000000000..c001473e510 --- /dev/null +++ b/pkgs/games/0ad/rootdir_env.patch @@ -0,0 +1,38 @@ +diff -ru3 0ad-0.0.20-alpha/source/ps/GameSetup/Paths.cpp 0ad-0.0.20-alpha-new/source/ps/GameSetup/Paths.cpp +--- 0ad-0.0.20-alpha/source/ps/GameSetup/Paths.cpp 2015-02-14 04:45:13.000000000 +0300 ++++ 0ad-0.0.20-alpha-new/source/ps/GameSetup/Paths.cpp 2016-11-03 16:23:47.241514876 +0300 +@@ -155,32 +155,8 @@ + + /*static*/ OsPath Paths::Root(const OsPath& argv0) + { +-#if OS_ANDROID +- return OsPath("/sdcard/0ad"); // TODO: this is kind of bogus +-#else +- +- // get full path to executable +- OsPath pathname = sys_ExecutablePathname(); // safe, but requires OS-specific implementation +- if(pathname.empty()) // failed, use argv[0] instead +- { +- errno = 0; +- pathname = wrealpath(argv0); +- if(pathname.empty()) +- WARN_IF_ERR(StatusFromErrno()); +- } +- +- // make sure it's valid +- if(!FileExists(pathname)) +- { +- LOGERROR("Cannot find executable (expected at '%s')", pathname.string8()); +- WARN_IF_ERR(StatusFromErrno()); +- } +- +- for(size_t i = 0; i < 2; i++) // remove "system/name.exe" +- pathname = pathname.Parent(); +- return pathname; +- +-#endif ++ UNUSED2(argv0); ++ return getenv("ZEROAD_ROOTDIR"); + } + + /*static*/ OsPath Paths::RootData(const OsPath& argv0) diff --git a/pkgs/games/0ad/wrapper.nix b/pkgs/games/0ad/wrapper.nix new file mode 100644 index 00000000000..ca7c8e16e3c --- /dev/null +++ b/pkgs/games/0ad/wrapper.nix @@ -0,0 +1,21 @@ +{ buildEnv, makeWrapper, zeroad-unwrapped, zeroad-data }: + +assert zeroad-unwrapped.version == zeroad-data.version; + +buildEnv { + name = "zeroad-${zeroad-unwrapped.version}"; + inherit (zeroad-unwrapped) meta; + + buildInputs = [ makeWrapper ]; + + paths = [ zeroad-unwrapped zeroad-data ]; + + pathsToLink = [ "/" "/bin" ]; + + postBuild = '' + for i in $out/bin/*; do + wrapProgram "$i" \ + --set ZEROAD_ROOTDIR "$out/share/0ad" + done + ''; +} diff --git a/pkgs/games/gnubg/default.nix b/pkgs/games/gnubg/default.nix index 80cc7763266..e74177a1ee3 100644 --- a/pkgs/games/gnubg/default.nix +++ b/pkgs/games/gnubg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, python, gtk2 }: +{ stdenv, fetchurl, pkgconfig, glib, python, gtk2, readline }: let version = "1.04.000"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0gsfl6qbj529d1jg3bkyj9m7bvb566wd7pq5fslgg5yn6c6rbjk6"; }; - buildInputs = [ pkgconfig python glib gtk2 ]; + buildInputs = [ pkgconfig python glib gtk2 readline ]; configureFlags = [ "--with-gtk" "--with--board3d" ]; diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 8c86371ecab..c53418b6523 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -52,6 +52,7 @@ in buildFHSUserEnv rec { gst_all_1.gst-plugins-ugly libdrm mono + xorg.xkeyboardconfig (steamPackages.steam-runtime-wrapped.override { inherit nativeOnly runtimeOnly newStdcpp; diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix index c2bc9d37b4f..deb283c57c4 100644 --- a/pkgs/games/tintin/default.nix +++ b/pkgs/games/tintin/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, pcre }: stdenv.mkDerivation rec { - name = "tintin-2.00.9"; + name = "tintin-2.01.1"; src = fetchurl { url = "mirror://sourceforge/tintin/${name}.tar.gz"; - sha256 = "0x8jakxx7hh7b0z6vjcxyrda0afbz2s2yy7mvrbxjffyc2dyxzna"; + sha256 = "195wrfcys8yy953gdrl1gxryhjnx9lg1vqgxm3dyzm8bi18aa2yc"; }; buildInputs = [ zlib pcre ]; diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix new file mode 100644 index 00000000000..b30b4c4a2c1 --- /dev/null +++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -0,0 +1,82 @@ +# Tested on linux-x86_64. Might work on linux-i386. Probably won't work on anything else. + +# To use this driver in NixOS, add it to printing.drivers in configuration.nix. +# configuration.nix might look like this when you're done: +# { pkgs, ... }: { +# printing = { +# enable = true; +# drivers = [ pkgs.samsung-unified-linux-driver_4_01_17 ]; +# }; +# (more stuff) +# } +# (This advice was tested on the 1st November 2016.) + +{ stdenv, fetchurl, cups, libusb }: + +# Do not bump lightly! Visit +# to see what will break when upgrading. Consider a new versioned attribute. +let + installationPath = if stdenv.system == "x86_64-linux" then "x86_64" else "i386"; + appendPath = if stdenv.system == "x86_64-linux" then "64" else ""; + libPath = stdenv.lib.makeLibraryPath [ cups libusb ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}"; +in stdenv.mkDerivation rec { + name = "samsung-UnifiedLinuxDriver-${version}"; + version = "4.01.17"; + + src = fetchurl { + url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${version}.tar.gz"; + sha256 = "1vv3pzvqpg1dq3xjr8161x2yp3v7ca75vil56ranhw5pkjwq66x0"; + }; + + dontPatchELF = true; + dontStrip = true; + + installPhase = '' + cd Linux/${installationPath} + mkdir -p $out/lib/cups/{backend,filter} + install -Dm755 mfp $out/lib/cups/backend/ + install -Dm755 pstosecps pstospl pstosplc rastertospl rastertosplc $out/lib/cups/filter/ + install -Dm755 libscmssc.so $out/lib/ + + GLOBIGNORE=*.so + for exe in $out/lib/cups/**/*; do + echo "Patching $exe" + patchelf \ + --set-rpath ${libPath} \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $exe + done + unset GLOBIGNORE + + install -v at_root/usr/lib${appendPath}/libmfp.so.1.0.1 $out/lib + cd $out/lib + ln -s -f libmfp.so.1.0.1 libmfp.so.1 + ln -s -f libmfp.so.1 libmfp.so + + for lib in $out/lib/*.so; do + echo "Patching $lib" + patchelf \ + --set-rpath ${libPath} \ + $lib + done + + mkdir -p $out/share/cups/model/samsung + cd - + cd ../noarch/at_opt/share/ppd + for i in *.ppd; do + sed -i $i -e \ + "s,pstosecps,$out/lib/cups/filter/pstosecps,g; \ + s,pstospl,$out/lib/cups/filter/pstospl,g; \ + s,rastertospl,$out/lib/cups/filter/rastertospl,g" + done; + cp -r ./* $out/share/cups/model/samsung + ''; + + meta = with stdenv.lib; { + description = "Samsung's Linux printing drivers; includes binaries without source code"; + homepage = http://www.samsung.com/; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ joko ]; + }; +} diff --git a/pkgs/misc/cups/drivers/samsung/default.nix b/pkgs/misc/cups/drivers/samsung/default.nix index 5f870bf9217..8ef788df66f 100644 --- a/pkgs/misc/cups/drivers/samsung/default.nix +++ b/pkgs/misc/cups/drivers/samsung/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelf, cups, libusb, libxml2 }: +{ stdenv, fetchurl, glibc, cups, libusb, ghostscript }: let @@ -15,45 +15,33 @@ in stdenv.mkDerivation rec { url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${version}.tar.gz"; }; - nativeBuildInputs = [ patchelf ]; + buildInputs = [ + cups + libusb + ]; - phases = [ "unpackPhase" "installPhase" ]; + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; installPhase = '' - my_patchelf() { - opts=(); while [[ "$1" != - ]]; do opts+=( "$1" ); shift; done; shift - for binary in "$@"; do - echo "Patching ELF file: $binary" - patchelf "''${opts[@]}" $binary - ldd $binary | grep "not found" && exit 1 - done; true - } - my_patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath ${cups.out}/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib:${stdenv.glibc}/lib \ - - ${arch}/{pstosecps,rastertospl,smfpnetdiscovery} + mkdir -p $out/bin + cp -R ${arch}/{gettext,pstosecps,rastertospl,smfpnetdiscovery,usbresetter} $out/bin mkdir -p $out/etc/sane.d/dll.d/ install -m644 noarch/etc/smfp.conf $out/etc/sane.d - echo smfp >> $out/etc/sane.d/dll.d/smfp-scanner + echo smfp >> $out/etc/sane.d/dll.d/smfp-scanner.conf mkdir -p $out/lib - my_patchelf \ - --set-rpath $(cat $NIX_CC/nix-support/orig-cc)/lib:${stdenv.glibc}/lib \ - - ${arch}/libscmssc.so* install -m755 ${arch}/libscmssc.so* $out/lib mkdir -p $out/lib/cups/backend - install -m755 ${arch}/smfpnetdiscovery $out/lib/cups/backend + ln -s $out/bin/smfpnetdiscovery $out/lib/cups/backend mkdir -p $out/lib/cups/filter - install -m755 ${arch}/{pstosecps,rastertospl} $out/lib/cups/filter + ln -s $out/bin/{pstosecps,rastertospl} $out/lib/cups/filter + ln -s $ghostscript/bin/gs $out/lib/cups/filter mkdir -p $out/lib/sane - my_patchelf \ - --set-rpath $(cat $NIX_CC/nix-support/orig-cc)/lib:${stdenv.lib.makeLibraryPath [ stdenv.glibc libusb libxml2 ] } \ - - ${arch}/libsane-smfp.so* install -m755 ${arch}/libsane-smfp.so* $out/lib/sane ln -s libsane-smfp.so.1.0.1 $out/lib/sane/libsane-smfp.so.1 ln -s libsane-smfp.so.1 $out/lib/sane/libsane-smfp.so @@ -66,16 +54,39 @@ in stdenv.mkDerivation rec { . noarch/package_utils . noarch/scanner-script.pkg fill_full_template noarch/etc/smfp.rules.in $out/lib/udev/rules.d/60_smfp_samsung.rules + chmod -x $out/lib/udev/rules.d/60_smfp_samsung.rules ) - mkdir -p $out/share/ppd - gzip -9 noarch/share/ppd/*.ppd - cp -R noarch/share/ppd $out/share/ppd/suld - - cp -R noarch/share/locale $out/share + mkdir -p $out/share + cp -R noarch/share/* $out/share + gzip -9 $out/share/ppd/*.ppd rm -r $out/share/locale/*/*/install.mo + + mkdir -p $out/share/cups + cd $out/share/cups + ln -s ../ppd . + ln -s ppd model ''; + preFixup = '' + + for bin in $out/bin/*; do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$bin" + patchelf --set-rpath "$out/lib:${cups.out}/lib" "$bin" + done + + patchelf --set-rpath "$out/lib:${cups.out}/lib" "$out/lib/libscmssc.so" + + ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ + + ''; + + # all binaries are already stripped + dontStrip = true; + + # we did this in prefixup already + dontPatchELF = true; + meta = with stdenv.lib; { description = "Unified Linux Driver for Samsung printers and scanners"; homepage = http://www.bchemnet.com/suldr; diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 40845a0988c..f3b12dc48f8 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -30,9 +30,9 @@ in rec { }; unstable = fetchurl rec { - version = "1.9.20"; + version = "1.9.22"; url = "https://dl.winehq.org/wine/source/1.9/wine-${version}.tar.bz2"; - sha256 = "1pvrlawp079qg74q348v9p2qzlj4aqibxxwn4vqid69j883g6s97"; + sha256 = "0hgc85d695mi1z4hyk561q2s9pblhdy6h5a23rh459y7qwd8xgx3"; inherit (stable) mono; gecko32 = fetchurl rec { version = "2.47"; @@ -48,7 +48,7 @@ in rec { staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "1hk20axv0hppi5rqgslibwfjmcpjks3xa2dxi5v1y27qqhphvxpl"; + sha256 = "1yqrxx4zaxc8khnnqfgz53apfa9mc315114psq3kvai01lz4a7p8"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/misc/jackaudio/git.nix b/pkgs/misc/jackaudio/unstable.nix similarity index 86% rename from pkgs/misc/jackaudio/git.nix rename to pkgs/misc/jackaudio/unstable.nix index ac50b4c3d39..deda40e7cba 100644 --- a/pkgs/misc/jackaudio/git.nix +++ b/pkgs/misc/jackaudio/unstable.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper -, bash, libsamplerate, libsndfile, readline +, bash, libsamplerate, libsndfile, readline, eigen, celt # Optional Dependencies , dbus ? null, libffado ? null, alsaLib ? null @@ -23,21 +23,21 @@ let optLibopus = shouldUsePkg libopus; in stdenv.mkDerivation rec { - name = "${prefix}jack2-${version}"; - version = "2015-09-03"; + name = "${prefix}jack2-unstable-${version}"; + version = "2016-08-18"; src = fetchFromGitHub { owner = "jackaudio"; repo = "jack2"; - rev = "2e8c5502c692a25f1c0213f3f7eeba1f4434da3c"; - sha256 = "0r1xdshm251yqb748r5l5f6xpznhwlqyyxkky7vgx5m2q51qb0a1"; + rev = "f2ece2418c875eb7e7ac3d25fbb484ddda47ab46"; + sha256 = "0cvb0m6qz3k8a5njwyw65l4y3izi2rsh512hv5va97kjc6wzzx4j"; }; nativeBuildInputs = [ pkgconfig python makeWrapper ]; buildInputs = [ python - libsamplerate libsndfile readline + libsamplerate libsndfile readline eigen celt optDbus optPythonDBus optLibffado optAlsaLib optLibopus ]; @@ -50,7 +50,6 @@ stdenv.mkDerivation rec { python waf configure --prefix=$out \ ${optionalString (optDbus != null) "--dbus"} \ --classic \ - --profile \ ${optionalString (optLibffado != null) "--firewire"} \ ${optionalString (optAlsaLib != null) "--alsa"} \ --autostart=${if (optDbus != null) then "dbus" else "classic"} \ diff --git a/pkgs/os-specific/linux/cryopid/default.nix b/pkgs/os-specific/linux/cryopid/default.nix deleted file mode 100644 index 0cb64bcc975..00000000000 --- a/pkgs/os-specific/linux/cryopid/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{stdenv, fetchurl, zlibStatic}: - -let - - pname = "cryopid"; - version = "20090908"; - revision = "7da69201d50e"; - -in - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "https://sharesource.org/hg/cryopid/archive/${revision}.tar.bz2"; - sha256 = "908a4b1cb26322ee25afe13ff59e0d86f669538cb4583766b15ca79fda6c69ca"; - }; - - buildInputs = [ zlibStatic ]; - - preBuild = "cd src"; - - installPhase = "mkdir -p $out/bin; cp cryopid $out/bin"; - - meta = { - description = "A process freezer for Linux"; - longDescription = '' - CryoPID allows you to capture the state of a running process in Linux - and save it to a file. This file can then be used to resume the process - later on, either after a reboot or even on another machines. - ''; - homepage = http://sharesource.org/project/cryopid; - license = '' - Modified BSD license (without advertising clause). CryoPID ships with - and links against the dietlibc library, which is distributed under the - GNU General Public Licence, version 2. - ''; - }; -} diff --git a/pkgs/os-specific/linux/devmem2/default.nix b/pkgs/os-specific/linux/devmem2/default.nix new file mode 100644 index 00000000000..17450f36daa --- /dev/null +++ b/pkgs/os-specific/linux/devmem2/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "devmem2-2004-08-05"; + + src = fetchurl { + url = "http://lartmaker.nl/lartware/port/devmem2.c"; + sha256 = "14f1k7v6i1yaxg4xcaaf5i4aqn0yabba857zjnbg9wiymy82qf7c"; + }; + + buildCommand = '' + export hardeningDisable=format # fix compile error + cc "$src" -o devmem2 + install -D devmem2 "$out/bin/devmem2" + ''; + + meta = with stdenv.lib; { + description = "Simple program to read/write from/to any location in memory"; + homepage = "http://lartmaker.nl/lartware/port/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ bjornfor ]; + }; +} diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix index 0a2da165638..b3a5e97e5d5 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.5"; + version = "4.8.6"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0264h3b8h4bqgcif2jzbz4yzv290nrn444bhcqzb0lizj8a1f5s8"; + sha256 = "0szk5m4wj6w0avpri9168acid8apbsjv78wz0k4cymh88804wx3l"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index 52a52562d60..199ff9122cb 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - mptcpVersion = "0.91"; - modDirVersion = "4.1.26"; + mptcpVersion = "0.91.2"; + modDirVersion = "4.1.35"; version = "${modDirVersion}-mptcp_v${mptcpVersion}"; extraMeta = { @@ -12,7 +12,7 @@ import ./generic.nix (args // rec { src = fetchurl { url = "https://github.com/multipath-tcp/mptcp/archive/v${mptcpVersion}.tar.gz"; - sha256 = "0rbvgz89j5wk781y201qdxy2kz4gmlamb72wdbxj8mxv92x56lh3"; + sha256 = "1jfxycg8i99ry2cr2ksarvqjzlr46sp192wkpb4sb2mynbzf3dmk"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 11f07f13345..6bba248374b 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -87,8 +87,8 @@ rec { grsecurity_testing = grsecPatch { kver = "4.7.10"; - grrev = "201610262029"; - sha256 = "0bczfyb0zazccl9d8sxm4p34nayamyiv7c1hp272glcjjmvlb7cv"; + grrev = "201611011946"; + sha256 = "0nva1007r4shlcxzflbxvd88yzvb98si2kjlgnhdqphyz1c0qhql"; }; # This patch relaxes grsec constraints on the location of usermode helpers, diff --git a/pkgs/os-specific/linux/light/default.nix b/pkgs/os-specific/linux/light/default.nix index 5ca9f69f879..1c44c0d78a8 100644 --- a/pkgs/os-specific/linux/light/default.nix +++ b/pkgs/os-specific/linux/light/default.nix @@ -1,15 +1,18 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, help2man }: stdenv.mkDerivation rec { - version = "0.9"; + version = "1.0"; name = "light-${version}"; src = fetchurl { url = "https://github.com/haikarainen/light/archive/v${version}.tar.gz"; - sha256 = "1dnzkkg307izvw76gvzsl2vpxd2a1grxg5h82ix505rb9nnmn0d6"; + sha256 = "974608ee42ffe85cfd23184306d56d86ec4e6f4b0518bafcb7b3330998b1af64"; }; + buildInputs = [ help2man ]; installPhase = "mkdir -p $out/bin; cp light $out/bin/"; + preFixup = "make man; mkdir -p $out/man/man1; mv light.1.gz $out/man/man1"; + meta = { description = "GNU/Linux application to control backlights"; homepage = https://haikarainen.github.io/light/; diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 083362489ad..7e29aa0f67d 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.8.0"; + version = "2.8.3"; src = fetchurl { url = "http://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2"; - sha256 = "0a9xwq0kgpx1y800l232h524f19g3py6cnxff10j9p01q6lzhrxh"; + sha256 = "018lqxbksj9hpjfp2a3yc6lkjkj4rgf2x147l1jjh7mfgqvcb53b"; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index f9969fa79fd..590d2b4a854 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "mcelog-${version}"; - version = "138"; + version = "142"; src = fetchFromGitHub { - sha256 = "039ycn5m3gx4n0kppxl35wcrkyva6lv64qhlqhh7034qkbqbhqiy"; + sha256 = "1cqx7w75d570vxqi2gk9bkqqclakkhp4kjanv5j3nhqwg3p38zyv"; rev = "v${version}"; repo = "mcelog"; owner = "andikleen"; diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 56f14b30acd..6b1e93e59df 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Grawp"; repo = "rtl8812au_rtl8821au"; - rev = "9c5b2978ab079081dd1e981353be681a1cf495de"; - sha256 = "0bx1vgs2qldwwhdgklbqz2vy9x4jg7cj3d6w6cpkndkcr7h0m5vz"; + rev = "d716b38abf5ca7da72d2be0adfcebe98cceeda8f"; + sha256 = "01z5p2vps3an69bbzca7ig14llc5rd6067pgs47kkhfjbsbws4ry"; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/tpacpi-bat/default.nix b/pkgs/os-specific/linux/tpacpi-bat/default.nix new file mode 100644 index 00000000000..bf60331d8ad --- /dev/null +++ b/pkgs/os-specific/linux/tpacpi-bat/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, perl, kmod }: + +# Requires the acpi_call kernel module in order to run. +stdenv.mkDerivation rec { + name = "tpacpi-bat-${version}"; + version = "3.0"; + + src = fetchFromGitHub { + owner = "teleshoes"; + repo = "tpacpi-bat"; + rev = "v${version}"; + sha256 = "0l72qvjk5j7sg9x4by7an0xwx65x10dx82fky8lnwlwfv54vgg8l"; + }; + + buildInputs = [ perl ]; + + installPhase = '' + mkdir -p $out/bin + cp tpacpi-bat $out/bin + ''; + + postPatch = '' + substituteInPlace tpacpi-bat --replace modprobe ${kmod}/bin/modprobe + ''; + + meta = { + maintainers = [stdenv.lib.maintainers.orbekk]; + platforms = stdenv.lib.platforms.linux; + description = "Tool to set battery charging thesholds on Lenovo Thinkpad"; + license = stdenv.lib.licenses.gpl3Plus; + }; +} diff --git a/pkgs/os-specific/linux/ttysnoop/default.nix b/pkgs/os-specific/linux/ttysnoop/default.nix deleted file mode 100644 index 670c9608344..00000000000 --- a/pkgs/os-specific/linux/ttysnoop/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{stdenv, fetchurl}: -let - s = # Generated upstream information - rec { - baseName="ttysnoop"; - version="0.12d.k26"; - name="${baseName}-${version}"; - hash="0jb2zchaiqmmickj0la7wjw3sf9vy65qfhhs11yrzx4mmwkp0395"; - url="http://sysd.org/stas/files/active/0/ttysnoop-0.12d.k26.tar.gz"; - sha256="0jb2zchaiqmmickj0la7wjw3sf9vy65qfhhs11yrzx4mmwkp0395"; - }; - buildInputs = [ - ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; - src = fetchurl { - inherit (s) url sha256; - }; - preBuild = '' - sed -e "s@/sbin@$out/sbin@g" -i Makefile - sed -e "s@/usr/man@$out/share/man@g" -i Makefile - mkdir -p "$out/share/man/man8" - mkdir -p "$out/sbin" - ''; - postInstall = '' - mkdir -p "$out/etc" - cp snooptab.dist "$out/etc/snooptab" - ''; - meta = { - inherit (s) version; - description = "A tool to clone input and output of another tty/pty to the current one"; - license = stdenv.lib.licenses.gpl2 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/ttysnoop/default.upstream b/pkgs/os-specific/linux/ttysnoop/default.upstream deleted file mode 100644 index 905a639c31e..00000000000 --- a/pkgs/os-specific/linux/ttysnoop/default.upstream +++ /dev/null @@ -1,3 +0,0 @@ -url http://sysd.org/stas/node/35 -ensure_choice -version '.*-([0-9a-z.]+)[.]tar[.].*' '\1' diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index bcba8ef21c6..5a1c473a43d 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atlassian-confluence-${version}"; - version = "5.10.7"; + version = "6.0.1"; src = fetchurl { url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz"; - sha256 = "1zzkaps78nqjgriz6i6m7bdnm5srvslq27lr3vk6cizn2xz9nc1b"; + sha256 = "15af05h0h92z4zw546s7wwglvl0argzrj9w588gb96j5dni9lka4"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" ]; diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index d37463f81a5..d2b3cc1c419 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atlassian-jira-${version}"; - version = "7.2.3"; + version = "7.2.4"; src = fetchurl { url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "0237f1x2ir3g6ll0w7fpm6vnccqlx1xr015q37qh693hykyi1hy9"; + sha256 = "0admsji5wsclrjdaqyibdk74fmazhz35d4fgbrm173fgqm6p2mqa"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 810fabb253f..8cb96d445c8 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchurl, openssl, libtool, perl, libxml2 , libseccomp ? null }: -let version = "9.10.4-P3"; in +let version = "9.10.4-P4"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "1vxs29w4hnl7jcd7sknga58xv1qk2rcpsxyich7cpp7xi77faxd0"; + sha256 = "11lxkb7d79c75scrs28q4xmr0ii2li69zj1c650al3qxir8yf754"; }; outputs = [ "bin" "lib" "dev" "out" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 5a566973787..3813baa6420 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.0.8300"; + version = "3.0.8500"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/archive/${version}.tar.gz"; - sha256 = "13hr87jrhw8kkh94rknzjmlshd2a6kbbkygikigmfyvf3g7r4jf8"; + sha256 = "0vm2yvwyhswsp31g48qdzm17c4p7c25vyiy1029hgy8nd5qy4shc"; }; buildInputs = with pkgs; [ diff --git a/pkgs/servers/felix/remoteshell.nix b/pkgs/servers/felix/remoteshell.nix index 6e8089d32e9..3ac3c98718f 100644 --- a/pkgs/servers/felix/remoteshell.nix +++ b/pkgs/servers/felix/remoteshell.nix @@ -1,14 +1,15 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "apache-felix-remoteshell-bundle-1.0.4"; + version = "1.1.2"; + name = "apache-felix-remoteshell-bundle-${version}"; src = fetchurl { - url = http://apache.proserve.nl/felix/org.apache.felix.shell.remote-1.0.4.jar; - sha256 = "1bgahzs9nnnvfr0yyh9s0r6h1zp2ls6533377rp8r1qk2a4s1gzb"; + url = "http://apache.proserve.nl/felix/org.apache.felix.shell.remote-${version}.jar"; + sha256 = "147zw5ppn98wfl3pr32isyb267xm3gwsvdfdvjr33m9g2v1z69aq"; }; - buildCommand = + buildCommand = '' mkdir -p $out/bundle - cp ${src} $out/bundle/org.apache.felix.shell.remote-1.0.4.jar + cp ${src} $out/bundle/org.apache.felix.shell.remote-${version}.jar ''; } diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 72b12d5aad5..166c5cdbf52 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, cyrus_sasl, libevent}: stdenv.mkDerivation rec { - name = "memcached-1.4.20"; + name = "memcached-1.4.33"; src = fetchurl { url = "http://memcached.org/files/${name}.tar.gz"; - sha256 = "0620llasj8xgffk6hk2ml15z0c5i34455wwg60i1a2zdir023l95"; + sha256 = "07bpd6xdhzw6q2ga6xc075bw4jd44nxjl1vk4dqmd315d26nqwl3"; }; buildInputs = [cyrus_sasl libevent]; diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index e9223b3dafd..fcdc4beb3c3 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "alertmanager-${version}"; - version = "0.4.2"; + version = "0.5.0"; rev = "v${version}"; goPackagePath = "github.com/prometheus/alertmanager"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "alertmanager"; - sha256 = "1ngfilln259mh92x5wigiz70lnkgwpfbbmf5682j4pw7m3bxaam8"; + sha256 = "1k30v0z5awnd6ys2ybc2m580y98nlifpgl7hly977nfhc6s90kvh"; }; # Tests exist, but seem to clash with the firewall. diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index f6e58e0a745..7f66aef9d11 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "prometheus-${version}"; - version = "1.1.2"; + version = "1.3.1"; rev = "v${version}"; goPackagePath = "github.com/prometheus/prometheus"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "prometheus"; - sha256 = "1k0lfmfkyibjan590wyswr65yr940w8d1zma6k3l2hc025xpi2i4"; + sha256 = "1q29ndi6dnflmv18y2qakipvialy7yfl308kv2vq9y2difij4pwi"; }; docheck = true; diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 280f7e0abd0..4c369f40610 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "nginx_exporter-${version}"; - version = "20160524-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "2cf16441591f6b6e58a8c0439dcaf344057aea2b"; + version = "20161104-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "1b2a3d124b6446a0159a68427b0dc3a8b9f32203"; goPackagePath = "github.com/discordianfish/nginx_exporter"; src = fetchgit { inherit rev; url = "https://github.com/discordianfish/nginx_exporter"; - sha256 = "0p9j0bbr2lr734980x2p8d67lcify21glwc5k3i3j4ri4vadpxvc"; + sha256 = "19nmkn81m0nyq022bnmjr93wifig4mjcgvns7cbn31i197cydw28"; }; goDeps = ./nginx-exporter_deps.nix; diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 8587134ad39..babca9af168 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "6.0.9"; + version = "6.1.0"; src = fetchurl { url = "http://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "1n7kf25yimgy9wy04hv5qvp4rzdzdr0ar92lhwms812qkhp3i4mq"; + sha256 = "03wz6zjql211dd8kvzcqyzkc8czd8gayr7rw5v274lajcs8f6rkb"; }; buildInputs = with stdenv.lib; [ pkgconfig mecab kytea libedit ] ++ diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index 68732b2e169..9db45d6a8e1 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "wallabag-${version}"; - version = "2.1.2"; + version = "2.1.3"; # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur src = fetchurl { url = "https://framabag.org/wallabag-release-${version}.tar.gz"; - sha256 = "01i4xdzw126wwwkxy0d97dizrikvawpzqj95bykd1g25m7jzvb7k"; + sha256 = "0pl1sqigrp08r657jmfpf8m3wnw65g2k3mg50zsc8xbrzn6nwbgp"; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 480c929e941..0429faab2ef 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -16,10 +16,11 @@ # # To use at startup, see hardware.bumblebee options. -{ stdenv, lib, fetchurl, pkgconfig, help2man, makeWrapper +{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, help2man, makeWrapper , glib, libbsd , libX11, libXext, xorgserver, xkbcomp, kmod, xkeyboard_config, xf86videonouveau , nvidia_x11, virtualgl, primusLib +, automake111x, autoconf # The below should only be non-null in a x86_64 system. On a i686 # system the above nvidia_x11 and virtualgl will be the i686 packages. # TODO: Confusing. Perhaps use "SubArch" instead of i686? @@ -48,6 +49,15 @@ let xmodules = lib.concatStringsSep "," (map (x: "${x.out or x}/lib/xorg/modules") ([ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau)); + modprobePatch = fetchpatch { + url = "https://github.com/Bumblebee-Project/Bumblebee/commit/1ada79fe5916961fc4e4917f8c63bb184908d986.patch"; + sha256 = "02vq3vba6nx7gglpjdfchws9vjhs1x02a543yvqrxqpvvdfim2x2"; + }; + libkmodPatch = fetchpatch { + url = "https://github.com/Bumblebee-Project/Bumblebee/commit/deceb14cdf2c90ff64ebd1010a674305464587da.patch"; + sha256 = "00c05i5lxz7vdbv445ncxac490vbl5g9w3vy3gd71qw1f0si8vwh"; + }; + in stdenv.mkDerivation rec { name = "bumblebee-${version}"; @@ -56,7 +66,12 @@ in stdenv.mkDerivation rec { sha256 = "03p3gvx99lwlavznrpg9l7jnl1yfg2adcj8jcjj0gxp20wxp060h"; }; - patches = [ ./nixos.patch ]; + patches = [ + ./nixos.patch + + modprobePatch + libkmodPatch + ]; # By default we don't want to use a display device nvidiaDeviceOptions = lib.optionalString (!useDisplayDevice) '' @@ -75,13 +90,6 @@ in stdenv.mkDerivation rec { ''; preConfigure = '' - # Substitute the path to the actual modinfo program in module.c. - # Note: module.c also calls rmmod and modprobe, but those just have to - # be in PATH, and thus no action for them is required. - - substituteInPlace src/module.c \ - --replace "/sbin/modinfo" "${kmod}/sbin/modinfo" - # Don't use a special group, just reuse wheel. substituteInPlace configure \ --replace 'CONF_GID="bumblebee"' 'CONF_GID="wheel"' @@ -96,8 +104,8 @@ in stdenv.mkDerivation rec { # Build-time dependencies of bumblebeed and optirun. # Note that it has several runtime dependencies. - buildInputs = [ libX11 glib libbsd ]; - nativeBuildInputs = [ makeWrapper pkgconfig help2man ]; + buildInputs = [ libX11 glib libbsd kmod ]; + nativeBuildInputs = [ makeWrapper pkgconfig help2man automake111x autoconf ]; # The order of LDPATH is very specific: First X11 then the host # environment then the optional sub architecture paths. diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix index 4c675a69842..f69d5d80649 100644 --- a/pkgs/tools/X11/xdotool/default.nix +++ b/pkgs/tools/X11/xdotool/default.nix @@ -2,15 +2,20 @@ stdenv.mkDerivation rec { name = "xdotool-${version}"; - version = "3.20150503.1"; + version = "3.20160805.1"; + src = fetchurl { url = "https://github.com/jordansissel/xdotool/releases/download/v${version}/xdotool-${version}.tar.gz"; - sha256 = "1lcngsw33fy9my21rdiz1gs474bfdqcfxjrnfggbx4aypn1nhcp8"; + sha256 = "1a6c1zr86zb53352yxv104l76l8x21gfl2bgw6h21iphxpv5zgim"; }; nativeBuildInputs = [ pkgconfig perl ]; buildInputs = [ libX11 libXtst xextproto libXi libXinerama libxkbcommon ]; + preBuild = '' + mkdir -p $out/lib + ''; + makeFlags = "PREFIX=$(out)"; meta = { diff --git a/pkgs/tools/X11/xlaunch/default.nix b/pkgs/tools/X11/xlaunch/default.nix deleted file mode 100644 index b7927ca8cb8..00000000000 --- a/pkgs/tools/X11/xlaunch/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv, xorgserver }: - -# !!! What does this package do, and does it belong in Nixpkgs? - -stdenv.mkDerivation { - name = "xlaunch"; - inherit xorgserver; - buildCommand = " - cat << EOF > realizeuid.c - #include - #include - #include - int main(int argc, char ** argv, char ** envp) - { - uid_t a,b,c; - int i; - char *nargv[10000]; - char arg1 [10]; - nargv[0]=argv[0]; - for (i=1; i<=argc; i++){ - nargv[i+1]=argv[i]; - } - nargv[1]=arg1; - getresuid (&a,&b,&c); - snprintf(arg1,8,\"%d\",a); - setresuid(c,c,c); - execve(\"\$out/libexec/xlaunch\", nargv, envp); - } -EOF - mkdir -p \$out/bin - mkdir -p \$out/libexec - gcc realizeuid.c -o \$out/bin/xlaunch - echo '#! ${stdenv.shell} - USER=\$(egrep '\\''^[-a-z0-9A-Z_]*:[^:]*:'\\''\$1'\\'':'\\'' /etc/passwd | sed -e '\\''s/:.*//'\\'' ) - shift - case \"\$1\" in - :*) export _display=\"\$1\"; - shift - esac - _display=\${_display:-:0} - _display=\${_display#:} - echo Using :\$_display - if [ -n \"\$DO_X_RESET\" ]; then - RESET_OPTION=\"-once\" - else - RESET_OPTION=\"-noreset\" - fi; - XCMD=\"\$(egrep \"^Environment=\" /etc/systemd/system/display-manager.service | sed -e \"s/Environment=/ export /\" | sed -e '\\''s/#.*//'\\'' ; echo export _XARGS_=\\\$\\( grep xserver_arguments \\\$SLIM_CFGFILE \\| sed -e s/xserver_arguments// \\| sed -e s/:0/:\${_display}/ \\| sed -e s/vt7/vt\$((7+_display))/ \\) ; echo ${xorgserver.out}/bin/X \\\$_XARGS_ \$RESET_OPTION )\" - PRE_XCMD=\"\$(egrep \"^ExecStartPre=\" /etc/systemd/system/display-manager.service | sed -e \"\s/ExecStartPre=//\")\" - echo \"\$PRE_XCMD\" - echo \"\$PRE_XCMD\" | bash - echo \"\$XCMD\" - echo \"\$XCMD\" | bash & - while ! test -e /tmp/.X11-unix/X\$_display &>/dev/null ; do sleep 0.5; done - su -l \${USER:-identityless-shelter} -c \"DISPLAY=:\$_display \$*\"; - ' >\$out/libexec/xlaunch - chmod a+x \$out/libexec/xlaunch - "; - meta = { - description = ''Wrapper to parse NixOS-specific X environment and launch a custom X session''; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/tools/archivers/gnutar/CVE-2016-6321.patch b/pkgs/tools/archivers/gnutar/CVE-2016-6321.patch new file mode 100644 index 00000000000..c53d92891fc --- /dev/null +++ b/pkgs/tools/archivers/gnutar/CVE-2016-6321.patch @@ -0,0 +1,35 @@ +commit 7340f67b9860ea0531c1450e5aa261c50f67165d +Author: Paul Eggert +Date: Sat Oct 29 21:04:40 2016 -0700 + + When extracting, skip ".." members + + * NEWS: Document this. + * src/extract.c (extract_archive): Skip members whose names + contain "..". + +diff --git a/src/extract.c b/src/extract.c +index f982433..7904148 100644 +--- a/src/extract.c ++++ b/src/extract.c +@@ -1629,12 +1629,20 @@ extract_archive (void) + { + char typeflag; + tar_extractor_t fun; ++ bool skip_dotdot_name; + + fatal_exit_hook = extract_finish; + + set_next_block_after (current_header); + ++ skip_dotdot_name = (!absolute_names_option ++ && contains_dot_dot (current_stat_info.orig_file_name)); ++ if (skip_dotdot_name) ++ ERROR ((0, 0, _("%s: Member name contains '..'"), ++ quotearg_colon (current_stat_info.orig_file_name))); ++ + if (!current_stat_info.file_name[0] ++ || skip_dotdot_name + || (interactive_option + && !confirm ("extract", current_stat_info.file_name))) + { diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 16660fea3e7..80c84236b8d 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "097hx7sbzp8qirl4m930lw84kn0wmxhmq7v1qpra3mrg0b8cyba0"; }; - patches = [ ]; # FIXME: remove on another stdenv rebuild + patches = [ ./CVE-2016-6321.patch ]; # FIXME: remove on another stdenv rebuild # avoid retaining reference to CF during stdenv bootstrap configureFlags = stdenv.lib.optionals stdenv.isDarwin [ diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index c63e6c515a5..4f5601501e9 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -3,8 +3,7 @@ let version = "0.7.07.1"; - inherit (python2Packages) boto cffi cryptography ecdsa enum idna ipaddress lockfile paramiko pyasn1 pycrypto python setuptools six; -in stdenv.mkDerivation { +in python2Packages.buildPythonApplication { name = "duplicity-${version}"; src = fetchurl { @@ -12,16 +11,21 @@ in stdenv.mkDerivation { sha256 = "594c6d0e723e56f8a7114d57811c613622d535cafdef4a3643a4d4c89c1904f8"; }; - installPhase = '' - python setup.py install --prefix=$out + postInstall = '' wrapProgram $out/bin/duplicity \ - --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${idna}):$(toPythonPath ${cffi}):$(toPythonPath ${ipaddress}):$(toPythonPath ${pyasn1}):$(toPythonPath ${six}):$(toPythonPath ${enum}):$(toPythonPath ${setuptools}):$(toPythonPath ${cryptography}):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" \ --prefix PATH : "${stdenv.lib.makeBinPath [ gnupg ncftp rsync ]}" - wrapProgram $out/bin/rdiffdir \ - --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${idna}):$(toPythonPath ${cffi}):$(toPythonPath ${ipaddress}):$(toPythonPath ${pyasn1}):$(toPythonPath ${six}):$(toPythonPath ${enum}):$(toPythonPath ${setuptools}):$(toPythonPath ${cryptography}):$(toPythonPath ${pycrypto}):$(toPythonPath ${ecdsa}):$(toPythonPath ${paramiko}):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" ''; - buildInputs = [ python librsync makeWrapper setuptools ]; + buildInputs = [ librsync makeWrapper ]; + + # Inputs for tests. These are added to buildInputs when doCheck = true + checkInputs = with python2Packages; [ lockfile mock pexpect ]; + + # Many problematic tests + doCheck = false; + + propagatedBuildInputs = with python2Packages; [ boto cffi cryptography ecdsa enum idna + ipaddress lockfile paramiko pyasn1 pycrypto six ]; meta = { description = "Encrypted bandwidth-efficient backup using the rsync algorithm"; diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix index 048321ea2e5..ef7299966a7 100644 --- a/pkgs/tools/backup/obnam/default.nix +++ b/pkgs/tools/backup/obnam/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { name = "obnam-${version}"; - version = "1.19.1"; + version = "1.20.2"; src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz"; - sha256 = "096abbvz2c9vm8r7zm82yqrd7zj04pb1xzlv6z0dspkngd0cfdqc"; + sha256 = "0r8gngjir9pinj5vp2aq326g74wnhv075n8y9i0hgc5cfvckjjmq"; }; buildInputs = [ pythonPackages.sphinx attr ]; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index e981a108914..d966175f50d 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "zstd-${version}"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { - sha256 = "0h8r8vlk8v28cxxgdp7h7dcygbpn8g95wffsvhzybxhfvkrlw6f2"; + sha256 = "18snd1jiz0j6r1yk4vkgqmil2gbzwxgmcv2chvpnc5i93pp18hri"; rev = "v${version}"; repo = "zstd"; owner = "facebook"; diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index d0d9fa02178..518edbb3ea4 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -1,31 +1,34 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, boost, fuse, openssl, perl -, pkgconfig, rlog }: +{ stdenv, fetchFromGitHub +, cmake, pkgconfig, perl +, gettext, fuse, openssl, tinyxml2 +}: stdenv.mkDerivation rec { name = "encfs-${version}"; - version = "1.8.1"; + version = "1.9.1"; src = fetchFromGitHub { - sha256 = "1cxihqwpnqbzy8qz0134199pwfnd7ikr2835p5p1yzqnl203wcdb"; + sha256 = "1pyldd802db987m13jfmy491mp8mnsv2mwki0ra4wbnngbqgalhv"; rev = "v${version}"; repo = "encfs"; owner = "vgough"; }; - buildInputs = [ boost fuse openssl rlog ]; - nativeBuildInputs = [ autoreconfHook perl pkgconfig ]; + buildInputs = [ gettext fuse openssl tinyxml2 ]; + nativeBuildInputs = [ cmake pkgconfig perl ]; - configureFlags = [ - "--with-boost-serialization=boost_wserialization" - "--with-boost-filesystem=boost_filesystem" - ]; + cmakeFlags = + [ "-DUSE_INTERNAL_TINYXML=OFF" + "-DBUILD_SHARED_LIBS=ON" + "-DINSTALL_LIBENCFS=ON" + ]; enableParallelBuilding = true; meta = with stdenv.lib; { + description = "An encrypted filesystem in user-space via FUSE"; homepage = https://vgough.github.io/encfs; - description = "Provides an encrypted filesystem in user-space via FUSE"; - license = licenses.lgpl2; + license = with licenses; [ gpl3 lgpl3 ]; maintainers = with maintainers; [ nckx ]; platforms = with platforms; linux; }; diff --git a/pkgs/tools/filesystems/fuse-zip/default.nix b/pkgs/tools/filesystems/fuse-zip/default.nix deleted file mode 100644 index a5ac74fe47a..00000000000 --- a/pkgs/tools/filesystems/fuse-zip/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, fuse, libzip, zlib }: - -stdenv.mkDerivation rec { - name = "fuse-zip-0.2.13"; - - src = fetchurl { - url = "http://fuse-zip.googlecode.com/files/${name}.tar.gz"; - sha1 = "9cfa00e38a59d4e06fd47bfaca75ad5e299ecc6b"; - }; - - patches = [ ./libzip.patch ]; # problems with new libzip; from Gentoo - - buildInputs = [ pkgconfig fuse libzip zlib ]; - - makeFlags = "INSTALLPREFIX=$(out)"; - - meta = { - homepage = http://code.google.com/p/fuse-zip/; - description = "A FUSE-based filesystem that allows read and write access to ZIP files"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl3Plus; - }; -} diff --git a/pkgs/tools/filesystems/fuse-zip/libzip.patch b/pkgs/tools/filesystems/fuse-zip/libzip.patch deleted file mode 100644 index f2348e5f1ba..00000000000 --- a/pkgs/tools/filesystems/fuse-zip/libzip.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ru fuse-zip-0.2.13/lib/bigBuffer.cpp fuse-zip-0.2.13.new//lib/bigBuffer.cpp ---- fuse-zip-0.2.13/lib/bigBuffer.cpp 2010-12-06 12:34:32.000000000 -0500 -+++ fuse-zip-0.2.13.new//lib/bigBuffer.cpp 2011-09-28 21:40:01.294946957 -0400 -@@ -236,7 +236,7 @@ - len = offset; - } - --ssize_t BigBuffer::zipUserFunctionCallback(void *state, void *data, size_t len, enum zip_source_cmd cmd) { -+zip_int64_t BigBuffer::zipUserFunctionCallback(void *state, void *data, zip_uint64_t len, enum zip_source_cmd cmd) { - CallBackStruct *b = (CallBackStruct*)state; - switch (cmd) { - case ZIP_SOURCE_OPEN: { -diff -ru fuse-zip-0.2.13/lib/bigBuffer.h fuse-zip-0.2.13.new//lib/bigBuffer.h ---- fuse-zip-0.2.13/lib/bigBuffer.h 2010-12-06 12:34:32.000000000 -0500 -+++ fuse-zip-0.2.13.new//lib/bigBuffer.h 2011-09-28 21:40:23.203719133 -0400 -@@ -52,7 +52,7 @@ - * never called because read() always successfull. - * See zip_source_function(3) for details. - */ -- static ssize_t zipUserFunctionCallback(void *state, void *data, size_t len, enum zip_source_cmd cmd); -+ static zip_int64_t zipUserFunctionCallback(void *state, void *data, zip_uint64_t len, enum zip_source_cmd cmd); - - /** - * Return number of chunks needed to keep 'offset' bytes. diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix index 577c0a33b3e..0bdcfa76fec 100644 --- a/pkgs/tools/misc/aspcud/default.nix +++ b/pkgs/tools/misc/aspcud/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, - boost, clasp, cmake, gringo, re2c + boost, clasp, cmake, clingo, re2c }: let @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { sha256 = "029035vcdk527ssf126i8ipi5zs73gqpbrg019pvm9r24rf0m373"; }; - buildInputs = [ boost clasp cmake gringo re2c ]; + buildInputs = [ boost clasp cmake clingo re2c ]; buildPhase = '' cmake -DCMAKE_BUILD_TYPE=Release \ - -DGRINGO_LOC=${gringo}/bin/gringo \ + -DGRINGO_LOC=${clingo}/bin/gringo \ -DCLASP_LOC=${clasp}/bin/clasp \ -DENCODING_LOC=$out/share/aspcud/specification.lp \ . diff --git a/pkgs/tools/misc/clingo/default.nix b/pkgs/tools/misc/clingo/default.nix new file mode 100644 index 00000000000..6ab0a68920f --- /dev/null +++ b/pkgs/tools/misc/clingo/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, + bison, re2c, scons +}: + +let + version = "5.1.0"; +in + +stdenv.mkDerivation rec { + name = "clingo-${version}"; + + src = fetchFromGitHub { + owner = "potassco"; + repo = "clingo"; + rev = "v${version}"; + sha256 = "1rvaqqa8xfagsqxk45lax3l29sksijd3zvl662vpvdi1sy0d71xv"; + }; + + buildInputs = [ bison re2c scons ]; + + buildPhase = '' + scons --build-dir=release + ''; + + installPhase = '' + mkdir -p $out/bin + cp build/release/{gringo,clingo,reify,lpconvert} $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "A grounder and solver for logic programs."; + homepage = http://potassco.org; + platforms = platforms.linux; + maintainers = [ maintainers.hakuch ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix index a9bdf1b2b92..0a7b079445d 100644 --- a/pkgs/tools/misc/cowsay/default.nix +++ b/pkgs/tools/misc/cowsay/default.nix @@ -1,11 +1,12 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, fetchgit, perl }: stdenv.mkDerivation { - name = "cowsay-3.03"; + name = "cowsay-3.03+dfsg1-16"; - src = fetchurl { - url = http://www.nog.net/~tony/warez/cowsay-3.03.tar.gz; - sha256 = "1s3c0g5vmsadicc4lrlkmkm8znm4y6wnxd8kyv9xgm676hban1il"; + src = fetchgit { + url = https://anonscm.debian.org/git/collab-maint/cowsay.git; + rev = "acb946c166fa3b9526b9c471ef1330f9f89f9c8b"; + sha256 = "1ji66nrdcc8sh79hwils3nbaj897s352r5wp7kzjwiym8bm2azk6"; }; buildInputs = [ perl ]; diff --git a/pkgs/tools/misc/g500-control/default.nix b/pkgs/tools/misc/g500-control/default.nix deleted file mode 100644 index 9d42c7d68d5..00000000000 --- a/pkgs/tools/misc/g500-control/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "g500-control-0.0.1"; - - src = fetchurl { - url = "http://g500-control.googlecode.com/files/g500_control_0.0.1.tar.gz"; - sha256 = "1xlg9lpxnk3228k81y1i6jjh4df1p4jh64g54w969g6a6v6dazvb"; - }; - - unpackPhase = '' - mkdir -p g500-control - tar -C g500-control/ -xf $src - ''; - - buildPhase = '' - cd g500-control - gcc -o g500-control *.c - ''; - - installPhase = '' - mkdir -p $out/bin/ - cp g500-control $out/bin/ - ''; - - meta = { - homepage = http://code.google.com/p/g500-control/; - description = "Configure Logitech G500's internal profile under Linux"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; - }; -} - diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 829c524113b..ae26bad5bc8 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "2.1.1"; + version = "2.1.2"; name = "graylog-${version}"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "0p7vx6b4k6lzxi0v9x44wbrvplw93288lpixpwckc0xx0r7js07z"; + sha256 = "0jwm1l3s00rh22gqvkg730h8xm4h1y1dr60m4s5xbz8qzdkk8rax"; }; dontBuild = true; diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix deleted file mode 100644 index ae71c01314c..00000000000 --- a/pkgs/tools/misc/gringo/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, - bison, re2c, scons -}: - -let - version = "4.5.4"; -in - -stdenv.mkDerivation rec { - name = "gringo-${version}"; - - src = fetchurl { - url = "mirror://sourceforge/project/potassco/gringo/${version}/gringo-${version}-source.tar.gz"; - sha256 = "16k4pkwyr2mh5w8j91vhxh9aff7f4y31npwf09w6f8q63fxvpy41"; - }; - - buildInputs = [ bison re2c scons ]; - - patches = [ - ./gringo-4.5.4-cmath.patch - ]; - - buildPhase = '' - scons --build-dir=release - ''; - - installPhase = '' - mkdir -p $out/bin - cp build/release/gringo $out/bin/gringo - ''; - - meta = with stdenv.lib; { - description = "Converts input programs with first-order variables to equivalent ground programs"; - homepage = http://potassco.sourceforge.net/; - platforms = platforms.linux; - maintainers = [ maintainers.hakuch ]; - license = licenses.gpl3Plus; - }; -} diff --git a/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch b/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch deleted file mode 100644 index 7b5510e2344..00000000000 --- a/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gringo/libgringo/src/term.cc~ 2016-07-12 23:56:10.593577749 -0400 -+++ gringo/libgringo/src/term.cc 2016-07-12 23:52:35.169968338 -0400 -@@ -22,6 +22,8 @@ - #include "gringo/logger.hh" - #include "gringo/graph.hh" - -+#include -+ - namespace Gringo { - - // {{{ definition of Defines diff --git a/pkgs/tools/misc/mcrl/default.nix b/pkgs/tools/misc/mcrl/default.nix deleted file mode 100644 index bf5043e8b63..00000000000 --- a/pkgs/tools/misc/mcrl/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{stdenv, fetchurl, coreutils}: - -stdenv.mkDerivation { - name = "mcrl-2.18.4"; - src = fetchurl { - url = http://homepages.cwi.nl/~mcrl/mcrl-2.18.4.tar.gz ; - sha256 = "0gld7x3cv3y0vwjr1snz24xzr818sj1l2dfn8qhirfyhc7dnnqfw"; - }; - - RMPROG = "${coreutils}/bin/rm -f"; -} - - - diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix index a6891886664..c138261f9a3 100644 --- a/pkgs/tools/misc/screenfetch/default.nix +++ b/pkgs/tools/misc/screenfetch/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, makeWrapper, coreutils, gawk, procps, gnused -, findutils, xdpyinfo, xprop, gnugrep, ncurses +, bc, findutils, xdpyinfo, xprop, gnugrep, ncurses }: stdenv.mkDerivation { @@ -30,7 +30,8 @@ stdenv.mkDerivation { --prefix PATH : "${xdpyinfo}/bin" \ --prefix PATH : "${xprop}/bin" \ --prefix PATH : "${gnugrep}/bin" \ - --prefix PATH : "${ncurses}/bin" + --prefix PATH : "${ncurses}/bin" \ + --prefix PATH : "${bc}/bin" ''; meta = { diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 3710eef238f..d1ba3ced99b 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonApplication, makeWrapper, zip, ffmpeg, pandoc +{ stdenv, fetchurl, buildPythonApplication, makeWrapper, zip, ffmpeg, rtmpdump, pandoc , atomicparsley # Pandoc is required to build the package's man page. Release tarballs contain a # formatted man page already, though, it will still be installed. We keep the @@ -7,6 +7,7 @@ # included. , generateManPage ? false , ffmpegSupport ? true +, rtmpSupport ? true }: with stdenv.lib; @@ -14,19 +15,20 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2016.10.31"; + version = "2016.11.04"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "b8a0889bf4fed2f54d8ebbc6ea7860feae05b122d1b192417af68159b83f0bb4"; + sha256 = "9622b29b81587278a00e39e4206e7c52555d240cbbb44242f237660169e8d531"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; # Ensure ffmpeg is available in $PATH for post-processing & transcoding support. + # rtmpdump is required to download files over RTMP # atomicparsley for embedding thumbnails postInstall = let - packagesthatwillbeusedbelow = [ atomicparsley ] ++ optional ffmpegSupport ffmpeg; + packagesthatwillbeusedbelow = [ atomicparsley ] ++ optional ffmpegSupport ffmpeg ++ optional rtmpSupport rtmpdump; in '' wrapProgram $out/bin/youtube-dl --prefix PATH : "${makeBinPath packagesthatwillbeusedbelow}" ''; diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 32cf5750c6a..1c91235652a 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, nodejs, which, python27, utillinux }: -let version = "17.3"; in +let version = "18"; in stdenv.mkDerivation { name = "cjdns-"+version; src = fetchurl { url = "https://github.com/cjdelisle/cjdns/archive/cjdns-v${version}.tar.gz"; - sha256 = "00p62y7b89y3piirpj27crprji8nh0zv7zh4mcqhzh6r39jxz4ri"; + sha256 = "1as7n730ppn93cpal7s6r6iq1qx46m0c45iwy8baypbpp42zxrap"; }; buildInputs = [ which python27 nodejs ] ++ diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 958bea34e7d..56c0d26a999 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -18,11 +18,11 @@ assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { - name = "curl-7.50.3"; + name = "curl-7.51.0"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "1v6q83qsrf7dgp3y5fa5vkppgqyy82pnsk8z9b4047b6fvclfwvv"; + sha256 = "1pldg1d8606p4q83k8fcp61kfcsbphln22mycw7h7r87i42410kz"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; diff --git a/pkgs/tools/networking/dirb/default.nix b/pkgs/tools/networking/dirb/default.nix new file mode 100644 index 00000000000..abb64d4d896 --- /dev/null +++ b/pkgs/tools/networking/dirb/default.nix @@ -0,0 +1,30 @@ +{ fetchurl, stdenv, automake, autoconf, curl, autoreconfHook }: + +let + major = "2"; + minor = "22"; +in stdenv.mkDerivation rec { + name = "dirb-${version}"; + version = "${major}.${minor}"; + src = fetchurl { + url = "mirror://sourceforge/dirb/${version}/dirb${major}${minor}.tar.gz"; + sha256 = "0b7wc2gvgnyp54rxf1n9arn6ymrvdb633v6b3ah138hw4gg8lx7k"; + }; + + unpackPhase = '' + tar -xf $src + find . -exec chmod +x "{}" ";" + export sourceRoot="dirb222" + ''; + + buildInputs = [ automake autoconf curl ]; + preConfigure = "chmod +x configure"; + + meta = { + description = "A web content scanner"; + homepage = "http://dirb.sourceforge.net/"; + maintainers = with stdenv.lib.maintainers; [ bennofs ]; + license = with stdenv.lib.licenses; [ gpl2 ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index f12b2900e67..56af632e616 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "1xwcq7lklma0daamp9z76l9mgr3glpvicjgsr645rjhdv8a0mqwp"; + sha256 = "0lw0vcibp3v5xz855h4x2rs3ff7yx86znzjfnfri348wg413js5c"; }; buildInputs = [ boost zlib openssl ]; diff --git a/pkgs/tools/networking/netcat/default.nix b/pkgs/tools/networking/netcat-gnu/default.nix similarity index 100% rename from pkgs/tools/networking/netcat/default.nix rename to pkgs/tools/networking/netcat-gnu/default.nix diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix index e71abcd8a2c..9933b512006 100644 --- a/pkgs/tools/networking/netcat-openbsd/default.nix +++ b/pkgs/tools/networking/netcat-openbsd/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { installPhase = '' install -Dm0755 nc $out/bin/nc + install -Dm0644 nc.1 $out/share/man/man1/nc.1 ''; meta = { diff --git a/pkgs/tools/networking/pixiewps/default.nix b/pkgs/tools/networking/pixiewps/default.nix new file mode 100644 index 00000000000..d9b44cc2311 --- /dev/null +++ b/pkgs/tools/networking/pixiewps/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "pixiewps-${version}"; + version = "1.2.2"; + src = fetchFromGitHub { + owner = "wiire"; + repo = "pixiewps"; + rev = "v${version}"; + sha256 = "09znnj7p8cks7zxzklkdm4zy2qnp92vhngm9r0zfgawnl2b4r2aw"; + }; + + preBuild = '' + cd src + substituteInPlace Makefile --replace "\$(DESTDIR)/usr" "$out" + substituteInPlace Makefile --replace "/local" "" + ''; + + meta = { + description = "An offline WPS bruteforce utility"; + homepage = https://github.com/wiire/pixiewps; + license = stdenv.lib.licenses.gpl3; + maintainer = stdenv.lib.maintainers.nico202; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/networking/reaver-wps-t6x/default.nix b/pkgs/tools/networking/reaver-wps-t6x/default.nix new file mode 100644 index 00000000000..59d2b04786d --- /dev/null +++ b/pkgs/tools/networking/reaver-wps-t6x/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, libpcap, sqlite, pixiewps }: + +stdenv.mkDerivation rec { + version = "1.5.2"; + name = "reaver-wps-t6x-${version}"; + + src = fetchFromGitHub { + owner = "t6x"; + repo = "reaver-wps-fork-t6x"; + rev = "v${version}"; + sha256 = "0zhlms89ncqz1f1hc22yw9x1s837yv76f1zcjizhgn5h7vp17j4b"; + }; + + buildInputs = [ libpcap sqlite pixiewps ]; + + prePatch = "cd src"; + + preInstall = "mkdir -p $out/bin"; + + meta = { + description = "Online and offline brute force attack against WPS"; + homepage = https://github.com/t6x/reaver-wps-fork-t6x; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; + maintainer = stdenv.lib.maintainers.nico202; + }; +} diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index 64c12dc6e5e..165091d934a 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { description = "A script to make rofi work with password-store"; homepage = https://github.com/carnager/rofi-pass; - maintainers = with stdenv.lib.maintainers; [ hiberno the-kenny ]; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; license = stdenv.lib.licenses.gpl3; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 13c50fe3ec9..46932076177 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -13,11 +13,22 @@ stdenv.mkDerivation rec{ buildInputs = [ autoreconfHook zlib pkgconfig libuuid ]; - preConfigure = '' - export ZLIB_CFLAGS=" " - export ZLIB_LIBS="-lz" - export UUID_CFLAGS=" " - export UUID_LIBS="-luuid" + # Allow UI to load when running as non-root + patches = [ ./web_access.patch ]; + + # Build will fail trying to create /var/{cache,lib,log}/netdata without this + postPatch = '' + sed -i '/dist_.*_DATA = \.keep/d' src/Makefile.am + ''; + + configureFlags = [ + "--localstatedir=/var" + ]; + + # App fails on runtime if the default config file is not detected + # The upstream installer does prepare an empty file too + postInstall = '' + touch $out/etc/netdata/netdata.conf ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/system/netdata/web_access.patch b/pkgs/tools/system/netdata/web_access.patch new file mode 100644 index 00000000000..f1e4bd64cbb --- /dev/null +++ b/pkgs/tools/system/netdata/web_access.patch @@ -0,0 +1,20 @@ +--- a/src/web_client.c.orig ++++ b/src/web_client.c +@@ -331,7 +331,7 @@ + buffer_sprintf(w->response.data, "File '%s' does not exist, or is not accessible.", webfilename); + return 404; + } +- ++#if 0 + // check if the file is owned by expected user + if(stat.st_uid != web_files_uid()) { + error("%llu: File '%s' is owned by user %u (expected user %u). Access Denied.", w->id, webfilename, stat.st_uid, web_files_uid()); +@@ -345,7 +345,7 @@ + buffer_sprintf(w->response.data, "Access to file '%s' is not permitted.", webfilename); + return 403; + } +- ++#endif + if((stat.st_mode & S_IFMT) == S_IFDIR) { + snprintfz(webfilename, FILENAME_MAX, "%s/index.html", filename); + return mysendfile(w, webfilename); diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/tools/system/sg3_utils/default.nix index e2fa8eacc91..e0f30b2db73 100644 --- a/pkgs/tools/system/sg3_utils/default.nix +++ b/pkgs/tools/system/sg3_utils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "sg3_utils-1.31"; + name = "sg3_utils-1.42"; src = fetchurl { url = "http://sg.danny.cz/sg/p/${name}.tgz"; - sha256 = "190hhkhl096fxkspkr93lrq1n79xz5c5i2n4n4g998qc3yv3hjyq"; + sha256 = "1wwy7iiz1lvc32c777yd4vp0c0dqfdlm5jrsm3aa62xx141pmjqx"; }; meta = { diff --git a/pkgs/tools/text/agrep/default.nix b/pkgs/tools/text/agrep/default.nix new file mode 100644 index 00000000000..81c09840848 --- /dev/null +++ b/pkgs/tools/text/agrep/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "agrep-${version}"; + version = "3.41.5"; + + src = fetchFromGitHub { + owner = "Wikinaut"; + repo = "agrep"; + # This repository has numbered versions, but not Git tags. + rev = "eef20411d605d9d17ead07a0ade75046f2728e21"; + sha256 = "14addnwspdf2mxpqyrw8b84bb2257y43g5ccy4ipgrr91fmxq2sk"; + }; + + installPhase = '' + install -Dm 555 agrep -t "$out/bin" + install -Dm 444 docs/* -t "$out/doc" + ''; + + meta = { + description = "Approximate grep for fast fuzzy string searching"; + homepage = "https://www.tgries.de/agrep/"; + license = stdenv.lib.licenses.isc; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix new file mode 100644 index 00000000000..36ff976a6c1 --- /dev/null +++ b/pkgs/tools/text/xml/jing-trang/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, jre, jdk, ant, saxon }: + +stdenv.mkDerivation rec { + name = "jing-trang-${version}"; + version = "20150603"; + + src = fetchFromGitHub { + owner = "relaxng"; + repo = "jing-trang"; + rev = "54b9b1f4e67cd79c7987750d8c9dcfc014af98c3"; # needed to compile with jdk8 + sha256 = "0wa569xjb7ihhcaazz32y2b0dv092lisjz77isz1gfb1wvf53di5"; + }; + + buildInputs = [ jdk ant saxon ]; + + preBuild = "ant"; + + installPhase = '' + mkdir -p "$out"/{share/java,bin} + cp ./build/*.jar "$out/share/java/" + + for tool in jing trang; do + cat > "$out/bin/$tool" < "$out/bin/jing" <> $out/bin/trang < "$wrapper" <<- EOF - export PATH="$PATH:\$PATH" - export VIRTUALENVWRAPPER_PYTHONPATH="$PYTHONPATH:$(toPythonPath $out)" - source "$wrapped" - EOF + export PATH="$PATH:\$PATH" + export VIRTUALENVWRAPPER_PYTHONPATH="$PYTHONPATH:$(toPythonPath $out)" + source "$wrapped" + EOF chmod -x "$wrapped" chmod +x "$wrapper" @@ -28186,26 +28321,6 @@ in { }; - moreItertools = buildPythonPackage rec { - name = "more-itertools-2.2"; - - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "https://github.com/erikrose/more-itertools/archive/2.2.tar.gz"; - sha256 = "4606417182e0a1289e23fb7f964a64ca9fdaafb7c1999034dc4fa0cc5850c478"; - }; - - propagatedBuildInputs = with self; [ nose ]; - - meta = { - homepage = https://more-itertools.readthedocs.org; - description = "Expansion of the itertools module"; - license = licenses.mit; - }; - }; - - uncertainties = buildPythonPackage rec { name = "uncertainties-${version}"; version = "3.0.1"; @@ -28722,28 +28837,28 @@ in { ofxclient = buildPythonPackage rec { name = "ofxclient-1.3.8"; - src = pkgs.fetchurl { - url = "mirror://pypi/o/ofxclient/${name}.tar.gz"; - sha256 = "99ab03bffdb30d9ec98724898f428f8e73129483417d5892799a0f0d2249f233"; - }; + src = pkgs.fetchurl { + url = "mirror://pypi/o/ofxclient/${name}.tar.gz"; + sha256 = "99ab03bffdb30d9ec98724898f428f8e73129483417d5892799a0f0d2249f233"; + }; - # ImportError: No module named tests - doCheck = false; + # ImportError: No module named tests + doCheck = false; - propagatedBuildInputs = with self; [ ofxhome ofxparse beautifulsoup keyring argparse ]; + propagatedBuildInputs = with self; [ ofxhome ofxparse beautifulsoup keyring argparse ]; }; ofxhome = buildPythonPackage rec { - name = "ofxhome-0.3.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/o/ofxhome/${name}.tar.gz"; - sha256 = "0000db437fd1a8c7c65cea5d88ce9d3b54642a1f4844dde04f860e29330ac68d"; - }; + name = "ofxhome-0.3.1"; + src = pkgs.fetchurl { + url = "mirror://pypi/o/ofxhome/${name}.tar.gz"; + sha256 = "0000db437fd1a8c7c65cea5d88ce9d3b54642a1f4844dde04f860e29330ac68d"; + }; - buildInputs = with self; [ nose ]; + buildInputs = with self; [ nose ]; - # ImportError: No module named tests - doCheck = false; + # ImportError: No module named tests + doCheck = false; meta = { homepage = "https://github.com/captin411/ofxhome"; @@ -28753,13 +28868,13 @@ in { }; ofxparse = buildPythonPackage rec { - name = "ofxparse-0.14"; - src = pkgs.fetchurl { - url = "mirror://pypi/o/ofxparse/${name}.tar.gz"; - sha256 = "d8c486126a94d912442d040121db44fbc4a646ea70fa935df33b5b4dbfbbe42a"; - }; + name = "ofxparse-0.14"; + src = pkgs.fetchurl { + url = "mirror://pypi/o/ofxparse/${name}.tar.gz"; + sha256 = "d8c486126a94d912442d040121db44fbc4a646ea70fa935df33b5b4dbfbbe42a"; + }; - propagatedBuildInputs = with self; [ six beautifulsoup4 ]; + propagatedBuildInputs = with self; [ six beautifulsoup4 ]; meta = { homepage = "http://sites.google.com/site/ofxparse"; @@ -29990,34 +30105,33 @@ in { }; }; - Quandl = buildPythonPackage rec { - version = "3.0.0"; - name = "Quandl-${version}"; + version = "3.0.0"; + name = "Quandl-${version}"; - src = pkgs.fetchurl { - url= "mirror://pypi/q/quandl/${name}.tar.gz"; - sha256 = "d4e698eb39291e0b281975813054101f3dfb379dead10d34d7b536e1aad60584"; - }; + src = pkgs.fetchurl { + url= "mirror://pypi/q/quandl/${name}.tar.gz"; + sha256 = "d4e698eb39291e0b281975813054101f3dfb379dead10d34d7b536e1aad60584"; + }; - propagatedBuildInputs = with self; [ - numpy - ndg-httpsclient - dateutil - inflection - moreItertools - requests2 - pandas - ]; + propagatedBuildInputs = with self; [ + numpy + ndg-httpsclient + dateutil + inflection + more-itertools + requests2 + pandas + ]; - #No tests in archive - doCheck = false; + # No tests in archive + doCheck = false; - meta = { - homepage = https://github.com/quandl/quandl-python; - description = "A Python library for Quandl’s RESTful API"; - maintainers = with maintainers; [ NikolaMandic ]; - }; + meta = { + homepage = https://github.com/quandl/quandl-python; + description = "A Python library for Quandl’s RESTful API"; + maintainers = with maintainers; [ NikolaMandic ]; + }; }; queuelib = buildPythonPackage rec { @@ -30272,15 +30386,19 @@ in { tensorflowNoGpuSupport = buildPythonPackage rec { name = "tensorflow"; - version = "0.9.0"; + version = "0.10.0"; format = "wheel"; src = pkgs.fetchurl { - url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-${version}-cp27-none-linux_x86_64.whl"; - sha256 = "15v7iyry8bmp5wcc1rr4bkp80f3887rl99zqf8pys5bad4gldbkh"; + url = if stdenv.isDarwin then + "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-${version}-py2-none-any.whl" else + "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-${version}-cp27-none-linux_x86_64.whl"; + sha256 = if stdenv.isDarwin then + "1gjybh3j3rn34bzhsxsfdbqgsr4jh50qyx2wqywvcb24fkvy40j9" else + "15v7iyry8bmp5wcc1rr4bkp80f3887rl99zqf8pys5bad4gldbkh"; }; - propagatedBuildInputs = with self; [ numpy six protobuf3_0_0b2 pkgs.swig ]; + propagatedBuildInputs = with self; [ numpy six protobuf3_0_0b2 pkgs.swig mock]; preFixup = '' RPATH="${stdenv.lib.makeLibraryPath [ pkgs.gcc.cc.lib pkgs.zlib ]}" @@ -30293,6 +30411,7 @@ in { description = "TensorFlow helps the tensors flow (no gpu support)"; homepage = http://tensorflow.org; license = licenses.asl20; + platforms = with platforms; linux ++ darwin; }; }; @@ -30621,6 +30740,8 @@ in { }; }; + moreItertools = self.more-itertools; + more-itertools = buildPythonPackage rec { name = "more-itertools-${version}"; version = "2.2"; @@ -30630,19 +30751,25 @@ in { sha256 = "1q3wqsg44z01g7i5z6j1wc0nf5c5h8g77xny6fia2gddqw2jxrlk"; }; - doCheck = false; + propagatedBuildInputs = with self; [ nose ]; + + meta = { + homepage = https://more-itertools.readthedocs.org; + description = "Expansion of the itertools module"; + license = licenses.mit; + }; }; jaraco_functools = buildPythonPackage rec { name = "jaraco.functools-${version}"; - version = "1.11"; + version = "1.15.1"; src = pkgs.fetchurl { url = "mirror://pypi/j/jaraco.functools/${name}.tar.gz"; - sha256 = "08n7vxdbsl0637b1ap2x3rg698d2as0wzvvpx05dzkrdgsgxrx3g"; + sha256 = "1nhl0pjc7acxznhadg9wq1a6ls17ja2np8vf9psq8j66716mk2ya"; }; - propagatedBuildInputs = with self; [ backports_functools_lru_cache ]; + propagatedBuildInputs = with self; [ more-itertools backports_functools_lru_cache ]; doCheck = false; @@ -31001,4 +31128,25 @@ in { maintainers = with maintainers; [ bennofs ]; }; }; + + yamllint = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "yamllint"; + version = "0.5.2"; + + src = pkgs.fetchurl{ + url = "mirror://pypi/y/${pname}/${name}.tar.gz"; + sha256 = "0brdy1crhfng10hlw0420bv10c2xnjk8ndnhssybkzym47yrzg84"; + }; + + buildInputs = with self; [ nose ]; + propagatedBuildInputs = with self; [ pyyaml ]; + + meta = { + homepage = "https://github.com/adrienverge/yamllint"; + description = "A linter for YAML files"; + license = licenses.gpl3; + maintainers = with maintainers; [ mikefaille ]; + }; + }; } diff --git a/pkgs/top-level/stdenv.nix b/pkgs/top-level/stdenv.nix index 9b8cf5a0309..c36b0fed091 100644 --- a/pkgs/top-level/stdenv.nix +++ b/pkgs/top-level/stdenv.nix @@ -1,12 +1,11 @@ -{ system, bootStdenv, crossSystem, config, platform, lib, ... }: -self: super: - -with super; +{ system, bootStdenv, crossSystem, config, platform, lib, nixpkgsFun, ... }: +pkgs: rec { allStdenvs = import ../stdenv { inherit system platform config lib; - allPackages = args: import ../.. ({ inherit config system; } // args); + # TODO(@Ericson2314): hack for cross-compiling until I clean that in follow-up PR + allPackages = args: nixpkgsFun (args // { crossSystem = null; }); }; defaultStdenv = allStdenvs.stdenv // { inherit platform; }; @@ -14,14 +13,14 @@ rec { stdenv = if bootStdenv != null then (bootStdenv // {inherit platform;}) else if crossSystem != null then - stdenvCross + pkgs.stdenvCross else let changer = config.replaceStdenv or null; in if changer != null then changer { # We import again all-packages to avoid recursivities. - pkgs = import ../.. { + pkgs = nixpkgsFun { # We remove packageOverrides to avoid recursivities config = removeAttrs config [ "replaceStdenv" ]; };