diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 84f6cb3658b..4161fa546c8 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -12,9 +12,15 @@ rec { inherit (builtins) attrNames listToAttrs hasAttr isAttrs getAttr; - /* Return an attribute from nested attribute sets. For instance - ["x" "y"] applied to some set e returns e.x.y, if it exists. The - default value is returned otherwise. */ + /* Return an attribute from nested attribute sets. + + Example: + x = { a = { b = 3; }; } + attrByPath ["a" "b"] 6 x + => 3 + attrByPath ["z" "z"] 6 x + => 6 + */ attrByPath = attrPath: default: e: let attr = head attrPath; in @@ -24,8 +30,15 @@ rec { else default; /* Return if an attribute from nested attribute set exists. - For instance ["x" "y"] applied to some set e returns true, if e.x.y exists. False - is returned otherwise. */ + + Example: + x = { a = { b = 3; }; } + hasAttrByPath ["a" "b"] x + => true + hasAttrByPath ["z" "z"] x + => false + + */ hasAttrByPath = attrPath: e: let attr = head attrPath; in @@ -35,14 +48,28 @@ rec { else false; - /* Return nested attribute set in which an attribute is set. For instance - ["x" "y"] applied with some value v returns `x.y = v;' */ + /* Return nested attribute set in which an attribute is set. + + Example: + setAttrByPath ["a" "b"] 3 + => { a = { b = 3; }; } + */ setAttrByPath = attrPath: value: if attrPath == [] then value else listToAttrs [ { name = head attrPath; value = setAttrByPath (tail attrPath) value; } ]; + /* Like `getAttrPath' without a default value. If it doesn't find the + path it will throw. + + Example: + x = { a = { b = 3; }; } + getAttrFromPath ["a" "b"] x + => 3 + getAttrFromPath ["z" "z"] x + => error: cannot find attribute `z.z' + */ getAttrFromPath = attrPath: set: let errorMsg = "cannot find attribute `" + concatStringsSep "." attrPath + "'"; in attrByPath attrPath (abort errorMsg) set; @@ -109,9 +136,11 @@ rec { ) (attrNames set) ); - /* foldAttrs: apply fold functions to values grouped by key. Eg accumulate values as list: - foldAttrs (n: a: [n] ++ a) [] [{ a = 2; } { a = 3; }] - => { a = [ 2 3 ]; } + /* Apply fold functions to values grouped by key. + + Example: + foldAttrs (n: a: [n] ++ a) [] [{ a = 2; } { a = 3; }] + => { a = [ 2 3 ]; } */ foldAttrs = op: nul: list_of_attrs: fold (n: a: @@ -147,7 +176,12 @@ rec { /* Utility function that creates a {name, value} pair as expected by - builtins.listToAttrs. */ + builtins.listToAttrs. + + Example: + nameValuePair "some" 6 + => { name = "some"; value = 6; } + */ nameValuePair = name: value: { inherit name value; }; @@ -248,11 +282,19 @@ rec { listToAttrs (map (n: nameValuePair n (f n)) names); - /* Check whether the argument is a derivation. */ + /* Check whether the argument is a derivation. Any set with + { type = "derivation"; } counts as a derivation. + + Example: + nixpkgs = import {} + isDerivation nixpkgs.ruby + => true + isDerivation "foobar" + => false + */ isDerivation = x: isAttrs x && x ? type && x.type == "derivation"; - - /* Convert a store path to a fake derivation. */ + /* Converts a store path to a fake derivation. */ toDerivation = path: let path' = builtins.storePath path; in { type = "derivation"; @@ -262,32 +304,49 @@ rec { }; - /* If the Boolean `cond' is true, return the attribute set `as', - otherwise an empty attribute set. */ + /* If `cond' is true, return the attribute set `as', + otherwise an empty attribute set. + + Example: + optionalAttrs (true) { my = "set"; } + => { my = "set"; } + optionalAttrs (false) { my = "set"; } + => { } + */ optionalAttrs = cond: as: if cond then as else {}; /* Merge sets of attributes and use the function f to merge attributes - values. */ + values. + + Example: + zipAttrsWithNames ["a"] (name: vs: vs) [{a = "x";} {a = "y"; b = "z";}] + => { a = ["x" "y"]; } + */ zipAttrsWithNames = names: f: sets: listToAttrs (map (name: { inherit name; value = f name (catAttrs name sets); }) names); - # implentation note: Common names appear multiple times in the list of - # names, hopefully this does not affect the system because the maximal - # laziness avoid computing twice the same expression and listToAttrs does - # not care about duplicated attribute names. + /* Implentation note: Common names appear multiple times in the list of + names, hopefully this does not affect the system because the maximal + laziness avoid computing twice the same expression and listToAttrs does + not care about duplicated attribute names. + + Example: + zipAttrsWith (name: values: values) [{a = "x";} {a = "y"; b = "z";}] + => { a = ["x" "y"]; b = ["z"] } + */ zipAttrsWith = f: sets: zipAttrsWithNames (concatMap attrNames sets) f sets; + /* Like `zipAttrsWith' with `(name: values: value)' as the function. + Example: + zipAttrs [{a = "x";} {a = "y"; b = "z";}] + => { a = ["x" "y"]; b = ["z"] } + */ zipAttrs = zipAttrsWith (name: values: values); - /* backward compatibility */ - zipWithNames = zipAttrsWithNames; - zip = builtins.trace "lib.zip is deprecated, use lib.zipAttrsWith instead" zipAttrsWith; - - /* Does the same as the update operator '//' except that attributes are merged until the given pedicate is verified. The predicate should accept 3 arguments which are the path to reach the attribute, a part of @@ -351,6 +410,15 @@ rec { !(isAttrs lhs && isAttrs rhs) ) lhs rhs; + /* Returns true if the pattern is contained in the set. False otherwise. + + FIXME(zimbatm): this example doesn't work !!! + + Example: + sys = mkSystem { } + matchAttrs { cpu = { bits = 64; }; } sys + => true + */ matchAttrs = pattern: attrs: fold or false (attrValues (zipAttrsWithNames (attrNames pattern) (n: values: let pat = head values; val = head (tail values); in @@ -359,10 +427,23 @@ rec { else pat == val ) [pattern attrs])); - # override only the attributes that are already present in the old set - # useful for deep-overriding + /* Override only the attributes that are already present in the old set + useful for deep-overriding. + + Example: + x = { a = { b = 4; c = 3; }; } + overrideExisting x { a = { b = 6; d = 2; }; } + => { a = { b = 6; d = 2; }; } + */ overrideExisting = old: new: old // listToAttrs (map (attr: nameValuePair attr (attrByPath [attr] old.${attr} new)) (attrNames old)); - deepSeqAttrs = x: y: deepSeqList (attrValues x) y; + + /*** deprecated stuff ***/ + + deepSeqAttrs = throw "removed 2016-02-29 because unused and broken"; + zipWithNames = zipAttrsWithNames; + zip = builtins.trace + "lib.zip is deprecated, use lib.zipAttrsWith instead" zipAttrsWith; + } diff --git a/lib/licenses.nix b/lib/licenses.nix index 64ba63b146a..f01712500e7 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -175,6 +175,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Eclipse Public License 1.0"; }; + epson = { + fullName = "Seiko Epson Corporation Software License Agreement for Linux"; + url = https://download.ebz.epson.net/dsc/du/02/eula/global/LINUX_EN.html; + free = false; + }; + fdl12 = spdx { spdxId = "GFDL-1.2"; fullName = "GNU Free Documentation License v1.2"; diff --git a/lib/lists.nix b/lib/lists.nix index 3bcf366f0c2..deb7dcfde42 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -6,17 +6,26 @@ rec { inherit (builtins) head tail length isList elemAt concatLists filter elem genList; + /* Create a list consisting of a single element. `singleton x' is + sometimes more convenient with respect to indentation than `[x]' + when x spans multiple lines. - # Create a list consisting of a single element. `singleton x' is - # sometimes more convenient with respect to indentation than `[x]' - # when x spans multiple lines. + Example: + singleton "foo" + => [ "foo" ] + */ singleton = x: [x]; + /* "Fold" a binary function `op' between successive elements of + `list' with `nul' as the starting value, i.e., `fold op nul [x_1 + x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))'. (This is + Haskell's foldr). - # "Fold" a binary function `op' between successive elements of - # `list' with `nul' as the starting value, i.e., `fold op nul [x_1 - # x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))'. (This is - # Haskell's foldr). + Example: + concat = fold (a: b: a + b) "z" + concat [ "a" "b" "c" ] + => "abcnul" + */ fold = op: nul: list: let len = length list; @@ -26,8 +35,14 @@ rec { else op (elemAt list n) (fold' (n + 1)); in fold' 0; - # Left fold: `fold op nul [x_1 x_2 ... x_n] == op (... (op (op nul - # x_1) x_2) ... x_n)'. + /* Left fold: `fold op nul [x_1 x_2 ... x_n] == op (... (op (op nul + x_1) x_2) ... x_n)'. + + Example: + lconcat = foldl (a: b: a + b) "z" + lconcat [ "a" "b" "c" ] + => "zabc" + */ foldl = op: nul: list: let len = length list; @@ -37,13 +52,22 @@ rec { else op (foldl' (n - 1)) (elemAt list n); in foldl' (length list - 1); + /* Strict version of foldl. - # Strict version of foldl. + The difference is that evaluation is forced upon access. Usually used + with small whole results (in contract with lazily-generated list or large + lists where only a part is consumed.) + */ foldl' = builtins.foldl' or foldl; + /* Map with index - # Map with index: `imap (i: v: "${v}-${toString i}") ["a" "b"] == - # ["a-1" "b-2"]'. FIXME: why does this start to count at 1? + FIXME(zimbatm): why does this start to count at 1? + + Example: + imap (i: v: "${v}-${toString i}") ["a" "b"] + => [ "a-1" "b-2" ] + */ imap = if builtins ? genList then f: list: genList (n: f (n + 1) (elemAt list n)) (length list) @@ -57,73 +81,141 @@ rec { else [ (f (n + 1) (elemAt list n)) ] ++ imap' (n + 1); in imap' 0; + /* Map and concatenate the result. - # Map and concatenate the result. + Example: + concatMap (x: [x] ++ ["z"]) ["a" "b"] + => [ "a" "z" "b" "z" ] + */ concatMap = f: list: concatLists (map f list); + /* Flatten the argument into a single list; that is, nested lists are + spliced into the top-level lists. - # Flatten the argument into a single list; that is, nested lists are - # spliced into the top-level lists. E.g., `flatten [1 [2 [3] 4] 5] - # == [1 2 3 4 5]' and `flatten 1 == [1]'. + Example: + flatten [1 [2 [3] 4] 5] + => [1 2 3 4 5] + flatten 1 + => [1] + */ flatten = x: if isList x then foldl' (x: y: x ++ (flatten y)) [] x else [x]; + /* Remove elements equal to 'e' from a list. Useful for buildInputs. - # Remove elements equal to 'e' from a list. Useful for buildInputs. + Example: + remove 3 [ 1 3 4 3 ] + => [ 1 4 ] + */ remove = e: filter (x: x != e); + /* Find the sole element in the list matching the specified + predicate, returns `default' if no such element exists, or + `multiple' if there are multiple matching elements. - # Find the sole element in the list matching the specified - # predicate, returns `default' if no such element exists, or - # `multiple' if there are multiple matching elements. + Example: + findSingle (x: x == 3) "none" "multiple" [ 1 3 3 ] + => "multiple" + findSingle (x: x == 3) "none" "multiple" [ 1 3 ] + => 3 + findSingle (x: x == 3) "none" "multiple" [ 1 9 ] + => "none" + */ findSingle = pred: default: multiple: list: let found = filter pred list; len = length found; in if len == 0 then default else if len != 1 then multiple else head found; + /* Find the first element in the list matching the specified + predicate or returns `default' if no such element exists. - # Find the first element in the list matching the specified - # predicate or returns `default' if no such element exists. + Example: + findFirst (x: x > 3) 7 [ 1 6 4 ] + => 6 + findFirst (x: x > 9) 7 [ 1 6 4 ] + => 7 + */ findFirst = pred: default: list: let found = filter pred list; in if found == [] then default else head found; + /* Return true iff function `pred' returns true for at least element + of `list'. - # Return true iff function `pred' returns true for at least element - # of `list'. + Example: + any isString [ 1 "a" { } ] + => true + any isString [ 1 { } ] + => false + */ any = builtins.any or (pred: fold (x: y: if pred x then true else y) false); + /* Return true iff function `pred' returns true for all elements of + `list'. - # Return true iff function `pred' returns true for all elements of - # `list'. + Example: + all (x: x < 3) [ 1 2 ] + => true + all (x: x < 3) [ 1 2 3 ] + => false + */ all = builtins.all or (pred: fold (x: y: if pred x then y else false) true); + /* Count how many times function `pred' returns true for the elements + of `list'. - # Count how many times function `pred' returns true for the elements - # of `list'. + Example: + count (x: x == 3) [ 3 2 3 4 6 ] + => 2 + */ count = pred: foldl' (c: x: if pred x then c + 1 else c) 0; + /* Return a singleton list or an empty list, depending on a boolean + value. Useful when building lists with optional elements + (e.g. `++ optional (system == "i686-linux") flashplayer'). - # Return a singleton list or an empty list, depending on a boolean - # value. Useful when building lists with optional elements - # (e.g. `++ optional (system == "i686-linux") flashplayer'). + Example: + optional true "foo" + => [ "foo" ] + optional false "foo" + => [ ] + */ optional = cond: elem: if cond then [elem] else []; + /* Return a list or an empty list, dependening on a boolean value. - # Return a list or an empty list, dependening on a boolean value. + Example: + optionals true [ 2 3 ] + => [ 2 3 ] + optionals false [ 2 3 ] + => [ ] + */ optionals = cond: elems: if cond then elems else []; - # If argument is a list, return it; else, wrap it in a singleton - # list. If you're using this, you should almost certainly - # reconsider if there isn't a more "well-typed" approach. + /* If argument is a list, return it; else, wrap it in a singleton + list. If you're using this, you should almost certainly + reconsider if there isn't a more "well-typed" approach. + + Example: + toList [ 1 2 ] + => [ 1 2 ] + toList "hi" + => [ "hi "] + */ toList = x: if isList x then x else [x]; + /* Return a list of integers from `first' up to and including `last'. - # Return a list of integers from `first' up to and including `last'. + Example: + range 2 4 + => [ 2 3 4 ] + range 3 2 + => [ ] + */ range = if builtins ? genList then first: last: @@ -136,9 +228,13 @@ rec { then [] else [first] ++ range (first + 1) last; + /* Splits the elements of a list in two lists, `right' and + `wrong', depending on the evaluation of a predicate. - # Partition the elements of a list in two lists, `right' and - # `wrong', depending on the evaluation of a predicate. + Example: + partition (x: x > 2) [ 5 1 2 3 4 ] + => { right = [ 5 3 4 ]; wrong = [ 1 2 ]; } + */ partition = pred: fold (h: t: if pred h @@ -146,7 +242,14 @@ rec { else { right = t.right; wrong = [h] ++ t.wrong; } ) { right = []; wrong = []; }; + /* Merges two lists of the same size together. If the sizes aren't the same + the merging stops at the shortest. How both lists are merged is defined + by the first argument. + Example: + zipListsWith (a: b: a + b) ["h" "l"] ["e" "o"] + => ["he" "lo"] + */ zipListsWith = if builtins ? genList then f: fst: snd: genList (n: f (elemAt fst n) (elemAt snd n)) (min (length fst) (length snd)) @@ -161,21 +264,37 @@ rec { else []; in zipListsWith' 0; + /* Merges two lists of the same size together. If the sizes aren't the same + the merging stops at the shortest. + + Example: + zipLists [ 1 2 ] [ "a" "b" ] + => [ { fst = 1; snd = "a"; } { fst = 2; snd = "b"; } ] + */ zipLists = zipListsWith (fst: snd: { inherit fst snd; }); + /* Reverse the order of the elements of a list. - # Reverse the order of the elements of a list. + Example: + + reverseList [ "b" "o" "j" ] + => [ "j" "o" "b" ] + */ reverseList = if builtins ? genList then xs: let l = length xs; in genList (n: elemAt xs (l - n - 1)) l else fold (e: acc: acc ++ [ e ]) []; + /* Sort a list based on a comparator function which compares two + elements and returns true if the first argument is strictly below + the second argument. The returned list is sorted in an increasing + order. The implementation does a quick-sort. - # Sort a list based on a comparator function which compares two - # elements and returns true if the first argument is strictly below - # the second argument. The returned list is sorted in an increasing - # order. The implementation does a quick-sort. + Example: + sort (a: b: a < b) [ 5 3 7 ] + => [ 3 5 7 ] + */ sort = builtins.sort or ( strictLess: list: let @@ -193,8 +312,14 @@ rec { if len < 2 then list else (sort strictLess pivot.left) ++ [ first ] ++ (sort strictLess pivot.right)); + /* Return the first (at most) N elements of a list. - # Return the first (at most) N elements of a list. + Example: + take 2 [ "a" "b" "c" "d" ] + => [ "a" "b" ] + take 2 [ ] + => [ ] + */ take = if builtins ? genList then count: sublist 0 count @@ -209,8 +334,14 @@ rec { [ (elemAt list n) ] ++ take' (n + 1); in take' 0; + /* Remove the first (at most) N elements of a list. - # Remove the first (at most) N elements of a list. + Example: + drop 2 [ "a" "b" "c" "d" ] + => [ "c" "d" ] + drop 2 [ ] + => [ ] + */ drop = if builtins ? genList then count: list: sublist count (length list) list @@ -225,9 +356,15 @@ rec { drop' (n - 1) ++ [ (elemAt list n) ]; in drop' (len - 1); + /* Return a list consisting of at most ‘count’ elements of ‘list’, + starting at index ‘start’. - # Return a list consisting of at most ‘count’ elements of ‘list’, - # starting at index ‘start’. + Example: + sublist 1 3 [ "a" "b" "c" "d" "e" ] + => [ "b" "c" "d" ] + sublist 1 3 [ ] + => [ ] + */ sublist = start: count: list: let len = length list; in genList @@ -236,23 +373,36 @@ rec { else if start + count > len then len - start else count); + /* Return the last element of a list. - # Return the last element of a list. + Example: + last [ 1 2 3 ] + => 3 + */ last = list: assert list != []; elemAt list (length list - 1); + /* Return all elements but the last - # Return all elements but the last + Example: + init [ 1 2 3 ] + => [ 1 2 ] + */ init = list: assert list != []; take (length list - 1) list; - deepSeqList = xs: y: if any (x: deepSeq x false) xs then y else y; - - + /* FIXME(zimbatm) Not used anywhere + */ crossLists = f: foldl (fs: args: concatMap (f: map f args) fs) [f]; - # Remove duplicate elements from the list. O(n^2) complexity. + /* Remove duplicate elements from the list. O(n^2) complexity. + + Example: + + unique [ 3 2 3 4 ] + => [ 3 2 4 ] + */ unique = list: if list == [] then [] @@ -262,12 +412,24 @@ rec { xs = unique (drop 1 list); in [x] ++ remove x xs; + /* Intersects list 'e' and another list. O(nm) complexity. - # Intersects list 'e' and another list. O(nm) complexity. + Example: + intersectLists [ 1 2 3 ] [ 6 3 2 ] + => [ 3 2 ] + */ intersectLists = e: filter (x: elem x e); + /* Subtracts list 'e' from another list. O(nm) complexity. - # Subtracts list 'e' from another list. O(nm) complexity. + Example: + subtractLists [ 3 2 ] [ 1 2 3 4 5 3 ] + => [ 1 4 5 ] + */ subtractLists = e: filter (x: !(elem x e)); + /*** deprecated stuff ***/ + + deepSeqList = throw "removed 2016-02-29 because unused and broken"; + } diff --git a/lib/maintainers.nix b/lib/maintainers.nix index b908ec3115a..09f928be20a 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -123,6 +123,7 @@ fpletz = "Franz Pletz "; fps = "Florian Paul Schmidt "; fridh = "Frederik Rietdijk "; + frlan = "Frank Lanitz "; fro_ozen = "fro_ozen "; ftrvxmtrx = "Siarhei Zirukin "; funfunctor = "Edward O'Callaghan "; @@ -152,7 +153,6 @@ iElectric = "Domen Kozar "; igsha = "Igor Sharonov "; ikervagyok = "Balázs Lengyel "; - iyzsong = "Song Wenwu "; j-keck = "Jürgen Keck "; jagajaga = "Arseniy Seroka "; javaguirre = "Javier Aguirre "; @@ -208,10 +208,12 @@ malyn = "Michael Alyn Miller "; manveru = "Michael Fellinger "; marcweber = "Marc Weber "; + markus1189 = "Markus Hauck "; markWot = "Markus Wotringer "; matejc = "Matej Cotman "; mathnerd314 = "Mathnerd314 "; matthiasbeyer = "Matthias Beyer "; + mbauer = "Matthew Bauer "; maurer = "Matthew Maurer "; mbakke = "Marius Bakke "; mbe = "Brandon Edens "; @@ -299,7 +301,9 @@ sander = "Sander van der Burg "; schmitthenner = "Fabian Schmitthenner "; schristo = "Scott Christopher "; + scolobb = "Sergiu Ivanov "; sepi = "Raffael Mancini "; + sheenobu = "Sheena Artrip "; sheganinans = "Aistis Raulinaitis "; shell = "Shell Turner "; shlevy = "Shea Levy "; diff --git a/lib/strings-with-deps.nix b/lib/strings-with-deps.nix index bdcc25cbd20..a901940ac12 100644 --- a/lib/strings-with-deps.nix +++ b/lib/strings-with-deps.nix @@ -15,7 +15,7 @@ Usage: Attention: let - pkgs = (import /etc/nixos/nixpkgs/pkgs/top-level/all-packages.nix) {}; + pkgs = (import ) {}; in let inherit (pkgs.stringsWithDeps) fullDepEntry packEntry noDepEntry textClosureMap; inherit (pkgs.lib) id; diff --git a/lib/strings.nix b/lib/strings.nix index fc6c2152b9f..a2a4be11e1b 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -10,65 +10,147 @@ rec { inherit (builtins) stringLength substring head tail isString replaceStrings; + /* Concatenate a list of strings. - # Concatenate a list of strings. + Example: + concatStrings ["foo" "bar"] + => "foobar" + */ concatStrings = if builtins ? concatStringsSep then builtins.concatStringsSep "" else lib.foldl' (x: y: x + y) ""; + /* Map a function over a list and concatenate the resulting strings. - # Map a function over a list and concatenate the resulting strings. + Example: + concatMapStrings (x: "a" + x) ["foo" "bar"] + => "afooabar" + */ concatMapStrings = f: list: concatStrings (map f list); + + /* Like `concatMapStrings' except that the f functions also gets the + position as a parameter. + + Example: + concatImapStrings (pos: x: "${toString pos}-${x}") ["foo" "bar"] + => "1-foo2-bar" + */ concatImapStrings = f: list: concatStrings (lib.imap f list); + /* Place an element between each element of a list - # Place an element between each element of a list, e.g., - # `intersperse "," ["a" "b" "c"]' returns ["a" "," "b" "," "c"]. + Example: + intersperse "/" ["usr" "local" "bin"] + => ["usr" "/" "local" "/" "bin"]. + */ intersperse = separator: list: if list == [] || length list == 1 then list else tail (lib.concatMap (x: [separator x]) list); + /* Concatenate a list of strings with a separator between each element - # Concatenate a list of strings with a separator between each element, e.g. - # concatStringsSep " " ["foo" "bar" "xyzzy"] == "foo bar xyzzy" + Example: + concatStringsSep "/" ["usr" "local" "bin"] + => "usr/local/bin" + */ concatStringsSep = builtins.concatStringsSep or (separator: list: concatStrings (intersperse separator list)); + /* First maps over the list and then concatenates it. + + Example: + concatMapStringsSep "-" (x: toUpper x) ["foo" "bar" "baz"] + => "FOO-BAR-BAZ" + */ concatMapStringsSep = sep: f: list: concatStringsSep sep (map f list); + + /* First imaps over the list and then concatenates it. + + Example: + + concatImapStringsSep "-" (pos: x: toString (x / pos)) [ 6 6 6 ] + => "6-3-2" + */ concatImapStringsSep = sep: f: list: concatStringsSep sep (lib.imap f list); + /* Construct a Unix-style search path consisting of each `subDir" + directory of the given list of packages. - # Construct a Unix-style search path consisting of each `subDir" - # directory of the given list of packages. For example, - # `makeSearchPath "bin" ["x" "y" "z"]' returns "x/bin:y/bin:z/bin". + Example: + makeSearchPath "bin" ["/root" "/usr" "/usr/local"] + => "/root/bin:/usr/bin:/usr/local/bin" + makeSearchPath "bin" ["/"] + => "//bin" + */ makeSearchPath = subDir: packages: concatStringsSep ":" (map (path: path + "/" + subDir) packages); + /* Construct a library search path (such as RPATH) containing the + libraries for a set of packages - # Construct a library search path (such as RPATH) containing the - # libraries for a set of packages, e.g. "${pkg1}/lib:${pkg2}/lib:...". + Example: + makeLibraryPath [ "/usr" "/usr/local" ] + => "/usr/lib:/usr/local/lib" + pkgs = import { } + makeLibraryPath [ pkgs.openssl pkgs.zlib ] + => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r/lib:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8/lib" + */ makeLibraryPath = makeSearchPath "lib"; - # Construct a binary search path (such as $PATH) containing the - # binaries for a set of packages, e.g. "${pkg1}/bin:${pkg2}/bin:...". + /* Construct a binary search path (such as $PATH) containing the + binaries for a set of packages. + + Example: + makeBinPath ["/root" "/usr" "/usr/local"] + => "/root/bin:/usr/bin:/usr/local/bin" + */ makeBinPath = makeSearchPath "bin"; - # Idem for Perl search paths. + /* Construct a perl search path (such as $PERL5LIB) + + FIXME(zimbatm): this should be moved in perl-specific code + + Example: + pkgs = import { } + makePerlPath [ pkgs.perlPackages.NetSMTP ] + => "/nix/store/n0m1fk9c960d8wlrs62sncnadygqqc6y-perl-Net-SMTP-1.25/lib/perl5/site_perl" + */ makePerlPath = makeSearchPath "lib/perl5/site_perl"; + /* Dependening on the boolean `cond', return either the given string + or the empty string. Useful to contatenate against a bigger string. - # Dependening on the boolean `cond', return either the given string - # or the empty string. + Example: + optionalString true "some-string" + => "some-string" + optionalString false "some-string" + => "" + */ optionalString = cond: string: if cond then string else ""; + /* Determine whether a string has given prefix. - # Determine whether a string has given prefix/suffix. + Example: + hasPrefix "foo" "foobar" + => true + hasPrefix "foo" "barfoo" + => false + */ hasPrefix = pref: str: substring 0 (stringLength pref) str == pref; + + /* Determine whether a string has given suffix. + + Example: + hasSuffix "foo" "foobar" + => false + hasSuffix "foo" "barfoo" + => true + */ hasSuffix = suff: str: let lenStr = stringLength str; @@ -76,36 +158,55 @@ rec { in lenStr >= lenSuff && substring (lenStr - lenSuff) lenStr str == suff; + /* Convert a string to a list of characters (i.e. singleton strings). + This allows you to, e.g., map a function over each character. However, + note that this will likely be horribly inefficient; Nix is not a + general purpose programming language. Complex string manipulations + should, if appropriate, be done in a derivation. + Also note that Nix treats strings as a list of bytes and thus doesn't + handle unicode. - # Convert a string to a list of characters (i.e. singleton strings). - # For instance, "abc" becomes ["a" "b" "c"]. This allows you to, - # e.g., map a function over each character. However, note that this - # will likely be horribly inefficient; Nix is not a general purpose - # programming language. Complex string manipulations should, if - # appropriate, be done in a derivation. + Example: + stringToCharacters "" + => [ ] + stringToCharacters "abc" + => [ "a" "b" "c" ] + stringToCharacters "💩" + => [ "�" "�" "�" "�" ] + */ stringToCharacters = s: map (p: substring p 1 s) (lib.range 0 (stringLength s - 1)); + /* Manipulate a string character by character and replace them by + strings before concatenating the results. - # Manipulate a string charactter by character and replace them by - # strings before concatenating the results. + Example: + stringAsChars (x: if x == "a" then "i" else x) "nax" + => "nix" + */ stringAsChars = f: s: concatStrings ( map f (stringToCharacters s) ); + /* Escape occurrence of the elements of ‘list’ in ‘string’ by + prefixing it with a backslash. - # Escape occurrence of the elements of ‘list’ in ‘string’ by - # prefixing it with a backslash. For example, ‘escape ["(" ")"] - # "(foo)"’ returns the string ‘\(foo\)’. + Example: + escape ["(" ")"] "(foo)" + => "\\(foo\\)" + */ escape = list: replaceChars list (map (c: "\\${c}") list); + /* Escape all characters that have special meaning in the Bourne shell. - # Escape all characters that have special meaning in the Bourne shell. + Example: + escapeShellArg "so([<>])me" + => "so\\(\\[\\<\\>\\]\\)me" + */ escapeShellArg = lib.escape (stringToCharacters "\\ ';$`()|<>\t*[]"); - - # Obsolete - use replaceStrings instead. + /* Obsolete - use replaceStrings instead. */ replaceChars = builtins.replaceStrings or ( del: new: s: let @@ -119,21 +220,52 @@ rec { in stringAsChars subst s); - # Case conversion utilities. lowerChars = stringToCharacters "abcdefghijklmnopqrstuvwxyz"; upperChars = stringToCharacters "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + + /* Converts an ASCII string to lower-case. + + Example: + toLower "HOME" + => "home" + */ toLower = replaceChars upperChars lowerChars; + + /* Converts an ASCII string to upper-case. + + Example: + toLower "home" + => "HOME" + */ toUpper = replaceChars lowerChars upperChars; + /* Appends string context from another string. This is an implementation + detail of Nix. - # Appends string context from another string. + Strings in Nix carry an invisible `context' which is a list of strings + representing store paths. If the string is later used in a derivation + attribute, the derivation will properly populate the inputDrvs and + inputSrcs. + + Example: + pkgs = import { }; + addContextFrom pkgs.coreutils "bar" + => "bar" + */ addContextFrom = a: b: substring 0 0 a + b; + /* Cut a string with a separator and produces a list of strings which + were separated by this separator. - # Cut a string with a separator and produces a list of strings which - # were separated by this separator; e.g., `splitString "." - # "foo.bar.baz"' returns ["foo" "bar" "baz"]. + NOTE: this function is not performant and should be avoided + + Example: + splitString "." "foo.bar.baz" + => [ "foo" "bar" "baz" ] + splitString "/" "/usr/local/bin" + => [ "" "usr" "local" "bin" ] + */ splitString = _sep: _s: let sep = addContextFrom _s _sep; @@ -157,10 +289,15 @@ rec { in recurse 0 0; + /* Return the suffix of the second argument if the first argument matches + its prefix. - # return the suffix of the second argument if the first argument match its - # prefix. e.g., - # `removePrefix "foo." "foo.bar.baz"' returns "bar.baz". + Example: + removePrefix "foo." "foo.bar.baz" + => "bar.baz" + removePrefix "xxx" "foo.bar.baz" + => "foo.bar.baz" + */ removePrefix = pre: s: let preLen = stringLength pre; @@ -171,6 +308,15 @@ rec { else s; + /* Return the prefix of the second argument if the first argument matches + its suffix. + + Example: + removeSuffix "front" "homefront" + => "home" + removeSuffix "xxx" "homefront" + => "homefront" + */ removeSuffix = suf: s: let sufLen = stringLength suf; @@ -181,25 +327,49 @@ rec { else s; - # Return true iff string v1 denotes a version older than v2. + /* Return true iff string v1 denotes a version older than v2. + + Example: + versionOlder "1.1" "1.2" + => true + versionOlder "1.1" "1.1" + => false + */ versionOlder = v1: v2: builtins.compareVersions v2 v1 == 1; + /* Return true iff string v1 denotes a version equal to or newer than v2. - # Return true iff string v1 denotes a version equal to or newer than v2. + Example: + versionAtLeast "1.1" "1.0" + => true + versionAtLeast "1.1" "1.1" + => true + versionAtLeast "1.1" "1.2" + => false + */ versionAtLeast = v1: v2: !versionOlder v1 v2; + /* This function takes an argument that's either a derivation or a + derivation's "name" attribute and extracts the version part from that + argument. - # This function takes an argument that's either a derivation or a - # derivation's "name" attribute and extracts the version part from that - # argument. For example: - # - # lib.getVersion "youtube-dl-2016.01.01" ==> "2016.01.01" - # lib.getVersion pkgs.youtube-dl ==> "2016.01.01" + Example: + getVersion "youtube-dl-2016.01.01" + => "2016.01.01" + getVersion pkgs.youtube-dl + => "2016.01.01" + */ getVersion = x: (builtins.parseDrvName (x.name or x)).version; + /* Extract name with version from URL. Ask for separator which is + supposed to start extension. - # Extract name with version from URL. Ask for separator which is - # supposed to start extension. + Example: + nameFromURL "https://nixos.org/releases/nix/nix-1.7/nix-1.7-x86_64-linux.tar.bz2" "-" + => "nix" + nameFromURL "https://nixos.org/releases/nix/nix-1.7/nix-1.7-x86_64-linux.tar.bz2" "_" + => "nix-1.7-x86" + */ nameFromURL = url: sep: let components = splitString "/" url; @@ -207,14 +377,24 @@ rec { name = builtins.head (splitString sep filename); in assert name != filename; name; + /* Create an --{enable,disable}- string that can be passed to + standard GNU Autoconf scripts. - # Create an --{enable,disable}- string that can be passed to - # standard GNU Autoconf scripts. + Example: + enableFeature true "shared" + => "--enable-shared" + enableFeature false "shared" + => "--disable-shared" + */ enableFeature = enable: feat: "--${if enable then "enable" else "disable"}-${feat}"; + /* Create a fixed width string with additional prefix to match + required width. - # Create a fixed width string with additional prefix to match - # required width. + Example: + fixedWidthString 5 "0" (toString 15) + => "00015" + */ fixedWidthString = width: filler: str: let strw = lib.stringLength str; @@ -223,25 +403,58 @@ rec { assert strw <= width; if strw == width then str else filler + fixedWidthString reqWidth filler str; + /* Format a number adding leading zeroes up to fixed width. - # Format a number adding leading zeroes up to fixed width. + Example: + fixedWidthNumber 5 15 + => "00015" + */ fixedWidthNumber = width: n: fixedWidthString width "0" (toString n); + /* Check whether a value is a store path. - # Check whether a value is a store path. + Example: + isStorePath "/nix/store/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11/bin/python" + => false + isStorePath "/nix/store/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11/" + => true + isStorePath pkgs.python + => true + */ isStorePath = x: builtins.substring 0 1 (toString x) == "/" && dirOf (builtins.toPath x) == builtins.storeDir; - # Convert string to int - # Obviously, it is a bit hacky to use fromJSON that way. + /* Convert string to int + Obviously, it is a bit hacky to use fromJSON that way. + + Example: + toInt "1337" + => 1337 + toInt "-4" + => -4 + toInt "3.14" + => error: floating point JSON numbers are not supported + */ toInt = str: let may_be_int = builtins.fromJSON str; in if builtins.isInt may_be_int then may_be_int else throw "Could not convert ${str} to int."; - # Read a list of paths from `file', relative to the `rootPath'. Lines - # beginning with `#' are treated as comments and ignored. Whitespace - # is significant. + /* Read a list of paths from `file', relative to the `rootPath'. Lines + beginning with `#' are treated as comments and ignored. Whitespace + is significant. + + NOTE: this function is not performant and should be avoided + + Example: + readPathsFromFile /prefix + ./pkgs/development/libraries/qt-5/5.4/qtbase/series + => [ "/prefix/dlopen-resolv.patch" "/prefix/tzdir.patch" + "/prefix/dlopen-libXcursor.patch" "/prefix/dlopen-openssl.patch" + "/prefix/dlopen-dbus.patch" "/prefix/xdg-config-dirs.patch" + "/prefix/nix-profiles-library-paths.patch" + "/prefix/compose-search-path.patch" ] + */ readPathsFromFile = rootPath: file: let root = toString rootPath; @@ -253,5 +466,4 @@ rec { absolutePaths = builtins.map (path: builtins.toPath (root + "/" + path)) relativePaths; in absolutePaths; - } diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml index 0ede1a9ce8e..83057a44d0a 100644 --- a/nixos/doc/manual/release-notes/rl-1603.xml +++ b/nixos/doc/manual/release-notes/rl-1603.xml @@ -247,6 +247,21 @@ $TTL 1800 + + + service.syncthing.dataDir options now has to point + to exact folder where syncthing is writing to. Example configuration should + loook something like: + + +services.syncthing = { + enable = true; + dataDir = "/home/somebody/.syncthing"; + user = "somebody"; +}; + + + diff --git a/nixos/maintainers/scripts/azure/create-azure.sh b/nixos/maintainers/scripts/azure/create-azure.sh index f87a88404f6..a834566be8f 100755 --- a/nixos/maintainers/scripts/azure/create-azure.sh +++ b/nixos/maintainers/scripts/azure/create-azure.sh @@ -1,11 +1,8 @@ #! /bin/sh -e -BUCKET_NAME=${BUCKET_NAME:-nixos} export NIX_PATH=nixpkgs=../../../.. export NIXOS_CONFIG=$(dirname $(readlink -f $0))/../../../modules/virtualisation/azure-image.nix export TIMESTAMP=$(date +%Y%m%d%H%M) nix-build '' \ - -A config.system.build.azureImage --argstr system x86_64-linux -o azure --option extra-binary-caches http://hydra.nixos.org -j 10 - -azure vm image create nixos-test --location "West Europe" --md5-skip -v --os Linux azure/disk.vhd + -A config.system.build.azureImage --argstr system x86_64-linux -o azure --option extra-binary-caches https://hydra.nixos.org -j 10 diff --git a/nixos/maintainers/scripts/azure/upload-azure.sh b/nixos/maintainers/scripts/azure/upload-azure.sh new file mode 100755 index 00000000000..2ea35d1d4c3 --- /dev/null +++ b/nixos/maintainers/scripts/azure/upload-azure.sh @@ -0,0 +1,22 @@ +#! /bin/sh -e + +export STORAGE=${STORAGE:-nixos} +export THREADS=${THREADS:-8} + +azure-vhd-utils-for-go upload --localvhdpath azure/disk.vhd --stgaccountname "$STORAGE" --stgaccountkey "$KEY" \ + --containername images --blobname nixos-unstable-nixops-updated.vhd --parallelism "$THREADS" --overwrite + + + + + + + + + + + + + + + diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 711576982ec..8514f765e61 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -14,6 +14,8 @@ let nvidiaForKernel = kernelPackages: if elem "nvidia" drivers then kernelPackages.nvidia_x11 + else if elem "nvidiaBeta" drivers then + kernelPackages.nvidia_x11_beta else if elem "nvidiaLegacy173" drivers then kernelPackages.nvidia_x11_legacy173 else if elem "nvidiaLegacy304" drivers then diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 0ab2b8a76fc..919271cc4e9 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -254,6 +254,7 @@ octoprint = 230; avahi-autoipd = 231; nntp-proxy = 232; + mjpg-streamer = 233; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 18f270cd531..f12ecc1b88e 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -104,7 +104,7 @@ in nixosVersion = mkDefault (maybeEnv "NIXOS_VERSION" (cfg.nixosRelease + cfg.nixosVersionSuffix)); # Note: code names must only increase in alphabetical order. - nixosCodeName = "Emu"; + nixosCodeName = "Flounder"; }; # Generate /etc/os-release. See diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 69b96f55f78..edfe2bb00c0 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -176,6 +176,7 @@ ./services/hardware/udisks2.nix ./services/hardware/upower.nix ./services/hardware/thermald.nix + ./services/logging/awstats.nix ./services/logging/fluentd.nix ./services/logging/klogd.nix ./services/logging/logcheck.nix @@ -219,6 +220,7 @@ ./services/misc/gitolite.nix ./services/misc/gpsd.nix ./services/misc/ihaskell.nix + ./services/misc/mantisbt.nix ./services/misc/mathics.nix ./services/misc/matrix-synapse.nix ./services/misc/mbpfan.nix @@ -329,6 +331,7 @@ ./services/networking/lambdabot.nix ./services/networking/libreswan.nix ./services/networking/mailpile.nix + ./services/networking/mjpg-streamer.nix ./services/networking/minidlna.nix ./services/networking/miniupnpd.nix ./services/networking/mstpd.nix @@ -438,6 +441,7 @@ ./services/web-servers/varnish/default.nix ./services/web-servers/winstone.nix ./services/web-servers/zope2.nix + ./services/x11/colord.nix ./services/x11/unclutter.nix ./services/x11/desktop-managers/default.nix ./services/x11/display-managers/auto.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 85435884b19..0de6ca758c1 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -98,6 +98,9 @@ with lib; (mkRenamedOptionModule [ "services" "hostapd" "extraCfg" ] [ "services" "hostapd" "extraConfig" ]) + # Enlightenment + (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "e19" "enable" ] [ "services" "xserver" "desktopManager" "enlightenment" "enable" ]) + # Options that are obsolete and have no replacement. (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ]) (mkRemovedOptionModule [ "programs" "bash" "enable" ]) diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index 40942644868..236206026c3 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -26,19 +26,11 @@ in ''; }; - stable = mkOption { - type = types.bool; - default = false; + kernelPatch = mkOption { + type = types.attrs; + example = lib.literalExample "pkgs.kernelPatches.grsecurity_4_1"; description = '' - Enable the stable grsecurity patch, based on Linux 3.14. - ''; - }; - - testing = mkOption { - type = types.bool; - default = false; - description = '' - Enable the testing grsecurity patch, based on Linux 4.0. + Grsecurity patch to use. ''; }; @@ -219,16 +211,7 @@ in config = mkIf cfg.enable { assertions = - [ { assertion = cfg.stable || cfg.testing; - message = '' - If grsecurity is enabled, you must select either the - stable patch (with kernel 3.14), or the testing patch (with - kernel 4.0) to continue. - ''; - } - { assertion = !(cfg.stable && cfg.testing); - message = "Select either one of the stable or testing patch"; - } + [ { assertion = (cfg.config.restrictProc -> !cfg.config.restrictProcWithGroup) || (cfg.config.restrictProcWithGroup -> !cfg.config.restrictProc); message = "You cannot enable both restrictProc and restrictProcWithGroup"; @@ -247,6 +230,8 @@ in } ]; + security.grsecurity.kernelPatch = lib.mkDefault pkgs.kernelPatches.grsecurity_latest; + systemd.services.grsec-lock = mkIf cfg.config.sysctl { description = "grsecurity sysctl-lock Service"; requires = [ "systemd-sysctl.service" ]; diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix index 78776786468..24892a2a59a 100644 --- a/nixos/modules/services/backup/tarsnap.nix +++ b/nixos/modules/services/backup/tarsnap.nix @@ -293,7 +293,7 @@ in # make sure that the tarsnap server is reachable after systemd starts up # the service - therefore we sleep in a loop until we can ping the # endpoint. - preStart = "while ! ping -q -c 1 betatest-server.tarsnap.com &> /dev/null; do sleep 3; done"; + preStart = "while ! ping -q -c 1 v1-0-0-server.tarsnap.com &> /dev/null; do sleep 3; done"; scriptArgs = "%i"; script = '' mkdir -p -m 0755 ${dirOf cfg.cachedir} diff --git a/nixos/modules/services/logging/awstats.nix b/nixos/modules/services/logging/awstats.nix new file mode 100644 index 00000000000..8ab7e6acd98 --- /dev/null +++ b/nixos/modules/services/logging/awstats.nix @@ -0,0 +1,123 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.awstats; + package = pkgs.awstats; +in + +{ + options.services.awstats = { + enable = mkOption { + type = types.bool; + default = cfg.service.enable; + description = '' + Enable the awstats program (but not service). + Currently only simple httpd (Apache) configs are supported, + and awstats plugins may not work correctly. + ''; + }; + vardir = mkOption { + type = types.path; + default = "/var/lib/awstats"; + description = "The directory where variable awstats data will be stored."; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = "Extra configuration to be appendend to awstats.conf."; + }; + + updateAt = mkOption { + type = types.nullOr types.string; + default = null; + example = "hourly"; + description = '' + Specification of the time at which awstats will get updated. + (in the format described by + systemd.time + 5) + ''; + }; + + service = { + enable = mkOption { + type = types.bool; + default = false; + description = ''Enable the awstats web service. This switches on httpd.''; + }; + urlPrefix = mkOption { + type = types.string; + default = "/awstats"; + description = "The URL prefix under which the awstats service appears."; + }; + }; + }; + + + config = mkIf cfg.enable { + environment.systemPackages = [ package.bin ]; + /* TODO: + - heed config.services.httpd.logPerVirtualHost, etc. + - Can't AllowToUpdateStatsFromBrowser, as CGI scripts don't have permission + to read the logs, and our httpd config apparently doesn't an option for that. + */ + environment.etc."awstats/awstats.conf".source = pkgs.runCommand "awstats.conf" + { preferLocalBuild = true; } + ( let + cfg-httpd = config.services.httpd; + logFormat = + if cfg-httpd.logFormat == "combined" then "1" else + if cfg-httpd.logFormat == "common" then "4" else + throw "awstats service doesn't support Apache log format `${cfg-httpd.logFormat}`"; + in + '' + sed \ + -e 's|^\(DirData\)=.*$|\1="${cfg.vardir}"|' \ + -e 's|^\(DirIcons\)=.*$|\1="icons"|' \ + -e 's|^\(CreateDirDataIfNotExists\)=.*$|\1=1|' \ + -e 's|^\(SiteDomain\)=.*$|\1="${cfg-httpd.hostName}"|' \ + -e 's|^\(LogFile\)=.*$|\1="${cfg-httpd.logDir}/access_log"|' \ + -e 's|^\(LogFormat\)=.*$|\1=${logFormat}|' \ + < '${package.out}/wwwroot/cgi-bin/awstats.model.conf' > "$out" + echo '${cfg.extraConfig}' >> "$out" + ''); + + # The httpd sub-service showing awstats. + services.httpd.enable = mkIf cfg.service.enable true; + services.httpd.extraSubservices = mkIf cfg.service.enable [ { function = { serverInfo, ... }: { + extraConfig = + '' + Alias ${cfg.service.urlPrefix}/classes "${package.out}/wwwroot/classes/" + Alias ${cfg.service.urlPrefix}/css "${package.out}/wwwroot/css/" + Alias ${cfg.service.urlPrefix}/icons "${package.out}/wwwroot/icon/" + ScriptAlias ${cfg.service.urlPrefix}/ "${package.out}/wwwroot/cgi-bin/" + + + Options None + AllowOverride None + Order allow,deny + Allow from all + + ''; + startupScript = + let + inherit (serverInfo.serverConfig) user group; + in pkgs.writeScript "awstats_startup.sh" + '' + mkdir -p '${cfg.vardir}' + chown '${user}:${group}' '${cfg.vardir}' + ''; + };}]; + + systemd.services.awstats-update = mkIf (cfg.updateAt != null) { + description = "awstats log collector"; + script = "exec '${package.bin}/bin/awstats' -update -config=awstats.conf"; + startAt = cfg.updateAt; + }; + }; + +} + diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 404cdf0f564..bad9d527f9a 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -27,7 +27,7 @@ let mainCf = '' - compatibility_level = 2 + compatibility_level = 9999 mail_owner = ${user} default_privs = nobody diff --git a/nixos/modules/services/misc/autofs.nix b/nixos/modules/services/misc/autofs.nix index 3a95e922820..8913030e0ea 100644 --- a/nixos/modules/services/misc/autofs.nix +++ b/nixos/modules/services/misc/autofs.nix @@ -79,6 +79,11 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; + preStart = '' + # There should be only one autofs service managed by systemd, so this should be safe. + rm -f /tmp/autofs-running + ''; + serviceConfig = { ExecStart = "${pkgs.autofs5}/sbin/automount ${if cfg.debug then "-d" else ""} -f -t ${builtins.toString cfg.timeout} ${autoMaster} ${if cfg.debug then "-l7" else ""}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index cc50bfbea53..85b3ab6f924 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -328,7 +328,7 @@ in { Group = cfg.group; TimeoutSec = "300"; WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab"; - ExecStart="${bundler}/bin/bundle exec \"sidekiq -q post_receive -q mailer -q system_hook -q project_web_hook -q gitlab_shell -q common -q default -e production -P ${cfg.statePath}/tmp/sidekiq.pid\""; + ExecStart="${bundler}/bin/bundle exec \"sidekiq -q post_receive -q mailers -q system_hook -q project_web_hook -q gitlab_shell -q common -q default -e production -P ${cfg.statePath}/tmp/sidekiq.pid\""; }; }; diff --git a/nixos/modules/services/misc/mantisbt.nix b/nixos/modules/services/misc/mantisbt.nix new file mode 100644 index 00000000000..7e3474feb67 --- /dev/null +++ b/nixos/modules/services/misc/mantisbt.nix @@ -0,0 +1,68 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.mantisbt; + + freshInstall = cfg.extraConfig == ""; + + # combined code+config directory + mantisbt = let + config_inc = pkgs.writeText "config_inc.php" ("@www@ is substituted for default mjpg-streamer www directory. + See plugins documentation for more information. + ''; + }; + + user = mkOption { + type = types.str; + default = "mjpg-streamer"; + description = "mjpg-streamer user name."; + }; + + group = mkOption { + type = types.str; + default = "video"; + description = "mjpg-streamer group name."; + }; + + }; + + }; + + config = mkIf cfg.enable { + + users.extraUsers = optional (cfg.user == "mjpg-streamer") { + name = "mjpg-streamer"; + uid = config.ids.uids.mjpg-streamer; + group = cfg.group; + }; + + systemd.services.mjpg-streamer = { + description = "mjpg-streamer webcam streamer"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig.User = cfg.user; + serviceConfig.Group = cfg.group; + + script = '' + IPLUGIN="${cfg.inputPlugin}" + OPLUGIN="${cfg.outputPlugin}" + OPLUGIN="''${OPLUGIN//@www@/${pkgs.mjpg-streamer}/share/mjpg-streamer/www}" + exec ${pkgs.mjpg-streamer}/bin/mjpg_streamer -i "$IPLUGIN" -o "$OPLUGIN" + ''; + }; + + }; + +} diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix index e7301e9ef5f..7ec484941ed 100644 --- a/nixos/modules/services/networking/vsftpd.nix +++ b/nixos/modules/services/networking/vsftpd.nix @@ -85,6 +85,9 @@ let ssl_enable=YES rsa_cert_file=${cfg.rsaCertFile} ''} + ${optionalString (cfg.rsaKeyFile != null) '' + rsa_private_key_file=${cfg.rsaKeyFile} + ''} ${optionalString (cfg.userlistFile != null) '' userlist_file=${cfg.userlistFile} ''} @@ -147,6 +150,12 @@ in description = "RSA certificate file."; }; + rsaKeyFile = mkOption { + type = types.nullOr types.path; + default = null; + description = "RSA private key file."; + }; + anonymousUmask = mkOption { type = types.string; default = "077"; diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 80d11565e47..9fb854e50cf 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -238,7 +238,8 @@ in example = literalExample "[ pkgs.splix ]"; description = '' CUPS drivers to use. Drivers provided by CUPS, cups-filters, Ghostscript - and Samba are added unconditionally. + and Samba are added unconditionally. For adding Gutenprint, see + gutenprint. ''; }; diff --git a/nixos/modules/services/web-servers/apache-httpd/foswiki.nix b/nixos/modules/services/web-servers/apache-httpd/foswiki.nix new file mode 100644 index 00000000000..8c1ac8935a4 --- /dev/null +++ b/nixos/modules/services/web-servers/apache-httpd/foswiki.nix @@ -0,0 +1,78 @@ +{ config, pkgs, lib, serverInfo, ... }: +let + inherit (pkgs) foswiki; + inherit (serverInfo.serverConfig) user group; + inherit (config) vardir; +in +{ + options.vardir = lib.mkOption { + type = lib.types.path; + default = "/var/www/foswiki"; + description = "The directory where variable foswiki data will be stored and served from."; + }; + + # TODO: this will probably need to be better customizable + extraConfig = + let httpd-conf = pkgs.runCommand "foswiki-httpd.conf" + { preferLocalBuild = true; } + '' + substitute '${foswiki}/foswiki_httpd_conf.txt' "$out" \ + --replace /var/www/foswiki/ "${vardir}/" + ''; + in + '' + RewriteEngine on + RewriteRule /foswiki/(.*) ${vardir}/$1 + + + Require all granted + + + Include ${httpd-conf} + + Options FollowSymlinks + + ''; + + /** This handles initial setup and updates. + It will probably need some tweaking, maybe per-site. */ + startupScript = pkgs.writeScript "foswiki_startup.sh" ( + let storeLink = "${vardir}/package"; in + '' + [ -e '${storeLink}' ] || needs_setup=1 + mkdir -p '${vardir}' + cd '${vardir}' + ln -sf -T '${foswiki}' '${storeLink}' + + if [ -n "$needs_setup" ]; then # do initial setup + mkdir -p bin lib + # setup most of data/ as copies only + cp -r '${foswiki}'/data '${vardir}/' + rm -r '${vardir}'/data/{System,mime.types} + ln -sr -t '${vardir}/data/' '${storeLink}'/data/{System,mime.types} + + ln -sr '${storeLink}/locale' . + + mkdir pub + ln -sr '${storeLink}/pub/System' pub/ + + mkdir templates + ln -sr '${storeLink}'/templates/* templates/ + + ln -sr '${storeLink}/tools' . + + mkdir -p '${vardir}'/working/{logs,tmp} + ln -sr '${storeLink}/working/README' working/ # used to check dir validity + + chown -R '${user}:${group}' . + chmod +w -R . + fi + + # bin/* and lib/* shall always be overwritten, in case files are added + ln -srf '${storeLink}'/bin/* '${vardir}/bin/' + ln -srf '${storeLink}'/lib/* '${vardir}/lib/' + '' + /* Symlinking bin/ one-by-one ensures that ${vardir}/lib/LocalSite.cfg + is used instead of ${foswiki}/... */ + ); +} diff --git a/nixos/modules/services/x11/colord.nix b/nixos/modules/services/x11/colord.nix new file mode 100644 index 00000000000..d9e81d75072 --- /dev/null +++ b/nixos/modules/services/x11/colord.nix @@ -0,0 +1,39 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.colord; + +in { + + options = { + + services.colord = { + enable = mkEnableOption "colord, the color management daemon"; + }; + + }; + + config = mkIf cfg.enable { + + services.dbus.packages = [ pkgs.colord ]; + + services.udev.packages = [ pkgs.colord ]; + + environment.systemPackages = [ pkgs.colord ]; + + systemd.services.colord = { + description = "Manage, Install and Generate Color Profiles"; + serviceConfig = { + Type = "dbus"; + BusName = "org.freedesktop.ColorManager"; + ExecStart = "${pkgs.colord}/libexec/colord"; + PrivateTmp = true; + }; + }; + + }; + +} diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 3e91450a39d..1ea7b5ccf16 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -19,7 +19,7 @@ in # E.g., if KDE is enabled, it supersedes xterm. imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./kde5.nix - ./e19.nix ./gnome3.nix ./kodi.nix + ./enlightenment.nix ./gnome3.nix ./kodi.nix ]; options = { diff --git a/nixos/modules/services/x11/desktop-managers/e19.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix similarity index 74% rename from nixos/modules/services/x11/desktop-managers/e19.nix rename to nixos/modules/services/x11/desktop-managers/enlightenment.nix index 2d5c7b192bc..c981b40f74a 100644 --- a/nixos/modules/services/x11/desktop-managers/e19.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -4,9 +4,9 @@ with lib; let + e = pkgs.enlightenment; xcfg = config.services.xserver; - cfg = xcfg.desktopManager.e19; - e19_enlightenment = pkgs.e19.enlightenment.override { set_freqset_setuid = true; }; + cfg = xcfg.desktopManager.enlightenment; GST_PLUGIN_PATH = lib.makeSearchPath "lib/gstreamer-1.0" [ pkgs.gst_all_1.gst-plugins-base pkgs.gst_all_1.gst-plugins-good @@ -18,10 +18,10 @@ in { options = { - services.xserver.desktopManager.e19.enable = mkOption { + services.xserver.desktopManager.enlightenment.enable = mkOption { default = false; example = true; - description = "Enable the E19 desktop environment."; + description = "Enable the Enlightenment desktop environment."; }; }; @@ -29,8 +29,8 @@ in config = mkIf (xcfg.enable && cfg.enable) { environment.systemPackages = [ - pkgs.e19.efl pkgs.e19.evas pkgs.e19.emotion pkgs.e19.elementary e19_enlightenment - pkgs.e19.terminology pkgs.e19.econnman + e.efl e.evas e.emotion e.elementary e.enlightenment + e.terminology e.econnman pkgs.xorg.xauth # used by kdesu pkgs.gtk # To get GTK+'s themes. pkgs.tango-icon-theme @@ -42,7 +42,7 @@ in environment.pathsToLink = [ "/etc/enlightenment" "/etc/xdg" "/share/enlightenment" "/share/elementary" "/share/applications" "/share/locale" "/share/icons" "/share/themes" "/share/mime" "/share/desktop-directories" ]; services.xserver.desktopManager.session = [ - { name = "E19"; + { name = "Enlightenment"; start = '' # Set GTK_DATA_PREFIX so that GTK+ can find the themes export GTK_DATA_PREFIX=${config.system.path} @@ -53,17 +53,16 @@ in export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}" # make available for D-BUS user services - #export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}:${config.system.path}/share:${pkgs.e19.efl}/share + #export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}:${config.system.path}/share:${e.efl}/share # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update - ${e19_enlightenment}/bin/enlightenment_start - waitPID=$! + exec ${e.enlightenment}/bin/enlightenment_start ''; }]; - security.setuidPrograms = [ "e19_freqset" ]; + security.setuidPrograms = [ "e_freqset" ]; environment.etc = singleton { source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; @@ -75,13 +74,13 @@ in services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; - #services.dbus.packages = [ pkgs.efl ]; # dbus-1 folder is not in /etc but in /share, so needs fixing first + services.dbus.packages = [ e.efl ]; systemd.user.services.efreet = { enable = true; description = "org.enlightenment.Efreet"; serviceConfig = - { ExecStart = "${pkgs.e19.efl}/bin/efreetd"; + { ExecStart = "${e.efl}/bin/efreetd"; StandardOutput = "null"; }; }; @@ -90,7 +89,7 @@ in { enable = true; description = "org.enlightenment.Ethumb"; serviceConfig = - { ExecStart = "${pkgs.e19.efl}/bin/ethumbd"; + { ExecStart = "${e.efl}/bin/ethumbd"; StandardOutput = "null"; }; }; diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 867dea63cc2..9891da2169e 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -128,6 +128,7 @@ in ++ lib.optional config.networking.networkmanager.enable kde5.plasma-nm ++ lib.optional config.hardware.pulseaudio.enable kde5.plasma-pa ++ lib.optional config.powerManagement.enable kde5.powerdevil + ++ lib.optional config.services.colord.enable kde5.colord-kde ++ lib.optionals config.services.samba.enable [ kde5.kdenetwork-filesharing pkgs.samba ] ++ lib.optionals cfg.phonon.gstreamer.enable diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 26dfbb1f4e1..63136beac71 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -17,6 +17,7 @@ in ./fluxbox.nix ./herbstluftwm.nix ./i3.nix + ./jwm.nix ./metacity.nix ./openbox.nix ./notion.nix diff --git a/nixos/modules/services/x11/window-managers/jwm.nix b/nixos/modules/services/x11/window-managers/jwm.nix new file mode 100644 index 00000000000..0e8dab2e922 --- /dev/null +++ b/nixos/modules/services/x11/window-managers/jwm.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.windowManager.jwm; +in +{ + ###### interface + options = { + services.xserver.windowManager.jwm.enable = mkEnableOption "jwm"; + }; + + ###### implementation + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton { + name = "jwm"; + start = '' + ${pkgs.jwm}/bin/jwm & + waitPID=$! + ''; + }; + environment.systemPackages = [ pkgs.jwm ]; + }; +} diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index f31620df1d8..757d883373a 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -58,6 +58,7 @@ let # Add RAID mdadm tool. copy_bin_and_libs ${pkgs.mdadm}/sbin/mdadm + copy_bin_and_libs ${pkgs.mdadm}/sbin/mdmon # Copy udev. copy_bin_and_libs ${udev}/lib/systemd/systemd-udevd diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 4d1466db22d..dd351306cb6 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -93,7 +93,7 @@ let config = { mountPoint = mkDefault name; device = mkIf (config.fsType == "tmpfs") (mkDefault config.fsType); - options = mkIf config.autoResize "x-nixos.autoresize"; + options = mkIf config.autoResize [ "x-nixos.autoresize" ]; # -F needed to allow bare block device without partitions formatOptions = mkIf ((builtins.substring 0 3 config.fsType) == "ext") (mkDefault "-F"); diff --git a/nixos/modules/tasks/swraid.nix b/nixos/modules/tasks/swraid.nix index 8e972891971..d6cb1c96ef4 100644 --- a/nixos/modules/tasks/swraid.nix +++ b/nixos/modules/tasks/swraid.nix @@ -12,4 +12,45 @@ cp -v ${pkgs.mdadm}/lib/udev/rules.d/*.rules $out/ ''; + systemd.services.mdadm-shutdown = { + wantedBy = [ "final.target"]; + after = [ "umount.target" ]; + + unitConfig = { + DefaultDependencies = false; + }; + + serviceConfig = { + Type = "oneshot"; + ExecStart = ''${pkgs.mdadm}/bin/mdadm --wait-clean --scan''; + }; + }; + + systemd.services."mdmon@" = { + description = "MD Metadata Monitor on /dev/%I"; + + unitConfig.DefaultDependencies = false; + + serviceConfig = { + Type = "forking"; + Environment = "IMSM_NO_PLATFORM=1"; + ExecStart = ''${pkgs.mdadm}/bin/mdmon --offroot --takeover %I''; + KillMode = "none"; + }; + }; + + systemd.services."mdadm-grow-continue@" = { + description = "Manage MD Reshape on /dev/%I"; + + unitConfig.DefaultDependencies = false; + + serviceConfig = { + ExecStart = ''${pkgs.mdadm}/bin/mdadm --grow --continue /dev/%I''; + StandardInput = "null"; + StandardOutput = "null"; + StandardError = "null"; + KillMode = "none"; + }; + }; + } diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index a895f66db8e..35af905bc62 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -40,7 +40,6 @@ let cfg = config.ec2; in # Force udev to exit to prevent random "Device or resource busy # while trying to open /dev/xvda" errors from fsck. udevadm control --exit || true - kill -9 -1 ''; boot.initrd.network.enable = true; diff --git a/nixos/modules/virtualisation/azure-agent-entropy.patch b/nixos/modules/virtualisation/azure-agent-entropy.patch new file mode 100644 index 00000000000..2a7ad08a4af --- /dev/null +++ b/nixos/modules/virtualisation/azure-agent-entropy.patch @@ -0,0 +1,17 @@ +--- a/waagent 2016-03-12 09:58:15.728088851 +0200 ++++ a/waagent 2016-03-12 09:58:43.572680025 +0200 +@@ -6173,10 +6173,10 @@ + Log("MAC address: " + ":".join(["%02X" % Ord(a) for a in mac])) + + # Consume Entropy in ACPI table provided by Hyper-V +- try: +- SetFileContents("/dev/random", GetFileContents("/sys/firmware/acpi/tables/OEM0")) +- except: +- pass ++ #try: ++ # SetFileContents("/dev/random", GetFileContents("/sys/firmware/acpi/tables/OEM0")) ++ #except: ++ # pass + + Log("Probing for Azure environment.") + self.Endpoint = self.DoDhcpWork() diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix index 640519758c7..da97565fd6d 100644 --- a/nixos/modules/virtualisation/azure-agent.nix +++ b/nixos/modules/virtualisation/azure-agent.nix @@ -14,6 +14,9 @@ let rev = "1b3a8407a95344d9d12a2a377f64140975f1e8e4"; sha256 = "10byzvmpgrmr4d5mdn2kq04aapqb3sgr1admk13wjmy5cd6bwd2x"; }; + + patches = [ ./azure-agent-entropy.patch ]; + buildInputs = [ makeWrapper python pythonPackages.wrapPython ]; runtimeDeps = [ findutils gnugrep gawk coreutils openssl openssh nettools # for hostname @@ -54,9 +57,15 @@ in ###### interface - options.virtualisation.azure.agent.enable = mkOption { - default = false; - description = "Whether to enable the Windows Azure Linux Agent."; + options.virtualisation.azure.agent = { + enable = mkOption { + default = false; + description = "Whether to enable the Windows Azure Linux Agent."; + }; + verboseLogging = mkOption { + default = false; + description = "Whether to enable verbose logging."; + }; }; ###### implementation @@ -88,7 +97,7 @@ in Provisioning.DeleteRootPassword=n # Generate fresh host key pair. - Provisioning.RegenerateSshHostKeyPair=y + Provisioning.RegenerateSshHostKeyPair=n # Supported values are "rsa", "dsa" and "ecdsa". Provisioning.SshHostKeyPairType=ed25519 @@ -121,7 +130,7 @@ in Logs.Console=y # Enable verbose logging (y|n) - Logs.Verbose=n + Logs.Verbose=${if cfg.verboseLogging then "y" else "n"} # Root device timeout in seconds. OS.RootDeviceScsiTimeout=300 @@ -146,16 +155,30 @@ in systemd.targets.provisioned = { description = "Services Requiring Azure VM provisioning to have finished"; - wantedBy = [ "sshd.service" ]; - before = [ "sshd.service" ]; }; + systemd.services.consume-hypervisor-entropy = + { description = "Consume entropy in ACPI table provided by Hyper-V"; + + wantedBy = [ "sshd.service" "waagent.service" ]; + before = [ "sshd.service" "waagent.service" ]; + after = [ "local-fs.target" ]; + + path = [ pkgs.coreutils ]; + script = + '' + echo "Fetching entropy..." + cat /sys/firmware/acpi/tables/OEM0 > /dev/random + ''; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + serviceConfig.StandardError = "journal+console"; + serviceConfig.StandardOutput = "journal+console"; + }; systemd.services.waagent = { - wantedBy = [ "sshd.service" ]; - before = [ "sshd.service" ]; - after = [ "ip-up.target" ]; - wants = [ "ip-up.target" ]; + wantedBy = [ "multi-user.target" ]; + after = [ "ip-up.target" "sshd.service" ]; path = [ pkgs.e2fsprogs ]; description = "Windows Azure Agent Service"; diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix index 79d1f7d7cc4..9dc0ce11992 100644 --- a/nixos/modules/virtualisation/azure-image.nix +++ b/nixos/modules/virtualisation/azure-image.nix @@ -2,7 +2,7 @@ with lib; let - diskSize = "4096"; + diskSize = "30720"; in { system.build.azureImage = @@ -23,7 +23,7 @@ in postVM = '' mkdir -p $out - ${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -O vpc -o subformat=fixed $diskImage $out/disk.vhd + ${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -O vpc $diskImage $out/disk.vhd rm $diskImage ''; diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw"; diff --git a/nixos/release.nix b/nixos/release.nix index 069cf3727de..101f68a43f7 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -240,6 +240,7 @@ in rec { tests.containers = callTest tests/containers.nix {}; tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; }); tests.dockerRegistry = hydraJob (import tests/docker-registry.nix { system = "x86_64-linux"; }); + tests.dnscrypt-proxy = callTest tests/dnscrypt-proxy.nix { system = "x86_64-linux"; }; tests.etcd = hydraJob (import tests/etcd.nix { system = "x86_64-linux"; }); tests.ec2-nixops = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-nixops; tests.ec2-config = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-config; diff --git a/nixos/tests/dnscrypt-proxy.nix b/nixos/tests/dnscrypt-proxy.nix new file mode 100644 index 00000000000..20ec3a333e7 --- /dev/null +++ b/nixos/tests/dnscrypt-proxy.nix @@ -0,0 +1,32 @@ +import ./make-test.nix ({ pkgs, ... }: { + name = "dnscrypt-proxy"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ joachifm ]; + }; + + nodes = { + # A client running the recommended setup: DNSCrypt proxy as a forwarder + # for a caching DNS client. + client = + { config, pkgs, ... }: + let localProxyPort = 43; in + { + security.apparmor.enable = true; + + services.dnscrypt-proxy.enable = true; + services.dnscrypt-proxy.localPort = localProxyPort; + + services.dnsmasq.enable = true; + services.dnsmasq.servers = [ "127.0.0.1#${toString localProxyPort}" ]; + }; + }; + + testScript = '' + $client->start; + $client->waitForUnit("multi-user.target"); + + # The daemon is socket activated; sending a single ping should activate it. + $client->execute("${pkgs.iputils}/bin/ping -c1 example.com"); + $client->succeed("systemctl is-active dnscrypt-proxy.service"); + ''; +}) diff --git a/pkgs/applications/audio/banshee/default.nix b/pkgs/applications/audio/banshee/default.nix new file mode 100644 index 00000000000..4e5086bdb26 --- /dev/null +++ b/pkgs/applications/audio/banshee/default.nix @@ -0,0 +1,55 @@ +{ pkgs, stdenv, lib, fetchurl, intltool, pkgconfig, gstreamer, gst_plugins_base +, gst_plugins_good, gst_plugins_bad, gst_plugins_ugly, gst_ffmpeg, glib +, mono, mono-addins, dbus-sharp-1_0, dbus-sharp-glib-1_0, notify-sharp, gtk-sharp-2_0 +, boo, gdata-sharp, taglib-sharp, sqlite, gnome-sharp, gconf, gtk-sharp-beans, gio-sharp +, libmtp, libgpod, mono-zeroconf }: + +stdenv.mkDerivation rec { + name = "banshee-${version}"; + version = "2.6.2"; + + src = fetchurl { + url = "http://ftp.gnome.org/pub/GNOME/sources/banshee/2.6/banshee-${version}.tar.xz"; + sha256 = "1y30p8wxx5li39i5gpq2wib0ympy8llz0gyi6ri9bp730ndhhz7p"; + }; + + dontStrip = true; + + nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ + gtk-sharp-2_0.gtk gstreamer gst_plugins_base gst_plugins_good + gst_plugins_bad gst_plugins_ugly gst_ffmpeg + mono dbus-sharp-1_0 dbus-sharp-glib-1_0 mono-addins notify-sharp + gtk-sharp-2_0 boo gdata-sharp taglib-sharp sqlite gnome-sharp gconf gtk-sharp-beans + gio-sharp libmtp libgpod mono-zeroconf + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + postPatch = '' + patchShebangs data/desktop-files/update-desktop-file.sh + patchShebangs build/private-icon-theme-installer + sed -i "s,DOCDIR=.*,DOCDIR=$out/lib/monodoc," configure + ''; + + postInstall = let + ldLibraryPath = lib.makeLibraryPath [ gtk-sharp-2_0.gtk gtk-sharp-2_0 sqlite gconf glib gstreamer ]; + + monoGACPrefix = lib.concatStringsSep ":" [ + mono dbus-sharp-1_0 dbus-sharp-glib-1_0 mono-addins notify-sharp gtk-sharp-2_0 + boo gdata-sharp taglib-sharp sqlite gnome-sharp gconf gtk-sharp-beans + gio-sharp libmtp libgpod mono-zeroconf + ]; + in '' + sed -e '2a export MONO_GAC_PREFIX=${monoGACPrefix}' \ + -e 's|LD_LIBRARY_PATH=|LD_LIBRARY_PATH=${ldLibraryPath}:|' \ + -e "s|GST_PLUGIN_PATH=|GST_PLUGIN_PATH=$GST_PLUGIN_SYSTEM_PATH:|" \ + -e 's| mono | ${mono}/bin/mono |' \ + -i $out/bin/banshee + ''; + meta = with lib; { + description = "A music player written in C# using GNOME technologies"; + platforms = platforms.linux; + maintainers = [ maintainers.zohl ]; + }; +} diff --git a/pkgs/applications/audio/ekho/default.nix b/pkgs/applications/audio/ekho/default.nix index 78383eec953..209ffa05bf2 100644 --- a/pkgs/applications/audio/ekho/default.nix +++ b/pkgs/applications/audio/ekho/default.nix @@ -20,7 +20,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; hydraPlatforms = []; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 4759f228e35..612a3dab99f 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -37,7 +37,8 @@ let inherit src; - buildInputs = [ makeWrapper llvm emscripten openssl libsndfile pkgconfig libmicrohttpd vim ]; + nativeBuildInputs = [ makeWrapper pkgconfig vim ]; + buildInputs = [ llvm emscripten openssl libsndfile libmicrohttpd ]; passthru = { @@ -53,6 +54,20 @@ let # correct system. unset system 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. + # + # Failing to properly detect the llvm version means that the macro + # LLVM_VERSION ends up being the raw output of `llvm-config --version`, while + # the code assumes that it's set to a symbol like `LLVM_35`. Two problems result: + # * :0:1: error: macro names must be identifiers.; and + # * a bunch of undefined reference errors due to conditional definitions relying on + # LLVM_XY being defined. + # + # 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 ''; # Remove most faust2appl scripts since they won't run properly diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index bf06761bc53..498a4be7ff4 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -5,7 +5,7 @@ assert stdenv.system == "x86_64-linux"; let - version = "1.0.23.93.gd6cfae15-30"; + version = "1.0.25.127.g58007b4c-22"; deps = [ alsaLib @@ -50,7 +50,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "0n6vz51jv6s20dp4zlqkk52bpmpyfm1qn5bfm4lfq09x1g6ir5lr"; + sha256 = "1fxps0ls0g4idw10la3qrpmp2jn85lkm3xj4nam4ycx0jj8g1v2p"; }; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/audio/vmpk/default.nix b/pkgs/applications/audio/vmpk/default.nix index 5db7fe5afbc..dde96764fe6 100644 --- a/pkgs/applications/audio/vmpk/default.nix +++ b/pkgs/applications/audio/vmpk/default.nix @@ -12,7 +12,6 @@ in stdenv.mkDerivation rec { homepage = "http://vmpk.sourceforge.net/"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index 6bec03bd71b..10b5bc0c117 100644 --- a/pkgs/applications/audio/xmp/default.nix +++ b/pkgs/applications/audio/xmp/default.nix @@ -8,7 +8,6 @@ stdenv.mkDerivation rec { homepage = "http://xmp.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index 43180bd04e3..15230a7a000 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -43,6 +43,5 @@ stdenv.mkDerivation rec { homepage = "http://www.aseprite.org/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [iyzsong]; }; } diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix index d72ab12b580..850041ccfc7 100644 --- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix +++ b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-lispdir=$out/share/emacs/site-lisp" - "--with-icondir=$out/share/emacs/site-lisp/images/w3m" + "--with-lispdir=$(out)/share/emacs/site-lisp" + "--with-icondir=$(out)/share/emacs/site-lisp/images/w3m" ]; postInstall = '' diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 1b99d44bcc5..b4f6baa9c64 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file }: let - version = "1.26"; + version = "1.27"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.geany.org/${name}.tar.bz2"; - sha256 = "e38530e87c577e1e9806be3b40e08fb9ee321eb1abc6361ddacdad89c825f90d"; + sha256 = "846ff699a5944c5c3c068ae0199d4c13946a668bfc6d03f8c79765667c20cadf"; }; buildInputs = [ gtk2 which pkgconfig intltool file ]; diff --git a/pkgs/applications/editors/kdevelop/default.nix b/pkgs/applications/editors/kdevelop/default.nix index b0ac24ee61a..938a56518d5 100644 --- a/pkgs/applications/editors/kdevelop/default.nix +++ b/pkgs/applications/editors/kdevelop/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "4.7.1"; + version = "4.7.3"; pname = "kdevelop"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "e3ad5377f53739a67216d37cda3f88c03f8fbb0c96e2a9ef4056df3c124e95c1"; + url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2"; + sha256 = "9db388d1c8274da7d168c13db612c7e94ece7815757b945b0aa0371620a06b35"; }; buildInputs = [ kdevplatform kdebase_workspace okteta qjson ]; @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ kdevplatform kate konsole kde_runtime oxygen_icons ]; + patches = [ ./gettext.patch ]; + NIX_CFLAGS_COMPILE = "-I${okteta}/include/KDE"; meta = with stdenv.lib; { @@ -31,6 +33,6 @@ stdenv.mkDerivation rec { programing languages. It is based on KDevPlatform, KDE and Qt libraries and is under development since 1998. ''; - homepage = http://www.kdevelop.org; + homepage = https://www.kdevelop.org; }; } diff --git a/pkgs/applications/editors/kdevelop/gettext.patch b/pkgs/applications/editors/kdevelop/gettext.patch new file mode 100644 index 00000000000..cefbc743fc3 --- /dev/null +++ b/pkgs/applications/editors/kdevelop/gettext.patch @@ -0,0 +1,8 @@ +diff -urN kdevelop-4.7.3.orig/po/CMakeLists.txt kdevelop-4.7.3/po/CMakeLists.txt +--- kdevelop-4.7.3.orig/po/CMakeLists.txt 2016-03-04 23:29:09.411886565 +0100 ++++ kdevelop-4.7.3/po/CMakeLists.txt 2016-03-04 23:28:35.108451713 +0100 +@@ -1,3 +1,4 @@ ++cmake_policy(SET CMP0002 OLD) + find_package(Gettext REQUIRED) + if (NOT GETTEXT_MSGMERGE_EXECUTABLE) + MESSAGE(FATAL_ERROR "Please install msgmerge binary") diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 61818561f74..efec2410f9b 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -12,12 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "nano-${version}"; - version = "2.5.0"; + version = "2.5.3"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.gz"; - sha256 = "1vl9bim56k1b4zwc3icxp46w6pn6gb042j1h4jlz1jklxxpkwcpz"; + sha256 = "1vhjrcydcfxqq1719vcsvqqnbjbq2523m00dhzag5vwzkc961c5j"; }; - buildInputs = [ ncurses texinfo ] ++ optional enableNls gettext; + nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; + buildInputs = [ ncurses ]; outputs = [ "out" "info" ]; configureFlags = '' --sysconfdir=/etc diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 4590baf6b8e..059b85cee5f 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -24,6 +24,5 @@ stdenv.mkDerivation rec { # The rest is GPL2 or later. license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; } diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 69e9ab35e96..6f43a2f9a89 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/Applications cp -r src/MacVim/build/Release/MacVim.app $out/Applications + rm -rf $out/MacVim.app rm $out/bin/{Vimdiff,Vimtutor,Vim,ex,rVim,rview,view} diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index 5e8dfd93f30..dded423652c 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -16,6 +16,15 @@ in }; patches = [ ./paths-fix.patch ]; + # fix build with glibc-2.23 + postPatch = '' + sed 's/\ herqq -> is missing its av part.*/ + /*qt_koauth */ + +# Supplementary packages required only by the wrapper. +, bash, kde_runtime, kde_baseapps, makeWrapper, oxygen_icons +, phonon_backend_vlc /*phonon_backend_gstreamer,*/ +, ffmpegthumbs /*mplayerthumbs*/ +, runCommand, shared_mime_info, writeScriptBin }: -stdenv.mkDerivation rec { - name = "digikam-4.12.0"; +let + version = "4.12.0"; + pName = "digikam-${version}"; - src = fetchurl { - url = "http://download.kde.org/stable/digikam/${name}.tar.bz2"; - sha256 = "081ldsaf3frf5khznjd3sxkjmi4dyp6w6nqnc2a0agkk0kxkl10m"; + build = stdenv.mkDerivation rec { + name = "digikam-build-${version}"; + + src = fetchurl { + url = "http://download.kde.org/stable/digikam/${pName}.tar.bz2"; + sha256 = "081ldsaf3frf5khznjd3sxkjmi4dyp6w6nqnc2a0agkk0kxkl10m"; + }; + + nativeBuildInputs = [ + automoc4 cmake gettext perl pkgconfig + ] ++ [ + # Optional + doxygen + ]; + + buildInputs = [ + boost eigen jasper kdelibs kdepimlibs lcms lensfun + libgphoto2 libjpeg libkdcraw libkexiv2 libkipi liblqr1 libpgf + libtiff marble mysql.lib opencv phonon qca2 qimageblitz qjson qt4 + shared_desktop_ontologies soprano ] + # Optional build time dependencies + ++ [ + baloo + kfilemetadata + lcms2 ] + ++ stdenv.lib.optional (kfaceSupport && null != libkface) [ libkface ] + ++ stdenv.lib.optional (kgeomapSupport && null != libkgeomap) [ libkgeomap ] ++ + [ libxslt ] + # Plugins optional build time dependencies + ++ [ + gdk_pixbuf imagemagick libgpod libksane + libkvkontakte + qt_gstreamer1 ]; + + # Make digikam find some FindXXXX.cmake + KDEDIRS="${marble}:${qjson}"; + + # Find kdepimlibs's upper case headers under `include/KDE`. + NIX_CFLAGS_COMPILE = "-I${kdepimlibs}/include/KDE"; + + # Help digiKam find libusb, otherwise gphoto2 support is disabled + cmakeFlags = [ + "-DLIBUSB_LIBRARIES=${libusb1}/lib" + "-DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0" + "-DENABLE_BALOOSUPPORT=ON" + "-DENABLE_KDEPIMLIBSSUPPORT=ON" + "-DENABLE_LCMS2=ON" ] + ++ stdenv.lib.optional (kfaceSupport && null == libkface) [ "-DDIGIKAMSC_COMPILE_LIBKFACE=ON" ] + ++ stdenv.lib.optional (kgeomapSupport && null == libkgeomap) [ "-DDIGIKAMSC_COMPILE_LIBKGEOMAP=ON" ]; + + enableParallelBuilding = true; + + meta = { + description = "Photo Management Program"; + license = stdenv.lib.licenses.gpl2; + homepage = http://www.digikam.org; + maintainers = with stdenv.lib.maintainers; [ goibhniu viric urkud ]; + inherit (kdelibs.meta) platforms; + }; }; - nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; - buildInputs = [ - boost eigen jasper kdelibs kdepimlibs lcms lensfun libgphoto2 - libjpeg libkdcraw libkexiv2 libkipi liblqr1 libpgf libtiff marble - mysql.lib opencv phonon qca2 qimageblitz qjson qt4 - shared_desktop_ontologies soprano + kdePkgs = [ + build # digikam's own build + kdelibs kdepimlibs kde_runtime kde_baseapps libkdcraw oxygen_icons + /*phonon_backend_gstreamer*/ phonon_backend_vlc + ffmpegthumbs /*mplayerthumbs*/ shared_mime_info ] + # Optional build time dependencies + ++ [ + + baloo kfilemetadata ] + ++ stdenv.lib.optional (kfaceSupport && null != libkface) [ libkface ] + ++ stdenv.lib.optional (kgeomapSupport && null != libkgeomap) [ libkgeomap ] + ++ [ + libkipi ] + # Plugins optional build time dependencies + ++ [ + libksane libkvkontakte ]; - # Make digikam find some FindXXXX.cmake - KDEDIRS="${marble}:${qjson}"; - # Help digiKam find libusb, otherwise gphoto2 support is disabled - cmakeFlags = [ - "-DLIBUSB_LIBRARIES=${libusb1}/lib" - "-DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0" - "-DDIGIKAMSC_COMPILE_LIBKFACE=ON" - ]; + # TODO: It should be the responsability of these packages to add themselves to `KDEDIRS`. See + # for + # a practical example. + # IMPORTANT: Note that using `XDG_DATA_DIRS` here instead of `KDEDIRS` won't work properly. + KDEDIRS = with stdenv.lib; concatStrings (intersperse ":" (map (x: "${x}") kdePkgs)); - enableParallelBuilding = true; + sycocaDirRelPath = "var/lib/kdesycoca"; + sycocaFileRelPath = "${sycocaDirRelPath}/${pName}.sycoca"; + + sycoca = runCommand "${pName}" { + + name = "digikam-sycoca-${version}"; + + nativeBuildInputs = [ kdelibs ]; + + dontPatchELF = true; + dontStrip = true; + + } '' + # Make sure kbuildsycoca4 does not attempt to write to user home directory. + export HOME=$PWD + + export KDESYCOCA="$out/${sycocaFileRelPath}" + + mkdir -p $out/${sycocaDirRelPath} + export XDG_DATA_DIRS="" + export KDEDIRS="${KDEDIRS}" + kbuildsycoca4 --noincremental --nosignal + ''; + + + replaceExeListWithWrapped = + let f = exeName: '' + rm -f "$out/bin/${exeName}" + makeWrapper "${build}/bin/${exeName}" "$out/bin/${exeName}" \ + --set XDG_DATA_DIRS "" \ + --set KDEDIRS "${KDEDIRS}" \ + --set KDESYCOCA "${sycoca}/${sycocaFileRelPath}" + ''; + in + with stdenv.lib; exeNameList: concatStrings (intersperse "\n" (map f exeNameList)); + +in + + +with stdenv.lib; + +/* + Final derivation + ---------------- + + - Create symlinks to our original build derivation items. + - Wrap specific executables so that they know of the appropriate + sycoca database, `KDEDIRS` to use and block any interference + from `XDG_DATA_DIRS` (only `dnginfo` is not wrapped). +*/ +runCommand "${pName}" { + inherit build; + inherit sycoca; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = kdePkgs; + + dontPatchELF = true; + dontStrip = true; meta = { description = "Photo Management Program"; license = stdenv.lib.licenses.gpl2; homepage = http://www.digikam.org; - maintainers = with stdenv.lib.maintainers; [ goibhniu viric urkud ]; + maintainers = with stdenv.lib.maintainers; [ /*jraygauthier*/ ]; inherit (kdelibs.meta) platforms; }; -} + +} '' + pushd $build > /dev/null + for d in `find . -maxdepth 1 -name "*" -printf "%f\n" | tail -n+2`; do + mkdir -p $out/$d + for f in `find $d -maxdepth 1 -name "*" -printf "%f\n" | tail -n+2`; do + ln -s "$build/$d/$f" "$out/$d/$f" + done + done + popd > /dev/null + + ${replaceExeListWithWrapped [ "cleanup_digikamdb" "digitaglinktree" "digikam" "dngconverter" + "expoblending" "photolayoutseditor" "scangui" "showfoto" ]} +'' + +/* + +TODO +---- + +### Useful ### + + - Per lib `KDELIBS` environment variable export. See above in-code TODO comment. + - Missing optional `qt_soap` or `herqq` (av + normal package) dependencies. Those are not + yet (or not fully) packaged in nix. Mainly required for upnp export. + - Possibility to use the `phonon_backend_gstreamer` with its own user specified set of backend. + - Allow user to disable optional features or dependencies reacting properly. + - Compile `kipiplugins` as a separate package (so that it can be used by other kde packages + and so that this package's build time is reduced). + +### Not so useful ### + + - Missing optional `qt_koauth` (not packaged in nix). + - Missing optional `libmediawiki` (not packaged in nix).. + - For some reason the cmake build does not detect `libkvkontakte`. Fix this. + - Possibility to use `mplayerthumbs` thumbnail creator backend. In digikam dev docs, + it is however suggested to use `ffmpegthumbs`. Maybe we should stick to it. + +*/ diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index 7ee298f7281..8eee5299a69 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "simple-scan-${version}"; - version = "3.19.91"; + version = "3.19.92"; src = fetchurl { - sha256 = "1c5glf5vxgld41w4jxfqcv17q76qnh43fawpv33hncgh8d283xkf"; + sha256 = "1zz6y4cih1v0npxjfxvnqz3bz7i5aripdsfy0hg9mhr1f4r0ig19"; url = "https://launchpad.net/simple-scan/3.19/${version}/+download/${name}.tar.xz"; }; diff --git a/pkgs/applications/misc/d4x/default.nix b/pkgs/applications/misc/d4x/default.nix index 3c146249dd0..cdcada196b9 100644 --- a/pkgs/applications/misc/d4x/default.nix +++ b/pkgs/applications/misc/d4x/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { inherit boost; src = fetchurl { - url = http://d4x.krasu.ru/files/d4x-2.5.7.1.tar.bz2; + url = http://pkgs.fedoraproject.org/repo/pkgs/d4x/d4x-2.5.7.1.tar.bz2/68d6336c3749a7caabb0f5a5f84f4102/d4x-2.5.7.1.tar.bz2; sha256 = "1i1jj02bxynisqapv31481sz9jpfp3f023ky47spz1v1wlwbs13m"; }; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index c9b6de715d2..733833e3171 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -18,11 +18,11 @@ in pythonPackages.buildPythonApplication rec { name = "electrum-${version}"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "14q6y1hwzki56nfhd3nfbxid07d5fv0pgmklvcf7yxjmpdxrg0iq"; + sha256 = "1wvzlx9aj88z01vljhyg3v67zsk2iz18r58727pdq7h94vwwjc86"; }; propagatedBuildInputs = with pythonPackages; [ @@ -55,6 +55,11 @@ pythonPackages.buildPythonApplication rec { pyrcc4 icons.qrc -o gui/qt/icons_rc.py ''; + doCheck = true; + checkPhase = '' + $out/bin/electrum help >/dev/null + ''; + meta = with stdenv.lib; { description = "Bitcoin thin-client"; longDescription = '' diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index ab55e3618ec..9f083592c40 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -24,6 +24,7 @@ python3Packages.buildPythonApplication rec { urwid pkginfo ]; + buildInputs = with python3Packages; [ setuptools_scm ]; meta = with stdenv.lib; { homepage = http://lostpackets.de/khal/; diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index ffb4c147c77..83130164fd9 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -1,28 +1,29 @@ -{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, wxGTK +, desktop_file_utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "0.7.82"; + version = "0.7.83"; name = "mediainfo-gui-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0ivvmxx93aldfbms6wg46x9npghg304j2zxl5i70m710gybjr232"; + sha256 = "0d8mph9lbg2lw0ccg1la0kqhbisra8q9rzn195lncch5cia5zyg7"; }; - buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libzen libmediainfo wxGTK desktop_file_utils libSM + imagemagick ]; sourceRoot = "./MediaInfo/Project/GNU/GUI/"; - preConfigure = "sh autogen.sh"; - - meta = { + meta = with stdenv.lib; { description = "Supplies technical and tag information about a video or audio file (GUI version)"; longDescription = '' MediaInfo is a convenient unified display of the most relevant technical and tag data for video and audio files. ''; homepage = http://mediaarea.net/; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.devhell ]; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = [ maintainers.devhell ]; }; } diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 5d953fed53a..cf1a4ce8280 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "0.7.82"; + version = "0.7.83"; name = "mediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0ivvmxx93aldfbms6wg46x9npghg304j2zxl5i70m710gybjr232"; + sha256 = "0d8mph9lbg2lw0ccg1la0kqhbisra8q9rzn195lncch5cia5zyg7"; }; - buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libzen libmediainfo zlib ]; sourceRoot = "./MediaInfo/Project/GNU/CLI/"; configureFlags = [ "--with-libmediainfo=${libmediainfo}" ]; - preConfigure = "sh autogen.sh"; meta = with stdenv.lib; { description = "Supplies technical and tag information about a video or audio file"; diff --git a/pkgs/applications/misc/octoprint/0001-Don-t-use-static-library.patch b/pkgs/applications/misc/octoprint/0001-Don-t-use-static-library.patch index 01b0c8f9cce..54116b80a6e 100644 --- a/pkgs/applications/misc/octoprint/0001-Don-t-use-static-library.patch +++ b/pkgs/applications/misc/octoprint/0001-Don-t-use-static-library.patch @@ -1,7 +1,7 @@ -From 73ff28c3ee5b737303871268a5487db0fcffc0f6 Mon Sep 17 00:00:00 2001 +From 0be3198cccf753226758684955f49a32d8d920c0 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 17 Feb 2016 14:37:31 +0300 -Subject: [PATCH 1/2] Don't use static library +Subject: [PATCH] Don't use static library --- octoprint_m3dfio/__init__.py | 67 +----------------------------------------- @@ -9,23 +9,23 @@ Subject: [PATCH 1/2] Don't use static library 2 files changed, 5 insertions(+), 68 deletions(-) diff --git a/octoprint_m3dfio/__init__.py b/octoprint_m3dfio/__init__.py -index 5e5369b..9f59768 100644 +index a2ca533..43f178a 100644 --- a/octoprint_m3dfio/__init__.py +++ b/octoprint_m3dfio/__init__.py -@@ -764,72 +764,7 @@ class M3DFioPlugin( +@@ -793,72 +793,7 @@ class M3DFioPlugin( # Set file locations self.setFileLocations() - # Check if running on Linux - if platform.uname()[0].startswith("Linux") : - -- # Check if running on a Raspberry Pi +- # Check if running on a Raspberry Pi 1 - if platform.uname()[4].startswith("armv6l") and self.getCpuHardware() == "BCM2708" : - - # Set shared library - self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm1176jzf-s.so") - -- # Otherwise check if running on a Raspberry Pi 2 +- # Otherwise check if running on a Raspberry Pi 2 or Raspberry Pi 3 - elif platform.uname()[4].startswith("armv7l") and self.getCpuHardware() == "BCM2709" : - - # Set shared library @@ -87,7 +87,7 @@ index 5e5369b..9f59768 100644 if self.sharedLibrary : diff --git a/shared library source/Makefile b/shared library source/Makefile -index 4062a91..89dab71 100644 +index 9d015a1..a24f134 100644 --- a/shared library source/Makefile +++ b/shared library source/Makefile @@ -58,13 +58,15 @@ ifeq ($(TARGET_PLATFORM), OSX64) @@ -109,5 +109,5 @@ index 4062a91..89dab71 100644 clean: rm -f ../octoprint_m3dfio/static/libraries/$(PROG) -- -2.7.0 +2.7.1 diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 1ae11be3cdd..d7927535f15 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -8,13 +8,13 @@ in { m3d-fio = buildPlugin rec { name = "M3D-Fio-${version}"; - version = "0.28.2"; + version = "0.29"; src = fetchFromGitHub { owner = "donovan6000"; repo = "M3D-Fio"; rev = "V${version}"; - sha256 = "1fwy6xmbid89rn7w7v779wb34gmfzc1fkggv3im1r7a7jrzph6nx"; + sha256 = "17jyr7qf9psq3xcckk1zjhaw0h8a0mh3v8lcv9vgqzni27kq9pnb"; }; patches = [ diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 14ae58a2932..7969695f1ad 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -8,7 +8,6 @@ buildPythonApplication rec { homepage = "http://ranger.nongnu.org/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/applications/misc/stardict/stardict.nix b/pkgs/applications/misc/stardict/stardict.nix index 600642f488a..16ca7957c12 100644 --- a/pkgs/applications/misc/stardict/stardict.nix +++ b/pkgs/applications/misc/stardict/stardict.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { description = "An international dictionary supporting fuzzy and glob style matching"; license = stdenv.lib.licenses.lgpl3; maintainers = with stdenv.lib.maintainers; [qknight]; + broken = true; }; } diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 237dfd17ac7..c63f57f934d 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -183,7 +183,7 @@ let configurePhase = '' # Precompile .pyc files to prevent race conditions during build - python -m compileall -q -f . || : # ignore errors + python -m compileall -q -f . > /dev/null 2>&1 || : # ignore errors # This is to ensure expansion of $out. libExecPath="${libExecPath}" diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index ffec5c8b807..c42488e9e1e 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the parent directory. { beta = { - sha256 = "1xc2npbc829nxria1j37kxyy95jkalkkphxgv24if0ibn62lrzd4"; - sha256bin64 = "1arm15g3vmm3zlvcql3qylw1fhrn5ddzl2v8mkpb3a251m425dsi"; - version = "49.0.2623.75"; + sha256 = "1lgpjnjhy3idha5b6wp31kdk6knic96dmajyrgn1701q3mq81g1i"; + sha256bin64 = "1yb3rk38zfgjzka0aim1xc4r0qaz2qkwaq06mjifpkszmfffhyd0"; + version = "50.0.2661.26"; }; dev = { - sha256 = "04j0nyz20gi7vf1javbw06wrqpkfw6vg024i3wkgx42hzd6hjgw4"; - sha256bin64 = "12ff4q615rwakgpr9v84p55maasqb4vg61s89vgxrlsgqrmkahg4"; - version = "50.0.2661.11"; + sha256 = "0z9m1mv6pv43y3ccd0nzqg5f9q8qxc8mlmy9y3dc9kqpvmqggnvp"; + sha256bin64 = "0khsxci970vclfg24b7m8w1jqfkv5rzswgwa62b4r7jzrglx1azj"; + version = "50.0.2661.18"; }; stable = { - sha256 = "1xc2npbc829nxria1j37kxyy95jkalkkphxgv24if0ibn62lrzd4"; - sha256bin64 = "01qi5jmlmdpy6icc4y51bn5a063mxrnkncg3pbmbl4r02vqca5jh"; - version = "49.0.2623.75"; + sha256 = "0kbph3l964bh7cb9yf8nydjaxa20yf8ls5a2vzsj8phz7n20z3f9"; + sha256bin64 = "1k6nhccdqzzzicwi07nldqfsdlic65i2xfyb7dbasbbg9zl3s9yw"; + version = "49.0.2623.87"; }; } diff --git a/pkgs/applications/networking/browsers/chromium/update.sh b/pkgs/applications/networking/browsers/chromium/update.sh index 05cc671d31c..14f3dc6bd9d 100755 --- a/pkgs/applications/networking/browsers/chromium/update.sh +++ b/pkgs/applications/networking/browsers/chromium/update.sh @@ -1,3 +1,4 @@ #!/bin/sh -e +cd "$(dirname "$0")" sp="$(nix-build -Q --no-out-link source/update.nix -A update)" cat "$sp" > source/sources.nix diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index 31ec6f313a8..6ae91e165a9 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,185 +4,187 @@ # ruby generate_sources.rb > sources.nix { - version = "44.0.2"; + version = "45.0"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha256 = "2d0ab9fba584576d67ccb600339efeb5ad7aac1629b2d7865e121825b1a5a6d5"; } - { locale = "ach"; arch = "linux-x86_64"; sha256 = "188b9aab64ab1beda84dbe7b36d899210472a3e445dd827b64ca7083ae3c0b32"; } - { locale = "af"; arch = "linux-i686"; sha256 = "e6b5fb28e5ad03240f0e156c81db1df16bfaf99a946ffab9672c06d8561de9c3"; } - { locale = "af"; arch = "linux-x86_64"; sha256 = "c2856308c9e87bf82f621c5d4c96e9c5a70e5ebb86a8e4ba8ecb4d08c1ae98ec"; } - { locale = "an"; arch = "linux-i686"; sha256 = "f138b17a230e9b42b334d3900bebf23156fe1dec1f4ec75f9a3b94348523e241"; } - { locale = "an"; arch = "linux-x86_64"; sha256 = "82d24b07dc8d887837e8fbd610c2feb1ff4975917d8a19836ec0d0db56522de8"; } - { locale = "ar"; arch = "linux-i686"; sha256 = "b530e58161331bff3222083298ddc5af0055c6b3337b58b1a4eb1d5d4e348d62"; } - { locale = "ar"; arch = "linux-x86_64"; sha256 = "67c0e4ce7dfe54d0e4fedb168342ea86a82458e2d3ce6aca78b4497f4e813bfd"; } - { locale = "as"; arch = "linux-i686"; sha256 = "f17e991e97e85b981c3191a0becad6df457a29b7042d31a667fd227dadc24e80"; } - { locale = "as"; arch = "linux-x86_64"; sha256 = "2d955443b785a65d2f9f914232d521aeb9082b4dead8fedc89cfa29329ab8e2a"; } - { locale = "ast"; arch = "linux-i686"; sha256 = "c9e2784047b58eddfd72c1e56964eea8ac098240436d029665bc940c7b8d8f8d"; } - { locale = "ast"; arch = "linux-x86_64"; sha256 = "4bd5cc7c34f0a1fc1e2e899942c4ebec6bdab2fbd9e3d331ecc0c67a6f8c16e4"; } - { locale = "az"; arch = "linux-i686"; sha256 = "1789f6c5524314df239e4b4beb677adf48ce926a097128e053b352067d13016f"; } - { locale = "az"; arch = "linux-x86_64"; sha256 = "4881ccb7521512b4275faa2598efda6bbcc3d7838b6200e79c8fcae358d32c23"; } - { locale = "be"; arch = "linux-i686"; sha256 = "e9e31e92e0732188f6c4494023de260e5b64e97c56ff07857b290355c50e25f4"; } - { locale = "be"; arch = "linux-x86_64"; sha256 = "00ef0cea013cdb8606d8786bb5a21e502a6054ab57b2fad4d24161c47768f418"; } - { locale = "bg"; arch = "linux-i686"; sha256 = "6428fa1d4f2bd0b703f207a1571e425f8076438954f955f60c0e8c1525743823"; } - { locale = "bg"; arch = "linux-x86_64"; sha256 = "fc156d3d76582c95eb6a0a7ee88dbdbd6c99d46ca42b011e1d789b0552bb5885"; } - { locale = "bn-BD"; arch = "linux-i686"; sha256 = "d0b69158e5ce85eec29dc70c4942bfc76eaf2d8e3359c45de5783d39fe1ccaf0"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "928575b759e4ae89d3e5ee475ffa18c69e945846981102d540de01c9bd87582e"; } - { locale = "bn-IN"; arch = "linux-i686"; sha256 = "a92a902e4380ddda37b8e70922e91ee029d47f866adea53220dd76182c52b596"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "022b9ff7141cd89df35477d357df74556bc4a24639141d21111eccfbf8e2f98c"; } - { locale = "br"; arch = "linux-i686"; sha256 = "c398c00b98edcaa2618363637075ccf749a4d3567dfdae070b4b0cbe23832f56"; } - { locale = "br"; arch = "linux-x86_64"; sha256 = "60f471fdf1b71072751396049f12a198c73d11892ec69fc142f925a12c6515f4"; } - { locale = "bs"; arch = "linux-i686"; sha256 = "d9e3c1b5c94ad207071cea86295ef3f98d4bd9201e896f6b9d67a2e475ea2898"; } - { locale = "bs"; arch = "linux-x86_64"; sha256 = "2ea3bb1c14a849b5039b633963687629839174ea886d3f8314f67eddafa2b16b"; } - { locale = "ca"; arch = "linux-i686"; sha256 = "bf1c1c3aaa900d66c4684cf48623bb0c9e0313cd919ad0e67e8a2e3ca5987aa6"; } - { locale = "ca"; arch = "linux-x86_64"; sha256 = "30c0217722c599ed8fc0e713e0b763a01dc0da37dc2f290a2a4d02cb2a86b6a3"; } - { locale = "cs"; arch = "linux-i686"; sha256 = "5ebd809827cdc85da0e6c973855c60426ab98e2cb898c030acd403577d3bb78a"; } - { locale = "cs"; arch = "linux-x86_64"; sha256 = "a1d55b7c54fd7eb89bcf5dbdadcaea0f5d2da7110a090c424c52a55ae23150f2"; } - { locale = "cy"; arch = "linux-i686"; sha256 = "55df045619bbe01af6f33c6cd563d6097b9c9023ab9133fa7def0800cc9aec83"; } - { locale = "cy"; arch = "linux-x86_64"; sha256 = "2ddb8bcd515aad4ddb029cf4e5c49e771aa1da14394924c4ec532c5125b7ca7b"; } - { locale = "da"; arch = "linux-i686"; sha256 = "b322bef3e95b24337f294b2786fc5a819d954adb43f98dee69674d41fd234b5c"; } - { locale = "da"; arch = "linux-x86_64"; sha256 = "3e5164351808ef2f8f4e9cea6bb1121c4d3394de56536d17869a56df3b783d3b"; } - { locale = "de"; arch = "linux-i686"; sha256 = "a404bf7c19dbc65adea8872b8bd080a17417bc0f1ffa3015513d86750b2903a9"; } - { locale = "de"; arch = "linux-x86_64"; sha256 = "3590e100bf84f2734d1b3c81508d8fa137fd100bdd1e764ae5da1f88602d5b9d"; } - { locale = "dsb"; arch = "linux-i686"; sha256 = "c4be1a5cc431f3aeb26694bfd0749da0dfc85c119f75b551e69083a384042833"; } - { locale = "dsb"; arch = "linux-x86_64"; sha256 = "36f451bb07af47aff7c930a2810ef628e3382f92560efbe396133735275f7075"; } - { locale = "el"; arch = "linux-i686"; sha256 = "736ee0dffe7c5dc0d5abc7755a83e29da718901252034ee503775fc3f11e31c1"; } - { locale = "el"; arch = "linux-x86_64"; sha256 = "1638e1fd69d1887bbfd2de95ffe7945f52934055f8e15eb919d9ccac930959e0"; } - { locale = "en-GB"; arch = "linux-i686"; sha256 = "1f9c8404fd01c1cac530c0e2b1fb488a2b4f7a02d8c2f0e568e0db050dc66f18"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "4f7491b919ca7a0563cd3444bd4a1abf48a4448ccdd743c5b5eb58584e5b1e94"; } - { locale = "en-US"; arch = "linux-i686"; sha256 = "abe3e5d23cf557ee81e7064d6d1b2d3a8f6b6e1a5f80947fc7229f0b2b631380"; } - { locale = "en-US"; arch = "linux-x86_64"; sha256 = "a4b439e28274feb4bf5494ba180143e6b8617428a63d11fa2fd0e650dda41908"; } - { locale = "en-ZA"; arch = "linux-i686"; sha256 = "9de2931e926e0b0667f6916283a7ef019d1c067b29d6bd5b4b903fdf87ad9c17"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "6ada8b6a9a2b19f9515a1aaf63ad66cf35a1ab5491fc8ffc86a17fe1378ab553"; } - { locale = "eo"; arch = "linux-i686"; sha256 = "92db868c78ae49a8275d217327ca442ef6733b955ddc5b4940183c9a596da3de"; } - { locale = "eo"; arch = "linux-x86_64"; sha256 = "2e8267fb43ba6b7636c98fe386c35ddb9032265565844dcbc90f3dba18a2bc05"; } - { locale = "es-AR"; arch = "linux-i686"; sha256 = "6343bacb35c929c8f7c5cb554aa0e5f67100032c71bc24203b663409e45cbf40"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "0b5a07e745aab7d1e0bb8bcf0afe12ab71a88679024ef6e9edd53bab7518df7f"; } - { locale = "es-CL"; arch = "linux-i686"; sha256 = "7288765c2222624e69b367ab83686c21a348330a8f26eff7c6ea8dca03a3aabf"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "543778259a5d7c4198c8125b72f9e66e9ae98b398bc3b07ac0e103f07ab7ef2c"; } - { locale = "es-ES"; arch = "linux-i686"; sha256 = "c1aec91c45591eaa6df8b15ba13ea58d15ab2cce20361719ea2549896d26ea1f"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "ee3b11c04ca280ff77e3cedd3dc2040b7b1722384639c02507bedc927c7b558b"; } - { locale = "es-MX"; arch = "linux-i686"; sha256 = "8adb9435f57da461150d8b283161760683e46b068eaade916119c2240f0a9c66"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "b624c4345794a22a7c63b4f6b7a1ed6f52472fa5cba4173f69f3c12ee3b4cbe1"; } - { locale = "et"; arch = "linux-i686"; sha256 = "efb6c6753e8a9d8174e8bd1ae7cbf3f75b479e5da3ebe07dbbbb4ac140e60eb9"; } - { locale = "et"; arch = "linux-x86_64"; sha256 = "c84bb0597fa14e8a7a2d086f24d71ad2f3c04b3fca794b76977d1a4cb1aea479"; } - { locale = "eu"; arch = "linux-i686"; sha256 = "d116553c492ec41b811befb35393553b9174da3960034ce5106558befbf9728a"; } - { locale = "eu"; arch = "linux-x86_64"; sha256 = "16c922f152d5e14c46277e23d30cfe0792c8e9828b8862df603aeff242c7ec96"; } - { locale = "fa"; arch = "linux-i686"; sha256 = "744ad5a8cb4473d502d1db50b6bf343e23525927b3a982677dd8a68aea111b3f"; } - { locale = "fa"; arch = "linux-x86_64"; sha256 = "968fea07386b96215af400524062447245fa038766caf0b133c932db6f105077"; } - { locale = "ff"; arch = "linux-i686"; sha256 = "0fdf06aa42cbd4d031fdad74d8ac9d6056708fc783180d72c5806cc45c5b8eec"; } - { locale = "ff"; arch = "linux-x86_64"; sha256 = "bfb65ec25192288b2f04f94bdcc9ce36a40a27c8a1f35f728f932c071b6756ce"; } - { locale = "fi"; arch = "linux-i686"; sha256 = "334c121cbd9a1469996ebc5535d838e3fecfcc419861cc70d5cdeb0cd584d5f5"; } - { locale = "fi"; arch = "linux-x86_64"; sha256 = "44883a9b819a24bef03c3322681e1b9f3fe61779e382a740900dfc16a5f7db06"; } - { locale = "fr"; arch = "linux-i686"; sha256 = "cd196dff293aabc39156e82deb5163e139a4b0173de92a2ba72df49bb4b0afe5"; } - { locale = "fr"; arch = "linux-x86_64"; sha256 = "77da207f48d7af908cb5e95767e61a2e6c04f1851e55430820ff8207da172361"; } - { locale = "fy-NL"; arch = "linux-i686"; sha256 = "39e8da569f2a6f67abac7782a938a906c810f8474fbb2c799dd26fb846c82707"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "44dbf644b3f96dd607e5c88eece8aaafd61ec42af9f7ba4c6ed06a272a45fa4a"; } - { locale = "ga-IE"; arch = "linux-i686"; sha256 = "783532acf3967f94232f42c9cd559e288db499c0ff74776543b59d71d281a74c"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "39509082dbeb935f481e95d6038943a17c5053f7001fbf71bdb0edea536adb9d"; } - { locale = "gd"; arch = "linux-i686"; sha256 = "dd73e1bf159f3d437d69306c5daeb7a06c951d6c5841315363c354f9aa1570c5"; } - { locale = "gd"; arch = "linux-x86_64"; sha256 = "a2fb4aa1ba4a50bdb308e8c12090158c5e040ae85617171786e93852d4f48de5"; } - { locale = "gl"; arch = "linux-i686"; sha256 = "8ac3fd13e0f173aa1dfffd44c91511bd457c6a751daa978fbaae3f9901427cae"; } - { locale = "gl"; arch = "linux-x86_64"; sha256 = "cf52827a18b400f8c3e426b00e2984bd5835014f3e97e9c1279f0b285ca5a5dc"; } - { locale = "gu-IN"; arch = "linux-i686"; sha256 = "1ef44836085733b52c338fdcaea78e7df5f78a0f0f470b9de3ac7b13e3ec4844"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "374280216142897536979fff6f876253caaf0eeb12a3d12d17b013e7ab3ba722"; } - { locale = "he"; arch = "linux-i686"; sha256 = "1dcca6ae796da1a1317a4f094f06369242cdf7c0f8ce3df7c9fabd22910996ab"; } - { locale = "he"; arch = "linux-x86_64"; sha256 = "e032513a673ba091207996b8a6a6b9da6ef05d5c080a93ed326fc4ac4ca6976a"; } - { locale = "hi-IN"; arch = "linux-i686"; sha256 = "2057287b406513a332d162f03f75ef7ff4c83834809163c8b870d9e5ab3f8cdf"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "8d19043416484c382fc9caec5dff4914fbc28feefd41a089591ef2b21f822a43"; } - { locale = "hr"; arch = "linux-i686"; sha256 = "995a6dd027a5a6b2123c62b74f524db53940e2c8fa6c7254dc41dca236f7889b"; } - { locale = "hr"; arch = "linux-x86_64"; sha256 = "4410e7d1cbce028de083b82ee68f442d27c2219544ec1be72ef2c274cb7c445a"; } - { locale = "hsb"; arch = "linux-i686"; sha256 = "0dcb0de11e35475cab33e11b08b88ff766915d7d98ceeb466a0fee90883ebaed"; } - { locale = "hsb"; arch = "linux-x86_64"; sha256 = "1695167eea386aec4fca23bb0bf4e5b83876a22f8c584f4e81886be229e9a43b"; } - { locale = "hu"; arch = "linux-i686"; sha256 = "31026a26c9fa9b3777c2f9dd1d55da7e0204e4d98586f887b67588ccb86c3843"; } - { locale = "hu"; arch = "linux-x86_64"; sha256 = "82d8fbe932765f100a116b6d572035297be2f027b4f0e0ba84ef88cb4b651000"; } - { locale = "hy-AM"; arch = "linux-i686"; sha256 = "864c112f13628bd9bc715a6a405dc92c3f8027b0e505722d819b84775fb27066"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "dddd71e651056c373225baab9bb190810f8ed6849abfa76587fcd05cc5060d89"; } - { locale = "id"; arch = "linux-i686"; sha256 = "3425906d6513d3e06286b9b3c62c30d702a47a3d7a31638a58f926e2fa4a254f"; } - { locale = "id"; arch = "linux-x86_64"; sha256 = "095d970add8bf54fc2fb2581532013f4792f648b58fa12d49a6a859f26a0e579"; } - { locale = "is"; arch = "linux-i686"; sha256 = "f3687eb0e7ce24e14621345543abdf2b92435466ededc98a4ec4a117c4593c3c"; } - { locale = "is"; arch = "linux-x86_64"; sha256 = "dbac8774c64e6c978a3eb900cf61d85a210d0c39c28df4a21e4295ba5febd0ea"; } - { locale = "it"; arch = "linux-i686"; sha256 = "62091c6f5214f4717462d9e2f6bacd7f30417b7e714de3fdec6fc2f703970eb7"; } - { locale = "it"; arch = "linux-x86_64"; sha256 = "480b9ffd4326a9a2e2002510027a15d4fdaf8ba1ea023ee6e55b2aa78b119a6c"; } - { locale = "ja"; arch = "linux-i686"; sha256 = "ef143bf31fa67cab3ccafc0083d81ffa8997e3365312b12312623755eb24f48d"; } - { locale = "ja"; arch = "linux-x86_64"; sha256 = "f74808de8fb999dceb067b3fda64e891c37bde7190e9eff68f1693f5b5feae0d"; } - { locale = "kk"; arch = "linux-i686"; sha256 = "a532d49011b632aa83f6b881b39c74bcb66fab0237e3e4f8682445aa0a053d4c"; } - { locale = "kk"; arch = "linux-x86_64"; sha256 = "7f32ee329e8281e89472b092248a26e1d38089bdc9830d2d1d0b1af8230ca20b"; } - { locale = "km"; arch = "linux-i686"; sha256 = "34ecf596b0870aca2db30513ef5d6522d86caf70fce38b23a7bff08c55551b69"; } - { locale = "km"; arch = "linux-x86_64"; sha256 = "6e7efd621e941674038887d1e8d90c36d0ac06a095386caa01d228494228be14"; } - { locale = "kn"; arch = "linux-i686"; sha256 = "062ebd6b27ef9094e65e60ad64be30470ed58eb2d92f247a87a781b97e0654d9"; } - { locale = "kn"; arch = "linux-x86_64"; sha256 = "e88428b1cd2e1919336dda303d8795bd02e4967ba8c6d2830205f68fa4c528d0"; } - { locale = "ko"; arch = "linux-i686"; sha256 = "6c43a7f86f908cccc7ca3a7ed45f95ea84b69e4a21ff1e1d58136ea19bf7bd2c"; } - { locale = "ko"; arch = "linux-x86_64"; sha256 = "9db2bfd818d82ee0c9bc35b6fd651ad8fe80f8d73d51326fde25fc4c2aaa295c"; } - { locale = "lij"; arch = "linux-i686"; sha256 = "be87fc2a6863f33f9ff9ad2990e1e6425a65002f2ee411a254dde80cbd5a31c4"; } - { locale = "lij"; arch = "linux-x86_64"; sha256 = "9cfb239df8195cfa355bc8ddaf63accd865de21086c5bc3180b2ad9886445f3e"; } - { locale = "lt"; arch = "linux-i686"; sha256 = "11e18e6baac8f31c62a301e8ee51056c707ca47332fbeb6f3492e8eaffa25c57"; } - { locale = "lt"; arch = "linux-x86_64"; sha256 = "3bb4dca607abc4e08300dfa61667d2f2b06661f47cf0029d078e14fa4686d4b8"; } - { locale = "lv"; arch = "linux-i686"; sha256 = "bc484992f230229ab4ab6d47fab9664f43341ad1202010f5dea91d2d78200c85"; } - { locale = "lv"; arch = "linux-x86_64"; sha256 = "42bdc60ad7edf2ed3e82f765abfc3815f98095adc2988f8d809a8834eada63ef"; } - { locale = "mai"; arch = "linux-i686"; sha256 = "628f0685185f91e695af5ce9a536d9263305cfd747683ef33dccd0c90f3e1bfb"; } - { locale = "mai"; arch = "linux-x86_64"; sha256 = "688c33b159b4fcd23fb4c6d3a7f845d03929b4a8b02eaa2ebb93682b396c73a2"; } - { locale = "mk"; arch = "linux-i686"; sha256 = "a59b2a8ee82513ef78f3509afc4dba75ec3128f0f42c657bbbfbad117b981b36"; } - { locale = "mk"; arch = "linux-x86_64"; sha256 = "3058ff9ac581a65ee0713fe3707f8b98eace0f833b8e7b901fa397538e9503f0"; } - { locale = "ml"; arch = "linux-i686"; sha256 = "43c80f530ad3eaf7c138e16b23b9eb32afc1f774374fe213f580cf68e4d0e245"; } - { locale = "ml"; arch = "linux-x86_64"; sha256 = "43f061317f9eb5a174cd13539bb3972535b552113d38c05d9888e7a37346ef22"; } - { locale = "mr"; arch = "linux-i686"; sha256 = "30c0ee68eadffcc95271f1e7c1c1b0151ee21ca3744fad61a723a9a6bfb751b0"; } - { locale = "mr"; arch = "linux-x86_64"; sha256 = "d9dd27af41ca021f323499be556d208f69b706aff079c8d7392c7f19092705d8"; } - { locale = "ms"; arch = "linux-i686"; sha256 = "adb5e1968c66378ff9b59dc57c00a2c953ad1f54f67e1bc40abc499bcf79653f"; } - { locale = "ms"; arch = "linux-x86_64"; sha256 = "3e4b43a88b3aa2887673e1962fa4ccbd895640113e683c849a3c9733677e1fe1"; } - { locale = "nb-NO"; arch = "linux-i686"; sha256 = "f4be0cff21abdc80fba10db2bf781fecfb4e503c70cb95a8b083c5f7123f8dc8"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "e9b191268a6694805a5ba86559e798c9a4e29eae39a7f64dab92a925fb31611d"; } - { locale = "nl"; arch = "linux-i686"; sha256 = "581c73084993be0bf1ab23bb468674d062fb98e99573d823e977a263b4cfaa91"; } - { locale = "nl"; arch = "linux-x86_64"; sha256 = "3fd8929341ae048187379b7648ec8e008ace53e4a5f0af1421ecabcb5ad3bf61"; } - { locale = "nn-NO"; arch = "linux-i686"; sha256 = "b2104d5895a727903f6a273888989887542ad9e61c998cc651bb24d64efc6cfd"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "1bf582e66da985cbb01c22f865fc291196c55b14d2f84516f68f184ea842a664"; } - { locale = "or"; arch = "linux-i686"; sha256 = "1ffbc776fb3ae030e6dedea009b71873bff57f9294e63331404b53e1ba36499c"; } - { locale = "or"; arch = "linux-x86_64"; sha256 = "b988f433a238b2cb3766042d911a1f002a5f91a47dbed5b937f70cb59ed060d2"; } - { locale = "pa-IN"; arch = "linux-i686"; sha256 = "6ba4941b5bef7b860194114c2704662a42f9f3007a0b634662e42f38c0aa601a"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "0d9920d4b358cfdcf8cdf4b2d2e07ceb191709eee9dbae4c59f9dbfcfffbf0f5"; } - { locale = "pl"; arch = "linux-i686"; sha256 = "e080fb35bf49f9eb2fc39a435a188164eedf2ea7a24f8e950d62567620a91954"; } - { locale = "pl"; arch = "linux-x86_64"; sha256 = "cc37624f0c1e82d2de2048129f58e85fe8a518ee4b0ebdbee0a5205517602cf9"; } - { locale = "pt-BR"; arch = "linux-i686"; sha256 = "d19bf65889c686cbb284e697e8ba1315b6ec004b57096725fb576898ef105346"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "0d00d2d0bbc6045117c4df93045f70ebe0468e004504a06dfc508bfca6c6df1f"; } - { locale = "pt-PT"; arch = "linux-i686"; sha256 = "5225afadf2ea62792376dfda1d2b3533d986f1ee3a281781a5be294b8883ac8b"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "0c1d841ba80e32d51d41c99b551e68c6b591e97af4ccee4d7c7d6ef03f8707ea"; } - { locale = "rm"; arch = "linux-i686"; sha256 = "2cc9200a132c967a7158f5422dad8f4b2d90dfc7e46ada305daebabc44806de8"; } - { locale = "rm"; arch = "linux-x86_64"; sha256 = "0dff628773d4f2e24b767501b9c768586a27e82c0e8b259ef1cc676985ad0125"; } - { locale = "ro"; arch = "linux-i686"; sha256 = "500142fe612fe6144a14ebaad486da04050940a755e205297473c1be6b9dc428"; } - { locale = "ro"; arch = "linux-x86_64"; sha256 = "f3a57abec8553c8b9d8db9fb5600cd7b6e1189ebf0225df96608eaf2863e41b3"; } - { locale = "ru"; arch = "linux-i686"; sha256 = "1266ed09db881af90794bef049cdfee777d7179026de8c0de2931275f3f288e9"; } - { locale = "ru"; arch = "linux-x86_64"; sha256 = "0f1b44177633149aaa31574ba3cf343971bd4e11ac6b4bb92a5875b6a30a42af"; } - { locale = "si"; arch = "linux-i686"; sha256 = "e027afd86b00379c12e014b8d0d11a05811c598f53490edf7070e7acccbf0d79"; } - { locale = "si"; arch = "linux-x86_64"; sha256 = "518c19c5351a2c1bd05afe63e9d8c2a0be3a9cedccf7aa1d84d1af9de7ecf7fd"; } - { locale = "sk"; arch = "linux-i686"; sha256 = "e3dcda7406d00166a601b77fbdf0b84181ba5372f760eb08d5476fe9d219caef"; } - { locale = "sk"; arch = "linux-x86_64"; sha256 = "019c03ecd24f394b0ff76aff5cd9f0db017ffd3b8dd65388c4f5ee3188e77a6c"; } - { locale = "sl"; arch = "linux-i686"; sha256 = "a88391cc29643277f9d8c58a205ac959af825326b61c16361d4def6f7da31235"; } - { locale = "sl"; arch = "linux-x86_64"; sha256 = "fcf45e13a0bc543988495a83e5e96400707564d2ed4fcd0579219c999ee71e83"; } - { locale = "son"; arch = "linux-i686"; sha256 = "a75e273e01df51ffbe2c8666545f1e6f4d00af373d7aac08978947d7afc1e5f4"; } - { locale = "son"; arch = "linux-x86_64"; sha256 = "9f28df29d980e6c7467e99b2b81740cb078ce8e6896fe4e2a6b1473770e6bef5"; } - { locale = "sq"; arch = "linux-i686"; sha256 = "2243773d7d38608e17233e1d98e4fc1ca19f40f27a3e87557ad7fbd958c080ba"; } - { locale = "sq"; arch = "linux-x86_64"; sha256 = "c18faf9d8971c43db18fcc66329a85018a04e8cf4819c4843d826bc86414cadb"; } - { locale = "sr"; arch = "linux-i686"; sha256 = "0cd5e6a3910923aed9a88fafd95bc11263de7359c38685e209212339bb2f50dc"; } - { locale = "sr"; arch = "linux-x86_64"; sha256 = "1ec48c65323b15332932060ec5193908d89715736bd0abd88472dc05e639a62a"; } - { locale = "sv-SE"; arch = "linux-i686"; sha256 = "6718eb3e71a3d4f5487b80bbd784fd61422345f94d3271f6de6f6feab9e2f6da"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "5b356a6334d424b5e47ea4b1c32403a858ff5dc8727bbc0b2f72e6a29c9b625f"; } - { locale = "ta"; arch = "linux-i686"; sha256 = "fdb4e36497a61af9badb848a067eff4e4dada7dfffefbfe6bb7266ad89a8707a"; } - { locale = "ta"; arch = "linux-x86_64"; sha256 = "de5f0b871425412f9f261eff5b1abb3ddbd40f588647fd8e174e2d6c5ba17b90"; } - { locale = "te"; arch = "linux-i686"; sha256 = "0cc82774a46580c9e2f890848f705b1dc4effac197a902f9d244f0b6f6258650"; } - { locale = "te"; arch = "linux-x86_64"; sha256 = "65ceda67a572053dd4d9e15b9bd47c91364651736417414d4ca4a0a7ded9775a"; } - { locale = "th"; arch = "linux-i686"; sha256 = "1c0084ed26218713c4606ab073bf09de888051e9dcc49652a87fb58209a8c614"; } - { locale = "th"; arch = "linux-x86_64"; sha256 = "5a70e29d282961e27350d26cf164472fe51247db1d7d1228dca693423c32d0a6"; } - { locale = "tr"; arch = "linux-i686"; sha256 = "f7fa2029a36eda63544beebb6534fc2f8432c87d7a8d08d4c8927275e659b686"; } - { locale = "tr"; arch = "linux-x86_64"; sha256 = "1e3744f5908164e163818522fa902bd57edb62837b2b399983ea5a4ed487cda8"; } - { locale = "uk"; arch = "linux-i686"; sha256 = "0f465eda0f7e87eef88bc17b3e6868ad90a270e6993d327fecca532637442df4"; } - { locale = "uk"; arch = "linux-x86_64"; sha256 = "6530af36cfab509fff37519b435c7939110c000dbdd94000fe964283a14b1622"; } - { locale = "uz"; arch = "linux-i686"; sha256 = "7ee5997bcb4915c3907cee90e350e3bc2b67965975faecffa738a728cf2e12e3"; } - { locale = "uz"; arch = "linux-x86_64"; sha256 = "d7b34e36bcb423977a2a7667504c096730ca684c9f2e861b17e8f0174f5bb0d0"; } - { locale = "vi"; arch = "linux-i686"; sha256 = "e9497a8eed98ec34b31e3b1ec7086a4d219121f0edf21fd8f6a01599afa41f12"; } - { locale = "vi"; arch = "linux-x86_64"; sha256 = "b94fbaee83014b88490bf19cc37dbda87fb9260ed5879be3b688a2abbe709a87"; } - { locale = "xh"; arch = "linux-i686"; sha256 = "d5a86db6b9f3bb5162a86f976cbbc01f542a924c05729eb54a2c24dabc711065"; } - { locale = "xh"; arch = "linux-x86_64"; sha256 = "d765b2d324e89119fee522ad8972031c8727841c2fa2700d010be7d23633bbbc"; } - { locale = "zh-CN"; arch = "linux-i686"; sha256 = "fb3bbc44952207f42112c291dccb82f02fbd23bba7b54b06a1047809d2bb18d2"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "255d19959cb0e0efbcb2eeceb39b43bbb567ab2474af4da6675574a0110781e1"; } - { locale = "zh-TW"; arch = "linux-i686"; sha256 = "cfc90ac621dc57d7eb922c564aa3a7d5ad7f2aacc95196606d34cba7b7e30d1a"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "ff119be821acb8f99a485a60de506123c76a7a3a13ac678576248f97ff1ab882"; } + { locale = "ach"; arch = "linux-i686"; sha256 = "795f7db97ecbc58cf3b0f599375d5ce86eccdd1159aba8ea5523229efce84f0a"; } + { locale = "ach"; arch = "linux-x86_64"; sha256 = "b511f394a8f313fcb8993cc220698150cdf16e6ce962004cb1be768bd26042d8"; } + { locale = "af"; arch = "linux-i686"; sha256 = "dec09a59488c4e532b409be866560bd4b874fcd6400129a23ed7dc8b272949e3"; } + { locale = "af"; arch = "linux-x86_64"; sha256 = "b19f3bbcef86ea03dd99cd6f59cdb755c9d724a6c8d6c8d5480f333a73260ed2"; } + { locale = "an"; arch = "linux-i686"; sha256 = "c9ff3f690d42585f5dbaae7d62305efeebd093c4ffe751fe989cc9d237e0e761"; } + { locale = "an"; arch = "linux-x86_64"; sha256 = "0dc5385e1bf23e3fbd25c82d32742add279ea293311159d283c7e93eb6e73396"; } + { locale = "ar"; arch = "linux-i686"; sha256 = "fe690e7fb25d96b830fcd06a88c44118eb06644104c5ed74c69621c128f5dcd8"; } + { locale = "ar"; arch = "linux-x86_64"; sha256 = "06e7c7e4e37621d7d14e81e79da6a4d35025476f87ed95ed4bb11d6160ce8546"; } + { locale = "as"; arch = "linux-i686"; sha256 = "f1f1bde8406ecc4275425ef91579f82a49bb9bc33a4c1de95c770e89205dd001"; } + { locale = "as"; arch = "linux-x86_64"; sha256 = "e31171d2470713b8cc211e5a1193a89890588c7c537a4c0405aa8db4a41b8862"; } + { locale = "ast"; arch = "linux-i686"; sha256 = "9bdbbc47a1a31ac45cee3222b03b2fd9661e8e9685c672ca5b378abff1a60c76"; } + { locale = "ast"; arch = "linux-x86_64"; sha256 = "511d340af37b8909006a446de906503a7b0904379597df36f8072790de727fed"; } + { locale = "az"; arch = "linux-i686"; sha256 = "c9d43c61ef5677a70e19ea3ff7400a93b926aa72edddb793fcc4e502b7f77b91"; } + { locale = "az"; arch = "linux-x86_64"; sha256 = "6450e41e581f49a76fa4bb7e685b2010899608aaa5c58224eec679b56e9d9d32"; } + { locale = "be"; arch = "linux-i686"; sha256 = "eef6cb47db9c3909b813d01a78a7af439dccdd00c040e513c4e784ee537a2d38"; } + { locale = "be"; arch = "linux-x86_64"; sha256 = "f20a4da9edd845a43b7bf85b70e2a67f3a96a4db9c461d0b4b168f0a6f0a3a73"; } + { locale = "bg"; arch = "linux-i686"; sha256 = "3af1a3fb90685e819fad2c69daf11df29b01a97899045ba49a79588e9e5e2e01"; } + { locale = "bg"; arch = "linux-x86_64"; sha256 = "d3662db0b9417d68a423b31f9aac7d03c3eccba36bcc0ba9b84ccf194325e521"; } + { locale = "bn-BD"; arch = "linux-i686"; sha256 = "f867fbbf3dbfe06dc027592543700802270daf2956d45e921f968277e84e75bd"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "08fdde0f76553ca018efeb0e0fd439b42d6e13715aee680ee77435bda20f684f"; } + { locale = "bn-IN"; arch = "linux-i686"; sha256 = "dc3251e661966174be97c99aa2d332e9c605e99ce6526a0b69daa56e2266f6da"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "9558f4bfb37dfaf3915345702c22fc14c19721c9f283c9824fa30151a8c2065e"; } + { locale = "br"; arch = "linux-i686"; sha256 = "b3f51cf697aba530f13ed7207b3fdb4416272d7d4324147722c7c9cf3b336485"; } + { locale = "br"; arch = "linux-x86_64"; sha256 = "c5c6804ae9d730c32c7b97219cbfef63be0ee28b8a3eacc3f21291f228aa0624"; } + { locale = "bs"; arch = "linux-i686"; sha256 = "099d3845b98baef27225f77b56663f2e290ec75ab0569cea10722c84a779c829"; } + { locale = "bs"; arch = "linux-x86_64"; sha256 = "d7688be752320867c31de94363f7c8b6321b1d6d11f57b6295e4e58db281fc0f"; } + { locale = "ca"; arch = "linux-i686"; sha256 = "ec55163d35d4b3e9f5c0a000b389e91aa4c6d8ea0df800f69feaa26840ac5f6e"; } + { locale = "ca"; arch = "linux-x86_64"; sha256 = "79c99f2dee213d7316060134562db67bbb377e6f44642869e25bd6b7533df464"; } + { locale = "cs"; arch = "linux-i686"; sha256 = "a2833f106cf999416eed734352873e99d4ac0dce6ebf541d9219e9eaee250604"; } + { locale = "cs"; arch = "linux-x86_64"; sha256 = "ccc6858d55578a0caa8edc3cd6b44e876266063a08b22c6aa82f6b975ba9265b"; } + { locale = "cy"; arch = "linux-i686"; sha256 = "0d3b8e10346653b658f31fffc806d3067e1215ce02ba737c38f5a90acf9ddce9"; } + { locale = "cy"; arch = "linux-x86_64"; sha256 = "0fe6206618a90d50927954dfff9de0653d0780de472c9be9eef7b679e8acbbde"; } + { locale = "da"; arch = "linux-i686"; sha256 = "c4998f1ac1b80621fc8172d300c473739bd1563fa9eda1560919d359bae0ba81"; } + { locale = "da"; arch = "linux-x86_64"; sha256 = "adc7129bb0992adc693577eb4846adad01bcf120f740b4fdc5f06f3dd5997a77"; } + { locale = "de"; arch = "linux-i686"; sha256 = "a19ce1edec32fc3f54444a52de13fbf5d5a9838782b288f39069a6aaa8c0bdc2"; } + { locale = "de"; arch = "linux-x86_64"; sha256 = "524c4aab74a14f97b42c830f1bca53d8dfcf53102873f47fbdfef21e6fe05170"; } + { locale = "dsb"; arch = "linux-i686"; sha256 = "965326f3f6fbdd3fe3aeb0d82113b86537db0b70e6eb93aeab154793660a84f4"; } + { locale = "dsb"; arch = "linux-x86_64"; sha256 = "a750854356b464d898a02ee82eeecfebca13b4217d3c0e427da8635210b3437e"; } + { locale = "el"; arch = "linux-i686"; sha256 = "fb72a501b2358fb803b0902d7a7c56f20a662d073451d22d85a0e75f9e62a5b4"; } + { locale = "el"; arch = "linux-x86_64"; sha256 = "cf72cc228f61bdcb94a5f7c508312e1b7c03f9e0828547ac18c08d1020ca9065"; } + { locale = "en-GB"; arch = "linux-i686"; sha256 = "bd4ad892ce6cc1be8d460bb1306a1f727abfaf4868155d9bab8508181c9f9796"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "9f28b5f905b9a7118d7f50ea93c4ce75bf447f052a1ef9daad8a70cf9cd48e95"; } + { locale = "en-US"; arch = "linux-i686"; sha256 = "310e16225f31ffcda25a70eda0defe2d361946c2705f39f4694059208d9f5223"; } + { locale = "en-US"; arch = "linux-x86_64"; sha256 = "d86c67b5d12fe7a0e219f823a47644b952cb3ced105fbe428bc89e2a728a9988"; } + { locale = "en-ZA"; arch = "linux-i686"; sha256 = "55ee09437fe8c2492a5f55682ae18d326c71c13ef88e9444dbdb0b5fe5f7ebde"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "b96c05a0e32604672d2ae420e1e534f4b19a539386360e93caf607e3ea8f5620"; } + { locale = "eo"; arch = "linux-i686"; sha256 = "75071e72dfd0b6212f6e160cb985964302e689432d226a6c08a5aa9ccf10a43e"; } + { locale = "eo"; arch = "linux-x86_64"; sha256 = "7d23e926420a7c29af93957b641636d2c23382b23940109b337f17e073445401"; } + { locale = "es-AR"; arch = "linux-i686"; sha256 = "769f306e31b319dec281fe2afa03f586e83942403b4f1ec40ceef1f522fdaf0a"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "d9146b07f48840ca7a33f3c20f99392ea1c10de8cbebd053a60b2ed8e03053bd"; } + { locale = "es-CL"; arch = "linux-i686"; sha256 = "c95df915aee57fb0e86368378025de462815dd15cf4fbfc1f4cc606f5dcf1fa2"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "1b7244f8132135e1f965f59eba6688f40dc377f7b9f7be4df4dd74fd07708778"; } + { locale = "es-ES"; arch = "linux-i686"; sha256 = "5de57ca5bb98bdd8b6a51e6223800309ccdbb448ee8a0519aa15da03efa3587b"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "1bea15feaab6bdb596cdf55e312609b637c79a185c11737939db20c45a130471"; } + { locale = "es-MX"; arch = "linux-i686"; sha256 = "5edbe5767f96cc197a7e546eef168c5b9543459ef0c6a2bbed1b99d032b3cb12"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "4bf18487452db842f5bd5a5ee7658e19a57f1ee16af4773d9647252c9e6c1385"; } + { locale = "et"; arch = "linux-i686"; sha256 = "41d37a5d2a839c5a9f63fd86939df187ec9f77094071097d80a19d85969b5400"; } + { locale = "et"; arch = "linux-x86_64"; sha256 = "8a2e8b97563f62c63f55711f0cc54fb57d6927cb7aad89cc4ab2300bccab16b4"; } + { locale = "eu"; arch = "linux-i686"; sha256 = "40c6722ee1e01281fb2bdccb2cd2239f222174803edd2c7face78e3a1e3eeb17"; } + { locale = "eu"; arch = "linux-x86_64"; sha256 = "0fe4cd9d4c7eead144596868402e2feacef5f0140765db3f97ee2bb26445dd19"; } + { locale = "fa"; arch = "linux-i686"; sha256 = "094893d8e4fb045ce68d3342d6f542f33604aa9eb9dd308b16591eba68b0fae6"; } + { locale = "fa"; arch = "linux-x86_64"; sha256 = "5d4c570aeca30053b5530d4a77ac92a622e6808c073f03273d5f95ec47b61aed"; } + { locale = "ff"; arch = "linux-i686"; sha256 = "aa13e64b3700f0727798ce0584c1ca458be2d37b854316eb8db95a766a603fc9"; } + { locale = "ff"; arch = "linux-x86_64"; sha256 = "19bc6d3991835acce993a3ece7d16338c718a4208060a730d197f74e830affdf"; } + { locale = "fi"; arch = "linux-i686"; sha256 = "d30a56a801c2305ca47b416923f93f9e0f5238d5e2054ca86b2facee25884870"; } + { locale = "fi"; arch = "linux-x86_64"; sha256 = "9db94e8ca2ca1409b3e0989af4ba9d2aa0101c9c2d5b6f1ee321532327a9a74c"; } + { locale = "fr"; arch = "linux-i686"; sha256 = "467c744b88987ea094367228175ee1d6f2d1b1deda2db056d143dbd4d214fd80"; } + { locale = "fr"; arch = "linux-x86_64"; sha256 = "50e4a71de78d4fa1b11a0fb57185456a2cfd01cf755e655324332ec28657680d"; } + { locale = "fy-NL"; arch = "linux-i686"; sha256 = "b7aa53b6c83ec514f650c1af83cdbda731775c8caadc508e34101161df6757a4"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "d71b1aae6c70176894abfcc3fed8c84b1d3c426ef2125241172259bf4205892e"; } + { locale = "ga-IE"; arch = "linux-i686"; sha256 = "70555105f42429e574e1df7f860fc1331c5d5c68e7b4fae6a6d1a00d14c2cf07"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "207a0a310b8fbaad1e030e7a3904170b44b6a796bfe8216ea4cf9bac93a08b1f"; } + { locale = "gd"; arch = "linux-i686"; sha256 = "19884e9d9511156bacb54414e8722fdf5f6579eaa911f5cacf736200ba989e85"; } + { locale = "gd"; arch = "linux-x86_64"; sha256 = "5e5f343c9367b6c8b67f326269152c0582e4f03b3d5abfc4747d96a3f43c2674"; } + { locale = "gl"; arch = "linux-i686"; sha256 = "b0495e2078e7f0748bf285a667d46a518297a54dd081d3fd612060528696d736"; } + { locale = "gl"; arch = "linux-x86_64"; sha256 = "991ca23b93fd2e9306e3b1c3128633e5e147265b95dfa72cff5b00bc4f5faab4"; } + { locale = "gn"; arch = "linux-i686"; sha256 = "4750afd6310a9be2c8e5697076d436c7321aa6b883971979453fc7148be6cf88"; } + { locale = "gn"; arch = "linux-x86_64"; sha256 = "2b14b5b286e541bca2465c2d3472a3113946b205da5a0acefdd9db9849d1b921"; } + { locale = "gu-IN"; arch = "linux-i686"; sha256 = "1c1f03dd683889b4ce80d6fc10d0939c1172b9becf4305989a5a3896a2230043"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "0ddd8706942b4ba46ac126f9eae33945b90ba2e8fce5d85ed61307189c37701d"; } + { locale = "he"; arch = "linux-i686"; sha256 = "e9c35252df6dc6ffe6d028404ea9d4157042c0743aad8deba42cf5da32ca354f"; } + { locale = "he"; arch = "linux-x86_64"; sha256 = "ae6b86a28daf441f22ac50adb6205bbbb0ffac978f638fd0558a63b9704dccce"; } + { locale = "hi-IN"; arch = "linux-i686"; sha256 = "84c638031ea3ac329d683ea282f26c530327ede87a42345f9eae417fd8fd4211"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "62e161cd10cbf6d1cd91067ddff474b0a73e3be93d44255311e3d44b41cb1cd1"; } + { locale = "hr"; arch = "linux-i686"; sha256 = "7349f78a35747de2a9d7a49526ea555a96e7aba5832f0eeaca4f367db3429555"; } + { locale = "hr"; arch = "linux-x86_64"; sha256 = "7f269905b76bdf9fbeeaccf1de194a9ff27a6aa3a871636320d46db9a585b3a7"; } + { locale = "hsb"; arch = "linux-i686"; sha256 = "72a14ca50ed839a9cd448254edb88e8f71d7d0f1de226bd2ba8f558721f249db"; } + { locale = "hsb"; arch = "linux-x86_64"; sha256 = "b546ee12183aefb64071f503ddf1e11820d2782cbd0984979fa6f6b77c66ab9b"; } + { locale = "hu"; arch = "linux-i686"; sha256 = "7882259d133231976be807bb170f887830cf2827deb6b9605708a42fcb10caaf"; } + { locale = "hu"; arch = "linux-x86_64"; sha256 = "55a23b51b3c90fd1936878ee48db16e8ad328ee68cf97170276e84fb5658119e"; } + { locale = "hy-AM"; arch = "linux-i686"; sha256 = "4cf64098fb6ae55553f5c5c60126e0a9ebcd224eb67240fef013988c21fef165"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "58ffcbfb60b63b06c520a5cf543e6ad8cdcda490fb2baf7c35ad0e7c17c8b255"; } + { locale = "id"; arch = "linux-i686"; sha256 = "3fad57b21f866534ce73d1a3702038a73aa64e9d28c96249cca890b886bc8817"; } + { locale = "id"; arch = "linux-x86_64"; sha256 = "eca4ec8568d02af755351db846ceed5bc58b401e2ac3eb6ac25eb235884912c1"; } + { locale = "is"; arch = "linux-i686"; sha256 = "c7a5b48d8055a46da40d650f18aab8f5aa7aefd59d165d5fdec0cf361b5360e3"; } + { locale = "is"; arch = "linux-x86_64"; sha256 = "7e0043f25378fafd3176a5b735ab35449c2febc83188d93bbcf12e47b729e0a8"; } + { locale = "it"; arch = "linux-i686"; sha256 = "e77950e24117e0e25e0a77f40819e9b10711725b2fe8e8772d8875120ae58751"; } + { locale = "it"; arch = "linux-x86_64"; sha256 = "347ec5d8bb5f61ef3003c2ed106ec7d70534816341c168acf46565571a76c0bf"; } + { locale = "ja"; arch = "linux-i686"; sha256 = "8ca089d2624572f38d9fe7911d9ab77dae2589b3022de9132215dafdc8f78ce8"; } + { locale = "ja"; arch = "linux-x86_64"; sha256 = "f5f5825ae34f819744c2a03c7af7ba38a2b2c3f65494f381a6561230c1bfc5a6"; } + { locale = "kk"; arch = "linux-i686"; sha256 = "58e863ff852874e797c6358bf5f7d52e29e504f03186b8b6c7a92cc44501ea13"; } + { locale = "kk"; arch = "linux-x86_64"; sha256 = "ece9759a53a5269be626d6f68c49da70f2c8e60b9d8ea2061328050d2c31b7eb"; } + { locale = "km"; arch = "linux-i686"; sha256 = "9ed22fef8e3d94b7a15fa557d86b05e883ad9d12755ba3420a263232dad7d5a0"; } + { locale = "km"; arch = "linux-x86_64"; sha256 = "fbba67f3ac60bc8d41e527e7bb7a82266efe47a9a09eb757433a52209c1b9754"; } + { locale = "kn"; arch = "linux-i686"; sha256 = "8cf7a3036d0221fa162683348ae047338b38e5755e6cf0cd6530a20e43eddc74"; } + { locale = "kn"; arch = "linux-x86_64"; sha256 = "cd99f17bfc77cb632c7c2d5627f43a98c1591c25a6175cbe88d0b8b5d6c7d4e8"; } + { locale = "ko"; arch = "linux-i686"; sha256 = "d1e27ad88e411d59448bc7d2aea0fac386d71a9579b246a151ecba7d10cb74eb"; } + { locale = "ko"; arch = "linux-x86_64"; sha256 = "82ece26a18be4db481a9bd9748bce59d14a2704e5e4c3873d2788e07efddfd67"; } + { locale = "lij"; arch = "linux-i686"; sha256 = "468085b58dfe815fb6a9b229d876ee6d14737edd7e34ffe7987bce1eec2e0079"; } + { locale = "lij"; arch = "linux-x86_64"; sha256 = "1e1a210f42e17de155b2f53a94d402be03f3a475e75db73e1aced157edafa9b0"; } + { locale = "lt"; arch = "linux-i686"; sha256 = "1350737560c2e5e69bc70152fc3ae246b3ab18e4dade066e6b9488ddadba29f5"; } + { locale = "lt"; arch = "linux-x86_64"; sha256 = "e96616deedc0c1967ca0d17dcd21d1b5f43838cb1c313fcf5394ee7a552ccf0c"; } + { locale = "lv"; arch = "linux-i686"; sha256 = "e7728d5d0e76df3750f1f5ed9e8585fc6210200f41d9b1a8f6b638582f623dd8"; } + { locale = "lv"; arch = "linux-x86_64"; sha256 = "5cab37509109146ae3ceb82df40152cf2de4b755c479248cfbc5ee9e7780399b"; } + { locale = "mai"; arch = "linux-i686"; sha256 = "3014cda0a3b95c7d5ce6e098e220bb107e2ff2974eb7d4b71ea9061cdc102955"; } + { locale = "mai"; arch = "linux-x86_64"; sha256 = "46b5b4f03bd32f5c84068326a78e5e744bfdc23b68ec067b6774574a6a952dc7"; } + { locale = "mk"; arch = "linux-i686"; sha256 = "55dcdaa2cf783171bf2e3f3244cb9f8165d7c873b62ee65d2392581585be7b99"; } + { locale = "mk"; arch = "linux-x86_64"; sha256 = "5002a14dbd07b29dc08f683d28c74429cfc1a924626e93f76f7568465cc550dc"; } + { locale = "ml"; arch = "linux-i686"; sha256 = "d1e4c7a26cfb2ea04abb1348e7bb57204fa355112537c26877d6e80bcbe3fd25"; } + { locale = "ml"; arch = "linux-x86_64"; sha256 = "d534c4a30eacff662fb387f1753be7e95fcfc1b0702ba3c98b88f121f1109859"; } + { locale = "mr"; arch = "linux-i686"; sha256 = "48d8cec7812fa7989a79f4560be33898c83525f383710d60f6dc8a2292851764"; } + { locale = "mr"; arch = "linux-x86_64"; sha256 = "5df095d48eedcfd1d102ced7b2928585ac1c7fc3e4fa84878b5a34914aec7c9a"; } + { locale = "ms"; arch = "linux-i686"; sha256 = "d377e167c3154143cceabc931dca1b031f45e9e8bb39dae923bca3842edb661e"; } + { locale = "ms"; arch = "linux-x86_64"; sha256 = "af023d2ccae69120958a0a5c4613e205972789603b43f11a32b24566fdee2d0c"; } + { locale = "nb-NO"; arch = "linux-i686"; sha256 = "8e50da27fc1ac9f2707afe7e964473e065de55ef726c03159029e89fa092b520"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "38c214d32b85bf1a55a66605614c72eeab693d39df9e95ec6971b6ba46a0d854"; } + { locale = "nl"; arch = "linux-i686"; sha256 = "9732ac83b4636b84e9084c0bcefe2ad8e0399e67aa5e9e22aaa40a2bb43c3274"; } + { locale = "nl"; arch = "linux-x86_64"; sha256 = "d4e424f62748bd9f35a98fe6a01300b13615ff6dba914eb69f4f343ef7630515"; } + { locale = "nn-NO"; arch = "linux-i686"; sha256 = "a0acef371c32189f78d13e9a7f24601559a5292642330a609267cda8929291ed"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "90fd2eeebebc9c2ca6413cd527697d1566312e099828035ce24204136b568466"; } + { locale = "or"; arch = "linux-i686"; sha256 = "bb628039e4d3e8e6cba0efb5754d4e61cae6b6a50f88aaf9b034570c5d25ba06"; } + { locale = "or"; arch = "linux-x86_64"; sha256 = "e1af53035829620db80c0e75ff28738a480ff0c946edd3f5c821dcb8683ef800"; } + { locale = "pa-IN"; arch = "linux-i686"; sha256 = "20665cc6f3d073530f459d8a14712e59cb5db82957042dc498e112db69957f5d"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "8a912aa7900012512a93e740f078a47340d724a936f4949467e028e2d44adac5"; } + { locale = "pl"; arch = "linux-i686"; sha256 = "a51c8e58ba89dbf53411b1d61229c1a515c1af53a28b7d39d654d1dd46c3f7bb"; } + { locale = "pl"; arch = "linux-x86_64"; sha256 = "e060bd9b72ce6feb151ebcb8630598f53c0ab5069a2cbc88c80b369ef5b4e924"; } + { locale = "pt-BR"; arch = "linux-i686"; sha256 = "d9391656b4e5959dba3eeb3537fe06ec67e56248259af723d09f0dc0d451d5c2"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "35cd35737abdf04ee714177a62b59bb2ecf819b508728ba5ce1ea4b85cbc9db6"; } + { locale = "pt-PT"; arch = "linux-i686"; sha256 = "22a90cc9e3da6abfc21d2ed039ab1877738b2f2d7aeb4fbfcbf1c3763b6516da"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "b4bca72d7b866de19b18d60a7278c124af9d00f44ff3b635eb80b042077634c5"; } + { locale = "rm"; arch = "linux-i686"; sha256 = "7d94fe2c2abbe8f27c10e27540cb415f61a338a121f87f4c4e93b923e544c923"; } + { locale = "rm"; arch = "linux-x86_64"; sha256 = "b55153028773d452c696eab97aff90393caf19d9ed8977c0b0d147284040d075"; } + { locale = "ro"; arch = "linux-i686"; sha256 = "80ccb9bb187f3b9597f6112ccd13b7274f4a7d9eed82567180a7ac99e0748323"; } + { locale = "ro"; arch = "linux-x86_64"; sha256 = "3a393002af7c9d6a90f15707e0a6c960f01a4335d647e8dd2ee237d02271a74a"; } + { locale = "ru"; arch = "linux-i686"; sha256 = "5c4456bc1711203b68467122c1bec0b7a323cd944cd2a2daa7cea3fe9d8bf79d"; } + { locale = "ru"; arch = "linux-x86_64"; sha256 = "82fe5ab5ffccfa4ae600e084b20ea9d60fe5d1d2f22fb836c6d05eec398239af"; } + { locale = "si"; arch = "linux-i686"; sha256 = "5cef376fb82f8d952d467f5c5db88282c6a812065a2c64beaae663e2a8c8ff86"; } + { locale = "si"; arch = "linux-x86_64"; sha256 = "b905f7ece85de9b13e055b93811d3b21bc07b95279b2f89a6837863821db546f"; } + { locale = "sk"; arch = "linux-i686"; sha256 = "5b671c85ae04e379ee7426f1a7e92c2295edb04362addd612812f39d4d90cac8"; } + { locale = "sk"; arch = "linux-x86_64"; sha256 = "3bb734435111310df7b8e7e3e52c36378fcbfe388420b3e144c008ee3e142044"; } + { locale = "sl"; arch = "linux-i686"; sha256 = "8c6af8ab571d42492b8d2aeb6ccbb29a261c1401293cef76b2158ad6e7841eac"; } + { locale = "sl"; arch = "linux-x86_64"; sha256 = "3cc7b211f88458d1b261ea92ce20fd4f72ba39fe9ec86dd4f0410874c227874d"; } + { locale = "son"; arch = "linux-i686"; sha256 = "b38286ece3dae0f9998e37ba7494d394daa8ac390ba60f6f75960adc87d0f7a1"; } + { locale = "son"; arch = "linux-x86_64"; sha256 = "b99b4334c2ca7731db895972d55ecad7420c4a4da825a496aed2fccb81cd6ff4"; } + { locale = "sq"; arch = "linux-i686"; sha256 = "bdd66c3d22c66c908bf275ee1ad1b7827b4439cf3fb75a537625a39e7acca3c9"; } + { locale = "sq"; arch = "linux-x86_64"; sha256 = "d7ce54fb3cce04bad41ba5491834e6cbf8daa93e983b7f66d4bc2f6b52c4c41e"; } + { locale = "sr"; arch = "linux-i686"; sha256 = "20cba6a11d976c036243dd3e55c2a7ad586006b5355bb8b742db4fd71d0bb7eb"; } + { locale = "sr"; arch = "linux-x86_64"; sha256 = "a9c8be3942abe8d14b89316f32402fae1abadacf5ddb844d0e50a69c7173bf22"; } + { locale = "sv-SE"; arch = "linux-i686"; sha256 = "f692fbb6fd82d1fdac23cde63687490c1ccebac715003b6212238f6a78289fd6"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "cdd7d6f9ea77f209c1ce3b2c405757ce44a0bdbe1803d32e8bf8e683b7f1894f"; } + { locale = "ta"; arch = "linux-i686"; sha256 = "064ecf6db5cc65f281e03763acb3512e0e2c54237c6a7a0be3c8828804e2b433"; } + { locale = "ta"; arch = "linux-x86_64"; sha256 = "33187d93b82edbfd01debc0956c1194539339b3949ef9f65a2aed7791b5a253a"; } + { locale = "te"; arch = "linux-i686"; sha256 = "ffa689f1111d373300785a5e62b501ac53300e02b520345d8a31de5122302e25"; } + { locale = "te"; arch = "linux-x86_64"; sha256 = "4d7504b72456d68aec2f73daeaf89112fb8372c00f117a436a5feb7ad5c255b7"; } + { locale = "th"; arch = "linux-i686"; sha256 = "d22c3e017c1897c6b4f4da0d43647289f35854d43b0dcc18d3e5898d70e163fd"; } + { locale = "th"; arch = "linux-x86_64"; sha256 = "4f3b91bef8c6d778e33ff17fe97535ddb7bc6d8ecf050d09ee722f065dada050"; } + { locale = "tr"; arch = "linux-i686"; sha256 = "d8effc19f4f9991c3e0cc8f34aef9040a1e36e0e0c7a4f541a8bc4c5e837a1ea"; } + { locale = "tr"; arch = "linux-x86_64"; sha256 = "9a6db03d21904d9b5e335137c866c61037d9a0074cdae77bb436ffd6fffe7595"; } + { locale = "uk"; arch = "linux-i686"; sha256 = "f5053f5d3237ab26971b678ce53d052fc3d87282127577b2590f3a911feef140"; } + { locale = "uk"; arch = "linux-x86_64"; sha256 = "2a9f26d892db02c97ebeb9486ab582a20b08b73ebd8cc71a4f4f3596bcf875af"; } + { locale = "uz"; arch = "linux-i686"; sha256 = "b2cca9b4e5a15d80cecee587c7b7738c22fe41f7ea106b3a336d15940cca1f39"; } + { locale = "uz"; arch = "linux-x86_64"; sha256 = "efd24f9c7ec712ba72b9305f30232b6129af8d75e9bbac7133c9dd3e056d6f0d"; } + { locale = "vi"; arch = "linux-i686"; sha256 = "3d1ba2ed2615a0543bf6484a130922e3176b07fd91f2c5294ecfb65978fe454c"; } + { locale = "vi"; arch = "linux-x86_64"; sha256 = "15807c890efbc934385766fa04ced69c9cf125da52a01ac685689a2873b689dd"; } + { locale = "xh"; arch = "linux-i686"; sha256 = "c9ed7d523d2fe5fe9b60972d48148ca95f56ea801c49dd962e832c7485d368d1"; } + { locale = "xh"; arch = "linux-x86_64"; sha256 = "f7d1314255490fae9ab31fe36adb7ea8a657a11539a7d2f95fb7d34d18a83322"; } + { locale = "zh-CN"; arch = "linux-i686"; sha256 = "6fe6f89f22cd9752ad5d91cb0cf7da8b362090aab9e0576483dd14df509732e8"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "1443bc4a7b07d2393d5914df42d3fefe8736e927590d8373f9f7db8d6c903c43"; } + { locale = "zh-TW"; arch = "linux-i686"; sha256 = "12a793f7033926dcd760c428ae015983e1c5175adc1768609a8859c653ce2272"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "eca47abc014870a7799aedb3f7e5603297dffd1ffd54ce2536c3399881127605"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 834c6ed339c..0ef3bc7f5da 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -133,8 +133,8 @@ in { firefox-unwrapped = common { pname = "firefox"; - version = "44.0.2"; - sha256 = "17id7ala1slb2mjqkikryqjadcsmdzqmkxrrnb5m1316m50qichb"; + version = "45.0"; + sha256 = "1wbrygxj285vs5qbpv3cq26w36bd533779mgi8d0gpxin44hzarn"; }; firefox-esr-unwrapped = common { diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index 336d6ae609d..a2a8c5ded7e 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { homepage = "http://midori-browser.org"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ raskin iyzsong ]; + maintainers = with stdenv.lib.maintainers; [ raskin ]; }; src = fetchurl { diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index f29f569cd3a..2b6b0d5b412 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -59,11 +59,11 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "11.2.202.559"; + version = "11.2.202.577"; src = fetchurl { url = "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/fp_${version}_archive.zip"; - sha256 = "1vb01pd1jhhh86r01nwdzcf66d72jksiyiyp92hs4khy6n5qfsl3"; + sha256 = "1k02d6c9y8z9lxyqyq04zsc5735cvm30mkwli71mh87fr1va2q4j"; }; buildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 86b82db60e1..b1b45185511 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -41,25 +41,43 @@ in stdenv.mkDerivation rec { preConfigure = '' substituteInPlace src/Makefile.am --subst-var-by mavenRepo ${mavenRepo} + + substituteInPlace 3rdparty/libprocess/include/process/subprocess.hpp \ + --replace '"sh"' '"${bash}/bin/bash"' + substituteInPlace 3rdparty/libprocess/3rdparty/stout/include/stout/posix/os.hpp \ + --replace '"sh"' '"${bash}/bin/bash"' + + substituteInPlace 3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/fork.hpp \ + --replace '"sh"' '"${bash}/bin/bash"' + + substituteInPlace src/cli/mesos-scp \ + --replace "'scp " "'${openssh}/bin/scp " + + substituteInPlace src/launcher/executor.cpp \ + --replace '"sh"' '"${bash}/bin/bash"' + substituteInPlace src/launcher/fetcher.cpp \ --replace '"gzip' '"${gzip}/bin/gzip' \ --replace '"tar' '"${gnutar}/bin/tar' \ --replace '"unzip' '"${unzip}/bin/unzip' - substituteInPlace src/cli/mesos-scp \ - --replace "'scp " "'${openssh}/bin/scp " - substituteInPlace src/python/cli/src/mesos/cli.py \ --replace "['mesos-resolve'" "['$out/bin/mesos-resolve'" + + substituteInPlace src/slave/containerizer/mesos/launch.cpp \ + --replace '"sh"' '"${bash}/bin/bash"' - '' + lib.optionalString (stdenv.isLinux) '' + '' + lib.optionalString stdenv.isLinux '' substituteInPlace configure.ac \ --replace /usr/include/libnl3 ${libnl}/include/libnl3 substituteInPlace src/linux/perf.cpp \ --replace '"perf ' '"${perf}/bin/perf ' + + substituteInPlace src/linux/systemd.cpp \ + --replace 'os::realpath("/sbin/init")' '"${systemd}/lib/systemd/systemd"' substituteInPlace src/slave/containerizer/mesos/isolators/filesystem/shared.cpp \ --replace '"mount ' '"${utillinux}/bin/mount ' \ @@ -72,15 +90,6 @@ in stdenv.mkDerivation rec { --replace '"ip ' '"${iproute}/bin/ip ' \ --replace '"mount ' '"${utillinux}/bin/mount ' \ --replace '/bin/sh' "${stdenv.shell}" - - substituteInPlace src/launcher/executor.cpp \ - --replace '"sh"' '"${bash}/bin/bash"' - - substituteInPlace src/slave/containerizer/mesos/launch.cpp \ - --replace '"sh"' '"${bash}/bin/bash"' - - substituteInPlace src/linux/systemd.cpp \ - --replace 'os::realpath("/sbin/init")' '"${systemd}/lib/systemd/systemd"' ''; configureFlags = [ diff --git a/pkgs/applications/networking/cluster/rq/default.nix b/pkgs/applications/networking/cluster/rq/default.nix deleted file mode 100644 index fdf11adfb6c..00000000000 --- a/pkgs/applications/networking/cluster/rq/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{stdenv, fetchurl, sqlite, ruby }: - -# Package builds rq with all dependencies into one blob. This to ascertain -# the combination of packages works. - -stdenv.mkDerivation { - name = "rq-3.4.0"; - src = fetchurl { - url = http://www.codeforpeople.com/lib/ruby/rq/rq-3.4.0.tgz; - sha256 = "1g8wiv83dcn4vzk9wjjzs9vjnwzwpy4h84h34cj32wfz793wfb8b"; - }; - - buildInputs = [ ruby ]; - - # patch checks for existing stdin file - sent it upstream - patches = [ ./rq.patch ]; - - buildPhase = '' - cd all - ./install.sh $out - cd .. - ''; - - installPhase = '' - ''; - - meta = { - license = stdenv.lib.licenses.ruby; - homepage = "http://www.codeforpeople.com/lib/ruby/rq/"; - description = "Simple cluster queue runner"; - longDescription = "rq creates instant linux clusters by managing priority work queues, even on a multi-core single machine. This cluster runner is easy to install and easy to manage, contrasting with the common complicated solutions."; - pkgMaintainer = "Pjotr Prins"; - # rq installs a separate Ruby interpreter, which has lower priority - priority = "10"; - }; -} diff --git a/pkgs/applications/networking/cluster/rq/rq.patch b/pkgs/applications/networking/cluster/rq/rq.patch deleted file mode 100644 index d57c7d0a71a..00000000000 --- a/pkgs/applications/networking/cluster/rq/rq.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -r b58e759f84db lib/rq/jobrunner.rb ---- a/lib/rq/jobrunner.rb Sun Sep 28 13:33:06 2008 +0200 -+++ b/lib/rq/jobrunner.rb Sun Sep 28 13:35:09 2008 +0200 -@@ -85,7 +85,7 @@ unless defined? $__rq_jobrunner__ - - command = - if @sh_like -- sin = "0<#{ @stdin }" if @stdin -+ sin = "0<#{ @stdin }" if @stdin and File.exist?(@stdin) - sout = "1>#{ @stdout }" if @stdout - serr = "2>#{ @stderr }" if @stderr - "( PATH=#{ path }:$PATH #{ command } ;) #{ sin } #{ sout } #{ serr }" diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix index c6801105a84..9f5c246ede6 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, libotr, pidgin, intltool } : stdenv.mkDerivation rec { - name = "pidgin-otr-4.0.1"; + name = "pidgin-otr-4.0.2"; src = fetchurl { url = "http://www.cypherpunks.ca/otr/${name}.tar.gz"; - sha256 = "02pkkf86fh5jvzsdn9y78impsgzj1n0p81kc2girvk3vq941yy0v"; + sha256 = "1i5s9rrgbyss9rszq6c6y53hwqyw1k86s40cpsfx5ccl9bprxdgl"; }; postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr"; diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 541fb5727ce..e08a112664a 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -4,7 +4,7 @@ qtbase, qtsvg, qttools, qttranslations, sqlcipher }: let - version = "1.2.4"; + version = "1.3.0"; revision = "v${version}"; in @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "tux3"; repo = "qTox"; rev = revision; - sha256 = "0iqnl00kmbpf3pn6z38n3cjzzsqpw2793j60c24kkrydapihknz9"; + sha256 = "0z2rxsa23vpl4q0h63mybw7kv8n1sm6nwb93l0cc046a3n9axid8"; }; buildInputs = diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index 05a59719902..65a526b88af 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -1,5 +1,4 @@ -{ fetchgit, libcommuni, qt5, stdenv -}: +{ fetchgit, libcommuni, makeQtWrapper, qt5, stdenv }: stdenv.mkDerivation rec { name = "communi-${version}"; @@ -11,20 +10,32 @@ stdenv.mkDerivation rec { sha256 = "0gk6gck09zb44qfsal7bs4ln2vl9s9x3vfxh7jvfc7mmf7l3sspd"; }; + nativeBuildInputs = [ makeQtWrapper ]; + buildInputs = [ libcommuni qt5.qtbase ]; enableParallelBuild = true; configurePhase = '' export QMAKEFEATURES=${libcommuni}/features - qmake -r COMMUNI_INSTALL_PREFIX=$out + qmake -r \ + COMMUNI_INSTALL_PREFIX=$out \ + COMMUNI_INSTALL_BINS=$out/bin \ + COMMUNI_INSTALL_PLUGINS=$out/lib/communi/plugins \ + COMMUNI_INSTALL_ICONS=$out/share/icons/hicolor \ + COMMUNI_INSTALL_DESKTOP=$out/share/applications \ + COMMUNI_INSTALL_THEMES=$out/share/communi/themes + ''; + + postInstall = '' + wrapQtProgram "$out/bin/communi" ''; meta = with stdenv.lib; { description = "A simple and elegant cross-platform IRC client"; homepage = https://github.com/communi/communi-desktop; license = licenses.bsd3; - platforms = platforms.all; maintainers = with maintainers; [ hrdinka ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 9c77e6b133f..aca68f94670 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -5,6 +5,7 @@ , tag ? "" # tag added to the package name , withKDE ? stdenv.isLinux # enable KDE integration , kdelibs ? null +, static ? false # link statically , stdenv, fetchurl, cmake, makeWrapper, qt, automoc4, phonon, dconf, qca2 }: @@ -42,8 +43,8 @@ in with stdenv; mkDerivation rec { NIX_CFLAGS_COMPILE = "-fPIC"; cmakeFlags = [ - "-DEMBED_DATA=OFF" - "-DSTATIC=OFF" ] + "-DEMBED_DATA=OFF" ] + ++ edf static "STATIC" ++ edf monolithic "WANT_MONO" ++ edf daemon "WANT_CORE" ++ edf client "WANT_QTCLIENT" diff --git a/pkgs/applications/networking/irc/quassel/qt-5.nix b/pkgs/applications/networking/irc/quassel/qt-5.nix index b5075fe2075..19e0c475c66 100644 --- a/pkgs/applications/networking/irc/quassel/qt-5.nix +++ b/pkgs/applications/networking/irc/quassel/qt-5.nix @@ -3,6 +3,7 @@ , client ? false # build Quassel client , previews ? false # enable webpage previews on hovering over URLs , tag ? "" # tag added to the package name +, static ? false # link statically , stdenv, fetchurl, cmake, makeWrapper, dconf , qtbase, qtscript, qtwebkit @@ -66,9 +67,9 @@ in with stdenv; mkDerivation rec { cmakeFlags = [ "-DEMBED_DATA=OFF" - "-DSTATIC=OFF" "-DUSE_QT5=ON" ] + ++ edf static "STATIC" ++ edf monolithic "WANT_MONO" ++ edf daemon "WANT_CORE" ++ edf client "WANT_QTCLIENT" diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 093e7a22b92..7fd4e3e1515 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -21,9 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://archive.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2"; - - # https://archive.mozilla.org/pub/thunderbird/releases/${verName}/SHA1SUMS - sha1 = "7c8ef066d6b6516fddbb654b38353f894f85d469"; + sha256 = "0sssw45sf4vfy63y0x1lj05zl9g3gjdcvgw232k6zfm44l9p25q4"; }; buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index dbd23195a1c..24b7a50b032 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -4,7 +4,7 @@ }: let - version = "2.90"; + version = "2.92"; in with { inherit (stdenv.lib) optional optionals optionalString; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://transmission.cachefly.net/transmission-${version}.tar.xz"; - sha256 = "1lig7y9fhmv2ajgq1isj9wqgpcgignzlczs3dy95ahb8h6pqrzv9"; + sha256 = "0pykmhi7pdmzq47glbj8i2im6iarp4wnj4l1pyvsrnba61f0939s"; }; buildInputs = [ pkgconfig intltool file openssl curl libevent inotify-tools zlib ] @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ "--with-systemd-daemon" ] + ++ [ "--enable-cli" ] ++ optional enableGTK3 "--with-gtk"; preFixup = optionalString enableGTK3 /* gsettings schemas for file dialogues */ '' diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 7c2131d2fcb..1ced6f3d02d 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -9,11 +9,11 @@ }: stdenv.mkDerivation rec { - name = "calligra-2.9.8"; + name = "calligra-2.9.11"; src = fetchurl { url = "mirror://kde/stable/${name}/${name}.tar.xz"; - sha256 = "08a5k8gjmzp9yzq46xy0p1sw7dpvxmxh8zz6dyj8q1dq29719kkc"; + sha256 = "02gaahp7a7m53n0hvrp3868s8w37b457isxir0z7b4mwhw7jv3di"; }; nativeBuildInputs = [ automoc4 cmake perl pkgconfig makeWrapper ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { vector graphics. ''; homepage = http://calligra.org; - maintainers = with stdenv.lib.maintainers; [ urkud phreedom ]; + maintainers = with stdenv.lib.maintainers; [ urkud phreedom ebzzry ]; inherit (kdelibs.meta) platforms; }; } diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 4d2396e8a11..9014e388468 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -9,19 +9,18 @@ buildPythonApplication rec { name = "zim-${version}"; - version = "0.63"; + version = "0.65"; namePrefix = ""; src = fetchurl { url = "http://zim-wiki.org/downloads/${name}.tar.gz"; - sha256 = "077vf4h0hjmbk8bxj9l0z9rxcb3dw642n32lvfn6vjdna1qm910m"; + sha256 = "15pdq4fxag85qjsrdmmssiq85qsk5vnbp8mrqnpvx8lm8crz6hjl"; }; propagatedBuildInputs = [ pythonPackages.sqlite3 pygtk pythonPackages.pyxdg pygobject ]; preBuild = '' - mkdir -p /tmp/home - export HOME="/tmp/home" + export HOME=$TMP sed -i '/zim_install_class,/d' setup.py ''; @@ -30,8 +29,14 @@ buildPythonApplication rec { preFixup = '' export makeWrapperArgs="--prefix XDG_DATA_DIRS : $out/share --argv0 $out/bin/.zim-wrapped" ''; - # Testing fails. - doCheck = false; + + postFixup = '' + wrapPythonPrograms + substituteInPlace $out/bin/.zim-wrapped \ + --replace "sys.argv[0] = 'zim'" "sys.argv[0] = '$out/bin/zim'" + ''; + + doCheck = true; meta = { description = "A desktop wiki"; diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix index 0fd90ac13b6..fa890c03b6f 100644 --- a/pkgs/applications/science/logic/acgtk/default.nix +++ b/pkgs/applications/science/logic/acgtk/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { homepage = "http://www.loria.fr/equipes/calligramme/acg"; description = "A toolkit for developing ACG signatures and lexicon"; license = licenses.cecill20; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.jirkamarsik ]; }; } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 5f998367430..76ebfc93a53 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.5.1"; + version = "8.5.5"; buildInputs = [ ruby bundler tzdata git nodejs procps ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "gitlabhq"; repo = "gitlabhq"; rev = "v${version}"; - sha256 = "1pn5r4axzjkgdjr59y3wgxsd2n83zfd5bry1g2w4c2qw0wcw7zqb"; + sha256 = "05cjqjcmwxlc67xr34ki83q8pn6bsvxvywmiys20bksq3maxdyih"; }; patches = [ diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix index f63a356a1f6..b0665278183 100644 --- a/pkgs/applications/version-management/gitlab/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gemset.nix @@ -975,10 +975,10 @@ dependencies = ["actionpack" "activesupport" "rake" "thor"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "07vmyrppa1x80whdjxhjij93qh9wvnmnxpsgn6fr9x2lqmzdyq5l"; + sha256 = "cfff64cbc0e409341003c35fa2e576e6a8cd8259a9894d09f15c6123be73f146"; type = "gem"; }; - version = "4.2.5.1"; + version = "4.2.5.2"; }; rails-html-sanitizer = { dependencies = ["loofah"]; @@ -1011,10 +1011,10 @@ dependencies = ["actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "03j6hfsqdl0bay59m4qjj2081s4vnhqagpl14qpm4wfrqrgpkcqb"; + sha256 = "aa93c1b9eb8b535eee58280504e30237f88217699fe9bb016e458e5122eefa2e"; type = "gem"; }; - version = "4.2.5.1"; + version = "4.2.5.2"; }; rack-test = { dependencies = ["rack"]; @@ -2906,10 +2906,10 @@ dependencies = ["i18n" "json" "minitest" "thread_safe" "tzinfo"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "16zgsvzwwf4hx3ywi2lz0dcm6d1ljsy6zr5k2q41amd7g62d886d"; + sha256 = "80ad345adf7e2b72c5d90753c0df91eacc34f4de02b34cfbf60bcf6c83483031"; type = "gem"; }; - version = "4.2.5.1"; + version = "4.2.5.2"; }; activerecord-session_store = { dependencies = ["actionpack" "activerecord" "railties"]; @@ -2940,55 +2940,55 @@ dependencies = ["activemodel" "activesupport" "arel"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qj5ii36yn9kb0ljnl05xgpgvs7j9l20yg2phsssy0j31g1ymmc5"; + sha256 = "c2b1b6a4c6b8542c2464b457dce4cac4915efcbd3d5acfba57102e58474c33f2"; type = "gem"; }; - version = "4.2.5.1"; + version = "4.2.5.2"; }; activemodel = { dependencies = ["activesupport" "builder"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zr83avw82infmzdzpilk6xpv5r9fr8pxgf5ql16b3vysp6va57p"; + sha256 = "09ce967be3086b34ae9fcbd919e714b2bdf72b8ab6e89b64aa74627267d93962"; type = "gem"; }; - version = "4.2.5.1"; + version = "4.2.5.2"; }; activejob = { dependencies = ["activesupport" "globalid"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xfj7lwp1v3k9zscavzq87wbbn6y825angz4zpx4xsvlwf3dn7jc"; + sha256 = "cecb9bbc55292dee064ca479990c6e50fa3e2273aac6722ce058d18c22383026"; type = "gem"; }; - version = "4.2.5.1"; + version = "4.2.5.2"; }; actionview = { dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dp1gqh0yxpyydza1ada0jjbpww97qhnkj9c9pm9rg5jbmpzg12m"; + sha256 = "e8ce01cf6cc822ec023a15a856a0fae0e078ebb232b95b722c23af4117d2d635"; type = "gem"; }; - version = "4.2.5.1"; + version = "4.2.5.2"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "13shdiwjfyqvfb11k0wqhcd7p7ix168fxd5l8m2pnn0bzskpswxv"; + sha256 = "a22e1818f06b707433c9a76867932929751b5d57edbeacc258635a7b23da12cf"; type = "gem"; }; - version = "4.2.5.1"; + version = "4.2.5.2"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fxn8f53nnpgan5xl9i5lszl1m8yk4q6ayc33d9xfzsnvhavpl4n"; + sha256 = "8cee5f2f1e58c8ada17cca696377443c0cbc9675df2b7eef97a04318876484b5"; type = "gem"; }; - version = "4.2.5.1"; + version = "4.2.5.2"; }; ace-rails-ap = { source = { @@ -3014,4 +3014,4 @@ }; version = "2.3.2"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 420031a8101..292d6fc934b 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { name = "smartgithg-${version}"; - version = "7_1_0"; + version = "7_1_2"; src = fetchurl { - url = "http://www.syntevo.com/downloads/smartgit/smartgit-linux-${version}.tar.gz"; - sha256 = "0nlv2ipmv3z1j4642gfsrpsgc2y4mxngiz6mz3nidrbrkz0ylsvy"; + url = "http://www.syntevo.com/static/smart/download/smartgit/smartgit-linux-${version}.tar.gz"; + sha256 = "18jw4g2akhj6h9w8378kacv7ws35ndcnc3kkhci9iypwy432ak8d"; }; buildInputs = [ @@ -58,5 +58,6 @@ stdenv.mkDerivation rec { homepage = http://www.syntevo.com/smartgit/; license = licenses.unfree; platforms = platforms.linux; + maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; }; } diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 219dd0babb7..bb7ee259ee0 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -17,13 +17,13 @@ assert javahlBindings -> jdk != null && perl != null; let - common = { version, sha1 }: stdenv.mkDerivation (rec { + common = { version, sha256 }: stdenv.mkDerivation (rec { inherit version; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion/${name}.tar.bz2"; - inherit sha1; + inherit sha256; }; buildInputs = [ zlib apr aprutil sqlite ] @@ -89,12 +89,12 @@ in { subversion18 = common { version = "1.8.15"; - sha1 = "680acf88f0db978fbbeac89ed63776d805b918ef"; + sha256 = "8bbf6bb125003d88ee1c22935a36b7b1ab7d957e0c8b5fbfe5cb6310b6e86ae0"; }; subversion19 = common { version = "1.9.3"; - sha1 = "27e8df191c92095f48314a415194ec37c682cbcf"; + sha256 = "8bbf6bb125003d88ee1c22935a36b7b1ab7d957e0c8b5fbfe5cb6310b6e86ae0"; }; } diff --git a/pkgs/applications/video/mjpg-streamer/default.nix b/pkgs/applications/video/mjpg-streamer/default.nix index 7cacc4fcf05..5409cf9f2f7 100644 --- a/pkgs/applications/video/mjpg-streamer/default.nix +++ b/pkgs/applications/video/mjpg-streamer/default.nix @@ -1,34 +1,31 @@ -{stdenv, fetchsvn, pkgconfig, libjpeg, imagemagick, libv4l}: +{ stdenv, fetchFromGitHub, cmake, libjpeg }: stdenv.mkDerivation rec { - rev = "182"; - name = "mjpg-streamer-${rev}"; + name = "mjpg-streamer-${version}"; + version = "2016-03-08"; - src = fetchsvn { - url = https://mjpg-streamer.svn.sourceforge.net/svnroot/mjpg-streamer/mjpg-streamer; - inherit rev; - sha256 = "008k2wk6xagprbiwk8fvzbz4dd6i8kzrr9n62gj5i1zdv7zcb16q"; + src = fetchFromGitHub { + owner = "jacksonliam"; + repo = "mjpg-streamer"; + rev = "4060cb64e3557037fd404d10e1c1d076b672e9e8"; + sha256 = "0g7y832jsz4ylmq9qp2l4fq6bm8l6dhsbi60fr5jfqpx4l0pia8m"; }; - patchPhase = '' - substituteInPlace Makefile "make -C plugins\/input_gspcav1" "# make -C plugins\/input_gspcav1" - substituteInPlace Makefile "cp plugins\/input_gspcav1\/input_gspcav1.so" "# cp plugins\/input_gspcav1\/input_gspcav1.so" + prePatch = '' + cd mjpg-streamer-experimental ''; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libjpeg ]; + postFixup = '' - patchelf --set-rpath "$(patchelf --print-rpath $out/bin/mjpg_streamer):$out/lib:$out/lib/plugins" $out/bin/mjpg_streamer + patchelf --set-rpath "$(patchelf --print-rpath $out/bin/mjpg_streamer):$out/lib/mjpg-streamer" $out/bin/mjpg_streamer ''; - makeFlags = "DESTDIR=$(out)"; - - preInstall = '' - mkdir -p $out/{bin,lib} - ''; - - buildInputs = [ pkgconfig libjpeg imagemagick libv4l ]; - - meta = { + meta = with stdenv.lib; { homepage = http://sourceforge.net/projects/mjpg-streamer/; description = "MJPG-streamer takes JPGs from Linux-UVC compatible webcams, filesystem or other input plugins and streams them as M-JPEG via HTTP to webbrowsers, VLC and other software"; + platforms = platforms.linux; + licenses = licenses.gpl2; }; } diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 54bd2b5f979..05bd5ad980b 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { (optional withGUI qt5.qtbase) ]; - preConfigure = "./autogen.sh"; + preConfigure = "./autogen.sh; patchShebangs ."; buildPhase = "./drake -j $NIX_BUILD_CORES"; installPhase = "./drake install -j $NIX_BUILD_CORES"; diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index f135630a9a1..d488a3718b7 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -23,7 +23,6 @@ in stdenv.mkDerivation rec { ''; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ iyzsong ]; }; nativeBuildInputs = [ pkgconfig intltool itstool makeWrapper ]; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 9301f886472..158231a6e64 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,11 +1,15 @@ { stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman -, attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy -, libseccomp, libaio, libcap_ng, gnutls, nettle, numactl +, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy +, libaio, gnutls, nettle , makeWrapper -, pulseSupport ? true, libpulseaudio -, sdlSupport ? true, SDL +, attr, libcap, libcap_ng +, CoreServices, Cocoa, rez, setfile +, numaSupport ? stdenv.isLinux, numactl +, seccompSupport ? stdenv.isLinux, libseccomp +, pulseSupport ? !stdenv.isDarwin, libpulseaudio +, sdlSupport ? !stdenv.isDarwin, SDL , vncSupport ? true, libjpeg, libpng -, spiceSupport ? true, spice, spice_protocol, usbredir +, spiceSupport ? !stdenv.isDarwin, spice, spice_protocol, usbredir , x86Only ? false }: @@ -26,31 +30,35 @@ stdenv.mkDerivation rec { }; buildInputs = - [ python zlib pkgconfig glib ncurses perl pixman attr libcap - vde2 texinfo libuuid flex bison makeWrapper lzo snappy libseccomp - libcap_ng gnutls nettle numactl + [ python zlib pkgconfig glib ncurses perl pixman + vde2 texinfo libuuid flex bison makeWrapper lzo snappy + gnutls nettle ] + ++ optionals stdenv.isDarwin [ CoreServices Cocoa rez setfile ] + ++ optionals seccompSupport [ libseccomp ] + ++ optionals numaSupport [ numactl ] ++ optionals pulseSupport [ libpulseaudio ] ++ optionals sdlSupport [ SDL ] ++ optionals vncSupport [ libjpeg libpng ] ++ optionals spiceSupport [ spice_protocol spice usbredir ] - ++ optionals (hasSuffix "linux" stdenv.system) [ alsaLib libaio ]; + ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ]; enableParallelBuilding = true; patches = [ ./no-etc-install.patch ]; configureFlags = - [ "--enable-seccomp" - "--enable-numa" - "--smbd=smbd" # use `smbd' from $PATH + [ "--smbd=smbd" # use `smbd' from $PATH "--audio-drv-list=${audio}" "--sysconfdir=/etc" "--localstatedir=/var" ] + ++ optional numaSupport "--enable-numa" + ++ optional seccompSupport "--enable-seccomp" ++ optional spiceSupport "--enable-spice" ++ optional x86Only "--target-list=i386-softmmu,x86_64-softmmu" - ++ optional (hasSuffix "linux" stdenv.system) "--enable-linux-aio"; + ++ optional stdenv.isDarwin "--enable-cocoa" + ++ optional stdenv.isLinux "--enable-linux-aio"; postInstall = '' @@ -66,6 +74,6 @@ stdenv.mkDerivation rec { description = "A generic and open source machine emulator and virtualizer"; license = licenses.gpl2Plus; maintainers = with maintainers; [ viric eelco ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 23c4f34a553..74cc7531e4c 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -15,39 +15,12 @@ let libDir = if stdenv.is64bit then "lib64" else "lib"; - # Sources needed to build the stubdoms and tools + # Sources needed to build the tools # These sources are already rather old and probably do not change frequently xenExtfiles = [ - { url = http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz; - sha256 = "13wlr85s1hnvia6a698qpryyy12lvmqw0a05xmjnd0h71ralsbkp"; - } - { url = http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz; - sha256 = "0pmh8kifb6sfkqfxc23wqp3f2wzk69sl80yz7w8p8cd4cz8cg58p"; - } - { url = http://xenbits.xensource.com/xen-extfiles/newlib-1.16.0.tar.gz; - sha256 = "01rxk9js833mwadq92jx0flvk9jyjrnwrq93j39c2j2wjsa66hnv"; - } - { url = http://xenbits.xensource.com/xen-extfiles/grub-0.97.tar.gz; - sha256 = "02r6b52r0nsp6ryqfiqchnl7r1d9smm80sqx24494gmx5p8ia7af"; - } - { url = http://xenbits.xensource.com/xen-extfiles/pciutils-2.2.9.tar.bz2; - sha256 = "092v4q478i1gc7f3s2wz6p4xlf1wb4gs5shbkn21vnnmzcffc2pn"; - } - { url = http://xenbits.xensource.com/xen-extfiles/tpm_emulator-0.7.4.tar.gz; - sha256 = "0nd4vs48j0zfzv1g5jymakxbjqf9ss6b2jph3b64356xhc6ylj2f"; - } - { url = http://xenbits.xensource.com/xen-extfiles/tboot-20090330.tar.gz; - sha256 = "0rl1b53g019w2c268pyxhjqsj9ls37i4p74bdv1hdi2yvs0r1y81"; - } { url = http://xenbits.xensource.com/xen-extfiles/ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz; sha256 = "0p206zaxlhda60ci33h9gipi5gm46fvvsm6k5c0w7b6cjg0yhb33"; } - { url = http://xenbits.xensource.com/xen-extfiles/polarssl-1.1.4-gpl.tgz; - sha256 = "1dl4fprpwagv9akwqpb62qwqvh24i50znadxwvd2kfnhl02gsa9d"; - } - { url = http://xenbits.xensource.com/xen-extfiles/gmp-4.3.2.tar.bz2; - sha256 = "0x8prpqi9amfcmi7r4zrza609ai9529pjaq0h4aw51i867064qck"; - } ]; scriptEnvPath = stdenv.lib.concatStrings (stdenv.lib.intersperse ":" (map (x: "${x}/bin") @@ -116,6 +89,9 @@ stdenv.mkDerivation { export EXTRA_QEMUU_CONFIGURE_ARGS="--enable-spice --enable-usb-redir --enable-linux-aio" ''; + # https://github.com/NixOS/nixpkgs/issues/13590 + configureFlags = ["--disable-stubdom"]; + postConfigure = '' substituteInPlace tools/libfsimage/common/fsimage_plugin.c \ @@ -171,7 +147,7 @@ stdenv.mkDerivation { #makeFlags = "XSM_ENABLE=y FLASK_ENABLE=y PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files "; makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files "; - buildFlags = "xen tools stubdom"; + buildFlags = "xen tools"; postBuild = '' diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 29b215d0642..181983e48b0 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -7,7 +7,7 @@ }: let - version = "3.5.8"; + version = "3.5.9"; in with luaPackages; stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz"; - sha256 = "1iifcyphgibmh3cvsy8agjrl9zjl80scrg0bcgnwywmxaxncjc3w"; + sha256 = "0kynair1ykr74b39a4gcm2y24viial64337cf26nhlc7azjbby67"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index f019ba9751b..adbdef5e284 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -1,29 +1,30 @@ -{ stdenv, fetchurl, libX11, libXext, libXinerama, libXpm, libXft, freetype, - fontconfig }: +{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool, which, xorg, + libX11, libXext, libXinerama, libXpm, libXft, libXau, libXdmcp, libpng, + libjpeg, expat, xproto, xextproto, xineramaproto, librsvg, gettext, + freetype, fontconfig }: stdenv.mkDerivation rec { - name = "jwm-2.2.2"; + name = "jwm-${version}"; + version = "1406"; src = fetchurl { - url = "http://www.joewing.net/projects/jwm/releases/${name}.tar.xz"; - sha256 = "0nhyy78c6imk85d47bakk460x0cfhkyghqq82zghmb00dhwiryln"; + url = "https://github.com/joewing/jwm/archive/s${version}.tar.gz"; + sha256 = "0yk22b7cshhyfpcqnb4p59yxspx95xg9yp1kmkxi2fyw95cacab4"; }; - buildInputs = [ libX11 libXext libXinerama libXpm libXft freetype - fontconfig ]; + nativeBuildInputs = [ pkgconfig automake autoconf libtool which ]; - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype}/include/freetype2 " - export NIX_LDFLAGS="$NIX_LDFLAGS -lXft -lfreetype -lfontconfig " - ''; + buildInputs = [ libX11 libXext libXinerama libXpm libXft xorg.libXrender + libXau libXdmcp libpng libjpeg expat xproto xextproto xineramaproto + librsvg gettext freetype fontconfig ]; - postInstall = - '' - sed -i -e s/rxvt/xterm/g $out/etc/system.jwmrc - sed -i -e "s/.*Swallow.*\|.*xload.*//" $out/etc/system.jwmrc - ''; + preConfigure = "./autogen.sh"; meta = { + homepage = "http://joewing.net/projects/jwm/"; description = "A window manager for X11 that requires only Xlib"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.romildo ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index 326cd2a49f4..ba0c812ef6a 100644 --- a/pkgs/applications/window-managers/openbox/default.nix +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -3,7 +3,8 @@ , imlib2, pango, libstartup_notification, makeWrapper }: stdenv.mkDerivation rec { - name = "openbox-3.6.1"; + name = "openbox-${version}"; + version = "3.6.1"; buildInputs = [ pkgconfig libxml2 @@ -40,5 +41,6 @@ stdenv.mkDerivation rec { description = "X window manager for non-desktop embedded systems"; homepage = http://openbox.org/; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index fa81971885a..7f494f3e0f2 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,21 +1,23 @@ -{ lib, stdenv, fetchurl, makeWrapper, cmake, pkgconfig -, wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, asciidoc, libxslt, dbus_libs +{ stdenv, fetchFromGitHub +, makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl +, wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs }: stdenv.mkDerivation rec { name = "sway-${version}"; version = "git-2016-02-08"; - repo = "https://github.com/SirCmpwn/sway"; - rev = "16e904634c65128610537bed7fcb16ac3bb45165"; - src = fetchurl { - url = "${repo}/archive/${rev}.tar.gz"; - sha256 = "52d6c4b49fea69e2a2c1b44b858908b7736301bdb9ed483c294bc54bb40e872e"; + src = fetchFromGitHub { + owner = "Sircmpwn"; + repo = "sway"; + + rev = "16e904634c65128610537bed7fcb16ac3bb45165"; + sha256 = "04qvdjaarglq3qsjbb9crjkad3y1v7s51bk82sl8w26c71jbhklg"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ]; - buildInputs = [ makeWrapper wayland wlc libxkbcommon pixman fontconfig pcre json_c asciidoc libxslt dbus_libs ]; + buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs ]; patchPhase = '' sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt; @@ -24,17 +26,17 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out)"; installPhase = "PREFIX=$out make install"; - LD_LIBRARY_PATH = lib.makeLibraryPath [ wlc dbus_libs ]; + LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ wlc dbus_libs ]; preFixup = '' wrapProgram $out/bin/sway \ --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}"; ''; - meta = { + meta = with stdenv.lib; { description = "i3-compatible window manager for Wayland"; homepage = "http://swaywm.org"; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ]; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index 841effcfca1..64cce3dbad5 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -4,8 +4,7 @@ with lib; let cfg = { - stable = grsecOptions.stable or false; - testing = grsecOptions.testing or false; + kernelPatch = grsecOptions.kernelPatch; config = { mode = "auto"; sysctl = false; @@ -22,18 +21,13 @@ let vals = rec { - mkKernel = kernel: patch: - assert patch.kversion == kernel.version; - { inherit kernel patch; - inherit (patch) grversion revision; + mkKernel = patch: + { + inherit patch; + inherit (patch) kernel patches grversion revision; }; - test-patch = with pkgs.kernelPatches; grsecurity_unstable; - stable-patch = with pkgs.kernelPatches; grsecurity_stable; - - grKernel = if cfg.stable - then mkKernel pkgs.linux_3_14 stable-patch - else mkKernel pkgs.linux_4_3 test-patch; + grKernel = mkKernel cfg.kernelPatch; ## -- grsecurity configuration --------------------------------------------- @@ -90,8 +84,8 @@ let # Disable restricting links under the testing kernel, as something # has changed causing it to fail miserably during boot. - restrictLinks = optionalString cfg.testing - "GRKERNSEC_LINK n"; + #restrictLinks = optionalString cfg.testing + # "GRKERNSEC_LINK n"; in '' GRKERNSEC y ${grsecMainConfig} @@ -109,7 +103,6 @@ let GRKERNSEC_CHROOT_CHMOD ${boolToKernOpt cfg.config.denyChrootChmod} GRKERNSEC_DENYUSB ${boolToKernOpt cfg.config.denyUSB} GRKERNSEC_NO_RBAC ${boolToKernOpt cfg.config.disableRBAC} - ${restrictLinks} ${cfg.config.kernelExtraConfig} ''; @@ -136,7 +129,7 @@ let mkGrsecKern = grkern: lowPrio (overrideDerivation (grkern.kernel.override (args: { - kernelPatches = args.kernelPatches ++ [ grkern.patch pkgs.kernelPatches.grsec_fix_path ]; + kernelPatches = args.kernelPatches ++ [ grkern.patch ] ++ grkern.patches; argsOverride = { modDirVersion = "${grkern.kernel.modDirVersion}${localver grkern}"; }; diff --git a/pkgs/build-support/grsecurity/flavors.nix b/pkgs/build-support/grsecurity/flavors.nix index 969ca579f5a..1281d60aa32 100644 --- a/pkgs/build-support/grsecurity/flavors.nix +++ b/pkgs/build-support/grsecurity/flavors.nix @@ -1,26 +1,17 @@ let - mkOpts = ver: prio: sys: virt: swvirt: hwvirt: + mkOpts = prio: sys: virt: swvirt: hwvirt: { config.priority = prio; config.system = sys; config.virtualisationConfig = virt; config.hardwareVirtualisation = hwvirt; config.virtualisationSoftware = swvirt; - } // builtins.listToAttrs [ { name = ver; value = true; } ]; + }; in { - # Stable kernels - linux_grsec_stable_desktop = - mkOpts "stable" "performance" "desktop" "host" "kvm" true; - linux_grsec_stable_server = - mkOpts "stable" "security" "server" "host" "kvm" true; - linux_grsec_stable_server_xen = - mkOpts "stable" "security" "server" "guest" "xen" true; - - # Testing kernels - linux_grsec_testing_desktop = - mkOpts "testing" "performance" "desktop" "host" "kvm" true; - linux_grsec_testing_server = - mkOpts "testing" "security" "server" "host" "kvm" true; - linux_grsec_testing_server_xen = - mkOpts "testing" "security" "server" "guest" "xen" true; + desktop = + mkOpts "performance" "desktop" "host" "kvm" true; + server = + mkOpts "security" "server" "host" "kvm" true; + server_xen = + mkOpts "security" "server" "guest" "xen" true; } diff --git a/pkgs/build-support/ocaml/default.nix b/pkgs/build-support/ocaml/default.nix index 87bfa6cea12..50f7627568d 100644 --- a/pkgs/build-support/ocaml/default.nix +++ b/pkgs/build-support/ocaml/default.nix @@ -11,7 +11,7 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; defaultMeta = { - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; in assert minimumSupportedOcamlVersion != null -> diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 93b8b1cbc42..fef91e1d89d 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -48,7 +48,10 @@ rec { # Create a forest of symlinks to the files in `paths'. symlinkJoin = name: paths: - runCommand name { inherit paths; } + runCommand name + { inherit paths; + preferLocalBuild = true; allowSubstitutes = false; + } '' mkdir -p $out for i in $paths; do diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix index b560a850a30..625071c9c33 100644 --- a/pkgs/build-support/vm/windows/cygwin-iso/default.nix +++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix @@ -16,7 +16,7 @@ let sha256 = "1slyj4qha7x649ggwdski9spmyrbs04z2d46vgk8krllg0kppnjv"; }; - cygwinCross = (import ../../../../top-level/all-packages.nix { + cygwinCross = (import ../../../../.. { inherit (stdenv) system; crossSystem = { libc = "msvcrt"; diff --git a/pkgs/data/fonts/montserrat/default.nix b/pkgs/data/fonts/montserrat/default.nix new file mode 100644 index 00000000000..70fd2060ff1 --- /dev/null +++ b/pkgs/data/fonts/montserrat/default.nix @@ -0,0 +1,28 @@ +# Originally packaged for ArchLinux. +# +# https://aur.archlinux.org/packages/ttf-montserrat/ + +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "montserrat-${version}"; + version = "1.0"; + + src = fetchurl { + url = "http://marvid.fr/~eeva/mirror/Montserrat.tar.gz"; + sha256 = "12yn651kxi5fcbpdxhapg5fpri291mgcfc1kx7ymg53nrl11nj3x"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/montserrat + cp *.ttf $out/share/fonts/montserrat + ''; + + meta = with stdenv.lib; { + description = "A geometric sans serif font with extended latin support (Regular, Alternates, Subrayada)"; + homepage = "http://www.fontspace.com/julieta-ulanovsky/montserrat"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ scolobb ]; + }; +} diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix index 7071d4a471f..3875362dcb3 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix @@ -5,7 +5,7 @@ import ./generic.nix { name = "docbook-xml-4.2"; src = fetchurl { url = http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip; - md5 = "73fe50dfe74ca631c1602f558ed8961f"; + sha256 = "acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2"; }; meta = { branch = "4.2"; diff --git a/pkgs/desktops/e19/default.nix b/pkgs/desktops/e19/default.nix deleted file mode 100644 index b285498be9d..00000000000 --- a/pkgs/desktops/e19/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ callPackage, pkgs }: -rec { - #### CORE EFL - efl = callPackage ./efl.nix { openjpeg = pkgs.openjpeg_1; }; - evas = callPackage ./evas.nix { }; - emotion = callPackage ./emotion.nix { }; - elementary = callPackage ./elementary.nix { }; - - #### WINDOW MANAGER - enlightenment = callPackage ./enlightenment.nix { }; - - #### APPLICATIONS - econnman = callPackage ./econnman.nix { }; - terminology = callPackage ./terminology.nix { }; - rage = callPackage ./rage.nix { }; -} diff --git a/pkgs/desktops/e19/enlightenment.nix b/pkgs/desktops/e19/enlightenment.nix deleted file mode 100644 index 5112058f8c6..00000000000 --- a/pkgs/desktops/e19/enlightenment.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, e19, xorg, libffi, pam, alsaLib, luajit, bzip2, libuuid -, libpthreadstubs, gdbm, libcap, mesa_glu, xkeyboard_config, set_freqset_setuid ? false }: - -stdenv.mkDerivation rec { - name = "enlightenment-${version}"; - version = "0.20.3"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "19z3bwdzwpzwi330l5g5mj7xy6wy8xrc39zivjhm0d1ql3fh649j"; - }; - buildInputs = [ pkgconfig e19.efl e19.elementary xorg.libXdmcp xorg.libxcb - xorg.xcbutilkeysyms xorg.libXrandr libffi pam alsaLib luajit bzip2 libuuid - libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; - NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" "-I${e19.efl}/include/emile-1" "-I${libuuid}/include/uuid" ]; - preConfigure = '' - export USER_SESSION_DIR=$prefix/lib/systemd/user - - substituteInPlace src/modules/xkbswitch/e_mod_parse.c \ - --replace "/usr/share/X11/xkb/rules/xorg.lst" "${xkeyboard_config}/share/X11/xkb/rules/base.lst" - - substituteInPlace "src/bin/e_import_config_dialog.c" \ - --replace "e_prefix_bin_get()" "\"${e19.efl}/bin\"" - ''; - - enableParallelBuilding = true; - - # this is a hack and without this cpufreq module is not working: - # when set_freqset_setuid is true and "e19_freqset" is set in setuidPrograms (this is taken care of in e19 NixOS module), - # then this postInstall does the folowing: - # 1. moves the "freqset" binary to "e19_freqset", - # 2. linkes "e19_freqset" to enlightenment/bin so that, - # 3. setuidPrograms detects it and makes appropriate stuff to /var/setuid-wrappers/e19_freqset, - # 4. and finaly, linkes /var/setuid-wrappers/e19_freqset to original destination where enlightenment wants it - postInstall = if set_freqset_setuid then '' - export CPUFREQ_DIRPATH=`readlink -f $out/lib/enlightenment/modules/cpufreq/linux-gnu-*`; - mv $CPUFREQ_DIRPATH/freqset $CPUFREQ_DIRPATH/e19_freqset - ln -sv $CPUFREQ_DIRPATH/e19_freqset $out/bin/e19_freqset - ln -sv /var/setuid-wrappers/e19_freqset $CPUFREQ_DIRPATH/freqset - '' else ""; - meta = { - description = "The Compositing Window Manager and Desktop Shell"; - homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.bsd2; - }; -} diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index 5aa3d781e4b..b285498be9d 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -1,29 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorg, dbus, imlib2, freetype }: +{ callPackage, pkgs }: +rec { + #### CORE EFL + efl = callPackage ./efl.nix { openjpeg = pkgs.openjpeg_1; }; + evas = callPackage ./evas.nix { }; + emotion = callPackage ./emotion.nix { }; + elementary = callPackage ./elementary.nix { }; -let version = "0.16.8.15"; in - stdenv.mkDerivation { - name = "enlightenment-${version}"; + #### WINDOW MANAGER + enlightenment = callPackage ./enlightenment.nix { }; - src = fetchurl { - url = "mirror://sourceforge/enlightenment/e16-${version}.tar.gz"; - sha256 = "0f8hg79mrk6b3fsvynvsrnqh1zgmvnnza0lf7qn4pq2mqyigbhgk"; - }; - - buildInputs = [pkgconfig imlib2 freetype - xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXft ]; - - meta = { - description = "Desktop shell built on the Enlightenment Foundation Libraries"; - - longDescription = '' - Enlightenment is a window manager. Enlightenment is a desktop - shell. Enlightenment is the building blocks to create - beautiful applications. Enlightenment, or simply e, is a - group of people trying to make a new generation of software. - ''; - - homepage = http://enlightenment.org/; - - license = "BSD-style"; - }; - } + #### APPLICATIONS + econnman = callPackage ./econnman.nix { }; + terminology = callPackage ./terminology.nix { }; + rage = callPackage ./rage.nix { }; +} diff --git a/pkgs/desktops/e19/econnman.nix b/pkgs/desktops/enlightenment/econnman.nix similarity index 57% rename from pkgs/desktops/e19/econnman.nix rename to pkgs/desktops/enlightenment/econnman.nix index 35b58aec638..0dabd7f1347 100644 --- a/pkgs/desktops/e19/econnman.nix +++ b/pkgs/desktops/enlightenment/econnman.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, e19, python27, python27Packages, dbus, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, efl, elementary, python2Packages, dbus, makeWrapper }: stdenv.mkDerivation rec { name = "econnman-${version}"; version = "1.1"; @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0"; }; - buildInputs = [ makeWrapper pkgconfig e19.efl python27 dbus ]; - propagatedBuildInputs = [ python27Packages.pythonefl_1_16 python27Packages.dbus e19.elementary ]; + buildInputs = [ makeWrapper pkgconfig efl python2Packages.python python2Packages.wrapPython dbus ]; + pythonPath = [ python2Packages.pythonefl python2Packages.dbus elementary ]; postInstall = '' - wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_16}/lib/python2.7/site-packages + wrapPythonPrograms ''; meta = { diff --git a/pkgs/desktops/e19/efl-elua.patch b/pkgs/desktops/enlightenment/efl-elua.patch similarity index 100% rename from pkgs/desktops/e19/efl-elua.patch rename to pkgs/desktops/enlightenment/efl-elua.patch diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/enlightenment/efl.nix similarity index 96% rename from pkgs/desktops/e19/efl.nix rename to pkgs/desktops/enlightenment/efl.nix index dd9c837ed8b..c2124f0b292 100644 --- a/pkgs/desktops/e19/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.16.1"; + version = "1.17.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz"; - sha256 = "116s4lcfj5lrfhyvvka3np9glqyrh21cyl9rhw7al0wgb60vw0gg"; + sha256 = "1zisnz4x54mn9sm46kcr571faqnazkcglyf0lbz19l34syx40df1"; }; buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa diff --git a/pkgs/desktops/e19/elementary.nix b/pkgs/desktops/enlightenment/elementary.nix similarity index 65% rename from pkgs/desktops/e19/elementary.nix rename to pkgs/desktops/enlightenment/elementary.nix index 1793a7e87c4..ffb0d70920e 100644 --- a/pkgs/desktops/e19/elementary.nix +++ b/pkgs/desktops/enlightenment/elementary.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, e19, libcap, automake114x, autoconf, libdrm, gdbm }: +{ stdenv, fetchurl, pkgconfig, efl, libcap, automake, autoconf, libdrm, gdbm }: stdenv.mkDerivation rec { name = "elementary-${version}"; - version = "1.16.1"; + version = "1.17.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.xz"; - sha256 = "0q58imh7s35q6cq5hsa6gqj84rkckh8s61iass8zyvcw19j66f3y"; + sha256 = "0avb0d6nk4d88l81c2j6py13vdfnvg080ycw2y3qvawyjf1mhska"; }; - buildInputs = [ pkgconfig e19.efl libdrm gdbm automake114x autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; + buildInputs = [ pkgconfig efl libdrm gdbm automake autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; NIX_CFLAGS_COMPILE = [ "-I${libdrm}/include/libdrm" ]; patches = [ ./elementary.patch ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/e19/elementary.patch b/pkgs/desktops/enlightenment/elementary.patch similarity index 100% rename from pkgs/desktops/e19/elementary.patch rename to pkgs/desktops/enlightenment/elementary.patch diff --git a/pkgs/desktops/e19/emotion.nix b/pkgs/desktops/enlightenment/emotion.nix similarity index 66% rename from pkgs/desktops/e19/emotion.nix rename to pkgs/desktops/enlightenment/emotion.nix index c38119719a0..39b3b162075 100644 --- a/pkgs/desktops/e19/emotion.nix +++ b/pkgs/desktops/enlightenment/emotion.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, pkgconfig, e19, vlc }: +{ stdenv, fetchurl, pkgconfig, efl, vlc }: stdenv.mkDerivation rec { name = "emotion_generic_players-${version}"; - version = "1.16.0"; + version = "1.17.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.xz"; - sha256 = "163ay26c6dx49m1am7vsxxn0gy877zhayxq0yxn9zkbq2srzvjym"; + sha256 = "03kaql95mk0c5j50v3c5i5lmlr3gz7xlh8p8q87xz8zf9j5h1pp7"; }; - buildInputs = [ pkgconfig e19.efl vlc ]; - NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" ]; + buildInputs = [ pkgconfig efl vlc ]; + NIX_CFLAGS_COMPILE = [ "-I${efl}/include/eo-1" ]; meta = { description = "Extra video decoders"; homepage = http://enlightenment.org/; diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix new file mode 100644 index 00000000000..ea232a2c607 --- /dev/null +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, pkgconfig, efl, elementary, xcbutilkeysyms, libXrandr, libXdmcp, libxcb, +libffi, pam, alsaLib, luajit, bzip2, libuuid, libpthreadstubs, gdbm, libcap, mesa_glu +, xkeyboard_config }: + +stdenv.mkDerivation rec { + name = "enlightenment-${version}"; + version = "0.20.6"; + src = fetchurl { + url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; + sha256 = "11ahll68nlci214ka05whp5l32hy9lznmcdfqx3hxsmq2p7bl7zj"; + }; + buildInputs = [ pkgconfig efl elementary libXdmcp libxcb + xcbutilkeysyms libXrandr libffi pam alsaLib luajit bzip2 libuuid + libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; + NIX_CFLAGS_COMPILE = [ "-I${efl}/include/eo-1" "-I${efl}/include/emile-1" "-I${libuuid}/include/uuid" ]; + preConfigure = '' + export USER_SESSION_DIR=$prefix/lib/systemd/user + + substituteInPlace src/modules/xkbswitch/e_mod_parse.c \ + --replace "/usr/share/X11/xkb/rules/xorg.lst" "${xkeyboard_config}/share/X11/xkb/rules/base.lst" + + substituteInPlace "src/bin/e_import_config_dialog.c" \ + --replace "e_prefix_bin_get()" "\"${efl}/bin\"" + ''; + + enableParallelBuilding = true; + + # this is a hack and without this cpufreq module is not working. does the following: + # 1. moves the "freqset" binary to "e_freqset", + # 2. linkes "e_freqset" to enlightenment/bin so that, + # 3. setuidPrograms detects it and makes appropriate stuff to /var/setuid-wrappers/e_freqset, + # 4. and finaly, linkes /var/setuid-wrappers/e_freqset to original destination where enlightenment wants it + postInstall = '' + export CPUFREQ_DIRPATH=`readlink -f $out/lib/enlightenment/modules/cpufreq/linux-gnu-*`; + mv $CPUFREQ_DIRPATH/freqset $CPUFREQ_DIRPATH/e_freqset + ln -sv $CPUFREQ_DIRPATH/e_freqset $out/bin/e_freqset + ln -sv /var/setuid-wrappers/e_freqset $CPUFREQ_DIRPATH/freqset + ''; + + meta = { + description = "The Compositing Window Manager and Desktop Shell"; + homepage = http://enlightenment.org/; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.bsd2; + }; +} diff --git a/pkgs/desktops/e19/evas.nix b/pkgs/desktops/enlightenment/evas.nix similarity index 64% rename from pkgs/desktops/e19/evas.nix rename to pkgs/desktops/enlightenment/evas.nix index b777dc893d7..fe8897b8be7 100644 --- a/pkgs/desktops/e19/evas.nix +++ b/pkgs/desktops/enlightenment/evas.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, e19, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }: +{ stdenv, fetchurl, pkgconfig, efl, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }: stdenv.mkDerivation rec { name = "evas_generic_loaders-${version}"; - version = "1.16.0"; + version = "1.17.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.xz"; - sha256 = "1il3i3rii6ddpj7cw2mdqnb0q2wmhwnvs6qi9janna1n5hhrqyfm"; + sha256 = "0ynq1nx0bfgg19p4vki1fap36yyip53zaxpzncx2slr6jcx1kxf2"; }; - buildInputs = [ pkgconfig e19.efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ]; + buildInputs = [ pkgconfig efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ]; meta = { description = "Extra image decoders"; homepage = http://enlightenment.org/; diff --git a/pkgs/desktops/e19/rage.nix b/pkgs/desktops/enlightenment/rage.nix similarity index 85% rename from pkgs/desktops/e19/rage.nix rename to pkgs/desktops/enlightenment/rage.nix index 19c99ac17eb..8c3391cf271 100644 --- a/pkgs/desktops/e19/rage.nix +++ b/pkgs/desktops/enlightenment/rage.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, e19, automake, autoconf, libtool, pkgconfig, gst_all_1 +{ stdenv, fetchurl, elementary, efl, automake, autoconf, libtool, pkgconfig, gst_all_1 , makeWrapper, lib }: stdenv.mkDerivation rec { name = "rage-${version}"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.gz"; sha256 = "10j3n8crk16jzqz2hn5djx6vms5f6x83qyiaphhqx94h9dgv2mgg"; }; - buildInputs = [ e19.elementary e19.efl automake autoconf libtool pkgconfig + buildInputs = [ elementary efl automake autoconf libtool pkgconfig makeWrapper ]; GST_PLUGIN_PATH = lib.makeSearchPath "lib/gstreamer-1.0" [ gst_all_1.gst-plugins-base diff --git a/pkgs/desktops/e19/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix similarity index 85% rename from pkgs/desktops/e19/terminology.nix rename to pkgs/desktops/enlightenment/terminology.nix index 195a1f43664..a302b7d5f61 100644 --- a/pkgs/desktops/e19/terminology.nix +++ b/pkgs/desktops/enlightenment/terminology.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, e19 }: +{ stdenv, fetchurl, pkgconfig, efl, elementary }: stdenv.mkDerivation rec { name = "terminology-${version}"; version = "0.9.1"; @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.xz"; sha256 = "1kwv9vkhngdm5v38q93xpcykghnyawhjjcb5bgy0p89gpbk7mvpc"; }; - buildInputs = [ pkgconfig e19.efl e19.elementary ]; + buildInputs = [ pkgconfig efl elementary ]; meta = { description = "The best terminal emulator written with the EFL"; homepage = http://enlightenment.org/; diff --git a/pkgs/desktops/xfce/applications/orage.nix b/pkgs/desktops/xfce/applications/orage.nix new file mode 100644 index 00000000000..c26327f4d92 --- /dev/null +++ b/pkgs/desktops/xfce/applications/orage.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, bison, flex, intltool, gtk, libical, dbus_glib +, libnotify, popt, xfce +}: + +stdenv.mkDerivation rec { + name = "${p_name}-${ver_maj}.${ver_min}"; + p_name = "orage"; + ver_maj = "4.12"; + ver_min = "1"; + + src = fetchurl { + url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "0qlhvnl2m33vfxqlbkic2nmfpwyd4mq230jzhs48cg78392amy9w"; + }; + + nativeBuildInputs = [ pkgconfig intltool bison flex ]; + + buildInputs = [ gtk libical dbus_glib libnotify popt xfce.libxfce4util + xfce.xfce4panel ]; + + preFixup = "rm $out/share/icons/hicolor/icon-theme.cache "; + + meta = { + homepage = http://www.xfce.org/projects/; + description = "A simple calendar application with reminders"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 9453e85d253..96e6c55162a 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -51,6 +51,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od gigolo = callPackage ./applications/gigolo.nix { }; mousepad = callPackage ./applications/mousepad.nix { }; + orage = callPackage ./applications/orage.nix { }; parole = callPackage ./applications/parole.nix { }; ristretto = callPackage ./applications/ristretto.nix { }; terminal = xfce4terminal; # it has changed its name diff --git a/pkgs/development/compilers/boo/config.patch b/pkgs/development/compilers/boo/config.patch new file mode 100644 index 00000000000..f6e0eee29b1 --- /dev/null +++ b/pkgs/development/compilers/boo/config.patch @@ -0,0 +1,45 @@ +diff --git a/default.build b/default.build +index e48fd9e..b0dee4f 100644 +--- a/default.build ++++ b/default.build +@@ -23,14 +23,14 @@ + + + +- ++ + + + + + + +- ++ + + + +@@ -575,9 +575,9 @@ + key files for mime detection, etc + --> + +- ++ + +- ++ + + + +@@ -707,9 +707,9 @@ + key files for mime detection, etc + --> + +- ++ + +- ++ + + + diff --git a/pkgs/development/compilers/boo/default.nix b/pkgs/development/compilers/boo/default.nix new file mode 100644 index 00000000000..c57d4de8767 --- /dev/null +++ b/pkgs/development/compilers/boo/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, pkgconfig, dbus, mono, makeWrapper, nant +, shared_mime_info, gtksourceview, gtk +, targetVersion ? "4.5" }: + +let + release = "alpha"; +in stdenv.mkDerivation rec { + name = "boo-${version}"; + version = "2013-10-21"; + + src = fetchFromGitHub { + owner = "boo-lang"; + repo = "boo"; + + rev = "${release}"; + sha256 = "174abdwfpq8i3ijx6bwqll16lx7xwici374rgsbymyk8g8mla094"; + }; + + buildInputs = [ + pkgconfig mono makeWrapper nant shared_mime_info gtksourceview + gtk + ]; + + patches = [ ./config.patch ]; + + postPatch = '' + sed -e 's|\$out|'$out'|' -i default.build + ''; + + buildPhase = '' + nant -t:mono-4.5 + ''; + + installPhase = '' + nant install + cp $out/lib/mono/boo/*.dll $out/lib/boo/ + ''; + + dontStrip = true; + + meta = with stdenv.lib; { + description = "The Boo Programming Language"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index e6fe97c6fe8..0b4ea9a1823 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -2,17 +2,19 @@ stdenv.mkDerivation rec { name = "fstar-${version}"; - version = "2016-01-12"; + version = "0.9.2.0"; src = fetchFromGitHub { owner = "FStarLang"; repo = "FStar"; - rev = "af9a231566ca52c9bc3409398c801ae9e8191cfa"; - sha256 = "1zri4gqr6j6hygnh0ckfhq93mqwk9i19vng8chnmvlr27zq734a2"; + rev = "v${version}"; + sha256 = "0vrxmxfaslngvbvkzpm1gfl1s34hdsprv8msasxf9sjqc3hlir3l"; }; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = with ocamlPackages; [ - mono fsharp z3 dotnetPackages.FsLexYacc ocaml findlib ocaml_batteries openssl makeWrapper + mono fsharp z3 dotnetPackages.FsLexYacc ocaml findlib ocaml_batteries openssl ]; preBuild = '' diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 0eddde15a58..0c0520533bc 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -7,6 +7,8 @@ , curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 # linear algebra , openblas, arpack, suitesparse +# Darwin frameworks +, CoreServices, ApplicationServices }: with stdenv.lib; @@ -19,6 +21,9 @@ in let arpack = arpack_.override { inherit openblas; }; suitesparse = suitesparse_.override { inherit openblas; }; + llvmShared = if stdenv.isDarwin + then llvm.override { enableSharedLibraries = true; } + else llvm; in let @@ -68,10 +73,11 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - arpack fftw fftwSinglePrec gmp libgit2 libunwind llvm mpfr + arpack fftw fftwSinglePrec gmp libgit2 libunwind llvmShared mpfr pcre2 openblas openlibm openspecfun readline suitesparse utf8proc zlib - ]; + ] ++ + stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] ; nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ]; @@ -127,6 +133,8 @@ stdenv.mkDerivation rec { openspecfun pcre2 suitesparse ]; + NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib"; + dontStrip = true; dontPatchELF = true; diff --git a/pkgs/development/compilers/mezzo/default.nix b/pkgs/development/compilers/mezzo/default.nix index a0fe441b153..67e7c932e55 100644 --- a/pkgs/development/compilers/mezzo/default.nix +++ b/pkgs/development/compilers/mezzo/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { homepage = http://protz.github.io/mezzo/; description = "A programming language in the ML tradition, which places strong emphasis on the control of aliasing and access to mutable memory"; license = licenses.gpl2; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/compilers/rgbds/default.nix b/pkgs/development/compilers/rgbds/default.nix new file mode 100644 index 00000000000..827dd774e78 --- /dev/null +++ b/pkgs/development/compilers/rgbds/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchFromGitHub, yacc}: + +stdenv.mkDerivation rec { + name = "rgbds-${version}"; + version = "0.2.4"; + src = fetchFromGitHub { + owner = "bentley"; + repo = "rgbds"; + rev = "v${version}"; + sha256 = "0dwq0p9g1lci8sm12a2rfk0g33z2vr75x78zdf1g84djwbz8ipc6"; + }; + nativeBuildInputs = [ yacc ]; + installFlags = "PREFIX=\${out}"; + + meta = with stdenv.lib; { + homepage = "https://www.anjbe.name/rgbds/"; + description = "An assembler/linker package that produces Game Boy programs"; + license = licenses.free; + maintainers = with maintainers; [ mbauer ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index ec80317c777..d452d0abe30 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "scala-2.11.7"; + name = "scala-2.11.8"; src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "1l16571fw5l339wd02w2pnr3556j804zpbsbymnad67f2dpikr7z"; + sha256 = "1khs7673wca7gnxz2rxphv6v5k94jkpcarlqznsys9cpknhqdz47"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/wla-dx/default.nix b/pkgs/development/compilers/wla-dx/default.nix new file mode 100644 index 00000000000..535868bee3b --- /dev/null +++ b/pkgs/development/compilers/wla-dx/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchFromGitHub, cmake}: + +stdenv.mkDerivation rec { + name = "wla-dx-git-2016-02-27"; + src = fetchFromGitHub { + owner = "vhelin"; + repo = "wla-dx"; + rev = "8189fe8d5620584ea16563875ff3c5430527c86a"; + sha256 = "02zgkcyfx7y8j6jvyi12lm29fydnd7m3rxv6g2psv23fyzmpkkir"; + }; + installPhase = '' + mkdir -p $out/bin + install binaries/* $out/bin + ''; + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + homepage = "http://www.villehelin.com/wla.html"; + description = "Yet Another GB-Z80/Z80/6502/65C02/6510/65816/HUC6280/SPC-700 Multi Platform Cross Assembler Package"; + license = licenses.gpl2; + maintainers = with maintainers; [ mbauer ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/guile-modules/guile-opengl/default.nix b/pkgs/development/guile-modules/guile-opengl/default.nix index 4d608f4caa9..c7704d87fad 100644 --- a/pkgs/development/guile-modules/guile-opengl/default.nix +++ b/pkgs/development/guile-modules/guile-opengl/default.nix @@ -8,7 +8,6 @@ stdenv.mkDerivation rec { homepage = "http://gnu.org/s/guile-opengl"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/development/guile-modules/guile-sdl/default.nix index 8c1706be583..4a0f23457ba 100644 --- a/pkgs/development/guile-modules/guile-sdl/default.nix +++ b/pkgs/development/guile-modules/guile-sdl/default.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation rec { homepage = "http://gnu.org/s/guile-sdl"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix index fc02ab305a3..a60a10c5c04 100644 --- a/pkgs/development/guile-modules/guile-xcb/default.nix +++ b/pkgs/development/guile-modules/guile-xcb/default.nix @@ -8,7 +8,6 @@ stdenv.mkDerivation { homepage = "http://www.markwitmer.com/guile-xcb/guile-xcb.html"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 71e31de1f6a..af494197edb 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -49,6 +49,9 @@ self: super: { # The package doesn't compile with ruby 1.9, which is our default at the moment. hruby = super.hruby.override { ruby = pkgs.ruby_2_1; }; + # help blake finding its native library + hs-blake2 = super.hs-blake2.override { b2 = pkgs.libb2; }; + # Use the default version of mysql to build this package (which is actually mariadb). mysql = super.mysql.override { mysql = pkgs.mysql.lib; }; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix index 2486d91b95a..af7ea54082f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix @@ -1783,6 +1783,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1971,6 +1972,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2583,6 +2585,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3962,6 +3965,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5037,6 +5041,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6328,6 +6333,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6806,6 +6812,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -7018,6 +7025,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7214,6 +7222,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7397,6 +7406,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7957,6 +7967,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -8034,6 +8045,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_0_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9071,6 +9083,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_0"; "yesod-form" = doDistribute super."yesod-form_1_4_3"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9163,6 +9176,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-archive" = doDistribute super."zip-archive_0_2_3_5"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix index 9ec9fd73f46..6c5c25b8938 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix @@ -1783,6 +1783,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1971,6 +1972,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2583,6 +2585,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3962,6 +3965,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5037,6 +5041,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6328,6 +6333,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6806,6 +6812,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -7018,6 +7025,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7214,6 +7222,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7397,6 +7406,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7957,6 +7967,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -8034,6 +8045,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_0_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9071,6 +9083,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_0"; "yesod-form" = doDistribute super."yesod-form_1_4_3"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9163,6 +9176,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-archive" = doDistribute super."zip-archive_0_2_3_5"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix index 6f09f2d2418..eb1af4c83e7 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix @@ -1783,6 +1783,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1971,6 +1972,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2583,6 +2585,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3962,6 +3965,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5037,6 +5041,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6328,6 +6333,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6806,6 +6812,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -7018,6 +7025,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7214,6 +7222,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7397,6 +7406,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7957,6 +7967,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -8034,6 +8045,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_0_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9071,6 +9083,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_0"; "yesod-form" = doDistribute super."yesod-form_1_4_3"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9163,6 +9176,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-archive" = doDistribute super."zip-archive_0_2_3_5"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix index a24c6905c07..e4d33f2efe5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix @@ -1783,6 +1783,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1971,6 +1972,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2583,6 +2585,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3962,6 +3965,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5037,6 +5041,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6328,6 +6333,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6806,6 +6812,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -7018,6 +7025,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7214,6 +7222,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7397,6 +7406,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7957,6 +7967,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -8034,6 +8045,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_0_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9071,6 +9083,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_0"; "yesod-form" = doDistribute super."yesod-form_1_4_3"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9163,6 +9176,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-archive" = doDistribute super."zip-archive_0_2_3_5"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix index f979f700e91..43ffde620d2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix @@ -1783,6 +1783,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1971,6 +1972,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2583,6 +2585,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3959,6 +3962,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5034,6 +5038,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6325,6 +6330,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6803,6 +6809,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -7015,6 +7022,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7210,6 +7218,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7393,6 +7402,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7953,6 +7963,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -8030,6 +8041,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_0_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9067,6 +9079,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_0"; "yesod-form" = doDistribute super."yesod-form_1_4_3"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9159,6 +9172,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-archive" = doDistribute super."zip-archive_0_2_3_5"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix index 6ee51f7c699..85d80b93352 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix @@ -1783,6 +1783,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1971,6 +1972,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2583,6 +2585,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3959,6 +3962,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5034,6 +5038,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6325,6 +6330,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6803,6 +6809,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -7015,6 +7022,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7210,6 +7218,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7393,6 +7402,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7953,6 +7963,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -8030,6 +8041,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_0_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9067,6 +9079,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_0"; "yesod-form" = doDistribute super."yesod-form_1_4_3"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9159,6 +9172,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-archive" = doDistribute super."zip-archive_0_2_3_5"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix index 8fe1d730c80..a0567225d9c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix @@ -1782,6 +1782,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1970,6 +1971,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2582,6 +2584,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3958,6 +3961,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5032,6 +5036,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6323,6 +6328,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6801,6 +6807,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -7013,6 +7020,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7207,6 +7215,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7390,6 +7399,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7950,6 +7960,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -8027,6 +8038,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_0_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9062,6 +9074,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_0"; "yesod-form" = doDistribute super."yesod-form_1_4_3_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9153,6 +9166,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-archive" = doDistribute super."zip-archive_0_2_3_5"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix index 48f29fddd71..30e31c1e084 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix @@ -1782,6 +1782,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1970,6 +1971,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2582,6 +2584,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3958,6 +3961,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5032,6 +5036,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6323,6 +6328,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6801,6 +6807,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -7013,6 +7020,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7207,6 +7215,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7390,6 +7399,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7950,6 +7960,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -8027,6 +8038,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_0_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9062,6 +9074,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_0"; "yesod-form" = doDistribute super."yesod-form_1_4_3_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9153,6 +9166,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-archive" = doDistribute super."zip-archive_0_2_3_5"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix index 49ec22af7c7..0f0c488d2e5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix @@ -927,6 +927,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_6_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1777,6 +1778,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1963,6 +1965,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2574,6 +2577,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3949,6 +3953,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5021,6 +5026,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6312,6 +6318,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6790,6 +6797,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -7002,6 +7010,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7195,6 +7204,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7378,6 +7388,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7937,6 +7948,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -8014,6 +8026,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_0_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9048,6 +9061,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_0"; "yesod-form" = doDistribute super."yesod-form_1_4_3_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9139,6 +9153,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-archive" = doDistribute super."zip-archive_0_2_3_5"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix index 3d4a16f325a..c1b4d8e6112 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix @@ -927,6 +927,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_6_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1777,6 +1778,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1962,6 +1964,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2572,6 +2575,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3946,6 +3950,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5015,6 +5020,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6305,6 +6311,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6783,6 +6790,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6995,6 +7003,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7188,6 +7197,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7371,6 +7381,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7928,6 +7939,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -8005,6 +8017,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_0_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9035,6 +9048,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_0"; "yesod-form" = doDistribute super."yesod-form_1_4_3_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9126,6 +9140,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-archive" = doDistribute super."zip-archive_0_2_3_5"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix index 67857ee4b1c..7da0500abde 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix @@ -926,6 +926,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1776,6 +1777,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1960,6 +1962,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2568,6 +2571,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3936,6 +3940,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4999,6 +5004,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6285,6 +6291,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6763,6 +6770,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6974,6 +6982,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7167,6 +7176,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7349,6 +7359,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7905,6 +7916,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7981,6 +7993,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9005,6 +9018,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9096,6 +9110,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix index c27a46a88c8..437962990c3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix @@ -926,6 +926,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1776,6 +1777,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1960,6 +1962,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2568,6 +2571,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3935,6 +3939,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4996,6 +5001,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6281,6 +6287,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6759,6 +6766,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6970,6 +6978,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7163,6 +7172,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7345,6 +7355,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7901,6 +7912,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7977,6 +7989,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9001,6 +9014,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9092,6 +9106,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix index a5a7d7fa360..4b22bce4ac1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix @@ -926,6 +926,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1776,6 +1777,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1960,6 +1962,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2568,6 +2571,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3935,6 +3939,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4995,6 +5000,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6280,6 +6286,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6758,6 +6765,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6969,6 +6977,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7162,6 +7171,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7344,6 +7354,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7900,6 +7911,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7976,6 +7988,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8999,6 +9012,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9090,6 +9104,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix index 66812de0443..191c04f8984 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix @@ -926,6 +926,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1776,6 +1777,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1960,6 +1962,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2568,6 +2571,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3934,6 +3938,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4994,6 +4999,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6279,6 +6285,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6757,6 +6764,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6968,6 +6976,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7161,6 +7170,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7343,6 +7353,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7899,6 +7910,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7975,6 +7987,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8997,6 +9010,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9088,6 +9102,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix index e125520cf71..6ba78851f21 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix @@ -925,6 +925,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1774,6 +1775,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1958,6 +1960,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2565,6 +2568,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3931,6 +3935,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4991,6 +4996,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6274,6 +6280,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6752,6 +6759,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6962,6 +6970,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7155,6 +7164,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7337,6 +7347,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7893,6 +7904,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7969,6 +7981,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8991,6 +9004,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9082,6 +9096,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix index 47821d85dab..710db92a7e5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix @@ -924,6 +924,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1773,6 +1774,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1957,6 +1959,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2562,6 +2565,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3927,6 +3931,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4987,6 +4992,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6268,6 +6274,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6746,6 +6753,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6955,6 +6963,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7148,6 +7157,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7330,6 +7340,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7884,6 +7895,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7960,6 +7972,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8981,6 +8994,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9072,6 +9086,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix index 8469c6f17c7..ca6f51c7e0f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix @@ -927,6 +927,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1777,6 +1778,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1962,6 +1964,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2570,6 +2573,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3943,6 +3947,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5012,6 +5017,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6301,6 +6307,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6779,6 +6786,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6990,6 +6998,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7183,6 +7192,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7365,6 +7375,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7922,6 +7933,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7999,6 +8011,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_0_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9029,6 +9042,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_0"; "yesod-form" = doDistribute super."yesod-form_1_4_3_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9120,6 +9134,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-archive" = doDistribute super."zip-archive_0_2_3_5"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix index 8b9dedb59fe..10f704082f5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix @@ -926,6 +926,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1776,6 +1777,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1961,6 +1963,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2569,6 +2572,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3941,6 +3945,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5009,6 +5014,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6297,6 +6303,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6775,6 +6782,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6986,6 +6994,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7179,6 +7188,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7361,6 +7371,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7918,6 +7929,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7995,6 +8007,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_0_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9024,6 +9037,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_3_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9115,6 +9129,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix index 23909c3d2e7..540aa779d7e 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix @@ -926,6 +926,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1776,6 +1777,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1960,6 +1962,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2568,6 +2571,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3940,6 +3944,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5008,6 +5013,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6296,6 +6302,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6774,6 +6781,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6985,6 +6993,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7178,6 +7187,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7360,6 +7370,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7917,6 +7928,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7994,6 +8006,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9021,6 +9034,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_3_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9112,6 +9126,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix index 127f3e90509..b9b74b37329 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix @@ -926,6 +926,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1776,6 +1777,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1960,6 +1962,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2568,6 +2571,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3940,6 +3944,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5003,6 +5008,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6291,6 +6297,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6769,6 +6776,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6980,6 +6988,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7173,6 +7182,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7355,6 +7365,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7912,6 +7923,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7989,6 +8001,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9016,6 +9029,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_3_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9107,6 +9121,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix index efbf9037a6f..6831e5a994d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix @@ -926,6 +926,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1776,6 +1777,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1960,6 +1962,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2568,6 +2571,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3937,6 +3941,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -5000,6 +5005,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6287,6 +6293,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6765,6 +6772,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6976,6 +6984,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7169,6 +7178,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7351,6 +7361,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7908,6 +7919,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7985,6 +7997,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9011,6 +9024,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9102,6 +9116,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix index 99dc38c7f80..fadfe04c4f6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix @@ -926,6 +926,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1776,6 +1777,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1960,6 +1962,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = dontDistribute super."cartel"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2568,6 +2571,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3936,6 +3940,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4999,6 +5004,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6286,6 +6292,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6764,6 +6771,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6975,6 +6983,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7168,6 +7177,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7350,6 +7360,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = dontDistribute super."servant-jquery"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7907,6 +7918,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7984,6 +7996,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -9010,6 +9023,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9101,6 +9115,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix index 568076876a7..b3b5b567740 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix @@ -919,6 +919,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1763,6 +1764,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1947,6 +1949,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2354,6 +2357,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2548,6 +2552,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3909,6 +3914,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4961,6 +4967,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6225,6 +6232,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6700,6 +6708,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6909,6 +6918,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7102,6 +7112,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7283,6 +7294,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7832,6 +7844,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7907,6 +7920,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8921,6 +8935,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9012,6 +9027,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix index 498229f2a84..eb82bb1cece 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix @@ -919,6 +919,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1763,6 +1764,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1946,6 +1948,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2353,6 +2356,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2547,6 +2551,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3908,6 +3913,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4960,6 +4966,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6224,6 +6231,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6699,6 +6707,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6908,6 +6917,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7101,6 +7111,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7282,6 +7293,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7831,6 +7843,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7906,6 +7919,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8919,6 +8933,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9010,6 +9025,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix index d779e935a1c..453c0b845e6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_9_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1754,6 +1755,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1935,6 +1937,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2341,6 +2344,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2534,6 +2538,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3889,6 +3894,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4937,6 +4943,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6193,6 +6200,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6665,6 +6673,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6873,6 +6882,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7065,6 +7075,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7245,6 +7256,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7788,6 +7800,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7861,6 +7874,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8870,6 +8884,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8961,6 +8976,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix index 88fa6fdbe07..0b26c8a2da0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_9_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1753,6 +1754,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1934,6 +1936,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2340,6 +2343,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2533,6 +2537,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3887,6 +3892,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4934,6 +4940,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6187,6 +6194,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6659,6 +6667,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6867,6 +6876,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7058,6 +7068,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7238,6 +7249,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7779,6 +7791,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7852,6 +7865,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8861,6 +8875,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8952,6 +8967,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix index 265cb7ab469..a23586c4557 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_9_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1753,6 +1754,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1934,6 +1936,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2340,6 +2343,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2533,6 +2537,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3887,6 +3892,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4934,6 +4940,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6187,6 +6194,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6659,6 +6667,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6867,6 +6876,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7058,6 +7068,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7237,6 +7248,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7778,6 +7790,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7851,6 +7864,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8860,6 +8874,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8951,6 +8966,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix index 64f691c05ec..53688afb8ec 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_9_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1753,6 +1754,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1934,6 +1936,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2340,6 +2343,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2533,6 +2537,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3886,6 +3891,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4932,6 +4938,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6185,6 +6192,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6657,6 +6665,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6865,6 +6874,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7056,6 +7066,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7235,6 +7246,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7776,6 +7788,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7849,6 +7862,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8858,6 +8872,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8949,6 +8964,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix index 0ac7dfa05a4..ec039632190 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_9_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1752,6 +1753,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1933,6 +1935,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2339,6 +2342,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2532,6 +2536,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3884,6 +3889,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4929,6 +4935,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6182,6 +6189,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6654,6 +6662,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6862,6 +6871,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7053,6 +7063,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7232,6 +7243,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7772,6 +7784,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7845,6 +7858,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8852,6 +8866,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8943,6 +8958,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix index 9070ce99658..a3d80430355 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_9_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1752,6 +1753,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1933,6 +1935,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2339,6 +2342,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2532,6 +2536,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3883,6 +3888,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4928,6 +4934,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6180,6 +6187,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6652,6 +6660,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6860,6 +6869,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7051,6 +7061,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7230,6 +7241,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7769,6 +7781,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7842,6 +7855,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8849,6 +8863,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8939,6 +8954,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix index 37eff2fd08b..aa482072e72 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_9_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1752,6 +1753,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1933,6 +1935,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2337,6 +2340,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2530,6 +2534,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3879,6 +3884,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4924,6 +4930,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6175,6 +6182,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6647,6 +6655,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6855,6 +6864,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7046,6 +7056,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7225,6 +7236,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7764,6 +7776,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7837,6 +7850,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8844,6 +8858,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8933,6 +8948,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix index 83f4314bb12..8f78f48e28b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_10_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1750,6 +1751,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1931,6 +1933,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2335,6 +2338,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2528,6 +2532,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3875,6 +3880,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4920,6 +4926,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6170,6 +6177,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6642,6 +6650,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6850,6 +6859,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7041,6 +7051,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7220,6 +7231,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7759,6 +7771,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7832,6 +7845,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8839,6 +8853,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8928,6 +8943,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix index fad6e89bae9..b73043843f5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_10_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1750,6 +1751,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1930,6 +1932,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2334,6 +2337,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2527,6 +2531,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3873,6 +3878,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4917,6 +4923,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6166,6 +6173,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6638,6 +6646,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6846,6 +6855,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7037,6 +7047,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7216,6 +7227,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7754,6 +7766,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7827,6 +7840,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8833,6 +8847,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8922,6 +8937,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix index de41ab241a4..44086d11797 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_10_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1750,6 +1751,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1930,6 +1932,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2334,6 +2337,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2527,6 +2531,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3872,6 +3877,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4916,6 +4922,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6164,6 +6171,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6636,6 +6644,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6844,6 +6853,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7035,6 +7045,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7214,6 +7225,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7750,6 +7762,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7823,6 +7836,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8828,6 +8842,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8917,6 +8932,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix index 56704b5a5dc..082dd709074 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix @@ -918,6 +918,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1762,6 +1763,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1943,6 +1945,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2350,6 +2353,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2544,6 +2548,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3905,6 +3910,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4957,6 +4963,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6221,6 +6228,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6696,6 +6704,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6905,6 +6914,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7098,6 +7108,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7279,6 +7290,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7828,6 +7840,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7903,6 +7916,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8915,6 +8929,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9006,6 +9021,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix index 14b71d7d362..e4088e83fda 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_10_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1750,6 +1751,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1930,6 +1932,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2333,6 +2336,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2526,6 +2530,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3871,6 +3876,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4915,6 +4921,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6163,6 +6170,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6634,6 +6642,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6842,6 +6851,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7033,6 +7043,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7212,6 +7223,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7747,6 +7759,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7820,6 +7833,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8825,6 +8839,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8914,6 +8929,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix index a4c6afbdc20..a5feb068167 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_10_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1750,6 +1751,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1930,6 +1932,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2333,6 +2336,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2526,6 +2530,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3871,6 +3876,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4915,6 +4921,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6162,6 +6169,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6632,6 +6640,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6840,6 +6849,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7031,6 +7041,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7210,6 +7221,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7745,6 +7757,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7818,6 +7831,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8820,6 +8834,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8909,6 +8924,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix index 6b945f2af10..0cc8eb33e20 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_10_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1750,6 +1751,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1930,6 +1932,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2333,6 +2336,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2526,6 +2530,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3871,6 +3876,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4914,6 +4920,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6160,6 +6167,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6630,6 +6638,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6838,6 +6847,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7029,6 +7039,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7208,6 +7219,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7743,6 +7755,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7816,6 +7829,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8818,6 +8832,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8907,6 +8922,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix index 3ce4419e3e0..9d44f450ac3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix @@ -918,6 +918,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_7_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1762,6 +1763,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1943,6 +1945,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2350,6 +2353,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2544,6 +2548,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3904,6 +3909,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4955,6 +4961,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6219,6 +6226,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6694,6 +6702,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6903,6 +6912,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7096,6 +7106,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7277,6 +7288,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7826,6 +7838,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7901,6 +7914,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8913,6 +8927,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9004,6 +9019,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix index 402e65f8b8f..8a2b3b4deac 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix @@ -918,6 +918,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_9_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1761,6 +1762,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1942,6 +1944,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2349,6 +2352,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2543,6 +2547,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3903,6 +3908,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4954,6 +4960,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6217,6 +6224,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6691,6 +6699,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6900,6 +6909,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7092,6 +7102,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7273,6 +7284,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7822,6 +7834,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7897,6 +7910,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8909,6 +8923,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -9000,6 +9015,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix index 489f310c2d0..67671cfa058 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix @@ -918,6 +918,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_9_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1761,6 +1762,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1942,6 +1944,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2348,6 +2351,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2542,6 +2546,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3902,6 +3907,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4953,6 +4959,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6216,6 +6223,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6690,6 +6698,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6899,6 +6908,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7091,6 +7101,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7272,6 +7283,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7821,6 +7833,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7896,6 +7909,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8908,6 +8922,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8999,6 +9014,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix index 171d7187d19..395eed7a466 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix @@ -918,6 +918,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_9_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1758,6 +1759,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1939,6 +1941,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2345,6 +2348,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2539,6 +2543,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3897,6 +3902,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4948,6 +4954,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6210,6 +6217,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6684,6 +6692,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6893,6 +6902,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7085,6 +7095,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7266,6 +7277,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7815,6 +7827,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7890,6 +7903,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8900,6 +8914,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8991,6 +9006,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix index d48d2912514..56b294f3a0d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix @@ -917,6 +917,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_9_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1757,6 +1758,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1938,6 +1940,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2344,6 +2347,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2538,6 +2542,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3896,6 +3901,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4947,6 +4953,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6209,6 +6216,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6683,6 +6691,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6892,6 +6901,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7084,6 +7094,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7265,6 +7276,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7814,6 +7826,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7889,6 +7902,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_1"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8899,6 +8913,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8990,6 +9005,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix index 2363e401c29..ed5076569f0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_9_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1756,6 +1757,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1937,6 +1939,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2343,6 +2346,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2537,6 +2541,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3894,6 +3899,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4945,6 +4951,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6207,6 +6214,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6681,6 +6689,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6890,6 +6899,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7082,6 +7092,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7262,6 +7273,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7808,6 +7820,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7883,6 +7896,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8893,6 +8907,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8984,6 +8999,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix index 2c924184096..154ac6f5c76 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix @@ -916,6 +916,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_7_9_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1754,6 +1755,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "bool-extras" = dontDistribute super."bool-extras"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; @@ -1935,6 +1937,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2341,6 +2344,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2535,6 +2539,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3890,6 +3895,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4939,6 +4945,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -6199,6 +6206,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6672,6 +6680,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = dontDistribute super."psqueues"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6881,6 +6890,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -7073,6 +7083,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7253,6 +7264,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_2_2_1"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7797,6 +7809,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7870,6 +7883,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_1_0"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -8879,6 +8893,7 @@ self: super: { "yesod-fay" = doDistribute super."yesod-fay_0_7_1"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-gitrepo" = doDistribute super."yesod-gitrepo_0_1_1_0"; "yesod-gitrev" = dontDistribute super."yesod-gitrev"; "yesod-goodies" = dontDistribute super."yesod-goodies"; @@ -8970,6 +8985,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix index aa9d7348a73..26901fe517d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix @@ -898,6 +898,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_0_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1701,6 +1702,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1876,6 +1878,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2272,6 +2275,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2462,6 +2466,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3332,6 +3337,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3776,6 +3782,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4797,6 +4804,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -5995,6 +6003,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6451,6 +6460,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_2"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6657,6 +6667,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6850,6 +6861,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7027,6 +7039,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7548,6 +7561,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7620,6 +7634,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -7879,7 +7894,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8595,6 +8609,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8682,6 +8697,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix index 1e1afff1d7a..22bf6130b77 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix @@ -898,6 +898,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1700,6 +1701,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1875,6 +1877,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2271,6 +2274,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2461,6 +2465,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3329,6 +3334,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3773,6 +3779,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4794,6 +4801,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -5990,6 +5998,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6445,6 +6454,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_2"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6651,6 +6661,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6843,6 +6854,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7020,6 +7032,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7541,6 +7554,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7613,6 +7627,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -7872,7 +7887,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8587,6 +8601,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8674,6 +8689,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix index 6be62d0311f..7b6a5fc116d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix @@ -164,7 +164,9 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1"; + "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_4"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; @@ -893,6 +895,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1384,6 +1387,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1686,6 +1690,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1861,6 +1866,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2224,6 +2230,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2254,6 +2261,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2444,6 +2452,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3300,6 +3309,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3742,6 +3752,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4757,6 +4768,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4840,6 +4852,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5940,6 +5953,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6388,6 +6402,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6593,6 +6608,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6784,6 +6800,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6961,6 +6978,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7476,6 +7494,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7548,6 +7567,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7802,7 +7822,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8220,6 +8239,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8505,6 +8525,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8590,6 +8611,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix index 6968b8f22ff..6d667e44406 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix @@ -164,7 +164,9 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1"; + "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_4"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; @@ -893,6 +895,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1384,6 +1387,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1686,6 +1690,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1860,6 +1865,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2223,6 +2229,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2253,6 +2260,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2443,6 +2451,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3298,6 +3307,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3740,6 +3750,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4755,6 +4766,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4838,6 +4850,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5938,6 +5951,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6385,6 +6399,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6590,6 +6605,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6781,6 +6797,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6958,6 +6975,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7472,6 +7490,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7544,6 +7563,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7798,7 +7818,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8216,6 +8235,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8501,6 +8521,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_5"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8586,6 +8607,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix index 54a18bac10a..e57cb676ac9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix @@ -164,6 +164,9 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; + "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_4"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; @@ -892,6 +895,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1383,6 +1387,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1685,6 +1690,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1859,6 +1865,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1981,6 +1988,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -2219,6 +2228,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2249,6 +2259,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2439,6 +2450,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3294,6 +3306,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3735,6 +3748,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4750,6 +4764,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4833,6 +4848,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5933,6 +5949,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6379,6 +6396,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6584,6 +6602,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6775,6 +6794,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6952,6 +6972,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7466,6 +7487,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7538,6 +7560,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7790,7 +7813,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8208,6 +8230,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8493,6 +8516,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_5"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8576,6 +8600,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix index e2f847f30df..b9cb47decb0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix @@ -164,6 +164,9 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; + "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_4"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; @@ -892,6 +895,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1383,6 +1387,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1685,6 +1690,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1859,6 +1865,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1981,6 +1988,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -2219,6 +2228,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2249,6 +2259,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2439,6 +2450,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3294,6 +3306,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3735,6 +3748,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4749,6 +4763,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4832,6 +4847,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5931,6 +5947,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6376,6 +6393,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6581,6 +6599,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6772,6 +6791,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6949,6 +6969,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7463,6 +7484,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7535,6 +7557,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7787,7 +7810,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8204,6 +8226,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8489,6 +8512,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_5"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8572,6 +8596,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix index 1757791208f..e587a7ad38a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix @@ -164,6 +164,9 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; + "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_4"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; @@ -892,6 +895,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1381,6 +1385,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1683,6 +1688,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1856,6 +1862,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1978,6 +1985,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -2216,6 +2225,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2245,6 +2255,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2435,6 +2446,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3288,6 +3300,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3729,6 +3742,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4742,6 +4756,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4825,6 +4840,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5923,6 +5939,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6368,6 +6385,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6573,6 +6591,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6764,6 +6783,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6941,6 +6961,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7455,6 +7476,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7527,6 +7549,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7779,7 +7802,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8196,6 +8218,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8480,6 +8503,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_5"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8563,6 +8587,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix index 11783029b1a..2be3799d16d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix @@ -164,6 +164,9 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; + "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_4"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; @@ -892,6 +895,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1381,6 +1385,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1683,6 +1688,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1856,6 +1862,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1978,6 +1985,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -2216,6 +2225,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2245,6 +2255,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2435,6 +2446,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3288,6 +3300,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3729,6 +3742,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4739,6 +4753,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4822,6 +4837,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5920,6 +5936,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6365,6 +6382,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6570,6 +6588,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6761,6 +6780,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6938,6 +6958,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7451,6 +7472,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7523,6 +7545,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7775,7 +7798,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8192,6 +8214,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8476,6 +8499,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_5"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8559,6 +8583,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix index e188ec15cbb..efd1b082339 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix @@ -164,6 +164,9 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; + "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_4"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; @@ -891,6 +894,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1380,6 +1384,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1682,6 +1687,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1855,6 +1861,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1977,6 +1984,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -2215,6 +2224,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2244,6 +2254,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2434,6 +2445,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3286,6 +3298,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3726,6 +3739,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4736,6 +4750,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4819,6 +4834,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5915,6 +5931,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6003,6 +6020,7 @@ self: super: { "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; "patches-vector" = dontDistribute super."patches-vector"; + "path" = doDistribute super."path_0_5_3"; "path-extra" = dontDistribute super."path-extra"; "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; @@ -6358,6 +6376,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6562,6 +6581,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6753,6 +6773,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6929,6 +6950,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7442,6 +7464,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7514,6 +7537,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7763,7 +7787,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8180,6 +8203,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8464,6 +8488,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_5"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8547,6 +8572,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix index 5875789a2af..b2af59ffb82 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix @@ -164,6 +164,9 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; + "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_4"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; @@ -891,6 +894,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1379,6 +1383,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1681,6 +1686,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1854,6 +1860,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1975,6 +1982,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -2213,6 +2222,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2242,6 +2252,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2432,6 +2443,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3284,6 +3296,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3723,6 +3736,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4732,6 +4746,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4815,6 +4830,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5909,6 +5925,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5997,6 +6014,7 @@ self: super: { "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; "patches-vector" = dontDistribute super."patches-vector"; + "path" = doDistribute super."path_0_5_3"; "path-extra" = dontDistribute super."path-extra"; "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; @@ -6352,6 +6370,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6556,6 +6575,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6747,6 +6767,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6923,6 +6944,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7436,6 +7458,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7508,6 +7531,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7757,7 +7781,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8174,6 +8197,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8457,6 +8481,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8540,6 +8565,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix index 58b5849579c..2668b094d9d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix @@ -164,6 +164,9 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; + "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_4"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; @@ -891,6 +894,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1379,6 +1383,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1681,6 +1686,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1853,6 +1859,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1974,6 +1981,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -2212,6 +2221,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2241,6 +2251,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2431,6 +2442,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3283,6 +3295,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3719,6 +3732,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4723,6 +4737,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4806,6 +4821,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5900,6 +5916,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5987,6 +6004,7 @@ self: super: { "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; "patches-vector" = dontDistribute super."patches-vector"; + "path" = doDistribute super."path_0_5_3"; "path-extra" = dontDistribute super."path-extra"; "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; @@ -6340,6 +6358,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6544,6 +6563,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6735,6 +6755,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6911,6 +6932,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7423,6 +7445,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7495,6 +7518,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7744,7 +7768,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8161,6 +8184,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8444,6 +8468,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8527,6 +8552,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix index 3eeb0194a49..fc230510d8d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix @@ -163,6 +163,9 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; + "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_4"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; @@ -890,6 +893,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1377,6 +1381,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1678,6 +1683,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1848,6 +1854,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1969,6 +1976,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -2206,6 +2215,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2235,6 +2245,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2425,6 +2436,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3277,6 +3289,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3713,6 +3726,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4714,6 +4728,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4797,6 +4812,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5888,6 +5904,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5975,6 +5992,7 @@ self: super: { "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; "patches-vector" = dontDistribute super."patches-vector"; + "path" = doDistribute super."path_0_5_3"; "path-extra" = dontDistribute super."path-extra"; "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; @@ -6080,6 +6098,7 @@ self: super: { "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_7"; + "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; @@ -6326,6 +6345,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6530,6 +6550,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6721,6 +6742,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6897,6 +6919,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7408,6 +7431,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7480,6 +7504,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7729,7 +7754,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8146,6 +8170,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8428,6 +8453,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8511,6 +8537,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix index 69483ad17f0..450ccc34a9a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix @@ -897,6 +897,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1698,6 +1699,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1873,6 +1875,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2269,6 +2272,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2459,6 +2463,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3325,6 +3330,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3769,6 +3775,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4790,6 +4797,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -5984,6 +5992,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6438,6 +6447,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_2"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6643,6 +6653,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6835,6 +6846,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7012,6 +7024,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7531,6 +7544,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7603,6 +7617,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -7862,7 +7877,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8284,6 +8298,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_4"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8576,6 +8591,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8663,6 +8679,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix index 535391a6252..8bab2133709 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix @@ -163,6 +163,9 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; + "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_4"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; @@ -889,6 +892,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1376,6 +1380,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1677,6 +1682,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1847,6 +1853,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1968,6 +1975,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -2205,6 +2214,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2234,6 +2244,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2424,6 +2435,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3276,6 +3288,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3712,6 +3725,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4713,6 +4727,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4796,6 +4811,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -4935,6 +4951,7 @@ self: super: { "language-boogie" = dontDistribute super."language-boogie"; "language-c-comments" = dontDistribute super."language-c-comments"; "language-c-inline" = dontDistribute super."language-c-inline"; + "language-c-quote" = doDistribute super."language-c-quote_0_11_4"; "language-cil" = dontDistribute super."language-cil"; "language-css" = dontDistribute super."language-css"; "language-dot" = dontDistribute super."language-dot"; @@ -5886,6 +5903,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5973,6 +5991,7 @@ self: super: { "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; "patches-vector" = dontDistribute super."patches-vector"; + "path" = doDistribute super."path_0_5_3"; "path-extra" = dontDistribute super."path-extra"; "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; @@ -6077,6 +6096,7 @@ self: super: { "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_7"; + "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; @@ -6323,6 +6343,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6527,6 +6548,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6717,6 +6739,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6893,6 +6916,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_5"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7403,6 +7427,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7475,6 +7500,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7723,7 +7749,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8140,6 +8165,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8421,6 +8447,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8504,6 +8531,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix index 3f7fe51cd18..5627d7f1520 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix @@ -163,6 +163,9 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; + "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_4"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; @@ -889,6 +892,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1376,6 +1380,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1677,6 +1682,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1847,6 +1853,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1968,6 +1975,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -2204,6 +2213,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2233,6 +2243,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2423,6 +2434,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3273,6 +3285,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3708,6 +3721,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4707,6 +4721,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4790,6 +4805,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -4929,6 +4945,7 @@ self: super: { "language-boogie" = dontDistribute super."language-boogie"; "language-c-comments" = dontDistribute super."language-c-comments"; "language-c-inline" = dontDistribute super."language-c-inline"; + "language-c-quote" = doDistribute super."language-c-quote_0_11_4"; "language-cil" = dontDistribute super."language-cil"; "language-css" = dontDistribute super."language-css"; "language-dot" = dontDistribute super."language-dot"; @@ -5879,6 +5896,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5965,6 +5983,7 @@ self: super: { "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; "patches-vector" = dontDistribute super."patches-vector"; + "path" = doDistribute super."path_0_5_3"; "path-extra" = dontDistribute super."path-extra"; "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; @@ -6069,6 +6088,7 @@ self: super: { "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_7"; + "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; @@ -6314,6 +6334,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6517,6 +6538,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6706,6 +6728,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6878,6 +6901,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pool" = dontDistribute super."servant-pool"; @@ -7382,6 +7406,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7454,6 +7479,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7702,7 +7728,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8115,6 +8140,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8394,6 +8420,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8476,6 +8503,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix index e3fb760f538..2d4131a2761 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix @@ -163,6 +163,9 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; + "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_4"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13"; @@ -889,6 +892,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1376,6 +1380,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1677,6 +1682,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1847,6 +1853,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1968,6 +1975,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -2204,6 +2213,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2233,6 +2243,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2423,6 +2434,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3271,6 +3283,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3706,6 +3719,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4701,6 +4715,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4784,6 +4799,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -4923,6 +4939,7 @@ self: super: { "language-boogie" = dontDistribute super."language-boogie"; "language-c-comments" = dontDistribute super."language-c-comments"; "language-c-inline" = dontDistribute super."language-c-inline"; + "language-c-quote" = doDistribute super."language-c-quote_0_11_4"; "language-cil" = dontDistribute super."language-cil"; "language-css" = dontDistribute super."language-css"; "language-dot" = dontDistribute super."language-dot"; @@ -5873,6 +5890,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5959,6 +5977,7 @@ self: super: { "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; "patches-vector" = dontDistribute super."patches-vector"; + "path" = doDistribute super."path_0_5_3"; "path-extra" = dontDistribute super."path-extra"; "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; @@ -6063,6 +6082,7 @@ self: super: { "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_7"; + "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; @@ -6308,6 +6328,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6511,6 +6532,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6700,6 +6722,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6872,6 +6895,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pool" = dontDistribute super."servant-pool"; @@ -7376,6 +7400,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7448,6 +7473,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7696,7 +7722,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8109,6 +8134,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8388,6 +8414,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8470,6 +8497,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix index fe46fd0999f..2c6fede1d7c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix @@ -897,6 +897,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1697,6 +1698,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1872,6 +1874,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2237,6 +2240,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2267,6 +2271,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2457,6 +2462,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3322,6 +3328,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3766,6 +3773,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4786,6 +4794,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -5980,6 +5989,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6434,6 +6444,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_2"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6639,6 +6650,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6830,6 +6842,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7007,6 +7020,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_2"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7525,6 +7539,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7597,6 +7612,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -7855,7 +7871,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8276,6 +8291,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_4"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8567,6 +8583,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8654,6 +8671,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix index 6d56cc3fd65..c6050740cf6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix @@ -897,6 +897,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1697,6 +1698,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1872,6 +1874,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_6"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2237,6 +2240,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2267,6 +2271,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2457,6 +2462,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3322,6 +3328,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3766,6 +3773,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4786,6 +4794,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -5980,6 +5989,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6434,6 +6444,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_2"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6639,6 +6650,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6830,6 +6842,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -7007,6 +7020,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_2"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7524,6 +7538,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7596,6 +7611,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-ant-xml" = doDistribute super."tasty-ant-xml_1_0_1"; @@ -7854,7 +7870,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8275,6 +8290,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_4"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8565,6 +8581,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8652,6 +8669,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix index bc5a71482e4..3ae2f390006 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix @@ -897,6 +897,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1696,6 +1697,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1871,6 +1873,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2236,6 +2239,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2266,6 +2270,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2456,6 +2461,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3320,6 +3326,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3764,6 +3771,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4780,6 +4788,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -5973,6 +5982,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6425,6 +6435,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_2"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6630,6 +6641,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6821,6 +6833,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6998,6 +7011,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_2"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7515,6 +7529,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7587,6 +7602,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7842,7 +7858,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8263,6 +8278,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_4"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8552,6 +8568,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8637,6 +8654,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix index f9bb0ec0e00..51691d09fe5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix @@ -897,6 +897,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1696,6 +1697,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1871,6 +1873,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2236,6 +2239,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2266,6 +2270,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2456,6 +2461,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3319,6 +3325,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3761,6 +3768,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4777,6 +4785,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -5966,6 +5975,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6418,6 +6428,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_2"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6623,6 +6634,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6814,6 +6826,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6991,6 +7004,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_2"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7508,6 +7522,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7580,6 +7595,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7835,7 +7851,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8254,6 +8269,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8543,6 +8559,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8628,6 +8645,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix index fb31054c6e7..2617995e3b3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix @@ -897,6 +897,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1694,6 +1695,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1869,6 +1871,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2233,6 +2236,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2263,6 +2267,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2453,6 +2458,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3316,6 +3322,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3758,6 +3765,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4773,6 +4781,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4856,6 +4865,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5961,6 +5971,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6411,6 +6422,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6616,6 +6628,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6807,6 +6820,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6984,6 +6998,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_4"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7500,6 +7515,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7572,6 +7588,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7827,7 +7844,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8246,6 +8262,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8533,6 +8550,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8618,6 +8636,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix index f5c350e91c1..d3da3959e8f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix @@ -897,6 +897,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1692,6 +1693,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1867,6 +1869,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2230,6 +2233,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2260,6 +2264,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2450,6 +2455,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3309,6 +3315,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3751,6 +3758,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4766,6 +4774,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4849,6 +4858,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5952,6 +5962,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6401,6 +6412,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6606,6 +6618,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6797,6 +6810,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6974,6 +6988,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_4"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7490,6 +7505,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7562,6 +7578,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7816,7 +7833,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8235,6 +8251,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8522,6 +8539,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8607,6 +8625,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix index e2d045ed44d..f76aae3bf7a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix @@ -895,6 +895,7 @@ self: super: { "Spock" = doDistribute super."Spock_0_8_1_0"; "Spock-auth" = dontDistribute super."Spock-auth"; "Spock-digestive" = doDistribute super."Spock-digestive_0_1_0_1"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1689,6 +1690,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1864,6 +1866,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = dontDistribute super."carray"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -2227,6 +2230,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2257,6 +2261,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2447,6 +2452,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3304,6 +3310,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3746,6 +3753,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4761,6 +4769,7 @@ self: super: { "irc-conduit" = dontDistribute super."irc-conduit"; "irc-core" = dontDistribute super."irc-core"; "irc-ctcp" = dontDistribute super."irc-ctcp"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4844,6 +4853,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5946,6 +5956,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -6395,6 +6406,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; @@ -6600,6 +6612,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "reform" = dontDistribute super."reform"; "reform-blaze" = dontDistribute super."reform-blaze"; @@ -6791,6 +6804,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6968,6 +6982,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-jquery" = doDistribute super."servant-jquery_0_4_4_4"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; @@ -7484,6 +7499,7 @@ self: super: { "sylvia" = dontDistribute super."sylvia"; "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "sync-mht" = dontDistribute super."sync-mht"; "synchronous-channels" = dontDistribute super."synchronous-channels"; @@ -7556,6 +7572,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_1"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_10_1_2"; "tasty-dejafu" = dontDistribute super."tasty-dejafu"; @@ -7810,7 +7827,6 @@ self: super: { "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -8229,6 +8245,7 @@ self: super: { "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -8516,6 +8533,7 @@ self: super: { "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form" = doDistribute super."yesod-form_1_4_4_1"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8601,6 +8619,7 @@ self: super: { "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; "zim-parser" = dontDistribute super."zim-parser"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix index d744f166c32..ae2745ddee8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix @@ -163,6 +163,8 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; "Chart-diagrams" = dontDistribute super."Chart-diagrams"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; @@ -870,6 +872,7 @@ self: super: { "SpinCounter" = dontDistribute super."SpinCounter"; "Spintax" = dontDistribute super."Spintax"; "Spock-auth" = dontDistribute super."Spock-auth"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1285,6 +1288,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1563,6 +1567,7 @@ self: super: { "bliplib" = dontDistribute super."bliplib"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; + "bloodhound" = doDistribute super."bloodhound_0_10_0_0"; "bloxorz" = dontDistribute super."bloxorz"; "blubber" = dontDistribute super."blubber"; "blubber-server" = dontDistribute super."blubber-server"; @@ -1572,6 +1577,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1737,6 +1743,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = doDistribute super."carray_0_1_6_2"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1855,6 +1862,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = doDistribute super."clckwrks_0_23_13"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; @@ -2080,6 +2089,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2108,6 +2118,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2295,6 +2306,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3118,6 +3130,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3544,6 +3557,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4231,6 +4245,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = doDistribute super."htaglib_1_0_1"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4485,6 +4500,7 @@ self: super: { "irc-client" = doDistribute super."irc-client_0_2_5_0"; "irc-colors" = dontDistribute super."irc-colors"; "irc-core" = dontDistribute super."irc-core"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4563,6 +4579,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5625,6 +5642,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5708,6 +5726,7 @@ self: super: { "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; "patches-vector" = doDistribute super."patches-vector_0_1_5_0"; + "path" = doDistribute super."path_0_5_3"; "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -5804,6 +5823,7 @@ self: super: { "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_7"; + "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; @@ -6037,6 +6057,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = doDistribute super."publicsuffix_0_20151212"; @@ -6234,6 +6255,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "regex-applicative-text" = doDistribute super."regex-applicative-text_0_1_0_0"; "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa"; @@ -6406,6 +6428,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6574,6 +6597,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pool" = dontDistribute super."servant-pool"; @@ -7056,6 +7080,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; @@ -7126,6 +7151,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; "tasty-integrate" = dontDistribute super."tasty-integrate"; @@ -7217,7 +7243,6 @@ self: super: { "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; - "text-show" = doDistribute super."text-show_2_1_2"; "text-show-instances" = dontDistribute super."text-show-instances"; "text-stream-decode" = dontDistribute super."text-stream-decode"; "text-utf7" = dontDistribute super."text-utf7"; @@ -7354,12 +7379,12 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = doDistribute super."tracy_0_1_2_0"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7747,6 +7772,7 @@ self: super: { "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -8007,6 +8033,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8082,6 +8109,7 @@ self: super: { "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix index 8645bceb82e..0e765572ffe 100644 --- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix @@ -163,6 +163,8 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; "Chart-diagrams" = dontDistribute super."Chart-diagrams"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; @@ -870,6 +872,7 @@ self: super: { "SpinCounter" = dontDistribute super."SpinCounter"; "Spintax" = dontDistribute super."Spintax"; "Spock-auth" = dontDistribute super."Spock-auth"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1283,6 +1286,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1561,6 +1565,7 @@ self: super: { "bliplib" = dontDistribute super."bliplib"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; + "bloodhound" = doDistribute super."bloodhound_0_10_0_0"; "bloxorz" = dontDistribute super."bloxorz"; "blubber" = dontDistribute super."blubber"; "blubber-server" = dontDistribute super."blubber-server"; @@ -1570,6 +1575,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1735,6 +1741,7 @@ self: super: { "carettah" = dontDistribute super."carettah"; "carray" = doDistribute super."carray_0_1_6_2"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1853,6 +1860,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = doDistribute super."clckwrks_0_23_13"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; @@ -2078,6 +2087,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2106,6 +2116,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2293,6 +2304,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3112,6 +3124,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3538,6 +3551,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4224,6 +4238,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = doDistribute super."htaglib_1_0_1"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4473,6 +4488,7 @@ self: super: { "irc-client" = doDistribute super."irc-client_0_2_5_0"; "irc-colors" = dontDistribute super."irc-colors"; "irc-core" = dontDistribute super."irc-core"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4551,6 +4567,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5610,6 +5627,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5692,6 +5710,7 @@ self: super: { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "path" = doDistribute super."path_0_5_3"; "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -5788,6 +5807,7 @@ self: super: { "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_7"; + "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; @@ -6020,6 +6040,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = doDistribute super."publicsuffix_0_20151212"; @@ -6217,6 +6238,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "regex-applicative-text" = doDistribute super."regex-applicative-text_0_1_0_0"; "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa"; @@ -6389,6 +6411,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6557,6 +6580,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pool" = dontDistribute super."servant-pool"; @@ -7039,6 +7063,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; @@ -7109,6 +7134,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; "tasty-integrate" = dontDistribute super."tasty-integrate"; @@ -7200,7 +7226,6 @@ self: super: { "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; - "text-show" = doDistribute super."text-show_2_1_2"; "text-show-instances" = dontDistribute super."text-show-instances"; "text-stream-decode" = dontDistribute super."text-stream-decode"; "text-utf7" = dontDistribute super."text-utf7"; @@ -7337,12 +7362,12 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = doDistribute super."tracy_0_1_2_0"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7729,6 +7754,7 @@ self: super: { "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7988,6 +8014,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8063,6 +8090,7 @@ self: super: { "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix index ecca396a71c..ae22300df63 100644 --- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix @@ -163,6 +163,8 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; "Chart-diagrams" = dontDistribute super."Chart-diagrams"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; @@ -867,6 +869,7 @@ self: super: { "SpinCounter" = dontDistribute super."SpinCounter"; "Spintax" = dontDistribute super."Spintax"; "Spock-auth" = dontDistribute super."Spock-auth"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1278,6 +1281,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1556,6 +1560,7 @@ self: super: { "bliplib" = dontDistribute super."bliplib"; "blocking-transactions" = dontDistribute super."blocking-transactions"; "blogination" = dontDistribute super."blogination"; + "bloodhound" = doDistribute super."bloodhound_0_10_0_0"; "bloxorz" = dontDistribute super."bloxorz"; "blubber" = dontDistribute super."blubber"; "blubber-server" = dontDistribute super."blubber-server"; @@ -1565,6 +1570,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1727,6 +1733,7 @@ self: super: { "carboncopy" = dontDistribute super."carboncopy"; "carettah" = dontDistribute super."carettah"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1844,6 +1851,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = doDistribute super."clckwrks_0_23_13"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; @@ -2067,6 +2076,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2095,6 +2105,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2281,6 +2292,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -3093,6 +3105,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3516,6 +3529,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4193,6 +4207,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = doDistribute super."htaglib_1_0_1"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4438,6 +4453,7 @@ self: super: { "irc-bytestring" = dontDistribute super."irc-bytestring"; "irc-colors" = dontDistribute super."irc-colors"; "irc-core" = dontDistribute super."irc-core"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4516,6 +4532,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5571,6 +5588,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5653,6 +5671,7 @@ self: super: { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "path" = doDistribute super."path_0_5_3"; "path-io" = dontDistribute super."path-io"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -5749,6 +5768,7 @@ self: super: { "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes" = doDistribute super."pipes_4_1_7"; + "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; @@ -5978,6 +5998,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = doDistribute super."publicsuffix_0_20151212"; @@ -6174,6 +6195,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "regex-applicative-text" = doDistribute super."regex-applicative-text_0_1_0_0"; "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa"; @@ -6343,6 +6365,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6510,6 +6533,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pool" = dontDistribute super."servant-pool"; @@ -6986,6 +7010,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; @@ -7055,6 +7080,7 @@ self: super: { "tar" = doDistribute super."tar_0_4_2_2"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; "tasty-integrate" = dontDistribute super."tasty-integrate"; @@ -7145,7 +7171,6 @@ self: super: { "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; - "text-show" = doDistribute super."text-show_2_1_2"; "text-show-instances" = dontDistribute super."text-show-instances"; "text-stream-decode" = dontDistribute super."text-stream-decode"; "text-utf7" = dontDistribute super."text-utf7"; @@ -7282,12 +7307,12 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = doDistribute super."tracy_0_1_2_0"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7672,6 +7697,7 @@ self: super: { "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7929,6 +7955,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -8004,6 +8031,7 @@ self: super: { "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.0.nix b/pkgs/development/haskell-modules/configuration-lts-5.0.nix index 9934d049508..c299aa73e67 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.0.nix @@ -162,6 +162,8 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; "Chart-diagrams" = dontDistribute super."Chart-diagrams"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; @@ -855,6 +857,7 @@ self: super: { "SpacePrivateers" = dontDistribute super."SpacePrivateers"; "SpinCounter" = dontDistribute super."SpinCounter"; "Spock-auth" = dontDistribute super."Spock-auth"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1263,6 +1266,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1398,7 +1402,6 @@ self: super: { "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; "bidispec" = dontDistribute super."bidispec"; "bidispec-extras" = dontDistribute super."bidispec-extras"; - "bifunctors" = doDistribute super."bifunctors_5_2"; "bighugethesaurus" = dontDistribute super."bighugethesaurus"; "billboard-parser" = dontDistribute super."billboard-parser"; "billeksah-forms" = dontDistribute super."billeksah-forms"; @@ -1544,6 +1547,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1701,6 +1705,7 @@ self: super: { "carboncopy" = dontDistribute super."carboncopy"; "carettah" = dontDistribute super."carettah"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1749,6 +1754,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_3"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1815,6 +1821,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = doDistribute super."clckwrks_0_23_13"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; @@ -2034,6 +2042,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2061,6 +2070,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2243,6 +2253,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -2817,6 +2828,8 @@ self: super: { "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; "fmark" = dontDistribute super."fmark"; + "fn" = doDistribute super."fn_0_2_0_2"; + "fn-extra" = doDistribute super."fn-extra_0_2_0_1"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; "foldl-incremental" = dontDistribute super."foldl-incremental"; @@ -3033,6 +3046,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3451,6 +3465,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4127,6 +4142,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = doDistribute super."htaglib_1_0_1"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4368,6 +4384,7 @@ self: super: { "irc-bytestring" = dontDistribute super."irc-bytestring"; "irc-colors" = dontDistribute super."irc-colors"; "irc-core" = dontDistribute super."irc-core"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4446,6 +4463,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5486,6 +5504,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5565,6 +5584,7 @@ self: super: { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "path" = doDistribute super."path_0_5_3"; "path-io" = doDistribute super."path-io_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -5659,6 +5679,7 @@ self: super: { "pinchot" = doDistribute super."pinchot_0_6_0_0"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; + "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; @@ -5883,6 +5904,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = doDistribute super."publicsuffix_0_20151212"; @@ -6076,6 +6098,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "regex-applicative-text" = doDistribute super."regex-applicative-text_0_1_0_0"; "regex-deriv" = dontDistribute super."regex-deriv"; @@ -6244,6 +6267,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6407,6 +6431,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pandoc" = dontDistribute super."servant-pandoc"; @@ -6873,6 +6898,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; @@ -6941,6 +6967,7 @@ self: super: { "tamper" = dontDistribute super."tamper"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; "tasty-integrate" = dontDistribute super."tasty-integrate"; @@ -7027,7 +7054,6 @@ self: super: { "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; - "text-show" = doDistribute super."text-show_2_1_2"; "text-show-instances" = dontDistribute super."text-show-instances"; "text-stream-decode" = dontDistribute super."text-stream-decode"; "text-utf7" = dontDistribute super."text-utf7"; @@ -7161,12 +7187,12 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = doDistribute super."tracy_0_1_2_0"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7543,6 +7569,7 @@ self: super: { "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -7797,6 +7824,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -7872,6 +7900,7 @@ self: super: { "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.1.nix b/pkgs/development/haskell-modules/configuration-lts-5.1.nix index 37a5a87c4f2..69f2161732c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.1.nix @@ -161,6 +161,8 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; "Chart-diagrams" = dontDistribute super."Chart-diagrams"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; @@ -853,6 +855,7 @@ self: super: { "SpacePrivateers" = dontDistribute super."SpacePrivateers"; "SpinCounter" = dontDistribute super."SpinCounter"; "Spock-auth" = dontDistribute super."Spock-auth"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1260,6 +1263,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1392,7 +1396,6 @@ self: super: { "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; "bidispec" = dontDistribute super."bidispec"; "bidispec-extras" = dontDistribute super."bidispec-extras"; - "bifunctors" = doDistribute super."bifunctors_5_2"; "bighugethesaurus" = dontDistribute super."bighugethesaurus"; "billboard-parser" = dontDistribute super."billboard-parser"; "billeksah-forms" = dontDistribute super."billeksah-forms"; @@ -1537,6 +1540,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1693,6 +1697,7 @@ self: super: { "carboncopy" = dontDistribute super."carboncopy"; "carettah" = dontDistribute super."carettah"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1741,6 +1746,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_3"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1804,6 +1810,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = doDistribute super."clckwrks_0_23_13"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; @@ -2023,6 +2031,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2050,6 +2059,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2231,6 +2241,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -2805,6 +2816,8 @@ self: super: { "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; "fmark" = dontDistribute super."fmark"; + "fn" = doDistribute super."fn_0_2_0_2"; + "fn-extra" = doDistribute super."fn-extra_0_2_0_1"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; "foldl-incremental" = dontDistribute super."foldl-incremental"; @@ -3021,6 +3034,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3439,6 +3453,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4115,6 +4130,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = doDistribute super."htaglib_1_0_1"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4355,6 +4371,7 @@ self: super: { "irc-bytestring" = dontDistribute super."irc-bytestring"; "irc-colors" = dontDistribute super."irc-colors"; "irc-core" = dontDistribute super."irc-core"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4433,6 +4450,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5471,6 +5489,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5550,6 +5569,7 @@ self: super: { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "path" = doDistribute super."path_0_5_3"; "path-io" = doDistribute super."path-io_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -5644,6 +5664,7 @@ self: super: { "pinchot" = doDistribute super."pinchot_0_6_0_0"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; + "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; @@ -5868,6 +5889,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "psqueues" = doDistribute super."psqueues_0_2_0_3"; "pub" = dontDistribute super."pub"; "publicsuffix" = doDistribute super."publicsuffix_0_20151212"; @@ -6060,6 +6082,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "regex-applicative-text" = doDistribute super."regex-applicative-text_0_1_0_0"; "regex-deriv" = dontDistribute super."regex-deriv"; @@ -6228,6 +6251,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6390,6 +6414,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pandoc" = dontDistribute super."servant-pandoc"; @@ -6856,6 +6881,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; @@ -6923,6 +6949,7 @@ self: super: { "tamper" = dontDistribute super."tamper"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; "tasty-integrate" = dontDistribute super."tasty-integrate"; @@ -7009,7 +7036,6 @@ self: super: { "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; - "text-show" = doDistribute super."text-show_2_1_2"; "text-show-instances" = dontDistribute super."text-show-instances"; "text-stream-decode" = dontDistribute super."text-stream-decode"; "text-utf7" = dontDistribute super."text-utf7"; @@ -7143,12 +7169,12 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = doDistribute super."tracy_0_1_2_0"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7524,6 +7550,7 @@ self: super: { "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -7778,6 +7805,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -7852,6 +7880,7 @@ self: super: { "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.2.nix b/pkgs/development/haskell-modules/configuration-lts-5.2.nix index 0e4e457bf1e..de127967a26 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.2.nix @@ -161,6 +161,8 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; "Chart-diagrams" = dontDistribute super."Chart-diagrams"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; @@ -852,6 +854,7 @@ self: super: { "SpacePrivateers" = dontDistribute super."SpacePrivateers"; "SpinCounter" = dontDistribute super."SpinCounter"; "Spock-auth" = dontDistribute super."Spock-auth"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1259,6 +1262,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1391,7 +1395,6 @@ self: super: { "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; "bidispec" = dontDistribute super."bidispec"; "bidispec-extras" = dontDistribute super."bidispec-extras"; - "bifunctors" = doDistribute super."bifunctors_5_2"; "bighugethesaurus" = dontDistribute super."bighugethesaurus"; "billboard-parser" = dontDistribute super."billboard-parser"; "billeksah-forms" = dontDistribute super."billeksah-forms"; @@ -1536,6 +1539,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1623,6 +1627,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-info" = dontDistribute super."cabal-info"; + "cabal-install" = doDistribute super."cabal-install_1_22_8_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74"; @@ -1691,6 +1696,7 @@ self: super: { "carboncopy" = dontDistribute super."carboncopy"; "carettah" = dontDistribute super."carettah"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1739,6 +1745,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_3"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1802,6 +1809,8 @@ self: super: { "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_5"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = doDistribute super."clckwrks_0_23_13"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; @@ -2021,6 +2030,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2048,6 +2058,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2229,6 +2240,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -2799,6 +2811,8 @@ self: super: { "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; "fmark" = dontDistribute super."fmark"; + "fn" = doDistribute super."fn_0_2_0_2"; + "fn-extra" = doDistribute super."fn-extra_0_2_0_1"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; "foldl-incremental" = dontDistribute super."foldl-incremental"; @@ -3014,6 +3028,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3332,6 +3347,7 @@ self: super: { "hGelf" = dontDistribute super."hGelf"; "hLLVM" = dontDistribute super."hLLVM"; "hMollom" = dontDistribute super."hMollom"; + "hOpenPGP" = doDistribute super."hOpenPGP_2_4_3"; "hPDB-examples" = dontDistribute super."hPDB-examples"; "hPushover" = dontDistribute super."hPushover"; "hR" = dontDistribute super."hR"; @@ -3430,6 +3446,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4106,6 +4123,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = doDistribute super."htaglib_1_0_1"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4344,6 +4362,7 @@ self: super: { "irc-bytestring" = dontDistribute super."irc-bytestring"; "irc-colors" = dontDistribute super."irc-colors"; "irc-core" = dontDistribute super."irc-core"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4422,6 +4441,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5454,6 +5474,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5533,6 +5554,7 @@ self: super: { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "path" = doDistribute super."path_0_5_3"; "path-io" = doDistribute super."path-io_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -5624,6 +5646,7 @@ self: super: { "pinchot" = doDistribute super."pinchot_0_6_0_0"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; + "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; @@ -5847,6 +5870,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "pub" = dontDistribute super."pub"; "publicsuffix" = doDistribute super."publicsuffix_0_20151212"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -6037,6 +6061,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "regex-applicative-text" = doDistribute super."regex-applicative-text_0_1_0_0"; "regex-deriv" = dontDistribute super."regex-deriv"; @@ -6204,6 +6229,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6366,6 +6392,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pandoc" = dontDistribute super."servant-pandoc"; @@ -6831,6 +6858,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; @@ -6898,6 +6926,7 @@ self: super: { "tamper" = dontDistribute super."tamper"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; "tasty-integrate" = dontDistribute super."tasty-integrate"; @@ -6984,7 +7013,6 @@ self: super: { "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; - "text-show" = doDistribute super."text-show_2_1_2"; "text-show-instances" = dontDistribute super."text-show-instances"; "text-stream-decode" = dontDistribute super."text-stream-decode"; "text-utf7" = dontDistribute super."text-utf7"; @@ -7118,12 +7146,12 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = doDistribute super."tracy_0_1_2_0"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7498,6 +7526,7 @@ self: super: { "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-predicates" = doDistribute super."wai-predicates_0_8_5"; "wai-request-spec" = dontDistribute super."wai-request-spec"; @@ -7649,6 +7678,7 @@ self: super: { "xlsx-templater" = dontDistribute super."xlsx-templater"; "xml-basic" = dontDistribute super."xml-basic"; "xml-catalog" = dontDistribute super."xml-catalog"; + "xml-conduit" = doDistribute super."xml-conduit_1_3_3_1"; "xml-enumerator" = dontDistribute super."xml-enumerator"; "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators"; "xml-extractors" = dontDistribute super."xml-extractors"; @@ -7751,6 +7781,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -7825,6 +7856,7 @@ self: super: { "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.3.nix b/pkgs/development/haskell-modules/configuration-lts-5.3.nix index 2e3c31fe650..942d47f5868 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.3.nix @@ -161,6 +161,8 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; "Chart-diagrams" = dontDistribute super."Chart-diagrams"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; @@ -849,6 +851,7 @@ self: super: { "SpacePrivateers" = dontDistribute super."SpacePrivateers"; "SpinCounter" = dontDistribute super."SpinCounter"; "Spock-auth" = dontDistribute super."Spock-auth"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1253,6 +1256,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1385,7 +1389,6 @@ self: super: { "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; "bidispec" = dontDistribute super."bidispec"; "bidispec-extras" = dontDistribute super."bidispec-extras"; - "bifunctors" = doDistribute super."bifunctors_5_2"; "bighugethesaurus" = dontDistribute super."bighugethesaurus"; "billboard-parser" = dontDistribute super."billboard-parser"; "billeksah-forms" = dontDistribute super."billeksah-forms"; @@ -1528,6 +1531,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1615,6 +1619,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-info" = dontDistribute super."cabal-info"; + "cabal-install" = doDistribute super."cabal-install_1_22_8_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74"; @@ -1683,6 +1688,7 @@ self: super: { "carboncopy" = dontDistribute super."carboncopy"; "carettah" = dontDistribute super."carettah"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1730,6 +1736,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_3"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1788,6 +1795,9 @@ self: super: { "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_5_1"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = doDistribute super."clckwrks_0_23_13"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; @@ -2005,6 +2015,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2032,6 +2043,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2212,6 +2224,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -2597,6 +2610,7 @@ self: super: { "event-list" = dontDistribute super."event-list"; "event-monad" = dontDistribute super."event-monad"; "eventloop" = dontDistribute super."eventloop"; + "eventstore" = doDistribute super."eventstore_0_10_0_2"; "every-bit-counts" = dontDistribute super."every-bit-counts"; "ewe" = dontDistribute super."ewe"; "ex-pool" = dontDistribute super."ex-pool"; @@ -2773,6 +2787,8 @@ self: super: { "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; "fmark" = dontDistribute super."fmark"; + "fn" = doDistribute super."fn_0_2_0_2"; + "fn-extra" = doDistribute super."fn-extra_0_2_0_1"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; "foldl-incremental" = dontDistribute super."foldl-incremental"; @@ -2987,6 +3003,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3304,6 +3321,7 @@ self: super: { "hGelf" = dontDistribute super."hGelf"; "hLLVM" = dontDistribute super."hLLVM"; "hMollom" = dontDistribute super."hMollom"; + "hOpenPGP" = doDistribute super."hOpenPGP_2_4_3"; "hPDB-examples" = dontDistribute super."hPDB-examples"; "hPushover" = dontDistribute super."hPushover"; "hR" = dontDistribute super."hR"; @@ -3402,6 +3420,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4078,6 +4097,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = doDistribute super."htaglib_1_0_1"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4315,6 +4335,7 @@ self: super: { "irc-bytestring" = dontDistribute super."irc-bytestring"; "irc-colors" = dontDistribute super."irc-colors"; "irc-core" = dontDistribute super."irc-core"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4393,6 +4414,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5421,6 +5443,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5498,6 +5521,7 @@ self: super: { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "path" = doDistribute super."path_0_5_3"; "path-io" = doDistribute super."path-io_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -5589,6 +5613,7 @@ self: super: { "pinchot" = doDistribute super."pinchot_0_6_0_0"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; + "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5"; @@ -5811,6 +5836,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "pub" = dontDistribute super."pub"; "publicsuffix" = doDistribute super."publicsuffix_0_20151212"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -5999,6 +6025,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "regex-deriv" = dontDistribute super."regex-deriv"; "regex-dfa" = dontDistribute super."regex-dfa"; @@ -6164,6 +6191,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6326,6 +6354,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pandoc" = dontDistribute super."servant-pandoc"; @@ -6706,6 +6735,7 @@ self: super: { "stream-fusion" = dontDistribute super."stream-fusion"; "stream-monad" = dontDistribute super."stream-monad"; "streamed" = dontDistribute super."streamed"; + "streaming-commons" = doDistribute super."streaming-commons_0_1_15_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; @@ -6785,6 +6815,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; @@ -6852,6 +6883,7 @@ self: super: { "tamper" = dontDistribute super."tamper"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; "tasty-integrate" = dontDistribute super."tasty-integrate"; @@ -6937,7 +6969,6 @@ self: super: { "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; - "text-show" = doDistribute super."text-show_2_1_2"; "text-show-instances" = dontDistribute super."text-show-instances"; "text-stream-decode" = dontDistribute super."text-stream-decode"; "text-utf7" = dontDistribute super."text-utf7"; @@ -7071,12 +7102,12 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = doDistribute super."tracy_0_1_2_0"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7450,6 +7481,7 @@ self: super: { "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7598,6 +7630,7 @@ self: super: { "xlsx-templater" = dontDistribute super."xlsx-templater"; "xml-basic" = dontDistribute super."xml-basic"; "xml-catalog" = dontDistribute super."xml-catalog"; + "xml-conduit" = doDistribute super."xml-conduit_1_3_3_1"; "xml-enumerator" = dontDistribute super."xml-enumerator"; "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators"; "xml-extractors" = dontDistribute super."xml-extractors"; @@ -7699,6 +7732,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -7773,6 +7807,7 @@ self: super: { "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.4.nix b/pkgs/development/haskell-modules/configuration-lts-5.4.nix index a167ad714b8..beb5cb4ebf8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.4.nix @@ -161,6 +161,8 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; "Chart-diagrams" = dontDistribute super."Chart-diagrams"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; @@ -848,6 +850,7 @@ self: super: { "SpacePrivateers" = dontDistribute super."SpacePrivateers"; "SpinCounter" = dontDistribute super."SpinCounter"; "Spock-auth" = dontDistribute super."Spock-auth"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1251,6 +1254,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1383,7 +1387,6 @@ self: super: { "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; "bidispec" = dontDistribute super."bidispec"; "bidispec-extras" = dontDistribute super."bidispec-extras"; - "bifunctors" = doDistribute super."bifunctors_5_2"; "bighugethesaurus" = dontDistribute super."bighugethesaurus"; "billboard-parser" = dontDistribute super."billboard-parser"; "billeksah-forms" = dontDistribute super."billeksah-forms"; @@ -1526,6 +1529,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1613,6 +1617,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-info" = dontDistribute super."cabal-info"; + "cabal-install" = doDistribute super."cabal-install_1_22_8_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74"; @@ -1681,6 +1686,7 @@ self: super: { "carboncopy" = dontDistribute super."carboncopy"; "carettah" = dontDistribute super."carettah"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1728,6 +1734,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_3"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1786,6 +1793,9 @@ self: super: { "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_5_1"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks" = doDistribute super."clckwrks_0_23_13"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; @@ -1912,10 +1922,12 @@ self: super: { "conductive-clock" = dontDistribute super."conductive-clock"; "conductive-hsc3" = dontDistribute super."conductive-hsc3"; "conductive-song" = dontDistribute super."conductive-song"; + "conduit" = doDistribute super."conduit_1_2_6_2"; "conduit-audio" = dontDistribute super."conduit-audio"; "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-extra" = doDistribute super."conduit-extra_1_1_10_1"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec"; @@ -1999,6 +2011,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2026,6 +2039,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2206,6 +2220,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -2584,6 +2599,7 @@ self: super: { "event-list" = dontDistribute super."event-list"; "event-monad" = dontDistribute super."event-monad"; "eventloop" = dontDistribute super."eventloop"; + "eventstore" = doDistribute super."eventstore_0_10_0_2"; "every-bit-counts" = dontDistribute super."every-bit-counts"; "ewe" = dontDistribute super."ewe"; "ex-pool" = dontDistribute super."ex-pool"; @@ -2759,6 +2775,8 @@ self: super: { "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; "fmark" = dontDistribute super."fmark"; + "fn" = doDistribute super."fn_0_2_0_2"; + "fn-extra" = doDistribute super."fn-extra_0_2_0_1"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; "foldl-incremental" = dontDistribute super."foldl-incremental"; @@ -2972,6 +2990,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3289,6 +3308,7 @@ self: super: { "hGelf" = dontDistribute super."hGelf"; "hLLVM" = dontDistribute super."hLLVM"; "hMollom" = dontDistribute super."hMollom"; + "hOpenPGP" = doDistribute super."hOpenPGP_2_4_3"; "hPDB-examples" = dontDistribute super."hPDB-examples"; "hPushover" = dontDistribute super."hPushover"; "hR" = dontDistribute super."hR"; @@ -3387,6 +3407,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4058,6 +4079,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = doDistribute super."htaglib_1_0_1"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4295,6 +4317,7 @@ self: super: { "irc-bytestring" = dontDistribute super."irc-bytestring"; "irc-colors" = dontDistribute super."irc-colors"; "irc-core" = dontDistribute super."irc-core"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4373,6 +4396,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5151,6 +5175,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_3_1_1"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -5390,6 +5415,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5466,6 +5492,7 @@ self: super: { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "path" = doDistribute super."path_0_5_3"; "path-io" = doDistribute super."path-io_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -5557,6 +5584,7 @@ self: super: { "pinchot" = doDistribute super."pinchot_0_6_0_0"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; + "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-bzip" = dontDistribute super."pipes-bzip"; @@ -5778,6 +5806,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "pub" = dontDistribute super."pub"; "publicsuffix" = doDistribute super."publicsuffix_0_20151212"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -5965,6 +5994,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "regex-deriv" = dontDistribute super."regex-deriv"; "regex-dfa" = dontDistribute super."regex-dfa"; @@ -6053,6 +6083,7 @@ self: super: { "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; + "resourcet" = doDistribute super."resourcet_1_1_7_2"; "respond" = dontDistribute super."respond"; "rest-core" = doDistribute super."rest-core_0_37"; "rest-example" = dontDistribute super."rest-example"; @@ -6129,6 +6160,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6291,6 +6323,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pandoc" = dontDistribute super."servant-pandoc"; @@ -6671,6 +6704,7 @@ self: super: { "stream-fusion" = dontDistribute super."stream-fusion"; "stream-monad" = dontDistribute super."stream-monad"; "streamed" = dontDistribute super."streamed"; + "streaming-commons" = doDistribute super."streaming-commons_0_1_15_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; @@ -6750,6 +6784,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; @@ -6817,6 +6852,7 @@ self: super: { "tamper" = dontDistribute super."tamper"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; "tasty-integrate" = dontDistribute super."tasty-integrate"; @@ -6901,7 +6937,6 @@ self: super: { "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; - "text-show" = doDistribute super."text-show_2_1_2"; "text-show-instances" = dontDistribute super."text-show-instances"; "text-stream-decode" = dontDistribute super."text-stream-decode"; "text-utf7" = dontDistribute super."text-utf7"; @@ -7035,12 +7070,12 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = doDistribute super."tracy_0_1_2_0"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7412,6 +7447,7 @@ self: super: { "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7560,6 +7596,7 @@ self: super: { "xlsx-templater" = dontDistribute super."xlsx-templater"; "xml-basic" = dontDistribute super."xml-basic"; "xml-catalog" = dontDistribute super."xml-catalog"; + "xml-conduit" = doDistribute super."xml-conduit_1_3_3_1"; "xml-enumerator" = dontDistribute super."xml-enumerator"; "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators"; "xml-extractors" = dontDistribute super."xml-extractors"; @@ -7660,6 +7697,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -7734,6 +7772,7 @@ self: super: { "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/configuration-lts-5.5.nix b/pkgs/development/haskell-modules/configuration-lts-5.5.nix index 90bd4fed403..516852b98a0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-5.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-5.5.nix @@ -161,6 +161,8 @@ self: super: { "Cascade" = dontDistribute super."Cascade"; "Catana" = dontDistribute super."Catana"; "ChannelT" = dontDistribute super."ChannelT"; + "Chart" = doDistribute super."Chart_1_5_4"; + "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4"; "Chart-diagrams" = dontDistribute super."Chart-diagrams"; "Chart-gtk" = dontDistribute super."Chart-gtk"; "Chart-simple" = dontDistribute super."Chart-simple"; @@ -848,6 +850,7 @@ self: super: { "SpacePrivateers" = dontDistribute super."SpacePrivateers"; "SpinCounter" = dontDistribute super."SpinCounter"; "Spock-auth" = dontDistribute super."Spock-auth"; + "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -1251,6 +1254,7 @@ self: super: { "atom-basic" = dontDistribute super."atom-basic"; "atom-conduit" = dontDistribute super."atom-conduit"; "atom-msp430" = dontDistribute super."atom-msp430"; + "atomic-primops" = doDistribute super."atomic-primops_0_8_0_2"; "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; "atomic-write" = dontDistribute super."atomic-write"; @@ -1382,7 +1386,6 @@ self: super: { "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; "bidispec" = dontDistribute super."bidispec"; "bidispec-extras" = dontDistribute super."bidispec-extras"; - "bifunctors" = doDistribute super."bifunctors_5_2"; "bighugethesaurus" = dontDistribute super."bighugethesaurus"; "billboard-parser" = dontDistribute super."billboard-parser"; "billeksah-forms" = dontDistribute super."billeksah-forms"; @@ -1525,6 +1528,7 @@ self: super: { "board-games" = dontDistribute super."board-games"; "bogre-banana" = dontDistribute super."bogre-banana"; "bond" = dontDistribute super."bond"; + "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1611,6 +1615,7 @@ self: super: { "cabal-ghci" = dontDistribute super."cabal-ghci"; "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; "cabal-info" = dontDistribute super."cabal-info"; + "cabal-install" = doDistribute super."cabal-install_1_22_8_0"; "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74"; @@ -1679,6 +1684,7 @@ self: super: { "carboncopy" = dontDistribute super."carboncopy"; "carettah" = dontDistribute super."carettah"; "cartel" = doDistribute super."cartel_0_14_2_8"; + "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; @@ -1726,6 +1732,7 @@ self: super: { "cfopu" = dontDistribute super."cfopu"; "cg" = dontDistribute super."cg"; "cgen" = dontDistribute super."cgen"; + "cgi" = doDistribute super."cgi_3001_2_2_3"; "cgi-undecidable" = dontDistribute super."cgi-undecidable"; "cgi-utils" = dontDistribute super."cgi-utils"; "cgrep" = dontDistribute super."cgrep"; @@ -1784,6 +1791,9 @@ self: super: { "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_5_1"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_5"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_5"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot"; @@ -1908,10 +1918,12 @@ self: super: { "conductive-clock" = dontDistribute super."conductive-clock"; "conductive-hsc3" = dontDistribute super."conductive-hsc3"; "conductive-song" = dontDistribute super."conductive-song"; + "conduit" = doDistribute super."conduit_1_2_6_2"; "conduit-audio" = dontDistribute super."conduit-audio"; "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-extra" = doDistribute super."conduit-extra_1_1_10_1"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec"; @@ -1995,6 +2007,7 @@ self: super: { "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; "cplusplus-th" = dontDistribute super."cplusplus-th"; + "cpphs" = doDistribute super."cpphs_1_19_3"; "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; "cpsa" = dontDistribute super."cpsa"; "cpuid" = dontDistribute super."cpuid"; @@ -2022,6 +2035,7 @@ self: super: { "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; "critbit" = dontDistribute super."critbit"; + "criterion" = doDistribute super."criterion_1_1_0_0"; "criterion-plus" = dontDistribute super."criterion-plus"; "criterion-to-html" = dontDistribute super."criterion-to-html"; "crockford" = dontDistribute super."crockford"; @@ -2202,6 +2216,7 @@ self: super: { "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; "dbus-th" = dontDistribute super."dbus-th"; + "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; "dclabel" = dontDistribute super."dclabel"; "dclabel-eci11" = dontDistribute super."dclabel-eci11"; "ddc-base" = dontDistribute super."ddc-base"; @@ -2580,6 +2595,7 @@ self: super: { "event-list" = dontDistribute super."event-list"; "event-monad" = dontDistribute super."event-monad"; "eventloop" = dontDistribute super."eventloop"; + "eventstore" = doDistribute super."eventstore_0_10_0_2"; "every-bit-counts" = dontDistribute super."every-bit-counts"; "ewe" = dontDistribute super."ewe"; "ex-pool" = dontDistribute super."ex-pool"; @@ -2755,6 +2771,8 @@ self: super: { "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; "fluidsynth" = dontDistribute super."fluidsynth"; "fmark" = dontDistribute super."fmark"; + "fn" = doDistribute super."fn_0_2_0_2"; + "fn-extra" = doDistribute super."fn-extra_0_2_0_1"; "fold-debounce" = dontDistribute super."fold-debounce"; "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit"; "foldl-incremental" = dontDistribute super."foldl-incremental"; @@ -2968,6 +2986,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_5"; "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror"; "ghcjs-dom" = dontDistribute super."ghcjs-dom"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3285,6 +3304,7 @@ self: super: { "hGelf" = dontDistribute super."hGelf"; "hLLVM" = dontDistribute super."hLLVM"; "hMollom" = dontDistribute super."hMollom"; + "hOpenPGP" = doDistribute super."hOpenPGP_2_4_3"; "hPDB-examples" = dontDistribute super."hPDB-examples"; "hPushover" = dontDistribute super."hPushover"; "hR" = dontDistribute super."hR"; @@ -3383,6 +3403,7 @@ self: super: { "handa-opengl" = dontDistribute super."handa-opengl"; "handle-like" = dontDistribute super."handle-like"; "handsy" = dontDistribute super."handsy"; + "handwriting" = dontDistribute super."handwriting"; "hangman" = dontDistribute super."hangman"; "hannahci" = dontDistribute super."hannahci"; "hans" = dontDistribute super."hans"; @@ -4052,6 +4073,7 @@ self: super: { "hsx-xhtml" = dontDistribute super."hsx-xhtml"; "hsyscall" = dontDistribute super."hsyscall"; "hszephyr" = dontDistribute super."hszephyr"; + "htaglib" = doDistribute super."htaglib_1_0_1"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; "htiled" = dontDistribute super."htiled"; @@ -4289,6 +4311,7 @@ self: super: { "irc-bytestring" = dontDistribute super."irc-bytestring"; "irc-colors" = dontDistribute super."irc-colors"; "irc-core" = dontDistribute super."irc-core"; + "irc-dcc" = dontDistribute super."irc-dcc"; "irc-fun-bot" = dontDistribute super."irc-fun-bot"; "irc-fun-client" = dontDistribute super."irc-fun-client"; "irc-fun-color" = dontDistribute super."irc-fun-color"; @@ -4366,6 +4389,7 @@ self: super: { "json-assertions" = dontDistribute super."json-assertions"; "json-ast" = dontDistribute super."json-ast"; "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; + "json-autotype" = doDistribute super."json-autotype_1_0_10"; "json-b" = dontDistribute super."json-b"; "json-encoder" = dontDistribute super."json-encoder"; "json-enumerator" = dontDistribute super."json-enumerator"; @@ -5143,6 +5167,7 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; + "neat-interpolation" = doDistribute super."neat-interpolation_0_3_1_1"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -5382,6 +5407,7 @@ self: super: { "origami" = dontDistribute super."origami"; "os-release" = dontDistribute super."os-release"; "osc" = dontDistribute super."osc"; + "osm-conduit" = dontDistribute super."osm-conduit"; "osm-download" = dontDistribute super."osm-download"; "oso2pdf" = dontDistribute super."oso2pdf"; "osx-ar" = dontDistribute super."osx-ar"; @@ -5458,6 +5484,7 @@ self: super: { "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "path" = doDistribute super."path_0_5_3"; "path-io" = doDistribute super."path-io_0_2_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -5549,6 +5576,7 @@ self: super: { "pinchot" = doDistribute super."pinchot_0_6_0_0"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; + "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_5"; "pipes-async" = dontDistribute super."pipes-async"; "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; "pipes-bzip" = dontDistribute super."pipes-bzip"; @@ -5770,6 +5798,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psql-helpers" = dontDistribute super."psql-helpers"; "pub" = dontDistribute super."pub"; "publicsuffix" = doDistribute super."publicsuffix_0_20151212"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -5957,6 +5986,7 @@ self: super: { "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; "reflex-gloss" = dontDistribute super."reflex-gloss"; "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; + "reflex-orphans" = dontDistribute super."reflex-orphans"; "reflex-transformers" = dontDistribute super."reflex-transformers"; "regex-deriv" = dontDistribute super."regex-deriv"; "regex-dfa" = dontDistribute super."regex-dfa"; @@ -6045,6 +6075,7 @@ self: super: { "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; + "resourcet" = doDistribute super."resourcet_1_1_7_2"; "respond" = dontDistribute super."respond"; "rest-core" = doDistribute super."rest-core_0_37"; "rest-example" = dontDistribute super."rest-example"; @@ -6121,6 +6152,7 @@ self: super: { "rsagl-math" = dontDistribute super."rsagl-math"; "rspp" = dontDistribute super."rspp"; "rss" = dontDistribute super."rss"; + "rss-conduit" = dontDistribute super."rss-conduit"; "rss2irc" = dontDistribute super."rss2irc"; "rtcm" = dontDistribute super."rtcm"; "rtld" = dontDistribute super."rtld"; @@ -6283,6 +6315,7 @@ self: super: { "servant-elm" = dontDistribute super."servant-elm"; "servant-examples" = dontDistribute super."servant-examples"; "servant-github" = dontDistribute super."servant-github"; + "servant-haxl-client" = dontDistribute super."servant-haxl-client"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pandoc" = dontDistribute super."servant-pandoc"; @@ -6663,6 +6696,7 @@ self: super: { "stream-fusion" = dontDistribute super."stream-fusion"; "stream-monad" = dontDistribute super."stream-monad"; "streamed" = dontDistribute super."streamed"; + "streaming-commons" = doDistribute super."streaming-commons_0_1_15_1"; "streaming-histogram" = dontDistribute super."streaming-histogram"; "streaming-png" = dontDistribute super."streaming-png"; "streaming-utils" = dontDistribute super."streaming-utils"; @@ -6742,6 +6776,7 @@ self: super: { "sym" = dontDistribute super."sym"; "sym-plot" = dontDistribute super."sym-plot"; "symbol" = dontDistribute super."symbol"; + "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; @@ -6809,6 +6844,7 @@ self: super: { "tamper" = dontDistribute super."tamper"; "target" = dontDistribute super."target"; "task" = dontDistribute super."task"; + "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; "tasty-integrate" = dontDistribute super."tasty-integrate"; @@ -6893,7 +6929,6 @@ self: super: { "text-region" = dontDistribute super."text-region"; "text-register-machine" = dontDistribute super."text-register-machine"; "text-render" = dontDistribute super."text-render"; - "text-show" = doDistribute super."text-show_2_1_2"; "text-show-instances" = dontDistribute super."text-show-instances"; "text-stream-decode" = dontDistribute super."text-stream-decode"; "text-utf7" = dontDistribute super."text-utf7"; @@ -7027,12 +7062,12 @@ self: super: { "traced" = dontDistribute super."traced"; "tracer" = dontDistribute super."tracer"; "tracker" = dontDistribute super."tracker"; + "tracy" = doDistribute super."tracy_0_1_2_0"; "trajectory" = dontDistribute super."trajectory"; "transactional-events" = dontDistribute super."transactional-events"; "transf" = dontDistribute super."transf"; "transformations" = dontDistribute super."transformations"; "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; "transformers-compose" = dontDistribute super."transformers-compose"; "transformers-convert" = dontDistribute super."transformers-convert"; "transformers-free" = dontDistribute super."transformers-free"; @@ -7402,6 +7437,7 @@ self: super: { "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; "wai-middleware-route" = dontDistribute super."wai-middleware-route"; "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; + "wai-middleware-throttle" = doDistribute super."wai-middleware-throttle_0_2_0_2"; "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; @@ -7548,6 +7584,7 @@ self: super: { "xlsx-templater" = dontDistribute super."xlsx-templater"; "xml-basic" = dontDistribute super."xml-basic"; "xml-catalog" = dontDistribute super."xml-catalog"; + "xml-conduit" = doDistribute super."xml-conduit_1_3_3_1"; "xml-enumerator" = dontDistribute super."xml-enumerator"; "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators"; "xml-extractors" = dontDistribute super."xml-extractors"; @@ -7648,6 +7685,7 @@ self: super: { "yesod-dsl" = dontDistribute super."yesod-dsl"; "yesod-examples" = dontDistribute super."yesod-examples"; "yesod-form-json" = dontDistribute super."yesod-form-json"; + "yesod-form-richtext" = dontDistribute super."yesod-form-richtext"; "yesod-goodies" = dontDistribute super."yesod-goodies"; "yesod-json" = dontDistribute super."yesod-json"; "yesod-links" = dontDistribute super."yesod-links"; @@ -7722,6 +7760,7 @@ self: super: { "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; "zeroth" = dontDistribute super."zeroth"; "zigbee-znet25" = dontDistribute super."zigbee-znet25"; + "zip" = dontDistribute super."zip"; "zip-conduit" = dontDistribute super."zip-conduit"; "zipedit" = dontDistribute super."zipedit"; "zipkin" = dontDistribute super."zipkin"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 09e2ef0ec8e..4d3f9edbf7b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -750,8 +750,8 @@ self: { pname = "Agda"; version = "2.4.2.5"; sha256 = "959658a372d93b735d92191b372d221461026c98de4f92e56d198b576dfb67ee"; - revision = "1"; - editedCabalFile = "85d09d8a607a351be092c5e168c35b8c303b20765ceb0f01cd34956c44ba7f5a"; + revision = "2"; + editedCabalFile = "9c7786cfae8d92deb077650a31f41d15b8e1c8f15450419c268fd16162753515"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -2575,6 +2575,7 @@ self: { HUnit old-time process QuickCheck regex-posix test-framework test-framework-hunit test-framework-quickcheck2 unix ]; + doCheck = false; homepage = "http://www.haskell.org/cabal/"; description = "A framework for packaging Haskell software"; license = stdenv.lib.licenses.bsd3; @@ -2804,7 +2805,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Chart" = callPackage + "Chart_1_5_4" = callPackage ({ mkDerivation, array, base, colour, data-default-class, lens, mtl , old-locale, operational, time, vector }: @@ -2819,9 +2820,10 @@ self: { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "A library for generating 2D Charts and Plots"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Chart_1_6" = callPackage + "Chart" = callPackage ({ mkDerivation, array, base, colour, data-default-class, lens, mtl , old-locale, operational, time, vector }: @@ -2836,7 +2838,6 @@ self: { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "A library for generating 2D Charts and Plots"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Chart-cairo_1_5_1" = callPackage @@ -2858,7 +2859,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Chart-cairo" = callPackage + "Chart-cairo_1_5_4" = callPackage ({ mkDerivation, array, base, cairo, Chart, colour , data-default-class, lens, mtl, old-locale, operational, time }: @@ -2870,12 +2871,14 @@ self: { array base cairo Chart colour data-default-class lens mtl old-locale operational time ]; + jailbreak = true; homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Cairo backend for Charts"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Chart-cairo_1_6" = callPackage + "Chart-cairo" = callPackage ({ mkDerivation, array, base, cairo, Chart, colour , data-default-class, lens, mtl, old-locale, operational, time }: @@ -2887,11 +2890,9 @@ self: { array base cairo Chart colour data-default-class lens mtl old-locale operational time ]; - jailbreak = true; homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Cairo backend for Charts"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Chart-diagrams_1_3_2" = callPackage @@ -2961,7 +2962,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Chart-diagrams" = callPackage + "Chart-diagrams_1_5_4" = callPackage ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour , containers, data-default-class, diagrams-core, diagrams-lib , diagrams-postscript, diagrams-svg, lens, lucid-svg, mtl @@ -2979,12 +2980,14 @@ self: { diagrams-svg lens lucid-svg mtl old-locale operational SVGFonts text time ]; + jailbreak = true; homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Diagrams backend for Charts"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Chart-diagrams_1_6" = callPackage + "Chart-diagrams" = callPackage ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour , containers, data-default-class, diagrams-core, diagrams-lib , diagrams-postscript, diagrams-svg, lens, lucid-svg, mtl @@ -3000,11 +3003,9 @@ self: { diagrams-svg lens lucid-svg mtl old-locale operational SVGFonts text time ]; - jailbreak = true; homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Diagrams backend for Charts"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Chart-gtk" = callPackage @@ -3019,7 +3020,6 @@ self: { array base cairo Chart Chart-cairo colour data-default-class gtk mtl old-locale time ]; - jailbreak = true; homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Utility functions for using the chart library with GTK"; license = stdenv.lib.licenses.bsd3; @@ -6975,8 +6975,8 @@ self: { ({ mkDerivation, base, directory, gtk3, process, temporary }: mkDerivation { pname = "Gifcurry"; - version = "0.1.0.6"; - sha256 = "73a6b620ced2f499d52563803fc5684d4470947713328afe347df63ce115772f"; + version = "0.1.1.0"; + sha256 = "21f72f6c440eec80cb2e7df3fc8ed65124b64ab45ba55b4adf5dfccdca0e257a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -13287,7 +13287,6 @@ self: { base data-default ghc-prim kan-extensions mmorph monad-products mtl parallel random transformers transformers-compat ]; - jailbreak = true; homepage = "http://alkalisoftware.net"; description = "Methods for composing monads"; license = stdenv.lib.licenses.bsd3; @@ -13347,7 +13346,6 @@ self: { libraryHaskellDepends = [ base mtl random transformers transformers-compat ]; - jailbreak = true; description = "Random-number generation monad"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -13366,7 +13364,6 @@ self: { libraryHaskellDepends = [ base mtl random transformers transformers-compat ]; - jailbreak = true; description = "Random-number generation monad"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -13383,7 +13380,6 @@ self: { libraryHaskellDepends = [ base mtl random transformers transformers-compat ]; - jailbreak = true; description = "Random-number generation monad"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -18100,7 +18096,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "Spock-worker" = callPackage + "Spock-worker_0_2_1_3" = callPackage ({ mkDerivation, base, containers, HTF, lifted-base, mtl, Spock , stm, text, time, transformers, vector }: @@ -18116,6 +18112,25 @@ self: { homepage = "http://github.com/agrafix/Spock-worker"; description = "Background workers for Spock"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "Spock-worker" = callPackage + ({ mkDerivation, base, containers, errors, HTF, lifted-base, mtl + , Spock, stm, text, time, transformers, vector + }: + mkDerivation { + pname = "Spock-worker"; + version = "0.3.0.0"; + sha256 = "f5ec5c09125a6dd6c6cd0534a1eb7bc0d6bfe9908f7328d999bf14bd785835f3"; + libraryHaskellDepends = [ + base containers errors lifted-base mtl Spock stm text time + transformers vector + ]; + testHaskellDepends = [ base containers HTF stm vector ]; + homepage = "http://github.com/agrafix/Spock-worker"; + description = "Background workers for Spock"; + license = stdenv.lib.licenses.mit; }) {}; "SpreadsheetML" = callPackage @@ -22494,6 +22509,8 @@ self: { pname = "aeson-compat"; version = "0.3.1.0"; sha256 = "9275040d031433eb0006bce8228a0828e058d547c7d07d61ab0b22154286d736"; + revision = "1"; + editedCabalFile = "88dde146e4177a807888b7058f8e24d057fa826205a005ade669ce1fc395f4a2"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers exceptions hashable nats scientific text time time-locale-compat unordered-containers @@ -24001,8 +24018,8 @@ self: { ({ mkDerivation, base, containers, mtl, syb, vector }: mkDerivation { pname = "alloy"; - version = "1.2.1"; - sha256 = "db73b7f02b642aec6a007c1542874d1bb674e482bc0d19f916a9410f466c7601"; + version = "1.2.2"; + sha256 = "f0a389f7008687b6244b7d6bb5598e1d0bd1e089c96c7a45cfc0f0160feac343"; libraryHaskellDepends = [ base containers mtl syb vector ]; description = "Generic programming library"; license = stdenv.lib.licenses.bsd3; @@ -30960,7 +30977,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "atomic-primops" = callPackage + "atomic-primops_0_8_0_2" = callPackage ({ mkDerivation, base, ghc-prim, primitive }: mkDerivation { pname = "atomic-primops"; @@ -30970,6 +30987,19 @@ self: { homepage = "https://github.com/rrnewton/haskell-lockfree/wiki"; description = "A safe approach to CAS and other atomic ops in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "atomic-primops" = callPackage + ({ mkDerivation, base, ghc-prim, primitive }: + mkDerivation { + pname = "atomic-primops"; + version = "0.8.0.3"; + sha256 = "1dbf0ac681bec29ee51125be1303536f54dc8640af9d57a92fc184152a38c997"; + libraryHaskellDepends = [ base ghc-prim primitive ]; + homepage = "https://github.com/rrnewton/haskell-lockfree/wiki"; + description = "A safe approach to CAS and other atomic ops in Haskell"; + license = stdenv.lib.licenses.bsd3; }) {}; "atomic-primops-foreign" = callPackage @@ -34287,6 +34317,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "basic-prelude_0_5_1" = callPackage + ({ mkDerivation, base, bytestring, containers, filepath, hashable + , lifted-base, ReadArgs, safe, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "basic-prelude"; + version = "0.5.1"; + sha256 = "0c15557a2f561a7b2472e6a34386d22917e603c14fa54d5a2069feef66b985f2"; + libraryHaskellDepends = [ + base bytestring containers filepath hashable lifted-base ReadArgs + safe text transformers unordered-containers vector + ]; + homepage = "https://github.com/snoyberg/basic-prelude"; + description = "An enhanced core prelude; a common foundation for alternate preludes"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "basic-sop" = callPackage ({ mkDerivation, base, deepseq, generics-sop, QuickCheck, text }: mkDerivation { @@ -34960,14 +35009,13 @@ self: { testHaskellDepends = [ base hspec QuickCheck transformers transformers-compat ]; - jailbreak = true; homepage = "http://github.com/ekmett/bifunctors/"; description = "Bifunctors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "bifunctors_5_2" = callPackage + "bifunctors" = callPackage ({ mkDerivation, base, comonad, containers, hspec, QuickCheck , semigroups, tagged, template-haskell, transformers , transformers-compat @@ -34983,14 +35031,13 @@ self: { testHaskellDepends = [ base hspec QuickCheck transformers transformers-compat ]; - jailbreak = true; + doHaddock = false; homepage = "http://github.com/ekmett/bifunctors/"; description = "Bifunctors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "bifunctors" = callPackage + "bifunctors_5_2_1" = callPackage ({ mkDerivation, base, comonad, containers, hspec, QuickCheck , semigroups, tagged, template-haskell, transformers , transformers-compat @@ -35006,10 +35053,11 @@ self: { testHaskellDepends = [ base hspec QuickCheck transformers transformers-compat ]; - doHaddock = false; + jailbreak = true; homepage = "http://github.com/ekmett/bifunctors/"; description = "Bifunctors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bighugethesaurus" = callPackage @@ -35525,8 +35573,8 @@ self: { pname = "binary-orphans"; version = "0.1.4.0"; sha256 = "0a952a7521747a7aacf4aa1638674130262f2efacb7121727c1932d49017f742"; - revision = "3"; - editedCabalFile = "b81b44514f6b9e69bb1cb36484268470dd9268112d974960fb6070a4bb1f307c"; + revision = "4"; + editedCabalFile = "5c473d152fd0cc986ec5330e6138d3c3b62b29f2d3ae7ebfad0832ba82593ce6"; libraryHaskellDepends = [ aeson base binary hashable scientific semigroups tagged text text-binary time unordered-containers vector @@ -38489,7 +38537,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "bloodhound" = callPackage + "bloodhound_0_10_0_0" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers , data-default-class, derive, directory, doctest, doctest-prop , errors, exceptions, filepath, hashable, hspec, http-client @@ -38518,6 +38566,37 @@ self: { homepage = "https://github.com/bitemyapp/bloodhound"; description = "ElasticSearch client library for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "bloodhound" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers + , data-default-class, derive, directory, doctest, doctest-prop + , errors, exceptions, filepath, hashable, hspec, http-client + , http-types, mtl, mtl-compat, network-uri, QuickCheck + , quickcheck-properties, scientific, semigroups, text, time + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "bloodhound"; + version = "0.11.0.0"; + sha256 = "df3c708675ad1e113aa31f6d1492bcf55dbef6c7e86e6202b118670a6fcbb939"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring containers data-default-class + exceptions hashable http-client http-types mtl mtl-compat + network-uri scientific semigroups text time transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers derive directory doctest + doctest-prop errors filepath hspec http-client http-types mtl + QuickCheck quickcheck-properties semigroups text time + unordered-containers vector + ]; + jailbreak = true; + homepage = "https://github.com/bitemyapp/bloodhound"; + description = "ElasticSearch client library for Haskell"; + license = stdenv.lib.licenses.bsd3; }) {}; "bloomfilter" = callPackage @@ -38683,6 +38762,7 @@ self: { testHaskellDepends = [ array base containers QuickCheck random transformers utility-ht ]; + jailbreak = true; homepage = "http://code.haskell.org/~thielema/games/"; description = "Three games for inclusion in a web server"; license = "GPL"; @@ -38736,6 +38816,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "bond-haskell-compiler" = callPackage + ({ mkDerivation, aeson, base, bond, bytestring, cmdargs, directory + , filepath, haskell-src-exts, monad-loops + }: + mkDerivation { + pname = "bond-haskell-compiler"; + version = "0.1.0.0"; + sha256 = "06bbfd191a7a2d901df2862196ae4e518306af9c363e908fd03802d7dfe27ba5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bond filepath haskell-src-exts ]; + executableHaskellDepends = [ + aeson base bond bytestring cmdargs directory filepath monad-loops + ]; + testHaskellDepends = [ base ]; + homepage = "http://github.com/rblaze/bond-haskell-compiler#readme"; + description = "Bond code generator for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bool-extras" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -39308,6 +39408,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "brick_0_5" = callPackage + ({ mkDerivation, base, containers, contravariant, data-default + , deepseq, lens, template-haskell, text, text-zipper, transformers + , vector, vty + }: + mkDerivation { + pname = "brick"; + version = "0.5"; + sha256 = "70819394a586d768e31bbf34b225ce642f682b625256ebe3c8651ee203f5e942"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers contravariant data-default deepseq lens + template-haskell text text-zipper transformers vector vty + ]; + executableHaskellDepends = [ + base data-default lens text vector vty + ]; + homepage = "https://github.com/jtdaugherty/brick/"; + description = "A declarative terminal user interface library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "brillig" = callPackage ({ mkDerivation, base, binary, cmdargs, containers, directory , filepath, ListZipper, text @@ -41675,7 +41799,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; - "cabal-install" = callPackage + "cabal-install_1_22_8_0" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , directory, extensible-exceptions, filepath, HTTP, HUnit, mtl , network, network-uri, pretty, process, QuickCheck, random @@ -41706,10 +41830,11 @@ self: { homepage = "http://www.haskell.org/cabal/"; description = "The command-line interface for Cabal and Hackage"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; - "cabal-install_1_22_9_0" = callPackage + "cabal-install" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , directory, extensible-exceptions, filepath, HTTP, HUnit, mtl , network, network-uri, pretty, process, QuickCheck, random @@ -41732,6 +41857,7 @@ self: { pretty process QuickCheck regex-posix stm test-framework test-framework-hunit test-framework-quickcheck2 time unix zlib ]; + doCheck = false; postInstall = '' mkdir $out/etc mv bash-completion $out/etc/bash_completion.d @@ -41739,7 +41865,6 @@ self: { homepage = "http://www.haskell.org/cabal/"; description = "The command-line interface for Cabal and Hackage"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; @@ -43407,6 +43532,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "casa-abbreviations-and-acronyms" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, QuickCheck + , template-haskell + }: + mkDerivation { + pname = "casa-abbreviations-and-acronyms"; + version = "0.0.1"; + sha256 = "5ebea4d5c229fbbf97fac6cd91016ef41fe712995d6f8719db330c2753e0ec8a"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/tonymorris/casa-abbreviations-and-acronyms"; + description = "CASA Abbreviations and Acronyms"; + license = "unknown"; + }) {}; + "casadi-bindings" = callPackage ({ mkDerivation, base, binary, casadi, casadi-bindings-core , casadi-bindings-internal, cereal, containers, doctest, linear @@ -44293,19 +44435,19 @@ self: { "cblrepo" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal , containers, directory, filepath, mtl, optparse-applicative - , process, safe, stringsearch, tar, transformers, unix, Unixutils - , utf8-string, zlib + , process, safe, stringsearch, tar, text, transformers, unix + , Unixutils, utf8-string, zlib }: mkDerivation { pname = "cblrepo"; - version = "0.19.1"; - sha256 = "e06276a14157bf82b86f3a534bc51620134253b1e9472e676616cec58ab8b436"; + version = "0.20.0"; + sha256 = "0cc8cf5888d0dc87be47a2e11c641e8f3c8f64f3e09b242694c74b69a1b093e5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson ansi-wl-pprint base bytestring Cabal containers directory filepath mtl optparse-applicative process safe stringsearch tar - transformers unix Unixutils utf8-string zlib + text transformers unix Unixutils utf8-string zlib ]; jailbreak = true; description = "Tool to maintain a database of CABAL packages and their dependencies"; @@ -44790,7 +44932,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cgi" = callPackage + "cgi_3001_2_2_3" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, mtl , multipart, network, network-uri, old-locale, old-time, parsec , xhtml @@ -44806,6 +44948,26 @@ self: { homepage = "https://github.com/cheecheeo/haskell-cgi"; description = "A library for writing CGI programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "cgi" = callPackage + ({ mkDerivation, base, bytestring, containers, doctest, exceptions + , mtl, multipart, network, network-uri, parsec, QuickCheck, time + , xhtml + }: + mkDerivation { + pname = "cgi"; + version = "3001.3.0.0"; + sha256 = "917d08354d9b613def8412fcb096d6adab62d62379a4f761c6cd3021d8bb644b"; + libraryHaskellDepends = [ + base bytestring containers exceptions mtl multipart network + network-uri parsec time xhtml + ]; + testHaskellDepends = [ base doctest QuickCheck ]; + homepage = "https://github.com/cheecheeo/haskell-cgi"; + description = "A library for writing CGI programs"; + license = stdenv.lib.licenses.bsd3; }) {}; "cgi-undecidable" = callPackage @@ -46059,7 +46221,6 @@ self: { lens lens-aeson mtl mtl-compat QuickCheck tasty tasty-hunit tasty-th transformers-compat ]; - jailbreak = true; homepage = "http://clafer.org"; description = "Compiles Clafer models to other formats: Alloy, JavaScript, JSON, HTML, Dot"; license = stdenv.lib.licenses.mit; @@ -46092,7 +46253,6 @@ self: { array base clafer cmdargs directory filepath HUnit tasty tasty-hunit tasty-th transformers transformers-compat ]; - jailbreak = true; homepage = "http://clafer.org"; description = "claferIG is an interactive tool that generates instances of Clafer models"; license = stdenv.lib.licenses.mit; @@ -46112,7 +46272,6 @@ self: { network-uri process SHA split time transformers transformers-compat utf8-string ]; - jailbreak = true; homepage = "http://github.com/gsdlab/claferwiki"; description = "A wiki-based IDE for literate modeling with Clafer"; license = stdenv.lib.licenses.mit; @@ -47428,7 +47587,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "classy-prelude" = callPackage + "classy-prelude_0_12_5_1" = callPackage ({ mkDerivation, base, basic-prelude, bifunctors, bytestring , chunked-data, containers, dlist, enclosed-exceptions, exceptions , ghc-prim, hashable, hspec, lifted-base, mono-traversable, mtl @@ -47453,6 +47612,34 @@ self: { homepage = "https://github.com/snoyberg/classy-prelude"; description = "A typeclass-based Prelude"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "classy-prelude" = callPackage + ({ mkDerivation, base, basic-prelude, bifunctors, bytestring + , chunked-data, containers, dlist, enclosed-exceptions, exceptions + , ghc-prim, hashable, hspec, lifted-base, mono-traversable, mtl + , mutable-containers, primitive, QuickCheck, semigroups, stm, text + , time, time-locale-compat, transformers, unordered-containers + , vector, vector-instances + }: + mkDerivation { + pname = "classy-prelude"; + version = "0.12.6"; + sha256 = "85abaa21998914465e553421aacaf64b0dc734c5e785d3974e24027c5b33e333"; + libraryHaskellDepends = [ + base basic-prelude bifunctors bytestring chunked-data containers + dlist enclosed-exceptions exceptions ghc-prim hashable lifted-base + mono-traversable mtl mutable-containers primitive semigroups stm + text time time-locale-compat transformers unordered-containers + vector vector-instances + ]; + testHaskellDepends = [ + base containers hspec QuickCheck transformers unordered-containers + ]; + homepage = "https://github.com/snoyberg/classy-prelude"; + description = "A typeclass-based Prelude"; + license = stdenv.lib.licenses.mit; }) {}; "classy-prelude-conduit_0_10_2" = callPackage @@ -47643,7 +47830,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "classy-prelude-conduit" = callPackage + "classy-prelude-conduit_0_12_5" = callPackage ({ mkDerivation, base, bytestring, classy-prelude, conduit , conduit-combinators, hspec, monad-control, QuickCheck, resourcet , transformers, void @@ -47659,6 +47846,29 @@ self: { testHaskellDepends = [ base bytestring conduit hspec QuickCheck transformers ]; + jailbreak = true; + homepage = "https://github.com/snoyberg/classy-prelude"; + description = "conduit instances for classy-prelude"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "classy-prelude-conduit" = callPackage + ({ mkDerivation, base, bytestring, classy-prelude, conduit + , conduit-combinators, hspec, monad-control, QuickCheck, resourcet + , transformers, void + }: + mkDerivation { + pname = "classy-prelude-conduit"; + version = "0.12.6"; + sha256 = "afaee71828145632914ebe83d5f635367ed702a95a1d327dadac13daa93d69ee"; + libraryHaskellDepends = [ + base bytestring classy-prelude conduit conduit-combinators + monad-control resourcet transformers void + ]; + testHaskellDepends = [ + base bytestring conduit hspec QuickCheck transformers + ]; homepage = "https://github.com/snoyberg/classy-prelude"; description = "conduit instances for classy-prelude"; license = stdenv.lib.licenses.mit; @@ -47832,7 +48042,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "classy-prelude-yesod" = callPackage + "classy-prelude-yesod_0_12_5" = callPackage ({ mkDerivation, aeson, base, classy-prelude , classy-prelude-conduit, data-default, http-conduit, http-types , persistent, yesod, yesod-newsfeed, yesod-static @@ -47846,6 +48056,27 @@ self: { http-conduit http-types persistent yesod yesod-newsfeed yesod-static ]; + jailbreak = true; + homepage = "https://github.com/snoyberg/classy-prelude"; + description = "Provide a classy prelude including common Yesod functionality"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "classy-prelude-yesod" = callPackage + ({ mkDerivation, aeson, base, classy-prelude + , classy-prelude-conduit, data-default, http-conduit, http-types + , persistent, yesod, yesod-newsfeed, yesod-static + }: + mkDerivation { + pname = "classy-prelude-yesod"; + version = "0.12.6"; + sha256 = "db65c7f0d49a4edf0c27bce0e614ffcbc54dc37afd08d368f239322240f60839"; + libraryHaskellDepends = [ + aeson base classy-prelude classy-prelude-conduit data-default + http-conduit http-types persistent yesod yesod-newsfeed + yesod-static + ]; homepage = "https://github.com/snoyberg/classy-prelude"; description = "Provide a classy prelude including common Yesod functionality"; license = stdenv.lib.licenses.mit; @@ -51138,7 +51369,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "conduit" = callPackage + "conduit_1_2_6_2" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, lifted-base , mmorph, mtl, QuickCheck, resourcet, safe, transformers , transformers-base @@ -51158,6 +51389,29 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming data processing library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "conduit" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec, lifted-base + , mmorph, mtl, QuickCheck, resourcet, safe, transformers + , transformers-base + }: + mkDerivation { + pname = "conduit"; + version = "1.2.6.3"; + sha256 = "6816ba600c8cbd14ce9fe89f8e101dedf10dda43d2a178576324678c1722d589"; + libraryHaskellDepends = [ + base exceptions lifted-base mmorph mtl resourcet transformers + transformers-base + ]; + testHaskellDepends = [ + base containers exceptions hspec mtl QuickCheck resourcet safe + transformers + ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Streaming data processing library"; + license = stdenv.lib.licenses.mit; }) {}; "conduit-audio" = callPackage @@ -51747,7 +52001,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "conduit-extra" = callPackage + "conduit-extra_1_1_10_1" = callPackage ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring , bytestring-builder, conduit, directory, exceptions, filepath , hspec, monad-control, network, primitive, process, resourcet, stm @@ -51770,6 +52024,32 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Batteries included conduit: adapters for common libraries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "conduit-extra" = callPackage + ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring + , bytestring-builder, conduit, directory, exceptions, filepath + , hspec, monad-control, network, primitive, process, resourcet, stm + , streaming-commons, text, transformers, transformers-base + }: + mkDerivation { + pname = "conduit-extra"; + version = "1.1.11"; + sha256 = "670009f95b16d74d1ffab5fe7f9e667249384cdddf80b8eda32413e11861ea2f"; + libraryHaskellDepends = [ + attoparsec base blaze-builder bytestring conduit directory + exceptions filepath monad-control network primitive process + resourcet stm streaming-commons text transformers transformers-base + ]; + testHaskellDepends = [ + async attoparsec base blaze-builder bytestring bytestring-builder + conduit exceptions hspec process resourcet stm streaming-commons + text transformers transformers-base + ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Batteries included conduit: adapters for common libraries"; + license = stdenv.lib.licenses.mit; }) {}; "conduit-iconv" = callPackage @@ -54072,7 +54352,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cpphs" = callPackage + "cpphs_1_19_3" = callPackage ({ mkDerivation, base, directory, old-locale, old-time, polyparse }: mkDerivation { @@ -54090,6 +54370,27 @@ self: { homepage = "http://projects.haskell.org/cpphs/"; description = "A liberalised re-implementation of cpp, the C pre-processor"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "cpphs" = callPackage + ({ mkDerivation, base, directory, old-locale, old-time, polyparse + }: + mkDerivation { + pname = "cpphs"; + version = "1.20.1"; + sha256 = "bd6eab851ec39ed5c5e4b0eb0b956f5892a36dedabcdf127a1ffa84c8e4f6017"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory old-locale old-time polyparse + ]; + executableHaskellDepends = [ + base directory old-locale old-time polyparse + ]; + homepage = "http://projects.haskell.org/cpphs/"; + description = "A liberalised re-implementation of cpp, the C pre-processor"; + license = "LGPL"; }) {}; "cprng-aes" = callPackage @@ -54752,7 +55053,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "criterion" = callPackage + "criterion_1_1_0_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring , cassava, containers, deepseq, directory, filepath, Glob, hastache , HUnit, mtl, mwc-random, optparse-applicative, parsec, QuickCheck @@ -54782,9 +55083,10 @@ self: { homepage = "http://www.serpentine.com/criterion"; description = "Robust, reliable performance measurement and analysis"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "criterion_1_1_1_0" = callPackage + "criterion" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring , cassava, containers, deepseq, directory, filepath, Glob, hastache , HUnit, mtl, mwc-random, optparse-applicative, parsec, QuickCheck @@ -54814,7 +55116,6 @@ self: { homepage = "http://www.serpentine.com/criterion"; description = "Robust, reliable performance measurement and analysis"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "criterion-plus" = callPackage @@ -56696,12 +56997,12 @@ self: { ({ mkDerivation, array, attoparsec, base, base16-bytestring, binary , bytestring, cmdargs, containers, cryptohash, curl, data-ordlist , directory, filepath, FindBin, hashable, haskeline, html, HTTP - , HUnit, mmap, mtl, network, network-uri, old-locale, old-time - , parsec, process, QuickCheck, random, regex-applicative - , regex-compat-tdfa, sandi, shelly, split, tar, terminfo - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, time, transformers, transformers-compat, unix, unix-compat - , utf8-string, vector, zip-archive, zlib + , HUnit, mmap, mtl, network, network-uri, old-time, parsec, process + , QuickCheck, random, regex-applicative, regex-compat-tdfa, sandi + , shelly, split, tar, terminfo, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, time + , transformers, transformers-compat, unix, unix-compat, utf8-string + , vector, zip-archive, zlib }: mkDerivation { pname = "darcs"; @@ -56715,9 +57016,9 @@ self: { libraryHaskellDepends = [ array attoparsec base base16-bytestring binary bytestring containers cryptohash data-ordlist directory filepath hashable - haskeline html HTTP mmap mtl network network-uri old-locale - old-time parsec process random regex-applicative regex-compat-tdfa - sandi tar terminfo text time transformers transformers-compat unix + haskeline html HTTP mmap mtl network network-uri old-time parsec + process random regex-applicative regex-compat-tdfa sandi tar + terminfo text time transformers transformers-compat unix unix-compat utf8-string vector zip-archive zlib ]; librarySystemDepends = [ curl ]; @@ -56729,7 +57030,6 @@ self: { test-framework-hunit test-framework-quickcheck2 text unix-compat zip-archive zlib ]; - jailbreak = true; postInstall = '' mkdir -p $out/etc/bash_completion.d mv contrib/darcs_completion $out/etc/bash_completion.d/darcs @@ -57340,8 +57640,8 @@ self: { ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { pname = "data-clist"; - version = "0.0.7.4"; - sha256 = "769f40b42d01d6e917a15fdfd381daafaabaed8d550bd7f85e6d45cb1cb2d96e"; + version = "0.1.0.0"; + sha256 = "f22ba783032ad904fc797ee3ff9d015a43cf26b7670addf4d3b74f5d6f359f45"; libraryHaskellDepends = [ base deepseq QuickCheck ]; homepage = "https://github.com/sw17ch/data-clist"; description = "Simple functional ring type"; @@ -57759,8 +58059,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "data-fix"; - version = "0.0.1"; - sha256 = "f93a17bedc61402014fa8b7ffdea2dfe3cee13866e4d5ec6356a8ab433452027"; + version = "0.0.2"; + sha256 = "27335dc34276f3915a42db3e49d6e63abf8eb4a673b302651acdd6f4933b2248"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/anton-k/data-fix"; description = "Fixpoint data types"; @@ -58863,8 +59163,8 @@ self: { }: mkDerivation { pname = "dbmigrations"; - version = "1.1"; - sha256 = "fe8075f25f1b55a55e792e654b8708e7f093c78b2cd75c1f1867efbf1a3cc2bc"; + version = "1.1.1"; + sha256 = "d36742052ed45f933e7883bb542c070c881685df721e526d4abc25e7a1444c9f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59021,8 +59321,8 @@ self: { }: mkDerivation { pname = "dbus-th"; - version = "0.1.1.1"; - sha256 = "6c113c42bc87a9c874f0a0d408368aa021b197f88e2d0a2ce8ecb4e6503db36b"; + version = "0.1.2.0"; + sha256 = "58560b8ae7215786b6d632e05a0ab74665abc59b66e18555493dd937cbee4909"; libraryHaskellDepends = [ base containers dbus syb template-haskell text ]; @@ -59030,6 +59330,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dbus-th-introspection" = callPackage + ({ mkDerivation, base, cmdargs, containers, dbus, dbus-th + , template-haskell + }: + mkDerivation { + pname = "dbus-th-introspection"; + version = "0.1.0.0"; + sha256 = "42c5e05f11789d9c738b5ce9495e0a25f15738db85637c49a5bb03c1ed768481"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers dbus dbus-th template-haskell + ]; + executableHaskellDepends = [ + base cmdargs containers dbus dbus-th template-haskell + ]; + jailbreak = true; + description = "Generate bindings for DBus calls by using DBus introspection and dbus-th"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dclabel" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, QuickCheck , quickcheck-instances, test-framework, test-framework-quickcheck2 @@ -64015,20 +64336,19 @@ self: { "distributed-process" = callPackage ({ mkDerivation, base, binary, bytestring, containers - , data-accessor, deepseq, distributed-static, ghc-prim, hashable - , mtl, network-transport, random, rank1dynamic, stm, syb + , data-accessor, deepseq, distributed-static, exceptions, ghc-prim + , hashable, mtl, network-transport, random, rank1dynamic, stm, syb , template-haskell, time, transformers }: mkDerivation { pname = "distributed-process"; - version = "0.6.0"; - sha256 = "d79f7e24e7b2896681f9f4b798da0e987742caab4c34917a0d04f40f9aef6b5b"; - revision = "2"; - editedCabalFile = "3931f513026c2190a6117df582f6ff72d06898b69fddfafe65c25d2d0460f140"; + version = "0.6.1"; + sha256 = "e533facdab2311bdfdea2dbb58e8920ad8121af36417ba98489146e5c224d555"; libraryHaskellDepends = [ base binary bytestring containers data-accessor deepseq - distributed-static ghc-prim hashable mtl network-transport random - rank1dynamic stm syb template-haskell time transformers + distributed-static exceptions ghc-prim hashable mtl + network-transport random rank1dynamic stm syb template-haskell time + transformers ]; doCheck = false; homepage = "http://haskell-distributed.github.com/"; @@ -64342,8 +64662,8 @@ self: { }: mkDerivation { pname = "distributed-process-lifted"; - version = "0.2.0.0"; - sha256 = "c0c323de903c6f6770c9e95e4c3dbbfc9295f55ad309220fd64710dae3a5e27f"; + version = "0.2.0.1"; + sha256 = "9f2d96e2148bdc3be54365810f2e8689e7ab2d133d6b8248701d997a92a32950"; libraryHaskellDepends = [ base deepseq distributed-process distributed-process-monad-control lifted-base monad-control mtl network-transport transformers @@ -64354,7 +64674,6 @@ self: { network-transport network-transport-tcp rematch test-framework test-framework-hunit transformers ]; - jailbreak = true; homepage = "https://github.com/jeremyjh/distributed-process-lifted"; description = "monad-control style typeclass and transformer instances for Process monad"; license = stdenv.lib.licenses.bsd3; @@ -64366,13 +64685,12 @@ self: { }: mkDerivation { pname = "distributed-process-monad-control"; - version = "0.5.1.1"; - sha256 = "dab2eb3396e4afa5fdf9f84dd51a3e6bf634c2971a28c782946cc9f4b0e7fa43"; + version = "0.5.1.2"; + sha256 = "284ff6a793a78e4d587cd5f408520b259e2e9d36ec9c69a161abe3103a18e0c7"; libraryHaskellDepends = [ base distributed-process monad-control transformers transformers-base ]; - jailbreak = true; homepage = "http://haskell-distributed.github.io"; description = "Orphan instances for MonadBase and MonadBaseControl"; license = stdenv.lib.licenses.bsd3; @@ -64702,8 +65020,8 @@ self: { }: mkDerivation { pname = "distributed-process-zookeeper"; - version = "0.2.0.0"; - sha256 = "b14f2f6a6f8f0e37bee40fd57a6e4c3491cf687a1de65f593fbac94962a912ed"; + version = "0.2.1.0"; + sha256 = "98e74ca698daf1434fda5ac2cb277e8849080ef897e907716a196c1348c84bcd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -64717,7 +65035,6 @@ self: { lifted-base monad-control network network-transport network-transport-tcp transformers ]; - jailbreak = true; homepage = "https://github.com/jeremyjh/distributed-process-zookeeper"; description = "A Zookeeper back-end for Cloud Haskell"; license = stdenv.lib.licenses.bsd3; @@ -65838,13 +66155,14 @@ self: { }) {}; "download" = callPackage - ({ mkDerivation, base, bytestring, feed, tagsoup, xml }: + ({ mkDerivation, base, bytestring, feed, hspec, tagsoup, xml }: mkDerivation { pname = "download"; - version = "0.3.2"; - sha256 = "839f46eae433b824e7013b84cfd253134a718319949447ad2b6cb28411760b5a"; + version = "0.3.2.3"; + sha256 = "8fa68c80182f763202a9301443613fe642af64b1d48251ba01b4d63c83715fc2"; libraryHaskellDepends = [ base bytestring feed tagsoup xml ]; - homepage = "http://code.haskell.org/~dons/code/download"; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/psibi/download"; description = "High-level file download based on URLs"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -70054,7 +70372,6 @@ self: { libraryHaskellDepends = [ base safe transformers transformers-compat ]; - jailbreak = true; description = "Simplified error-handling"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -70870,7 +71187,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "eventstore" = callPackage + "eventstore_0_10_0_2" = callPackage ({ mkDerivation, aeson, async, base, bytestring, cereal, containers , network, protobuf, random, stm, tasty, tasty-hunit, text, time , unordered-containers, uuid @@ -70891,6 +71208,32 @@ self: { description = "EventStore TCP Client"; license = stdenv.lib.licenses.bsd3; platforms = [ "x86_64-darwin" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "eventstore" = callPackage + ({ mkDerivation, aeson, array, async, base, bytestring, cereal + , containers, dns, http-client, network, protobuf, random + , semigroups, stm, tasty, tasty-hunit, text, time + , unordered-containers, uuid + }: + mkDerivation { + pname = "eventstore"; + version = "0.11.0.0"; + sha256 = "841ea8c033dde7b59aa9eed6dfb5726866f53c4a4309fa074e357bc7cfb72915"; + libraryHaskellDepends = [ + aeson array async base bytestring cereal containers dns http-client + network protobuf random semigroups stm text time + unordered-containers uuid + ]; + testHaskellDepends = [ + aeson base stm tasty tasty-hunit text time + ]; + doCheck = false; + homepage = "http://github.com/YoEight/eventstore"; + description = "EventStore TCP Client"; + license = stdenv.lib.licenses.bsd3; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "every-bit-counts" = callPackage @@ -71137,7 +71480,6 @@ self: { base HUnit test-framework test-framework-hunit transformers transformers-compat ]; - jailbreak = true; description = "Type classes and monads for unchecked extensible exceptions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -75070,8 +75412,8 @@ self: { }: mkDerivation { pname = "fit"; - version = "0.5.1"; - sha256 = "ab192e41436054b04b476670748d43ff486fc90c5f80e01397bf51103fdbf278"; + version = "0.5.2"; + sha256 = "2e5ef15c5b4ea60f9861377a133801a3e2c28dcff74fa7aa5f9d8e6b115f3cf7"; libraryHaskellDepends = [ attoparsec base bytestring containers contravariant mtl text ]; @@ -76131,7 +76473,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "fn" = callPackage + "fn_0_2_0_2" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, directory , filepath, hspec, http-types, text, unordered-containers, wai , wai-extra @@ -76151,9 +76493,10 @@ self: { homepage = "http://github.com/dbp/fn#readme"; description = "A functional web framework"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "fn_0_3_0_0" = callPackage + "fn" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, directory , filepath, hspec, http-types, text, unordered-containers, wai , wai-extra @@ -76173,7 +76516,6 @@ self: { homepage = "http://github.com/dbp/fn#readme"; description = "A functional web framework"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fn-extra_0_2_0_0" = callPackage @@ -76194,7 +76536,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "fn-extra" = callPackage + "fn-extra_0_2_0_1" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, either, fn, heist , http-types, lens, mtl, text, wai, wai-util, xmlhtml }: @@ -76209,9 +76551,10 @@ self: { homepage = "http://github.com/dbp/fn#readme"; description = "Extras for Fn, a functional web framework"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "fn-extra_0_3_0_0" = callPackage + "fn-extra" = callPackage ({ mkDerivation, base, blaze-builder, bytestring , digestive-functors, directory, either, fn, heist, http-types , lens, mtl, resourcet, text, wai, wai-extra, wai-util, xmlhtml @@ -76228,7 +76571,6 @@ self: { homepage = "http://github.com/dbp/fn#readme"; description = "Extras for Fn, a functional web framework"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "focus_0_1_3" = callPackage @@ -78041,8 +78383,8 @@ self: { ({ mkDerivation, base, directory }: mkDerivation { pname = "frown"; - version = "0.6.2.2"; - sha256 = "d061880b6b3fca4f2a5c054f5669d9c0747139386c47ccf57db4d5521c02c447"; + version = "0.6.2.3"; + sha256 = "fcca75244343a976a397f7d50687a80d41192e9eaa47d77799d11892f5fe400c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory ]; @@ -80239,8 +80581,8 @@ self: { }: mkDerivation { pname = "geojson"; - version = "1.3.0"; - sha256 = "1adba5e0bcfc4efad8ed9742279d78cc85d45be845257dd64999f66a872dd9a1"; + version = "1.3.1"; + sha256 = "b4f6624c79d7f1ba66519b3711c2f67b682c6c7b126fb7b4ccf87edd4c7f9661"; libraryHaskellDepends = [ aeson base lens semigroups text transformers validation vector ]; @@ -81440,7 +81782,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghcid" = callPackage + "ghcid_0_5" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit , terminal-size, time @@ -81468,9 +81810,10 @@ self: { homepage = "https://github.com/ndmitchell/ghcid#readme"; description = "GHCi based bare bones IDE"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghcid_0_5_1" = callPackage + "ghcid" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit , terminal-size, time @@ -81492,10 +81835,10 @@ self: { ansi-terminal base cmdargs containers directory extra filepath fsnotify process tasty tasty-hunit terminal-size time ]; + doCheck = false; homepage = "https://github.com/ndmitchell/ghcid#readme"; description = "GHCi based bare bones IDE"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-codemirror" = callPackage @@ -82979,15 +83322,14 @@ self: { }: mkDerivation { pname = "gitignore"; - version = "1.0.1"; - sha256 = "14bf2fb4a56ec53514986536c1b63bd5c0b1404f5c9f7b7d645cf7733585520f"; + version = "1.1"; + sha256 = "59cc0668488d3fc587b48b04293cd67fcefde64125fefc4f1d0f5682b9401084"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson base base64-bytestring bytestring http-conduit network safe text ]; - jailbreak = true; homepage = "https://github.com/relrod/gitignore"; description = "Apply GitHub .gitignore templates to already existing repositories."; license = stdenv.lib.licenses.bsd3; @@ -88971,7 +89313,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hOpenPGP" = callPackage + "hOpenPGP_2_4_3" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib , conduit, conduit-extra, containers, crypto-cipher-types @@ -89009,6 +89351,47 @@ self: { homepage = "http://floss.scru.org/hOpenPGP/"; description = "native Haskell implementation of OpenPGP (RFC4880)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hOpenPGP" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib + , conduit, conduit-extra, containers, crypto-cipher-types + , cryptonite, data-default-class, errors, hashable + , incremental-parser, ixset-typed, lens, memory, monad-loops + , nettle, network, network-uri, newtype, openpgp-asciiarmor + , QuickCheck, quickcheck-instances, resourcet, securemem + , semigroups, split, tasty, tasty-hunit, tasty-quickcheck, text + , time, time-locale-compat, transformers, unordered-containers + , wl-pprint-extras, zlib + }: + mkDerivation { + pname = "hOpenPGP"; + version = "2.4.4"; + sha256 = "6d137b38a2a60f711fd34612849f34a1731271c6a2cc83aa57c37cfea1f5a806"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring bifunctors binary + binary-conduit byteable bytestring bzlib conduit conduit-extra + containers crypto-cipher-types cryptonite data-default-class errors + hashable incremental-parser ixset-typed lens memory monad-loops + nettle network network-uri newtype openpgp-asciiarmor resourcet + securemem semigroups split text time time-locale-compat + transformers unordered-containers wl-pprint-extras zlib + ]; + testHaskellDepends = [ + aeson attoparsec base bifunctors binary binary-conduit byteable + bytestring bzlib conduit conduit-extra containers + crypto-cipher-types cryptonite data-default-class errors hashable + incremental-parser ixset-typed lens memory monad-loops nettle + network network-uri newtype QuickCheck quickcheck-instances + resourcet securemem semigroups split tasty tasty-hunit + tasty-quickcheck text time time-locale-compat transformers + unordered-containers wl-pprint-extras zlib + ]; + homepage = "http://floss.scru.org/hOpenPGP/"; + description = "native Haskell implementation of OpenPGP (RFC4880)"; + license = stdenv.lib.licenses.mit; }) {}; "hPDB_1_2_0" = callPackage @@ -91694,6 +92077,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "handwriting" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, lens, lens-aeson, random, split, text, transformers + , wreq + }: + mkDerivation { + pname = "handwriting"; + version = "0.1.0.0"; + sha256 = "ce50861bc2b6957e34cc52d05cb6f7837806988bcc82edc30123e1525bdc79f9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers lens lens-aeson split text + transformers wreq + ]; + executableHaskellDepends = [ + base bytestring directory filepath random text + ]; + testHaskellDepends = [ base ]; + homepage = "http://github.com/ismailmustafa/handwriting-haskell#readme"; + description = "API Client for the handwriting.io API."; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hangman" = callPackage ({ mkDerivation, base, mtl, random, utility-ht }: mkDerivation { @@ -91784,8 +92191,8 @@ self: { }: mkDerivation { pname = "haphviz"; - version = "0.1.2.0"; - sha256 = "d7dcb9cc3c345a3886206fc2c50ce375fbafea5c44124602a6124d144d172f8e"; + version = "0.2.0.0"; + sha256 = "352fd5f9b696341f33ef262a15df817d3831f0bea09de1d5babb34d4388e238d"; libraryHaskellDepends = [ base mtl text ]; testHaskellDepends = [ base checkers hspec QuickCheck quickcheck-text text @@ -92484,7 +92891,6 @@ self: { testHaskellDepends = [ base bytestring containers HUnit parsec zlib ]; - jailbreak = true; homepage = "http://happstack.com"; description = "Web related tools and services"; license = stdenv.lib.licenses.bsd3; @@ -92515,7 +92921,6 @@ self: { testHaskellDepends = [ base bytestring containers HUnit parsec zlib ]; - jailbreak = true; homepage = "http://happstack.com"; description = "Web related tools and services"; license = stdenv.lib.licenses.bsd3; @@ -98674,21 +99079,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hedis_0_7_1" = callPackage - ({ mkDerivation, attoparsec, base, BoundedChan, bytestring - , bytestring-lexing, deepseq, HUnit, mtl, network, resource-pool + "hedis_0_7_6" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, bytestring-lexing + , deepseq, HUnit, mtl, network, resource-pool, slave-thread , test-framework, test-framework-hunit, time, vector }: mkDerivation { pname = "hedis"; - version = "0.7.1"; - sha256 = "741dce86d4a331c64f7720ad9650e5af77ccb8c0a3301266287ae07093f7a0a0"; + version = "0.7.6"; + sha256 = "5108932156140465b41915fc043dc6e23491480576c48a4a81dd9bbb570f5cbe"; libraryHaskellDepends = [ - attoparsec base BoundedChan bytestring bytestring-lexing deepseq - mtl network resource-pool time vector + attoparsec base bytestring bytestring-lexing deepseq mtl network + resource-pool time vector ]; testHaskellDepends = [ - base bytestring HUnit mtl test-framework test-framework-hunit time + base bytestring HUnit mtl slave-thread test-framework + test-framework-hunit time ]; homepage = "https://github.com/informatikr/hedis"; description = "Client library for the Redis datastore: supports full command set, pipelining"; @@ -100541,8 +100947,8 @@ self: { }: mkDerivation { pname = "higher-leveldb"; - version = "0.3.0.0"; - sha256 = "668557a64c3df44ab1ddb3f9ffd9bdaf2a88fb6f56b7712daf8ee8418370f051"; + version = "0.3.0.1"; + sha256 = "42d99bd80aa8ca53b537529a580ba9222ad840f50bc7d300120254165cb888fa"; libraryHaskellDepends = [ base bytestring cereal data-default leveldb-haskell lifted-base monad-control mtl resourcet transformers transformers-base @@ -100551,7 +100957,6 @@ self: { base bytestring cereal hspec leveldb-haskell lifted-base monad-control mtl process resourcet transformers transformers-base ]; - jailbreak = true; homepage = "https://github.com/jeremyjh/higher-leveldb"; description = "A rich monadic API for working with leveldb databases"; license = stdenv.lib.licenses.bsd3; @@ -105560,6 +105965,7 @@ self: { array base containers cpphs filemanip filepath Glob haskell-src-exts optparse-applicative split ]; + jailbreak = true; homepage = "http://github.com/luqui/hothasktags"; description = "Generates ctags for Haskell, incorporating import lists and qualified imports"; license = stdenv.lib.licenses.bsd3; @@ -110902,7 +111308,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {com_err = null; zephyr = null;}; - "htaglib" = callPackage + "htaglib_1_0_1" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, HUnit , taglib, test-framework, test-framework-hunit, text }: @@ -110918,6 +111324,25 @@ self: { homepage = "https://github.com/mrkkrp/htaglib"; description = "Bindings to TagLib, audio meta-data library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) taglib;}; + + "htaglib" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, HUnit + , taglib, test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "htaglib"; + version = "1.0.2"; + sha256 = "dbf110578fb4f30426a538756efa6b0bb9af5650c9d3752732973c9725385478"; + libraryHaskellDepends = [ base bytestring text ]; + librarySystemDepends = [ taglib ]; + testHaskellDepends = [ + base directory filepath HUnit test-framework test-framework-hunit + ]; + homepage = "https://github.com/mrkkrp/htaglib"; + description = "Bindings to TagLib, audio meta-data library"; + license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) taglib;}; "htags" = callPackage @@ -113107,8 +113532,8 @@ self: { }: mkDerivation { pname = "http-test"; - version = "0.2.4"; - sha256 = "03e5ea74bc05ce46b2cfabae00c307db86fdc31dc6636d33cb32655f67b4c71b"; + version = "0.2.5"; + sha256 = "06254d86b26a7df3ac6e5bee7e8c4cf74bdde12e825567a10ca81c8ae6fdb3a3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117503,13 +117928,11 @@ self: { }: mkDerivation { pname = "indentation"; - version = "0.2.1.1"; - sha256 = "72134a7c01812ccadacf1c5db86e40892136e7bf583b85c083b088cec19e65f1"; - revision = "1"; - editedCabalFile = "642875a7d7d3b8bd626f1671ff1dad1a8584bfa0fab236e5e404d8b26345317e"; + version = "0.2.1.2"; + sha256 = "dd7161daaf85a26af3ac18113760ef2af69c6d2ccef6e3febab103cd299205df"; libraryHaskellDepends = [ base mtl parsec parsers trifecta ]; testHaskellDepends = [ base parsec tasty tasty-hunit trifecta ]; - homepage = "https://bitbucket.org/adamsmd/indentation"; + homepage = "https://bitbucket.org/mdmkolbe/indentation"; description = "Indentation sensitive parsing combinators for Parsec and Trifecta"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -118606,8 +119029,8 @@ self: { }: mkDerivation { pname = "intricacy"; - version = "0.6"; - sha256 = "8cd3cdd44e80f65f79c88a3a18580ce4bf02dc5086652f8af46ec90d18cadb42"; + version = "0.6.1"; + sha256 = "da202b4ce7d57dd675695fedfbf5bbc2a203d160e72c5fae8994a7bb7eca254c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -119472,6 +119895,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "irc-dcc" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring, errors + , hspec-attoparsec, io-streams, iproute, irc-ctcp, network, path + , tasty, tasty-hspec, transformers, utf8-string + }: + mkDerivation { + pname = "irc-dcc"; + version = "1.0.0"; + sha256 = "5cb2dc63d786b76a6d6145a2b6e5599855284c1c3d9609a59f21842905d9cd3f"; + libraryHaskellDepends = [ + attoparsec base binary bytestring errors io-streams iproute + irc-ctcp network path transformers utf8-string + ]; + testHaskellDepends = [ + attoparsec base binary bytestring hspec-attoparsec iproute irc-ctcp + network path tasty tasty-hspec utf8-string + ]; + homepage = "https://github.com/JanGe/irc-dcc"; + description = "A DCC message parsing and helper library for IRC clients"; + license = stdenv.lib.licenses.mit; + }) {}; + "irc-fun-bot" = callPackage ({ mkDerivation, aeson, auto-update, base, case-insensitive, clock , containers, data-default-class, fast-logger, formatting @@ -120422,8 +120867,8 @@ self: { }: mkDerivation { pname = "jammittools"; - version = "0.5.0.2"; - sha256 = "2d633a0410423ad12840449bb809f3bc3ffbc9aae7db6b365379b02ebeb3829c"; + version = "0.5.0.3"; + sha256 = "90917b080f69f47982c0c8851e7a7781e1627b42f291f11f6543214da2a7a1b4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120432,7 +120877,6 @@ self: { vector xml ]; executableHaskellDepends = [ base boxes directory filepath ]; - jailbreak = true; homepage = "https://github.com/mtolly/jammittools"; description = "Export sheet music and audio from Windows/Mac app Jammit"; license = "GPL"; @@ -121412,7 +121856,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "json-autotype" = callPackage + "json-autotype_1_0_10" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, GenericPretty, hashable, hflags, hint, lens, mtl , pretty, process, QuickCheck, scientific, smallcheck, text @@ -121442,9 +121886,10 @@ self: { homepage = "https://github.com/mgajda/json-autotype"; description = "Automatic type declaration for JSON input data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "json-autotype_1_0_11" = callPackage + "json-autotype" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, GenericPretty, hashable, hflags, hint, lens, mmap, mtl , pretty, process, QuickCheck, scientific, smallcheck, text @@ -121474,7 +121919,6 @@ self: { homepage = "https://github.com/mgajda/json-autotype"; description = "Automatic type declaration for JSON input data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-b" = callPackage @@ -122299,8 +122743,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.2.3"; - sha256 = "e57562e66b77b22f9297f5bc9e8c0e0fb00d6073f3ab0a04839284db5c6f67f9"; + version = "0.2.7"; + sha256 = "7b52f0890ed569f5962fbbb3fa9a340496711b4ca13fb4ab6bb843aea64828ab"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125379,7 +125823,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "language-c-quote" = callPackage + "language-c-quote_0_11_4" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , exception-mtl, exception-transformers, filepath, happy , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb @@ -125403,6 +125847,32 @@ self: { homepage = "http://www.cs.drexel.edu/~mainland/"; description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "language-c-quote" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers + , exception-mtl, exception-transformers, filepath, happy + , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb + , symbol, template-haskell, test-framework, test-framework-hunit + }: + mkDerivation { + pname = "language-c-quote"; + version = "0.11.4.1"; + sha256 = "37c2183ddbf95ee21d298e241266a09f73ac74065e51a0cf2fb28b45aefa9591"; + libraryHaskellDepends = [ + array base bytestring containers exception-mtl + exception-transformers filepath haskell-src-meta mainland-pretty + mtl srcloc syb symbol template-haskell + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + base bytestring HUnit mainland-pretty srcloc symbol test-framework + test-framework-hunit + ]; + homepage = "http://www.cs.drexel.edu/~mainland/"; + description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; + license = stdenv.lib.licenses.bsd3; }) {}; "language-cil" = callPackage @@ -127086,6 +127556,7 @@ self: { leksah-server ltk monad-loops QuickCheck stm text transformers webkitgtk3 ]; + jailbreak = true; homepage = "http://www.leksah.org"; description = "Haskell IDE written in Haskell"; license = "GPL"; @@ -129302,6 +129773,8 @@ self: { pname = "linear"; version = "1.20.3"; sha256 = "50f63a5b6019acb53ae06886749dea80443b18876c2990ca5376578c94537ac4"; + revision = "1"; + editedCabalFile = "3c3139b3d84be69cc9ec8b122cbce075d498076a4e5b4e4f8bfbda34523b91de"; libraryHaskellDepends = [ adjunctions base binary bytes cereal containers deepseq distributive ghc-prim hashable lens reflection semigroupoids @@ -129331,6 +129804,8 @@ self: { pname = "linear"; version = "1.20.4"; sha256 = "7bd91c482611f9b7226ec346a9630d2cf1975672b3a67e1b52ae24cdd039ddd3"; + revision = "1"; + editedCabalFile = "0f9612cde0983a35d53d29dee617abdd1d350f602ac1da7f3fcfbbc3012572b1"; libraryHaskellDepends = [ adjunctions base base-orphans binary bytes cereal containers deepseq distributive ghc-prim hashable lens reflection @@ -132312,6 +132787,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lucid_2_9_5" = callPackage + ({ mkDerivation, base, bifunctors, blaze-builder, bytestring + , containers, hashable, hspec, HUnit, mmorph, mtl, parsec, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "lucid"; + version = "2.9.5"; + sha256 = "ae73ed5490f11f23252e98b3b8c4aa4b86acc0019370e1a54e5957ebf948cbb8"; + libraryHaskellDepends = [ + base blaze-builder bytestring containers hashable mmorph mtl text + transformers unordered-containers + ]; + testHaskellDepends = [ + base bifunctors hspec HUnit mtl parsec text + ]; + homepage = "https://github.com/chrisdone/lucid"; + description = "Clear to write, read and edit DSL for HTML"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lucid-foundation" = callPackage ({ mkDerivation, base, hspec, lucid, QuickCheck , quickcheck-instances, text @@ -132900,8 +133397,8 @@ self: { }: mkDerivation { pname = "machinecell"; - version = "3.0.1"; - sha256 = "a018aa83f998b5c94daf1886269fe442566039c26060e4705095b40fa3639236"; + version = "3.1.0"; + sha256 = "0dde8e806b5418ac6c5610a3ed65dcd54ddc5f7232c516be31a5b375f6e67feb"; libraryHaskellDepends = [ arrows base free mtl profunctors semigroups ]; @@ -136884,8 +137381,8 @@ self: { }: mkDerivation { pname = "milena"; - version = "0.5.0.0"; - sha256 = "fbae487cc6e61fa6cde0ba79b4d0df28c75e1af9c0d75970b7685a7beb18b63a"; + version = "0.5.0.1"; + sha256 = "2fe50795fe7a1826d1a24e66f5f31823cc83621de5137dd98196e2ce7420db10"; libraryHaskellDepends = [ base bytestring cereal containers digest lens lifted-base mtl murmur-hash network random resource-pool semigroups transformers @@ -136894,7 +137391,6 @@ self: { base bytestring lens mtl network QuickCheck semigroups tasty tasty-hspec tasty-quickcheck ]; - jailbreak = true; description = "A Kafka client for Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -138185,7 +138681,6 @@ self: { libraryHaskellDepends = [ base transformers transformers-base transformers-compat ]; - jailbreak = true; homepage = "https://github.com/basvandijk/monad-control"; description = "Lift control operations, like exception catching, through monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -138270,7 +138765,6 @@ self: { libraryHaskellDepends = [ base monad-parallel transformers transformers-compat ]; - jailbreak = true; homepage = "http://trac.haskell.org/SCC/wiki/monad-coroutine"; description = "Coroutine monad transformer for suspending and resuming monadic computations"; license = "GPL"; @@ -138934,7 +139428,6 @@ self: { libraryHaskellDepends = [ base parallel transformers transformers-compat ]; - jailbreak = true; homepage = "http://trac.haskell.org/SCC/wiki/monad-parallel"; description = "Parallel execution of monadic computations"; license = stdenv.lib.licenses.bsd3; @@ -138951,7 +139444,6 @@ self: { libraryHaskellDepends = [ base parallel transformers transformers-compat ]; - jailbreak = true; homepage = "http://trac.haskell.org/SCC/wiki/monad-parallel"; description = "Parallel execution of monadic computations"; license = stdenv.lib.licenses.bsd3; @@ -142137,13 +142629,12 @@ self: { }: mkDerivation { pname = "mvc"; - version = "1.1.1"; - sha256 = "b97122c1df6b5eb569e75cbc2a4c84a06e8ab942f68110a2f56b9cdac1bd34f5"; + version = "1.1.2"; + sha256 = "26b6c80efce2c38db22c46c27ba07f2d7bad0d3cddf6093b9d51d649643f8fcf"; libraryHaskellDepends = [ async base contravariant foldl managed mmorph pipes pipes-concurrency transformers ]; - jailbreak = true; description = "Model-view-controller"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -142209,8 +142700,8 @@ self: { ({ mkDerivation, base, mwc-random, primitive, transformers }: mkDerivation { pname = "mwc-probability"; - version = "1.1.3"; - sha256 = "a7190d8f2b12d5aff0344a1bdc5a85386cb12960fe31e346b14806e615773363"; + 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"; @@ -143321,7 +143812,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "neat-interpolation" = callPackage + "neat-interpolation_0_3_1_1" = callPackage ({ mkDerivation, base, base-prelude, HTF, parsec, template-haskell , text }: @@ -143336,9 +143827,10 @@ self: { homepage = "https://github.com/nikita-volkov/neat-interpolation"; description = "A quasiquoter for neat and simple multiline text interpolation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "neat-interpolation_0_3_2" = callPackage + "neat-interpolation" = callPackage ({ mkDerivation, base, base-prelude, HTF, parsec, template-haskell , text }: @@ -143353,7 +143845,6 @@ self: { homepage = "https://github.com/nikita-volkov/neat-interpolation"; description = "A quasiquoter for neat and simple multiline text interpolation"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "needle" = callPackage @@ -146164,8 +146655,8 @@ self: { ({ mkDerivation, base, containers, numeric-prelude, primes }: mkDerivation { pname = "np-extras"; - version = "0.3.0.1"; - sha256 = "15ac78e4ba39331eee1b4db52dd822e2adabb3770c0e24d1ae58ed8b9141b2a6"; + version = "0.3.1"; + sha256 = "3e0a363aa70842155dfe0046f0e96c3feac56f7e543f6307a9d764b4af1991d1"; libraryHaskellDepends = [ base containers numeric-prelude primes ]; description = "NumericPrelude extras"; license = stdenv.lib.licenses.bsd3; @@ -148686,7 +149177,6 @@ self: { libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat ]; - jailbreak = true; homepage = "https://github.com/pcapriotti/optparse-applicative"; description = "Utilities and combinators for parsing command line options"; license = stdenv.lib.licenses.bsd3; @@ -148704,7 +149194,6 @@ self: { libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat ]; - jailbreak = true; homepage = "https://github.com/pcapriotti/optparse-applicative"; description = "Utilities and combinators for parsing command line options"; license = stdenv.lib.licenses.bsd3; @@ -149089,6 +149578,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "osm-conduit" = callPackage + ({ mkDerivation, base, conduit, exceptions, hspec, resourcet, text + , transformers, xml-conduit, xml-types + }: + mkDerivation { + pname = "osm-conduit"; + version = "0.1.0.0"; + sha256 = "df65ea545cfea5c2f274248670769a970709f2b7799b7384df4ce7211d7451f2"; + libraryHaskellDepends = [ + base conduit exceptions resourcet text transformers xml-conduit + xml-types + ]; + testHaskellDepends = [ + base conduit exceptions hspec resourcet text xml-conduit xml-types + ]; + homepage = "http://github.com/przembot/osm-conduit#readme"; + description = "Parse and operate on OSM data in efficient way"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "osm-download" = callPackage ({ mkDerivation, base, bytestring, conduit, containers , data-default, directory, gps, http-conduit, http-types @@ -150406,26 +150915,29 @@ self: { "pandoc-crossref" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor - , data-accessor-transformers, data-default, hspec, mtl, pandoc - , pandoc-types, process, yaml + , data-accessor-template, data-accessor-transformers, data-default + , hspec, mtl, pandoc, pandoc-types, process, roman-numerals, syb + , template-haskell, yaml }: mkDerivation { pname = "pandoc-crossref"; - version = "0.1.6.5"; - sha256 = "6b92a2730ed28c0242b81e47c0e21902321f98eb2b580d2114d906ca89a451e2"; + version = "0.2.0.0"; + sha256 = "e7039ced02eaaec80f0814d1d242dd06002d76dc3bed784fd18e50ddec77e3bd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring containers data-accessor data-accessor-transformers - data-default mtl pandoc pandoc-types yaml + base bytestring containers data-accessor data-accessor-template + data-accessor-transformers data-default mtl pandoc pandoc-types + roman-numerals syb template-haskell yaml ]; executableHaskellDepends = [ base bytestring containers data-default mtl pandoc pandoc-types yaml ]; testHaskellDepends = [ - base bytestring containers data-accessor data-accessor-transformers - data-default hspec mtl pandoc pandoc-types process yaml + base bytestring containers data-accessor data-accessor-template + data-accessor-transformers data-default hspec mtl pandoc + pandoc-types process roman-numerals syb template-haskell yaml ]; description = "Pandoc filter for cross-references"; license = stdenv.lib.licenses.gpl2; @@ -151766,7 +152278,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "path" = callPackage + "path_0_5_3" = callPackage ({ mkDerivation, base, exceptions, filepath, hspec, HUnit, mtl , template-haskell }: @@ -151780,6 +152292,24 @@ self: { testHaskellDepends = [ base hspec HUnit mtl ]; description = "Path"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "path" = callPackage + ({ mkDerivation, base, deepseq, exceptions, filepath, hspec, HUnit + , mtl, template-haskell + }: + mkDerivation { + pname = "path"; + version = "0.5.7"; + sha256 = "5b631abc6cedcb634ec6886d43291e01c694d8088c5faee13a3b64010beb05ab"; + libraryHaskellDepends = [ + base deepseq exceptions filepath template-haskell + ]; + testHaskellDepends = [ base hspec HUnit mtl ]; + doHaddock = false; + description = "Support for well-typed paths"; + license = stdenv.lib.licenses.bsd3; }) {}; "path-extra" = callPackage @@ -151826,14 +152356,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "path-io_1_0_1" = callPackage + "path-io_1_1_0" = callPackage ({ mkDerivation, base, directory, exceptions, filepath, hspec, path , temporary, time, transformers }: mkDerivation { pname = "path-io"; - version = "1.0.1"; - sha256 = "92e4763c88c21d46d009baedb14eb724699b583bc6675b4513bb35186f421336"; + version = "1.1.0"; + sha256 = "b94af45683e0c39d259fac8cad906957b97991a3cdac45e067fd1dc9baebe59f"; libraryHaskellDepends = [ base directory exceptions filepath path temporary time transformers ]; @@ -155483,8 +156013,8 @@ self: { }: mkDerivation { pname = "pinchot"; - version = "0.12.0.0"; - sha256 = "5fbbb77f122dbb51fac0004b607b486e317df08b17dfcaccb8dd7d300f4980de"; + version = "0.14.0.0"; + sha256 = "5b7ff31987e51ff69fe75b950ac3b4d27c4d7b530b15ea3f8057b314834aad10"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155672,7 +156202,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pipes-aeson" = callPackage + "pipes-aeson_0_4_1_5" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, pipes , pipes-attoparsec, pipes-bytestring, pipes-parse, transformers }: @@ -155687,6 +156217,24 @@ self: { homepage = "https://github.com/k0001/pipes-aeson"; description = "Encode and decode JSON streams using Aeson and Pipes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "pipes-aeson" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, pipes + , pipes-attoparsec, pipes-bytestring, pipes-parse, transformers + }: + mkDerivation { + pname = "pipes-aeson"; + version = "0.4.1.6"; + sha256 = "fb91280e7e12c1ea1c78a36b264eafea707d08e7cd52c792a06b194ff78b03dc"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring pipes pipes-attoparsec + pipes-bytestring pipes-parse transformers + ]; + homepage = "https://github.com/k0001/pipes-aeson"; + description = "Encode and decode JSON streams using Aeson and Pipes"; + license = stdenv.lib.licenses.bsd3; }) {}; "pipes-async" = callPackage @@ -161826,6 +162374,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "psql-helpers" = callPackage + ({ mkDerivation, base, postgresql-simple }: + mkDerivation { + pname = "psql-helpers"; + version = "0.1.0.0"; + sha256 = "f13ca642072477d3ab0246c514e3fc78e0c5cb419345240fbad994ed2a3219f4"; + libraryHaskellDepends = [ base postgresql-simple ]; + homepage = "http://github.com/agrafix/psql-helpers#readme"; + description = "A small collection of helper functions to generate postgresql queries"; + license = stdenv.lib.licenses.mit; + }) {}; + "psqueues_0_2_0_2" = callPackage ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit , QuickCheck, tagged, test-framework, test-framework-hunit @@ -166452,6 +167012,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "reflex-orphans" = callPackage + ({ mkDerivation, base, deepseq, dependent-map, mtl, ref-tf, reflex + , tasty, tasty-hunit, these + }: + mkDerivation { + pname = "reflex-orphans"; + version = "0.1.0.1"; + sha256 = "bcebc4227af7a3a3e5b3293d135c1f7085bee563bbc7542b73ca8f8d88c7fdea"; + libraryHaskellDepends = [ base reflex these ]; + testHaskellDepends = [ + base deepseq dependent-map mtl ref-tf reflex tasty tasty-hunit + ]; + description = "Useful missing instances for Reflex"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "reflex-transformers" = callPackage ({ mkDerivation, base, containers, lens, mtl, reflex, semigroups , stateWriter, transformers @@ -168137,8 +168713,8 @@ self: { ({ mkDerivation, base, containers, haskeline, mtl, process }: mkDerivation { pname = "repline"; - version = "0.1.4.0"; - sha256 = "32ae73f4343e5b4a0530259a5b23f35ff784d00e62a6adb50dc656ff2e1d119b"; + version = "0.1.5.0"; + sha256 = "9e807cf92d5f8a8e68787f6d93597bac41ace50997305105451bf852ce7ce3a4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers haskeline mtl ]; @@ -168619,7 +169195,6 @@ self: { transformers transformers-base transformers-compat ]; testHaskellDepends = [ base hspec lifted-base transformers ]; - jailbreak = true; homepage = "http://github.com/snoyberg/conduit"; description = "Deterministic allocation and freeing of scarce resources"; license = stdenv.lib.licenses.bsd3; @@ -168640,7 +169215,6 @@ self: { transformers transformers-base transformers-compat ]; testHaskellDepends = [ base hspec lifted-base transformers ]; - jailbreak = true; homepage = "http://github.com/snoyberg/conduit"; description = "Deterministic allocation and freeing of scarce resources"; license = stdenv.lib.licenses.bsd3; @@ -168661,7 +169235,6 @@ self: { transformers transformers-base transformers-compat ]; testHaskellDepends = [ base hspec lifted-base transformers ]; - jailbreak = true; homepage = "http://github.com/snoyberg/conduit"; description = "Deterministic allocation and freeing of scarce resources"; license = stdenv.lib.licenses.bsd3; @@ -168682,7 +169255,6 @@ self: { transformers transformers-base transformers-compat ]; testHaskellDepends = [ base hspec lifted-base transformers ]; - jailbreak = true; homepage = "http://github.com/snoyberg/conduit"; description = "Deterministic allocation and freeing of scarce resources"; license = stdenv.lib.licenses.bsd3; @@ -168709,7 +169281,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "resourcet" = callPackage + "resourcet_1_1_7_2" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, lifted-base , mmorph, monad-control, mtl, transformers, transformers-base , transformers-compat @@ -168726,6 +169298,26 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Deterministic allocation and freeing of scarce resources"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "resourcet" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec, lifted-base + , mmorph, monad-control, mtl, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "resourcet"; + version = "1.1.7.3"; + sha256 = "fccc5a897abb38156e61c801e8e0eba29f31a8ec1ad81598dec134ed1c20e1bf"; + libraryHaskellDepends = [ + base containers exceptions lifted-base mmorph monad-control mtl + transformers transformers-base transformers-compat + ]; + testHaskellDepends = [ base hspec lifted-base transformers ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Deterministic allocation and freeing of scarce resources"; + license = stdenv.lib.licenses.bsd3; }) {}; "respond" = callPackage @@ -168888,7 +169480,6 @@ self: { monad-control mtl resourcet rest-types tostring transformers transformers-base transformers-compat uri-encode utf8-string ]; - jailbreak = true; description = "Utility library for use in generated API client libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -168911,7 +169502,6 @@ self: { monad-control mtl resourcet rest-types tostring transformers transformers-base transformers-compat uri-encode utf8-string ]; - jailbreak = true; description = "Utility library for use in generated API client libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -171521,6 +172111,33 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "rss-conduit" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , conduit-parse, containers, data-default, exceptions, foldl, hlint + , lens-simple, mono-traversable, parsers, QuickCheck + , quickcheck-instances, resourcet, safe, tasty, tasty-hunit + , tasty-quickcheck, text, time, timerep, uri-bytestring + , xml-conduit, xml-conduit-parse, xml-types + }: + mkDerivation { + pname = "rss-conduit"; + version = "0.2.0.0"; + sha256 = "feff18d16f9c23e3180a7a4ae9efebcce52cdc8b8ad78791948dba33f5af53a6"; + libraryHaskellDepends = [ + base conduit conduit-parse containers exceptions foldl lens-simple + mono-traversable parsers safe text time timerep uri-bytestring + xml-conduit xml-conduit-parse xml-types + ]; + testHaskellDepends = [ + base bytestring conduit conduit-extra conduit-parse data-default + exceptions hlint lens-simple mono-traversable parsers QuickCheck + quickcheck-instances resourcet tasty tasty-hunit tasty-quickcheck + text time uri-bytestring xml-conduit xml-conduit-parse xml-types + ]; + description = "Streaming parser/renderer for the RSS 2.0 standard."; + license = "unknown"; + }) {}; + "rss2irc" = callPackage ({ mkDerivation, base, bytestring, cabal-file-th, cmdargs , containers, deepseq, feed, http-client, http-conduit, http-types @@ -173735,7 +174352,6 @@ self: { async base data-default-class directory hspec hspec-wai http-types lifted-base network text wai ]; - jailbreak = true; homepage = "https://github.com/scotty-web/scotty"; description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; license = stdenv.lib.licenses.bsd3; @@ -174517,8 +175133,8 @@ self: { }: mkDerivation { pname = "secp256k1"; - version = "0.4.4"; - sha256 = "33532973312cafa00b12f5fe21ed65bd89810bd8e19be95b29c5d5aa0b9946d2"; + version = "0.4.5"; + sha256 = "0e01ac093dc418a2d9b4f3a6dafa2c527220b9e79861921119898391b9a43b2b"; libraryHaskellDepends = [ base base16-bytestring binary bytestring entropy largeword mtl QuickCheck string-conversions @@ -174528,7 +175144,7 @@ self: { mtl QuickCheck string-conversions test-framework test-framework-hunit test-framework-quickcheck2 ]; - homepage = "http://github.com/haskoin/secp256k1#readme"; + homepage = "http://github.com/haskoin/secp256k1-haskell#readme"; description = "Bindings for secp256k1 library from Bitcoin Core"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -174907,7 +175523,6 @@ self: { distributive semigroups tagged transformers transformers-compat ]; testHaskellDepends = [ base directory doctest filepath ]; - jailbreak = true; doCheck = false; homepage = "http://github.com/ekmett/semigroupoids"; description = "Semigroupoids: Category sans id"; @@ -176248,6 +176863,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-haxl-client" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , deepseq, either, exceptions, hashable, haxl, hspec, http-client + , http-client-tls, http-media, http-types, HUnit, network + , network-uri, QuickCheck, safe, servant, servant-server + , string-conversions, text, transformers, wai, warp + }: + mkDerivation { + pname = "servant-haxl-client"; + version = "0.1.0.0"; + sha256 = "c9433881ea1aa4ff0f1eb99356cb223b7d7595859f3a1abac936488f1b18fc59"; + revision = "1"; + editedCabalFile = "9c5cd1e5bd9ba4fdb1b07de37a7aad75bd8f32d64a7f59f5cee3ec86975dbee9"; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring either exceptions hashable + haxl http-client http-client-tls http-media http-types network-uri + safe servant string-conversions text transformers + ]; + testHaskellDepends = [ + aeson base bytestring deepseq either haxl hspec http-client + http-client-tls http-media http-types HUnit network QuickCheck + servant servant-server text wai warp + ]; + homepage = "http://github.com/ElvishJerricco/servant-haxl-client/"; + description = "automatical derivation of querying functions for servant webservices"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-jquery_0_2_2_1" = callPackage ({ mkDerivation, aeson, base, filepath, hspec, language-ecmascript , lens, servant, servant-server, stm, transformers, warp @@ -184095,6 +184738,8 @@ self: { pname = "species"; version = "0.3.4.2"; sha256 = "9e1683448aa2152561c65b02fb832e366ce9f47542e5e963abd82d5e08eeb11f"; + revision = "1"; + editedCabalFile = "397aa0a55ea7021bec1f866b9dde980b9ae67319ae2838339f865babf856c431"; libraryHaskellDepends = [ base containers multiset-comb np-extras numeric-prelude template-haskell @@ -186944,7 +187589,6 @@ self: { libraryHaskellDepends = [ base mtl transformers transformers-compat ]; - jailbreak = true; description = "Simple State-like monad transformer with saveable and restorable state"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -188572,7 +189216,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "streaming-commons" = callPackage + "streaming-commons_0_1_15_1" = callPackage ({ mkDerivation, array, async, base, blaze-builder, bytestring , deepseq, directory, hspec, network, process, QuickCheck, random , stm, text, transformers, unix, zlib @@ -188592,6 +189236,29 @@ self: { homepage = "https://github.com/fpco/streaming-commons"; description = "Common lower-level functions needed by various streaming data libraries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "streaming-commons" = callPackage + ({ mkDerivation, array, async, base, blaze-builder, bytestring + , deepseq, directory, hspec, network, process, QuickCheck, random + , stm, text, transformers, unix, zlib + }: + mkDerivation { + pname = "streaming-commons"; + version = "0.1.15.2"; + sha256 = "230ad154608ce7c081d1367c77216c85ac47a05623903d45ce693dcea67d499d"; + libraryHaskellDepends = [ + array async base blaze-builder bytestring directory network process + random stm text transformers unix zlib + ]; + testHaskellDepends = [ + array async base blaze-builder bytestring deepseq hspec network + QuickCheck text unix zlib + ]; + homepage = "https://github.com/fpco/streaming-commons"; + description = "Common lower-level functions needed by various streaming data libraries"; + license = stdenv.lib.licenses.mit; }) {}; "streaming-histogram" = callPackage @@ -190767,6 +191434,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "symengine-hs" = callPackage + ({ mkDerivation, base, gmp, gmpxx, symengine }: + mkDerivation { + pname = "symengine-hs"; + version = "0.1.1.0"; + sha256 = "f4aa385e16a13007aaa369dfa771c8e3880ed00139a02fbc1d20d346a0d20156"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + executableSystemDepends = [ gmp gmpxx symengine ]; + testHaskellDepends = [ base ]; + testSystemDepends = [ gmp gmpxx symengine ]; + homepage = "http://github.com/bollu/symengine.hs#readme"; + description = "SymEngine symbolic mathematics engine for Haskell"; + license = stdenv.lib.licenses.mit; + }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; symengine = null;}; + "sync" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -192674,6 +193359,43 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "task-distribution" = callPackage + ({ mkDerivation, async, base, binary, bytestring, containers + , directory, distributed-process + , distributed-process-simplelocalnet, distributed-static, filepath + , hadoop-rpc, hashable, hint, hslogger, hspec, json, packman + , process, rank1dynamic, split, strings, temporary, text, time + , transformers, vector, zlib + }: + mkDerivation { + pname = "task-distribution"; + version = "0.1.0.0"; + sha256 = "70c40ecf27e8a170029b0fedf8ca0b2ffde6c6bd96d79a2310e3a1678a4e4fa4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base binary bytestring containers directory + distributed-process distributed-process-simplelocalnet + distributed-static filepath hadoop-rpc hashable hint hslogger + packman process rank1dynamic split temporary text time transformers + vector zlib + ]; + executableHaskellDepends = [ + async base binary bytestring containers directory + distributed-process filepath hadoop-rpc hslogger json process split + strings temporary text time vector zlib + ]; + testHaskellDepends = [ + base binary bytestring directory distributed-process + distributed-process-simplelocalnet distributed-static filepath + hadoop-rpc hint hslogger hspec packman process rank1dynamic split + temporary text transformers vector + ]; + homepage = "http://github.com/michaxm/task-distribution#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "taskpool" = callPackage ({ mkDerivation, async, base, containers, fgl, hspec, stm , transformers @@ -193573,8 +194295,8 @@ self: { }: mkDerivation { pname = "telegram-api"; - version = "0.2.1.0"; - sha256 = "02e564a45e095053f36e77772fc8dd9847b65f95087d47c6d50b96418f373a4f"; + version = "0.2.1.1"; + sha256 = "fd2ca89b40cdf7128c8739e5d3ff32278c5ab30aa9de21e8ab5a4ff0a2867705"; libraryHaskellDepends = [ aeson base either servant servant-client text ]; @@ -194520,7 +195242,6 @@ self: { hspec-expectations-lifted mtl process QuickCheck regex-posix template-haskell text transformers transformers-compat unix ]; - jailbreak = true; homepage = "http://gree.github.io/haskell-test-sandbox/"; description = "Sandbox for system tests"; license = stdenv.lib.licenses.bsd3; @@ -195574,7 +196295,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "text-show_2_1_2" = callPackage + "text-show" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors , bytestring, bytestring-builder, containers, generic-deriving , ghc-prim, hspec, integer-gmp, nats, QuickCheck @@ -195598,14 +196319,12 @@ self: { quickcheck-instances tagged text transformers transformers-compat void ]; - jailbreak = true; homepage = "https://github.com/RyanGlScott/text-show"; description = "Efficient conversion of values into Text"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "text-show" = callPackage + "text-show_3_0_1" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors , bytestring, bytestring-builder, containers, generic-deriving , ghc-prim, hspec, integer-gmp, nats, QuickCheck @@ -195628,9 +196347,11 @@ self: { integer-gmp nats QuickCheck quickcheck-instances semigroups tagged template-haskell text th-lift transformers transformers-compat void ]; + jailbreak = true; homepage = "https://github.com/RyanGlScott/text-show"; description = "Efficient conversion of values into Text"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-show-instances" = callPackage @@ -195660,6 +196381,7 @@ self: { transformers transformers-compat unix unordered-containers vector xhtml ]; + jailbreak = true; homepage = "https://github.com/RyanGlScott/text-show-instances"; description = "Additional instances for text-show"; license = stdenv.lib.licenses.bsd3; @@ -198959,7 +199681,7 @@ self: { license = "LGPL"; }) {}; - "tracy" = callPackage + "tracy_0_1_2_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "tracy"; @@ -198968,6 +199690,18 @@ self: { libraryHaskellDepends = [ base ]; description = "Convenience wrappers for non-intrusive debug tracing"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "tracy" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "tracy"; + version = "0.1.3.0"; + sha256 = "9c298b7ff70dd4f5aaf839e7bccbc9810f0235833bb5b723babe0838eac5d301"; + libraryHaskellDepends = [ base ]; + description = "Convenience wrappers for non-intrusive debug tracing"; + license = stdenv.lib.licenses.mit; }) {}; "trajectory" = callPackage @@ -199147,7 +199881,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "transformers-compat_0_4_0_4" = callPackage + "transformers-compat" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "transformers-compat"; @@ -199158,10 +199892,9 @@ self: { homepage = "http://github.com/ekmett/transformers-compat/"; description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "transformers-compat" = callPackage + "transformers-compat_0_5_1_4" = callPackage ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { pname = "transformers-compat"; @@ -199171,6 +199904,7 @@ self: { homepage = "http://github.com/ekmett/transformers-compat/"; description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "transformers-compose" = callPackage @@ -200387,37 +201121,21 @@ self: { }) {}; "turtle-options" = callPackage - ({ mkDerivation, base, optional-args, parsec, text, turtle }: - mkDerivation { - pname = "turtle-options"; - version = "0.1.0.2"; - sha256 = "6c1b02d67663d8849aa41c0e54ef824e013abbd6e89c71fb14c34aeb6434c8fd"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base optional-args parsec text turtle ]; - executableHaskellDepends = [ base turtle ]; - testHaskellDepends = [ base ]; - homepage = "http://github.com/githubuser/turtle-options#readme"; - description = "Collection of command line options and parsers for these options"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "turtle-options_0_1_0_3" = callPackage ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle }: mkDerivation { pname = "turtle-options"; - version = "0.1.0.3"; - sha256 = "d77e55a1a0b3ae2a5117e20780e5b98aab183ff65e9f532a03040d6b050a14d8"; + version = "0.1.0.4"; + sha256 = "c2c76b0bc0bc93397827c12b6f049e682afe702f9f662a1b0818e8e221d51ace"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base optional-args parsec text turtle ]; executableHaskellDepends = [ base turtle ]; testHaskellDepends = [ base HUnit parsec ]; + doCheck = false; homepage = "https://github.com/elaye/turtle-options#readme"; description = "Collection of command line options and parsers for these options"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tweak" = callPackage @@ -201532,8 +202250,8 @@ self: { }: mkDerivation { pname = "type-unary"; - version = "0.2.21"; - sha256 = "93ed75c592bfd4916cd89654ed15ea6d7df1fd83bf9e91f43c6e343a403ca627"; + version = "0.3.0"; + sha256 = "14083b3bdcefd7a25dd459178818602e18a1c3fa22a1017c8f58f7ee0e5f04e9"; libraryHaskellDepends = [ applicative-numbers base constraints newtype ty vector-space ]; @@ -209416,7 +210134,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai-middleware-throttle" = callPackage + "wai-middleware-throttle_0_2_0_2" = callPackage ({ mkDerivation, base, bytestring, containers, hashable, hlint , hspec, http-types, HUnit, network, stm, token-bucket , transformers, wai, wai-extra @@ -209436,6 +210154,28 @@ self: { doCheck = false; description = "WAI Middleware for Request Throttling"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "wai-middleware-throttle" = callPackage + ({ mkDerivation, base, bytestring, containers, hashable, hspec + , http-types, HUnit, network, stm, token-bucket, transformers, wai + , wai-extra + }: + mkDerivation { + pname = "wai-middleware-throttle"; + version = "0.2.1.0"; + sha256 = "862ac07bb8c8e21b4f56a6398444e2e6bdf9512a198ae394fa9d023f7cfcf87c"; + libraryHaskellDepends = [ + base containers hashable http-types network stm token-bucket + transformers wai + ]; + testHaskellDepends = [ + base bytestring hspec http-types HUnit stm transformers wai + wai-extra + ]; + description = "WAI Middleware for Request Throttling"; + license = stdenv.lib.licenses.bsd3; }) {}; "wai-middleware-verbs" = callPackage @@ -211920,8 +212660,10 @@ self: { }: mkDerivation { pname = "webapi"; - version = "0.1.0.0"; - sha256 = "c0d16e251abc585bcf5f3f65a7e8c24039efc08c335515af9c491bc48c2e2465"; + version = "0.2.0.0"; + sha256 = "473b1051b0833d90d5485f467cfaa69bc7777a24973cf0628ec0d006da60500b"; + revision = "1"; + editedCabalFile = "e374eaff480d32831ea7ec5cddfdaed5c58ed38a1517635a8ec5fbb321956535"; libraryHaskellDepends = [ aeson base binary blaze-builder bytestring bytestring-lexing bytestring-trie case-insensitive containers cookie exceptions @@ -211929,8 +212671,8 @@ self: { QuickCheck resourcet text time transformers vector wai wai-extra ]; testHaskellDepends = [ - base bytestring hspec hspec-wai http-types QuickCheck text time - vector wai wai-extra warp + aeson base bytestring case-insensitive hspec hspec-wai http-media + http-types QuickCheck text time vector wai wai-extra warp ]; jailbreak = true; homepage = "http://byteally.github.io/webapi/"; @@ -215714,7 +216456,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "xml-conduit" = callPackage + "xml-conduit_1_3_3_1" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, conduit, conduit-extra, containers , data-default, deepseq, hspec, HUnit, monad-control, resourcet @@ -215736,9 +216478,10 @@ self: { homepage = "http://github.com/snoyberg/xml"; description = "Pure-Haskell utilities for dealing with XML with the conduit package"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "xml-conduit_1_3_4" = callPackage + "xml-conduit" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, conduit, conduit-extra, containers , data-default, deepseq, hspec, HUnit, monad-control, resourcet @@ -215760,7 +216503,6 @@ self: { homepage = "http://github.com/snoyberg/xml"; description = "Pure-Haskell utilities for dealing with XML with the conduit package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-conduit-parse" = callPackage @@ -221559,6 +222301,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-form-richtext" = callPackage + ({ mkDerivation, base, blaze-builder, blaze-html, shakespeare, text + , xss-sanitize, yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-form-richtext"; + version = "0.1.0.0"; + sha256 = "b404fed16d56aac153e2f7a6c512f1b02653edb77bfea7e5331eac08ac6c11d1"; + libraryHaskellDepends = [ + base blaze-builder blaze-html shakespeare text xss-sanitize + yesod-core yesod-form + ]; + homepage = "http://github.com/geraldus/yesod-form-richtext#readme"; + description = "Various rich-text WYSIWYG editors for Yesod forms"; + license = stdenv.lib.licenses.mit; + }) {}; + "yesod-gitrepo_0_1_1_0" = callPackage ({ mkDerivation, base, directory, enclosed-exceptions, http-types , lifted-base, process, system-filepath, temporary, text, wai @@ -224047,6 +224806,33 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "zip" = callPackage + ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive + , cereal, conduit, conduit-extra, containers, digest, exceptions + , filepath, hspec, mtl, path, path-io, plan-b, QuickCheck + , resourcet, semigroups, text, time, transformers + }: + mkDerivation { + pname = "zip"; + version = "0.1.0"; + sha256 = "77dff5313dbab62d8078708acbdf2369277cbe757044bd20b0f5dffa5ef13a05"; + revision = "2"; + editedCabalFile = "3f8587754a06ce6e0b4f68bf54dd91f1dc9c0384eaffa065a553fff7a6ba8bad"; + libraryHaskellDepends = [ + base bytestring bzlib-conduit case-insensitive cereal conduit + conduit-extra containers digest exceptions filepath mtl path + path-io plan-b resourcet semigroups text time transformers + ]; + testHaskellDepends = [ + base bytestring conduit containers exceptions filepath hspec path + path-io QuickCheck text time transformers + ]; + jailbreak = true; + homepage = "https://github.com/mrkkrp/zip"; + description = "Operations on zip archives"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "zip-archive_0_2_3_5" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , digest, directory, filepath, HUnit, mtl, old-time, pretty diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix index 4f2e100c684..88490e9cd9c 100644 --- a/pkgs/development/interpreters/eff/default.nix +++ b/pkgs/development/interpreters/eff/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { backtracking, multi-threading, and much more... ''; license = licenses.bsd2; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.jirkamarsik ]; }; } diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index 25b0b02a33b..3977b32bad7 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "elixir-${version}"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"; - sha256 = "0ml0sl1l5ibb8qh505fsd7y87wq9qjvaxw9y1dyfcw00d3i1z989"; + sha256 = "09s8469830s4070i0m04fxdhqimkdyc5k9jylm5vpfz9l3z4wvl8"; }; buildInputs = [ erlang rebar makeWrapper ]; diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 4b5f3bd8b3b..355723ba337 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation { homepage = "http://renpy.org/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/interpreters/ruby/bundix/default.nix b/pkgs/development/interpreters/ruby/bundix/default.nix index 1ce2528291e..21b42ae020a 100644 --- a/pkgs/development/interpreters/ruby/bundix/default.nix +++ b/pkgs/development/interpreters/ruby/bundix/default.nix @@ -5,9 +5,9 @@ buildRubyGem rec { name = "${gemName}-${version}"; gemName = "bundix"; - version = "2.0.5"; + version = "2.0.6"; - sha256 = "0bsynhr44jz6nih0xn7v32h1qvywnb5335ka208gn7jp6bjwabhy"; + sha256 = "0yd960awd427mg29r2yzhccd0vjimn1ljr8d8hncj6m6wg84nvh5"; buildInputs = [bundler]; diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/development/interpreters/scsh/default.nix index ad2bf945f96..91ae67474ff 100644 --- a/pkgs/development/interpreters/scsh/default.nix +++ b/pkgs/development/interpreters/scsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoconf, automake, autoreconfHook, scheme48 }: +{ stdenv, fetchgit, autoreconfHook, scheme48 }: stdenv.mkDerivation { name = "scsh-0.7pre"; @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "0fz1r0bmiii9ld91r84dqkqwhnqk0h6drdycq93zcy5ndyn12fqp"; }; - buildInputs = [ autoconf automake autoreconfHook scheme48 ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ scheme48 ]; configureFlags = ''--with-scheme48=${scheme48}''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/apache-activemq/5.12.nix b/pkgs/development/libraries/apache-activemq/5.12.nix new file mode 100644 index 00000000000..e2e3af96532 --- /dev/null +++ b/pkgs/development/libraries/apache-activemq/5.12.nix @@ -0,0 +1,6 @@ +import ./recent.nix + rec { + version = "5.12.1"; + sha256 = "1hn6pls12dzc2fngz6lji7kmz7blvd3z1dq4via8gd4fjflmw5c9"; + mkUrl = name: "mirror://apache/activemq/${version}/${name}-bin.tar.gz"; + } diff --git a/pkgs/development/libraries/apache-activemq/5.8.nix b/pkgs/development/libraries/apache-activemq/5.8.nix new file mode 100644 index 00000000000..7e4644895e9 --- /dev/null +++ b/pkgs/development/libraries/apache-activemq/5.8.nix @@ -0,0 +1,6 @@ +import ./recent.nix + rec { + version = "5.8.0"; + sha256 = "12a1lmmqapviqdgw307jm07vw1z5q53r56pkbp85w9wnqwspjrbk"; + mkUrl = name: "mirror://apache/activemq/apache-activemq/${version}/${name}-bin.tar.gz"; + } diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/recent.nix similarity index 75% rename from pkgs/development/libraries/apache-activemq/default.nix rename to pkgs/development/libraries/apache-activemq/recent.nix index 2f2792dec14..a6988023343 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/recent.nix @@ -1,12 +1,13 @@ +{ version, sha256, mkUrl }: +# use a function to make the source url, because the url schemes differ between 5.8.0 and greater { stdenv, fetchurl }: stdenv.mkDerivation rec { name = "apache-activemq-${version}"; - version = "5.8.0"; src = fetchurl { - url = "mirror://apache/activemq/apache-activemq/${version}/${name}-bin.tar.gz"; - sha256 = "12a1lmmqapviqdgw307jm07vw1z5q53r56pkbp85w9wnqwspjrbk"; + url = mkUrl name; + inherit sha256; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 5cdfa4bc601..5df6ac2cace 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation { ''; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 3fb49c2be24..c0c4bf97b60 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -167,6 +167,15 @@ in { }; }; + ro = buildDict { + shortName = "ro-3.3-2"; + fullName = "Romanian"; + src = fetchurl { + url = mirror://gnu/aspell/dict/ro/aspell5-ro-3.3-2.tar.bz2; + sha256 = "0gb8j9iy1acdl11jq76idgc2lbc1rq3w04favn8cyh55d1v8phsk"; + }; + }; + ru = buildDict { shortName = "ru-0.99f7-1"; fullName = "Russian"; diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix index 03f08efca98..86cde42dfa1 100644 --- a/pkgs/development/libraries/atkmm/default.nix +++ b/pkgs/development/libraries/atkmm/default.nix @@ -1,14 +1,25 @@ { stdenv, fetchurl, atk, glibmm, pkgconfig }: - +let + ver_maj = "2.24"; + ver_min = "2"; +in stdenv.mkDerivation rec { - name = "atkmm-2.22.7"; + name = "atkmm-${ver_maj}.${ver_min}"; src = fetchurl { - url = "mirror://gnome/sources/atkmm/2.22/${name}.tar.xz"; - sha256 = "06zrf2ymml2dzp53sss0d4ch4dk9v09jm8rglnrmwk4v81mq9gxz"; + url = "mirror://gnome/sources/atkmm/${ver_maj}/${name}.tar.xz"; + sha256 = "ff95385759e2af23828d4056356f25376cfabc41e690ac1df055371537e458bd"; }; propagatedBuildInputs = [ atk glibmm ]; nativeBuildInputs = [ pkgconfig ]; + + doCheck = true; + + meta = { + description = "C++ wrappers for ATK accessibility toolkit"; + license = stdenv.lib.licenses.lgpl21Plus; + homepage = http://gtkmm.org; + }; } diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 90e60d59da0..b28668e7b30 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -58,7 +58,7 @@ let "--layout=${layout}" "variant=${variant}" "threading=${threading}" - "runtime-link=${runtime-link}" + ] ++ optional (link != "static") "runtime-link=${runtime-link}" ++ [ "link=${link}" "${cflags}" ] ++ optional (variant == "release") "debug-symbols=off"; diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index b2500d1f49b..4a612c5351d 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchgit, cmake, perl }: +{ stdenv, fetchgit, cmake, perl, go }: stdenv.mkDerivation rec { name = "boringssl-${version}"; - version = "20140820-a7d1363f"; + version = "2016-03-08"; src = fetchgit { url = "https://boringssl.googlesource.com/boringssl"; - rev = "a7d1363fcb1f0d825ec2393c06be3d58b0c57efd"; - sha256 = "d27dd1416de1a2ea4ec2c219248b2ed2cce5c0405e56adb394077ddc7c319bab"; + rev = "bfb38b1a3c5e37d43188bbd02365a87bebc8d122"; + sha256 = "0g9gh915ywawqf1gq7pwkhrhbh79w7si4g34ryml7a6mnmvx8b52"; }; - buildInputs = [ cmake perl ]; + buildInputs = [ cmake perl go ]; enableParallelBuilding = true; NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index 97636f7a957..67ae3b08ed8 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -1,16 +1,21 @@ { fetchurl, stdenv, pkgconfig, cairo, xlibsWrapper, fontconfig, freetype, libsigcxx }: - +let + ver_maj = "1.12"; + ver_min = "0"; +in stdenv.mkDerivation rec { - name = "cairomm-1.11.2"; + name = "cairomm-${ver_maj}.${ver_min}"; src = fetchurl { - url = "http://cairographics.org/releases/${name}.tar.gz"; - sha1 = "35e190a03f760924bece5dc1204cc36b3583c806"; + url = "mirror://gnome/sources/cairomm/${ver_maj}/${name}.tar.xz"; + sha256 = "a54ada8394a86182525c0762e6f50db6b9212a2109280d13ec6a0b29bfd1afe6"; }; - buildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ cairo libsigcxx ]; + buildInputs = [ fontconfig freetype ]; - propagatedBuildInputs = [ cairo xlibsWrapper fontconfig freetype libsigcxx ]; + doCheck = true; meta = with stdenv.lib; { description = "A 2D graphics library with support for multiple output devices"; diff --git a/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix new file mode 100644 index 00000000000..208288bfca1 --- /dev/null +++ b/pkgs/development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono, dbus-sharp-1_0 }: + +stdenv.mkDerivation rec { + name = "dbus-sharp-glib-${version}"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "dbus-sharp-glib"; + + rev = "v${version}"; + sha256 = "0z8ylzby8n5sar7aywc8rngd9ap5qqznadsscp5v34cacdfz1gxm"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ mono dbus-sharp-1_0 ]; + + dontStrip = true; + + meta = with stdenv.lib; { + description = "D-Bus for .NET: GLib integration module"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/dbus-sharp-glib/default.nix b/pkgs/development/libraries/dbus-sharp-glib/default.nix new file mode 100644 index 00000000000..ef1ddd9bfff --- /dev/null +++ b/pkgs/development/libraries/dbus-sharp-glib/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, pkgconfig, mono, dbus-sharp-2_0, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "dbus-sharp-glib-${version}"; + version = "0.6"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "dbus-sharp-glib"; + + rev = "v${version}"; + sha256 = "0i39kfg731as6j0hlmasgj8dyw5xsak7rl2dlimi1naphhffwzm8"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ mono dbus-sharp-2_0 ]; + + dontStrip = true; + + meta = with stdenv.lib; { + description = "D-Bus for .NET: GLib integration module"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix new file mode 100644 index 00000000000..c17a140b9c5 --- /dev/null +++ b/pkgs/development/libraries/dbus-sharp/dbus-sharp-1.0.nix @@ -0,0 +1,24 @@ +{stdenv, fetchFromGitHub, pkgconfig, dbus, mono, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "dbus-sharp-${version}"; + version = "0.7"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "dbus-sharp"; + + rev = "v${version}"; + sha256 = "13qlqx9wqahfpzzl59157cjxprqcx2bd40w5gb2bs3vdx058p562"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ mono ]; + + dontStrip = true; + + meta = with stdenv.lib; { + description = "D-Bus for .NET"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix new file mode 100644 index 00000000000..ea7d920dc82 --- /dev/null +++ b/pkgs/development/libraries/dbus-sharp/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchFromGitHub, pkgconfig, dbus, mono, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "dbus-sharp-${version}"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "dbus-sharp"; + + rev = "v${version}"; + sha256 = "1g5lblrvkd0wnhfzp326by6n3a9mj2bj7a7646g0ziwgsxp5w6y7"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ mono ]; + + dontStrip = true; + + meta = with stdenv.lib; { + description = "D-Bus for .NET"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index eed6a3bc763..91974a31175 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -235,11 +235,11 @@ assert x11grabExtlib -> libX11 != null && libXv != null; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "2.8.5"; + version = "3.0"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.bz2"; - sha256 = "0nk1j3i7qc1k3dygpq74pxq382vqg9kaf2hxl9jfw8rkad8rjv9v"; + sha256 = "1h0k05cj6j0nd2i16z7hc5scpwsbg3sfx68lvm0nlwvz5xxgg7zi"; }; patchPhase = ''patchShebangs .''; @@ -449,7 +449,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A complete, cross-platform solution to record, convert and stream audio and video"; - homepage = http://www.ffmpeg.org/; + homepage = https://www.ffmpeg.org/; longDescription = '' FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines diff --git a/pkgs/development/libraries/gdata-sharp/default.nix b/pkgs/development/libraries/gdata-sharp/default.nix new file mode 100644 index 00000000000..e9f5898e2ea --- /dev/null +++ b/pkgs/development/libraries/gdata-sharp/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchsvn, pkgconfig, mono, dotnetPackages }: + +let + newtonsoft-json = dotnetPackages.NewtonsoftJson; +in stdenv.mkDerivation rec { + name = "gdata-sharp-${version}"; + version = "2.2.0.0"; + + src = fetchsvn { + url = "http://google-gdata.googlecode.com/svn/trunk/"; + rev = "1217"; + sha256 = "0b0rvgg3xsbbg2fdrpz0ywsy9rcahlyfskndaagd3yzm83gi6bhk"; + }; + + buildInputs = [ pkgconfig mono newtonsoft-json ]; + + sourceRoot = "svn-r1217/clients/cs"; + + dontStrip = true; + + postPatch = '' + sed -i -e 's#^\(DEFINES=.*\)\(.\)#\1 /r:third_party/Newtonsoft.Json.dll\2#' Makefile + # carriage return ^ + ''; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = https://code.google.com/archive/p/google-gdata/; + + description = "The Google Data APIs"; + longDescription = '' + The Google Data APIs provide a simple protocol for reading and writing + data on the web. + ''; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index 73d3bb92e7e..83becae05a4 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "geoclue-2.4.1"; + name = "geoclue-2.4.2"; src = fetchurl { url = "http://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz"; - sha256 = "1m1l1npdv804m98xhfpd1wl1whrrp2pjivliwwlnyk86yq0gs6cs"; + sha256 = "0g4krigdaf5ipkp4mi16rca62crr8pdk3wkhm0fxbcqnil75fyy4"; }; buildInputs = @@ -23,10 +23,10 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ dbus dbus_glib glib ]; - meta = { + meta = with stdenv.lib; { description = "Geolocation framework and some data providers"; - maintainers = with stdenv.lib.maintainers; [ raskin garbas ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl2; + maintainers = with maintainers; [ raskin garbas ]; + platforms = platforms.linux; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/giflib/libungif.nix b/pkgs/development/libraries/giflib/libungif.nix index fd9d4b7e81a..123cfca1b82 100644 --- a/pkgs/development/libraries/giflib/libungif.nix +++ b/pkgs/development/libraries/giflib/libungif.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libungif-4.1.4"; src = fetchurl { url = mirror://sourceforge/giflib/libungif-4.1.4.tar.gz; - md5 = "efdfcf8e32e35740288a8c5625a70ccb"; + sha256 = "5e65e1e5deacd0cde489900dbf54c6c2ee2ebc818199e720dbad685d87abda3d"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix new file mode 100644 index 00000000000..ad5220cac4e --- /dev/null +++ b/pkgs/development/libraries/gio-sharp/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, gtk-sharp }: + +stdenv.mkDerivation rec { + name = "gio-sharp-${version}"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "gio-sharp"; + + rev = "${version}"; + sha256 = "13pc529pjabj7lq23dbndc26ssmg5wkhc7lfvwapm87j711m0zig"; + }; + + nativeBuildInputs = [ pkgconfig autoconf automake which ]; + buildInputs = [ mono gtk-sharp ]; + + dontStrip = true; + + prePatch = '' + ./autogen-2.22.sh + ''; + + meta = with stdenv.lib; { + description = "GIO API bindings"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 3c433511fc1..fb380d60cf9 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, http-parser}: +{stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, http-parser, libiconv}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { version = "0.23.2"; name = "libgit2-${version}"; @@ -21,4 +21,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; all; }; -} +} // stdenv.lib.optionalAttrs (!stdenv.isLinux) { + NIX_LDFLAGS = "-liconv"; + propagatedBuildInputs = [ libiconv ]; +}) diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 25666066601..8417179dde1 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -1,30 +1,31 @@ -{ stdenv, fetchurl, pkgconfig, glib, libsigcxx }: +{ stdenv, fetchurl, pkgconfig, gnum4, glib, libsigcxx }: let - ver_maj = "2.44"; - ver_min = "0"; + ver_maj = "2.46"; + ver_min = "3"; in stdenv.mkDerivation rec { name = "glibmm-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/glibmm/${ver_maj}/${name}.tar.xz"; - sha256 = "1a1fczy7hcpn24fglyn4i79f4yjc8s50is70q03mb294bm1c02hv"; + sha256 = "c78654addeb27a1213bedd7cd21904a45bbb98a5ba2f2f0de2b2f1a5682d86cf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gnum4 ]; propagatedBuildInputs = [ glib libsigcxx ]; + enableParallelBuilding = true; #doCheck = true; # some tests need network - meta = { + meta = with stdenv.lib; { description = "C++ interface to the GLib library"; homepage = http://gtkmm.org/; - license = stdenv.lib.licenses.lgpl2Plus; + license = licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [urkud raskin]; - platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [raskin]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index dd9ddc7ec9b..4603b3e29db 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 9192feb1c0c..4f592dbe31e 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -11,7 +11,6 @@ stdenv.mkDerivation rec { homepage = "http://gstreamer.freedesktop.org"; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 98cfa98bfe1..754b2bb64b8 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation rec { homepage = "http://gstreamer.freedesktop.org"; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 96dc42c3cb1..1e0ee39667e 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation rec { homepage = "http://gstreamer.freedesktop.org"; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix index 4b6e7957f5c..9d43f3ac23c 100644 --- a/pkgs/development/libraries/gstreamer/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/gnonlin/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 8afbfd4ff54..75f0760747b 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index aeefd667b34..6d0c28d0e28 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { homepage = "http://gstreamer.freedesktop.org"; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index b014446c7c4..540b3ba0be8 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index c88cf489732..0b0ba11a793 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation rec { homepage = "http://gstreamer.freedesktop.org"; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/gtk-sharp-beans/default.nix b/pkgs/development/libraries/gtk-sharp-beans/default.nix new file mode 100644 index 00000000000..92578f42e34 --- /dev/null +++ b/pkgs/development/libraries/gtk-sharp-beans/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono, gtk-sharp, gio-sharp }: + +stdenv.mkDerivation rec { + name = "gtk-sharp-beans-${version}"; + version = "2.14.0"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "gtk-sharp-beans"; + + rev = "${version}"; + sha256 = "04sylwdllb6gazzs2m4jjfn14mil9l3cny2q0xf0zkhczzih6ah1"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook which ]; + buildInputs = [ mono gtk-sharp gio-sharp ]; + + dontStrip = true; + + meta = with stdenv.lib; { + description = "gtk-sharp-beans binds some API from Gtk+ that isn't in Gtk# 2.12.x"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/gtk-sharp-2/default.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix similarity index 100% rename from pkgs/development/libraries/gtk-sharp-2/default.nix rename to pkgs/development/libraries/gtk-sharp/2.0.nix diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/pkgs/development/libraries/gtk-sharp/3.0.nix new file mode 100644 index 00000000000..380c43108de --- /dev/null +++ b/pkgs/development/libraries/gtk-sharp/3.0.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, pkgconfig, mono +, glib +, pango +, gtk3 +, GConf ? null +, libglade ? null +, libgtkhtml ? null +, gtkhtml ? null +, libgnomecanvas ? null +, libgnomeui ? null +, libgnomeprint ? null +, libgnomeprintui ? null +, gnomepanel ? null +, libxml2 +, monoDLLFixer +}: + +stdenv.mkDerivation { + name = "gtk-sharp-2.99.3"; + + builder = ./builder.sh; + src = fetchurl { + #"mirror://gnome/sources/gtk-sharp/2.99/gtk-sharp-2.99.3.tar.xz"; + url = "http://ftp.gnome.org/pub/GNOME/sources/gtk-sharp/2.99/gtk-sharp-2.99.3.tar.xz"; + sha256 = "18n3l9zcldyvn4lwi8izd62307mkhz873039nl6awrv285qzah34"; + }; + + # patch bad usage of glib, which wasn't tolerated anymore + # prePatch = '' + # for f in glib/glue/{thread,list,slist}.c; do + # sed -i 's,#include ,#include ,g' "$f" + # done + # ''; + + buildInputs = [ + pkgconfig mono glib pango gtk3 GConf libglade libgnomecanvas + libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 + gnomepanel + ]; + + dontStrip = true; + + inherit monoDLLFixer; + + passthru = { + inherit gtk3; + }; +} diff --git a/pkgs/development/libraries/gtk-sharp-2/builder.sh b/pkgs/development/libraries/gtk-sharp/builder.sh similarity index 100% rename from pkgs/development/libraries/gtk-sharp-2/builder.sh rename to pkgs/development/libraries/gtk-sharp/builder.sh diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index bc327468855..1401f763c3d 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }: +{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy }: let - ver_maj = "3.16"; + ver_maj = "3.18"; ver_min = "0"; in stdenv.mkDerivation rec { @@ -9,17 +9,18 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtkmm/${ver_maj}/${name}.tar.xz"; - sha256 = "036xn22jkaf3akpid7w23b8vkqa3xxqz93mwacmyar5vw7slm3cv"; + sha256 = "829fa113daed74398c49c3f2b7672807f58ba85d0fa463f5bc726e1b0138b86b"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ epoxy ]; propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ]; enableParallelBuilding = true; doCheck = true; - meta = { + meta = with stdenv.lib; { description = "C++ interface to the GTK+ graphical user interface library"; longDescription = '' @@ -34,9 +35,9 @@ stdenv.mkDerivation rec { homepage = http://gtkmm.org/; - license = stdenv.lib.licenses.lgpl2Plus; + license = licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ raskin urkud vcunat ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ raskin vcunat ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/ilbc/default.nix b/pkgs/development/libraries/ilbc/default.nix index d77b5d46a79..0ea2949659c 100644 --- a/pkgs/development/libraries/ilbc/default.nix +++ b/pkgs/development/libraries/ilbc/default.nix @@ -3,11 +3,7 @@ stdenv.mkDerivation rec { name = "ilbc-rfc3951"; - script = fetchurl { - url = http://ilbcfreeware.org/documentation/extract-cfile.txt; - name = "extract-cfile.awk"; - sha256 = "0md76qlszaras9grrxaq7xfxn1yikmz4qqgnjj6y50jg31yr5wyd"; - }; + script = ./extract-cfile.awk; rfc3951 = fetchurl { url = http://www.ietf.org/rfc/rfc3951.txt; diff --git a/pkgs/development/libraries/ilbc/extract-cfile.awk b/pkgs/development/libraries/ilbc/extract-cfile.awk new file mode 100644 index 00000000000..e4b07bc0896 --- /dev/null +++ b/pkgs/development/libraries/ilbc/extract-cfile.awk @@ -0,0 +1,24 @@ +BEGIN { srcname = "nothing"; } +{ if (/^A\.[0-9][0-9]*\.* *[a-zA-Z][a-zA-Z_0-9]*\.[ch]/) { + if (srcname != "nothing") + close(srcname); + srcname = $2; + printf("creating source file %s\n", srcname); + }else if (srcname != "nothing") { + if (/Andersen,* *et* *al\./) + printf("skipping %s\n", $0); + else if (/ /) + printf("skipping2 %s\n", $0); + else if (/Internet Low Bit Rate Codec *December 2004/) + printf("skipping3 %s\n", $0); + else if (/Authors' *Addresses/){ + close(srcname); + exit;} + else + print $0 >> srcname; + } +} +END { + printf("ending file %s\n", srcname); + close(srcname); +} diff --git a/pkgs/development/libraries/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix index 8398f2d7db4..44e1a1f63ad 100644 --- a/pkgs/development/libraries/kdevplatform/default.nix +++ b/pkgs/development/libraries/kdevplatform/default.nix @@ -1,19 +1,15 @@ -{ stdenv, fetchurl, fetchpatch, cmake, kdelibs, subversion, qt4, automoc4, phonon, +{ stdenv, fetchurl, cmake, kdelibs, subversion, qt4, automoc4, phonon, gettext, pkgconfig, apr, aprutil, boost, qjson, grantlee }: stdenv.mkDerivation rec { - name = "kdevplatform-1.7.1"; + name = "kdevplatform-1.7.3"; src = fetchurl { - url = "mirror://kde/stable/kdevelop/4.7.1/src/${name}.tar.xz"; - sha256 = "dfd8953aec204f04bd949443781aa0f6d9d58c40f73027619a168bb4ffc4b1ac"; + url = "mirror://kde/stable/kdevelop/4.7.3/src/${name}.tar.bz2"; + sha256 = "195134bde11672de38838f4b341ed28c58042374ca12beedacca9d30e6ab4a2b"; }; - patches = [(fetchpatch { - name = "svn-1.9.patch"; - url = "https://git.reviewboard.kde.org/r/124783/diff/raw/"; - sha256 = "1ixll5pvynb3l4znc65d82a5bj2s3c7c7is585s2wdpfzjgl5ay0"; - })]; + patches = [ ./gettext.patch ]; propagatedBuildInputs = [ kdelibs qt4 phonon ]; buildInputs = [ apr aprutil subversion boost qjson grantlee ]; @@ -31,5 +27,6 @@ stdenv.mkDerivation rec { IDE-like programs. It is programing-language independent, and is planned to be used by programs like: KDevelop, Quanta, Kile, KTechLab ... etc." ''; + homepage = https://www.kdevelop.org; }; } diff --git a/pkgs/development/libraries/kdevplatform/gettext.patch b/pkgs/development/libraries/kdevplatform/gettext.patch new file mode 100644 index 00000000000..733a542e0c8 --- /dev/null +++ b/pkgs/development/libraries/kdevplatform/gettext.patch @@ -0,0 +1,8 @@ +diff -urN kdevplatform-1.7.3.orig/po/CMakeLists.txt kdevplatform-1.7.3/po/CMakeLists.txt +--- kdevplatform-1.7.3.orig/po/CMakeLists.txt 2016-03-04 23:25:30.102112596 +0100 ++++ kdevplatform-1.7.3/po/CMakeLists.txt 2016-03-04 23:26:06.242570024 +0100 +@@ -1,3 +1,4 @@ ++cmake_policy(SET CMP0002 OLD) + find_package(Gettext REQUIRED) + if (NOT GETTEXT_MSGMERGE_EXECUTABLE) + MESSAGE(FATAL_ERROR "Please install msgmerge binary") diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index a26d8094e39..d266a97535e 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "ldb-1.1.23"; + name = "ldb-1.1.26"; src = fetchurl { url = "mirror://samba/ldb/${name}.tar.gz"; - sha256 = "0ncmwgga6q9v7maiywgw21w6rb3149m1w2ca11yq8k5j0izjz2wg"; + sha256 = "1rmjv12pf57vga8s5z9p9d90rlfckc1lqjbcp89r83cq5fkwfhw8"; }; buildInputs = [ diff --git a/pkgs/development/libraries/libbrotli/default.nix b/pkgs/development/libraries/libbrotli/default.nix new file mode 100644 index 00000000000..1e28b57dadf --- /dev/null +++ b/pkgs/development/libraries/libbrotli/default.nix @@ -0,0 +1,36 @@ +{stdenv, fetchFromGitHub, autoconf, automake, libtool, brotliUnstable}: + +stdenv.mkDerivation rec { + name = "libbrotli-20160120"; + version = "53d53e8"; + + src = fetchFromGitHub { + owner = "bagder"; + repo = "libbrotli"; + rev = "53d53e8d9c0d37398d37bac2e7a7aa20b0025e9e"; + sha256 = "10r4nx6n1r54f5cjck5mmmsj7bkasnmmz7m84imhil45q73kzd4m"; + }; + + buildInputs = [autoconf automake libtool]; + preConfigure = '' + cp -r ${brotliUnstable.src}/* brotli/ + chmod -R +700 brotli + mkdir m4 + autoreconf --install --force --symlink + ''; + + meta = with stdenv.lib; { + description = "Meta project to build libraries from the brotli source code"; + longDescription = '' + Wrapper scripts and code around the brotli code base. + Builds libraries out of the brotli decode and encode sources. Uses autotools. + 'brotlidec' is the library for decoding, decompression + 'brotlienc' is the library for encoding, compression + ''; + + homepage = https://github.com/bagder/libbrotli; + license = licenses.mit; + platforms = platforms.all; + maintainers = []; + }; +} diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index 16d9d8c75a4..de3f51752b9 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, python, llvm, clang }: stdenv.mkDerivation { - name = "libclc-2015-03-27"; + name = "libclc-2015-08-07"; src = fetchFromGitHub { owner = "llvm-mirror"; repo = "libclc"; - rev = "0a2d1619921545b52303be5608b64dc46f381e97"; - sha256 = "0hgm013c0vlfqfbbf4cdajl01hhk1mhsfk4h4bfza1san97l0vcc"; + rev = "f97d9db40718f2e68b3f0b44200760d8e0d50532"; + sha256 = "10n9qk1dild9yjkjjkzpmp9zid3ysdgvqrad554azcf755frch7g"; }; buildInputs = [ python llvm clang ]; diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index 6a1f28c96ff..b4b951325a4 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -1,6 +1,8 @@ -{stdenv, fetchurl, gettext, perl, perlXMLParser, intltool, pkgconfig, glib, +{stdenv, lib, fetchurl, gettext, perl, perlXMLParser, intltool, pkgconfig, glib, libxml2, sqlite, libusb1, zlib, sg3_utils, gdk_pixbuf, taglib, - libimobiledevice, python, pygobject, mutagen }: + libimobiledevice, python, pygobject, mutagen, + monoSupport ? true, mono, gtk-sharp +}: stdenv.mkDerivation rec { name = "libgpod-0.8.3"; @@ -10,13 +12,19 @@ stdenv.mkDerivation rec { }; preConfigure = "configureFlagsArray=( --with-udev-dir=$out/lib/udev )"; - configureFlags = "--without-hal --enable-udev"; + + configureFlags = [ + "--without-hal" + "--enable-udev" + ] ++ lib.optionals monoSupport [ "--with-mono" ]; + + dontStrip = true; propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils gdk_pixbuf taglib libimobiledevice python pygobject mutagen ]; nativeBuildInputs = [ gettext perlXMLParser intltool pkgconfig perl - libimobiledevice.swig ]; + libimobiledevice.swig ] ++ lib.optionals monoSupport [ mono gtk-sharp ]; meta = { homepage = http://gtkpod.sourceforge.net/; diff --git a/pkgs/development/libraries/libgsystem/default.nix b/pkgs/development/libraries/libgsystem/default.nix index b37503df5d9..eaf2eb17095 100644 --- a/pkgs/development/libraries/libgsystem/default.nix +++ b/pkgs/development/libraries/libgsystem/default.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation { homepage = "https://wiki.gnome.org/Projects/LibGSystem"; license = licenses.lgpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchFromGitHub { diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 4db3913bdd2..6d80bfdccf1 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -15,11 +15,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "libinput-1.2.0"; + name = "libinput-1.2.1"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "0b3f67xsy1s84cvzw22mjfkbcv6pj4p4yns4h3m0fmb7zqbvjm0p"; + sha256 = "1hy1h0a4zx5wj23sah4kms2z0285yl0kcn4fqlrrp1gqax9qrnz2"; }; configureFlags = [ diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 2bc18a5a61d..b3d76b1c931 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,29 +1,29 @@ -{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "0.7.82"; + version = "0.7.83"; name = "libmediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "1mqmk1q2phwqwrak54jc9hfwjllhhr4nqyigisrh9rcvd6wx6r86"; + sha256 = "0kl5x07j3jp5mnmhpjvdq0a2nnlgvqnhwar0xalvg3b3msdf8417"; }; - buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libzen zlib ]; sourceRoot = "./MediaInfoLib/Project/GNU/Library/"; configureFlags = [ "--enable-shared" ]; - preConfigure = "sh autogen.sh"; postInstall = '' install -vD -m 644 libmediainfo.pc "$out/lib/pkgconfig/libmediainfo.pc" ''; - meta = { + meta = with stdenv.lib; { description = "Shared library for mediainfo"; homepage = http://mediaarea.net/; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.devhell ]; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = [ maintainers.devhell ]; }; } diff --git a/pkgs/development/libraries/libotr/3.2.nix b/pkgs/development/libraries/libotr/3.2.nix deleted file mode 100644 index 7dd6226a698..00000000000 --- a/pkgs/development/libraries/libotr/3.2.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv, fetchurl, libgcrypt}: - -stdenv.mkDerivation { - name = "libotr-3.2.1"; - src = fetchurl { - url = http://www.cypherpunks.ca/otr/libotr-3.2.0.tar.gz; - sha256 = "14v6idnqpp2vhgir9bzp1ay2gmhqsb8iavrkwmallakfwch9sfyq"; - }; - - propagatedBuildInputs = [libgcrypt]; -} diff --git a/pkgs/development/libraries/libotr/default.nix b/pkgs/development/libraries/libotr/default.nix index aeae2a70d6c..0a01cd9825e 100644 --- a/pkgs/development/libraries/libotr/default.nix +++ b/pkgs/development/libraries/libotr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libgcrypt, autoreconfHook }: stdenv.mkDerivation rec { - name = "libotr-4.1.0"; + name = "libotr-4.1.1"; src = fetchurl { url = "https://otr.cypherpunks.ca/${name}.tar.gz"; - sha256 = "0c6rkh58s6wqzcrpccwdik5qs91qj6dgd60a340d72gc80cqknsg"; + sha256 = "1x8rliydhbibmzwdbyr7pd7n87m2jmxnqkpvaalnf4154hj1hfwb"; }; buildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 231216cbc69..74fc4270b80 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -3,10 +3,10 @@ let - listVersion = "2016-02-25"; + listVersion = "2016-03-10"; listSources = fetchFromGitHub { - sha256 = "0i9aa0bl3x50z0ba4n06pajpfncw8n780hhql13b1vppgfc6s4i7"; - rev = "84fd7e2a090f53ba4378f2a0e08cdaaa882ce3e5"; + sha256 = "10kc0b41y5cn0cnqvalz9i14j1dj6b9wgr21zz3ngqf943q6z5r9"; + rev = "1e52b7efc42b1505f9580ec15a1d692523db4a3b"; repo = "list"; owner = "publicsuffix"; }; diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index 610d14568ae..1171fa079cf 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -1,19 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, gnum4 }: - +{ stdenv, fetchurl, fetchpatch, pkgconfig, gnum4 }: +let + ver_maj = "2.6"; # odd major numbers are unstable + ver_min = "2"; +in stdenv.mkDerivation rec { - name = "libsigc++-2.3.1"; + name = "libsigc++-${ver_maj}.${ver_min}"; src = fetchurl { - url = "mirror://gnome/sources/libsigc++/2.3/${name}.tar.xz"; - sha256 = "14q3sq6d43f6wfcmwhw4v1aal4ba0h5x9v6wkxy2dnqznd95il37"; + url = "mirror://gnome/sources/libsigc++/${ver_maj}/${name}.tar.xz"; + sha256 = "fdace7134c31de792c17570f9049ca0657909b28c4c70ec4882f91a03de54437"; }; + patches = [(fetchpatch { + url = "https://anonscm.debian.org/cgit/collab-maint/libsigc++-2.0.git/plain" + + "/debian/patches/0002-Enforce-c-11-via-pkg-config.patch?id=d451a4d195b1"; + sha256 = "19g19473syp2z3kg8vdrli89lm9kcvaqajkqfmdig1vfpkbq0nci"; + })]; - buildInputs = [ pkgconfig gnum4 ]; + nativeBuildInputs = [ pkgconfig gnum4 ]; doCheck = true; - meta = { + meta = with stdenv.lib; { homepage = http://libsigc.sourceforge.net/; description = "A typesafe callback system for standard C++"; + license = licenses.lgpl21; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index 5543b05ce9d..ea74bea152c 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://xkbcommon.org/download/${name}.tar.xz"; - sha1 = "z9dvxrkcyb4b7f2zybgkrqb9zcxrj9vi"; + sha256 = "176ii5dn2wh74q48sd8ac37ljlvgvp5f506glr96z6ibfhj7igch"; }; buildInputs = [ pkgconfig yacc flex xkeyboard_config libxcb ]; @@ -23,4 +23,3 @@ stdenv.mkDerivation rec { homepage = http://xkbcommon.org; }; } - diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/development/libraries/libxmp/default.nix index 8aa8bf600a8..106fcee257f 100644 --- a/pkgs/development/libraries/libxmp/default.nix +++ b/pkgs/development/libraries/libxmp/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix index 127eeaeaca9..23597c2e03b 100644 --- a/pkgs/development/libraries/libzen/default.nix +++ b/pkgs/development/libraries/libzen/default.nix @@ -1,26 +1,25 @@ -{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig }: +{ stdenv, fetchurl, autoreconfHook }: -let version = "0.4.32"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { + version = "0.4.33"; name = "libzen-${version}"; src = fetchurl { - url = "http://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2"; - sha256 = "0rhbiaywij6jj8d7vkc4v7y21ic1kv9fbn9lk82mm12yjwzlhhyd"; + url = "https://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2"; + sha256 = "0py5iagajz6m5zh26svkjyy85k1dmyhi6cdbmc3cb56a4ix1k2d2"; }; - buildInputs = [ automake autoconf libtool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ "--enable-shared" ]; sourceRoot = "./ZenLib/Project/GNU/Library/"; preConfigure = "sh autogen.sh"; - meta = { + meta = with stdenv.lib; { description = "Shared library for libmediainfo and mediainfo"; - homepage = http://mediaarea.net/; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.devhell ]; + homepage = https://mediaarea.net/; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = [ maintainers.devhell ]; }; } diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix new file mode 100644 index 00000000000..e68661b44ec --- /dev/null +++ b/pkgs/development/libraries/mono-addins/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono, gtk-sharp-2_0 }: + +stdenv.mkDerivation rec { + name = "mono-addins-${version}"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "mono-addins"; + + rev = "mono-addins-${version}"; + sha256 = "1hnn0a2qsjcjprsxas424bzvhsdwy0yc2jj5xbp698c0m9kfk24y"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ mono gtk-sharp-2_0 ]; + + dontStrip = true; + + meta = with stdenv.lib; { + homepage = http://www.mono-project.com/archived/monoaddins/; + description = "A generic framework for creating extensible applications"; + longDescription = '' + Mono.Addins is a generic framework for creating extensible applications, + and for creating libraries which extend those applications. + ''; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/mono-zeroconf/default.nix b/pkgs/development/libraries/mono-zeroconf/default.nix new file mode 100644 index 00000000000..12b15c4937d --- /dev/null +++ b/pkgs/development/libraries/mono-zeroconf/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, autoreconfHook, which, pkgconfig, mono }: + +stdenv.mkDerivation rec { + name = "mono-zeroconf-${version}"; + version = "0.9.0"; + + src = fetchurl { + url = "http://download.banshee-project.org/mono-zeroconf/mono-zeroconf-${version}.tar.bz2"; + sha256 = "1qfp4qvsx7rc2shj1chi2y7fxn10rwi70rw2y54b2i8a4jq7gpkb"; + }; + + buildInputs = [ pkgconfig which mono ]; + + dontStrip = true; + + configureFlags = [ "--disable-docs" ]; + + meta = with stdenv.lib; { + description = "A cross platform Zero Configuration Networking library for Mono and .NET"; + homepage = http://www.mono-project.com/archived/monozeroconf/; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/development/libraries/notify-sharp/default.nix new file mode 100644 index 00000000000..c7e133d94b2 --- /dev/null +++ b/pkgs/development/libraries/notify-sharp/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +, mono, gtk-sharp-3_0, dbus-sharp-1_0, dbus-sharp-glib-1_0 }: + +stdenv.mkDerivation rec { + name = "notify-sharp-${version}"; + version = "3.0.3"; + + src = fetchFromGitHub { + owner = "GNOME"; + repo = "notify-sharp"; + + rev = "${version}"; + sha256 = "1vm7mnmxdwrgy4mr07lfva8sa6a32f2ah5x7w8yzcmahaks3sj5m"; + }; + + nativeBuildInputs = [ + pkgconfig autoreconfHook + ]; + + buildInputs = [ + mono gtk-sharp-3_0 + dbus-sharp-1_0 dbus-sharp-glib-1_0 + ]; + + dontStrip = true; + + postPatch = '' + sed -i 's#^[ \t]*DOCDIR=.*$#DOCDIR=$out/lib/monodoc#' ./configure.ac + ''; + + meta = with stdenv.lib; { + description = "D-Bus for .NET"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index e8d3fb3cdf2..230c22258e2 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: -let version = "4.11"; in +let version = "4.12"; in stdenv.mkDerivation { name = "nspr-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "cb320a9eee7028275ac0fce7adc39dee36f14f02fd8432fce1b7e1aa5e3685c2"; + sha256 = "1pk98bmc5xzbl62q5wf2d6mryf0v95z6rsmxz27nclwiaqg0mcg0"; }; preConfigure = '' diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index d3c2deb609e..060aa20967f 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.22"; + version = "3.22.2"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_22_RTM/src/${name}.tar.gz"; - sha256 = "30ebd121c77e725a1383618eff79a6752d6e9f0f21882ad825ddab12e7227611"; + url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_22_2_RTM/src/${name}.tar.gz"; + sha256 = "0l1n5mwgqkcwfh10hizdv0vfj6gg9i4zip021wh33b17qn3r5m07"; }; buildInputs = [ nspr perl zlib sqlite ]; diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index f71c52e670b..c13af349d43 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -1,19 +1,21 @@ -{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng, cairo }: +{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm }: let - ver_maj = "2.34"; - ver_min = "0"; + ver_maj = "2.38"; + ver_min = "1"; in stdenv.mkDerivation rec { name = "pangomm-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/pangomm/${ver_maj}/${name}.tar.xz"; - sha256 = "0hcyvv7c5zmivprdam6cp111i6hn2y5jsxzk00m6j9pncbzvp0hf"; + sha256 = "effb18505b36d81fc32989a39ead8b7858940d0533107336a30bc3eef096bc8b"; }; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ pango glibmm cairomm libpng cairo ]; + propagatedBuildInputs = [ pango glibmm cairomm ]; + + doCheck = true; meta = with stdenv.lib; { description = "C++ interface to the Pango text rendering library"; diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index b4b9a6970ff..b1cf9c83c7b 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -5,6 +5,7 @@ let name = "suitesparse-${version}"; int_t = if openblas.blas64 then "int64_t" else "int32_t"; + SHLIB_EXT = if stdenv.isDarwin then "dylib" else "so"; in stdenv.mkDerivation { inherit name; @@ -23,6 +24,10 @@ stdenv.mkDerivation { -e 's/METIS_PATH .*$/METIS_PATH =/' \ -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION -DLONGBLAS=${int_t}/' \ -e '/UMFPACK_CONFIG/ s/$/-DLONGBLAS=${int_t}/' + '' + + stdenv.lib.optionalString stdenv.isDarwin '' + sed -i "SuiteSparse_config/SuiteSparse_config.mk" \ + -e 's/^[[:space:]]*\(LIB = -lm\) -lrt/\1/' ''; makeFlags = [ @@ -33,6 +38,8 @@ stdenv.mkDerivation { "LAPACK=" ]; + NIX_CFLAGS = stdenv.lib.optionalString stdenv.isDarwin " -DNTIMER"; + postInstall = '' # Build and install shared library ( @@ -40,10 +47,10 @@ stdenv.mkDerivation { for i in "$out"/lib/lib*.a; do ar -x $i done - gcc *.o --shared -o "$out/lib/libsuitesparse.so" -lopenblas + ''${CC} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse.${SHLIB_EXT}" -lopenblas ) for i in umfpack cholmod amd camd colamd spqr; do - ln -s libsuitesparse.so "$out"/lib/lib$i.so; + ln -s libsuitesparse.${SHLIB_EXT} "$out"/lib/lib$i.${SHLIB_EXT} done # Install documentation diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 83f64d1eb00..4e23a36939d 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, pkgconfig, freetype, cmake }: stdenv.mkDerivation rec { - version = "1.2.4"; + version = "1.3.6"; name = "graphite2-${version}"; src = fetchurl { - url = "mirror://sourceforge/silgraphite/graphite2/${name}.tgz"; - sha256 = "00xhv1mp640fr3wmdzwn4yz0g56jd4r9fb7b02mc1g19h0bdbhsb"; + url = "https://github.com/silnrsi/graphite/releases/download/" + + "${version}/graphite-${version}.tgz"; + sha256 = "0xdg6bc02bl8yz39l5i2skczfg17q4lif0qqan0dhvk0mibpcpj7"; }; buildInputs = [ pkgconfig freetype cmake ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index d9fbde9aa09..24be2c2a9c8 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert interactive -> readline != null && ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.9.2"; + name = "sqlite-3.11.1"; src = fetchurl { - url = "http://sqlite.org/2015/sqlite-autoconf-3090200.tar.gz"; - sha1 = "dae1ae5297fece9671ae0c434a7ecd0cda09c76a"; + url = "http://sqlite.org/2016/sqlite-autoconf-3110100.tar.gz"; + sha1 = "c4b4dcd735a4daf5a2e2bb90f374484c8d4dad29"; }; buildInputs = lib.optionals interactive [ readline ncurses ]; diff --git a/pkgs/development/libraries/taglib-sharp/default.nix b/pkgs/development/libraries/taglib-sharp/default.nix new file mode 100644 index 00000000000..6da524c2339 --- /dev/null +++ b/pkgs/development/libraries/taglib-sharp/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono }: + +stdenv.mkDerivation rec { + name = "taglib-sharp-${version}"; + version = "2.1.0.0"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "taglib-sharp"; + + rev = "taglib-sharp-${version}"; + sha256 = "12pk4z6ag8w7kj6vzplrlasq5lwddxrww1w1ya5ivxrfki15h5cp"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook which ]; + buildInputs = [ mono ]; + + dontStrip = true; + + configureFlags = [ "--disable-docs" ]; + + meta = with stdenv.lib; { + description = "Library for reading and writing metadata in media files"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index 4b77ced250b..95eb0255bdc 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tevent-0.9.26"; + name = "tevent-0.9.28"; src = fetchurl { url = "mirror://samba/tevent/${name}.tar.gz"; - sha256 = "1gbh6d2m49j1v2hkaiyrh8bj02i5wxd4hqayzk2g44yyivbi8b16"; + sha256 = "0a9ml52jjnzz7qg9z750mavlvs1yibjwrzy4yl55dc95j0vm7n84"; }; buildInputs = [ diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix index 8ad3fcd0428..b1f47b80d78 100644 --- a/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/pkgs/development/libraries/webkitgtk/2.4.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { homepage = "http://webkitgtk.org/"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = [ maintainers.iyzsong ]; + maintainers = []; }; src = fetchurl { diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 29e3206da0f..5fd10816168 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.linux; hydraPlatforms = []; - maintainers = with maintainers; [ iyzsong koral ]; + maintainers = with maintainers; [ koral ]; }; preConfigure = "patchShebangs Tools"; diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 1473910e004..736c350bc06 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -16,14 +16,14 @@ in stdenv.mkDerivation rec { name = "x265-${version}"; - version = "1.7"; + version = "1.9"; src = fetchurl { urls = [ "http://get.videolan.org/x265/x265_${version}.tar.gz" "https://github.com/videolan/x265/archive/${version}.tar.gz" ]; - sha256 = "18w3whmbjlalvysny51kdq9b228iwg3rdav4kmifazksvrm4yacq"; + sha256 = "1j0mbcf10aj6zi1nxql45f9817jd2ndcpd7x123sjmyr7q9m8iiy"; }; patchPhase = '' diff --git a/pkgs/development/ocaml-modules/ansiterminal/default.nix b/pkgs/development/ocaml-modules/ansiterminal/default.nix index 64b4f8263ff..615e1d1b673 100644 --- a/pkgs/development/ocaml-modules/ansiterminal/default.nix +++ b/pkgs/development/ocaml-modules/ansiterminal/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { this part is currently work in progress). ''; license = licenses.lgpl3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.jirkamarsik ]; }; } diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix index b3555d7fddb..544db9e0d78 100644 --- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/mirleft/ocaml-asn1-combinators; description = "Combinators for expressing ASN.1 grammars in OCaml"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ vbgl ]; broken = stdenv.isi686; # https://github.com/mirleft/ocaml-asn1-combinators/issues/13 diff --git a/pkgs/development/ocaml-modules/base64/default.nix b/pkgs/development/ocaml-modules/base64/default.nix index f7e4513d826..aabb9f8a76a 100644 --- a/pkgs/development/ocaml-modules/base64/default.nix +++ b/pkgs/development/ocaml-modules/base64/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/mirage/ocaml-base64; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; description = "Base64 encoding and decoding in OCaml"; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 06618fff819..ae4dcc93076 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { language. ''; license = stdenv.lib.licenses.lgpl21Plus; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.z77z ]; diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix index 565176276f9..d2d3159cde1 100644 --- a/pkgs/development/ocaml-modules/biniou/default.nix +++ b/pkgs/development/ocaml-modules/biniou/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "${webpage}"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/bolt/default.nix b/pkgs/development/ocaml-modules/bolt/default.nix index 61c3d6f23b4..cf8b21edb50 100644 --- a/pkgs/development/ocaml-modules/bolt/default.nix +++ b/pkgs/development/ocaml-modules/bolt/default.nix @@ -48,7 +48,7 @@ EOF modeled after the famous log4j logging framework for Java. ''; license = licenses.lgpl3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.jirkamarsik ]; }; } diff --git a/pkgs/development/ocaml-modules/calendar/default.nix b/pkgs/development/ocaml-modules/calendar/default.nix index 48aaf972503..c33deec9c78 100644 --- a/pkgs/development/ocaml-modules/calendar/default.nix +++ b/pkgs/development/ocaml-modules/calendar/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { homepage = https://forge.ocamlcore.org/projects/calendar/; description = "An Objective Caml library managing dates and times"; license = "LGPL"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.gal_bolle ]; diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix index 2024f5a5ab8..de800a295bc 100644 --- a/pkgs/development/ocaml-modules/camlzip/default.nix +++ b/pkgs/development/ocaml-modules/camlzip/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { for reading from and writing to compressed files in these formats. ''; license = "LGPL+linking exceptions"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.z77z ]; diff --git a/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/pkgs/development/ocaml-modules/camomile/0.8.2.nix index f6d22f62ec0..9f7201708af 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.2.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.2.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { description = "A comprehensive Unicode library for OCaml"; license = stdenv.lib.licenses.lgpl21; branch = "0.8.2"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.z77z ]; diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix index ecdc5bef295..11a7828f1e4 100644 --- a/pkgs/development/ocaml-modules/camomile/default.nix +++ b/pkgs/development/ocaml-modules/camomile/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { homepage = https://github.com/yoriyuki/Camomile/tree/master/Camomile; description = "A comprehensive Unicode library for OCaml"; license = stdenv.lib.licenses.lgpl21; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.z77z ]; diff --git a/pkgs/development/ocaml-modules/cil/default.nix b/pkgs/development/ocaml-modules/cil/default.nix index 43522e180b6..1753084910b 100644 --- a/pkgs/development/ocaml-modules/cil/default.nix +++ b/pkgs/development/ocaml-modules/cil/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { description = "A front-end for the C programming language that facilitates program analysis and transformation"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix index ba955061740..80992bdfe7c 100644 --- a/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation { description = "An OCaml module for the declarative definition of command line interfaces"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/config-file/default.nix b/pkgs/development/ocaml-modules/config-file/default.nix index 15eb0666777..4ca9d4a30e0 100644 --- a/pkgs/development/ocaml-modules/config-file/default.nix +++ b/pkgs/development/ocaml-modules/config-file/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { homepage = http://config-file.forge.ocamlcore.org/; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; description = "An OCaml library used to manage the configuration file(s) of an application"; license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index 5c2447614ad..8a03098d84b 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation { helpers for unix and threads. ''; license = stdenv.lib.licenses.bsd2; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index 20f03667c3b..d29136dd434 100644 --- a/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/pkgs/development/ocaml-modules/cpdf/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.coherentpdf.com/; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; description = "PDF Command Line Tools"; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix index 8f18658b0f6..114aa7e5ffd 100644 --- a/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { itself. ''; license = stdenv.lib.licenses.mit; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.z77z ]; diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index cfb353bfe3e..f56ec3cbed6 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { homepage = "http://pauillac.inria.fr/~xleroy/software.html"; description = "A library of cryptographic primitives for OCaml"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.z77z ]; diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index 5b2eebed9e0..57a057e0eaa 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation { description = "Map OCaml arrays onto C-like structs"; license = stdenv.lib.licenses.isc; maintainers = [ maintainers.vbgl maintainers.ericbmerritt ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix index e04523cd14c..760b981dd2c 100644 --- a/pkgs/development/ocaml-modules/csv/default.nix +++ b/pkgs/development/ocaml-modules/csv/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { homepage = https://github.com/Chris00/ocaml-csv; license = licenses.lgpl21; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/dolog/default.nix b/pkgs/development/ocaml-modules/dolog/default.nix index 898c2b67fd6..5987c53898f 100644 --- a/pkgs/development/ocaml-modules/dolog/default.nix +++ b/pkgs/development/ocaml-modules/dolog/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/UnixJunkie/dolog; description = "Minimalistic lazy logger in OCaml"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/dypgen/default.nix b/pkgs/development/ocaml-modules/dypgen/default.nix index 63a48219b15..b579c073f29 100644 --- a/pkgs/development/ocaml-modules/dypgen/default.nix +++ b/pkgs/development/ocaml-modules/dypgen/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { homepage = http://dypgen.free.fr; description = "Dypgen GLR self extensible parser generator"; license = stdenv.lib.licenses.cecill-b; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index ef0a88fb228..80b5b9eae0e 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec license = stdenv.lib.licenses.lgpl21; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.gal_bolle ]; }; diff --git a/pkgs/development/ocaml-modules/enumerate/default.nix b/pkgs/development/ocaml-modules/enumerate/default.nix index ce20cdd47bb..a9475649ff6 100644 --- a/pkgs/development/ocaml-modules/enumerate/default.nix +++ b/pkgs/development/ocaml-modules/enumerate/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { homepage = https://ocaml.janestreet.com/; description = "Quotation expanders for enumerating finite types"; license = stdenv.lib.licenses.asl20; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/erm_xml/default.nix b/pkgs/development/ocaml-modules/erm_xml/default.nix index 0ff2a725ea2..ecfdb846ff1 100644 --- a/pkgs/development/ocaml-modules/erm_xml/default.nix +++ b/pkgs/development/ocaml-modules/erm_xml/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/ermine/xml; description = "XML Parser for discrete data"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/pkgs/development/ocaml-modules/erm_xmpp/default.nix index 7508a14738d..efa239f6c33 100644 --- a/pkgs/development/ocaml-modules/erm_xmpp/default.nix +++ b/pkgs/development/ocaml-modules/erm_xmpp/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/ermine/xmpp; description = "OCaml based XMPP implementation"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index 9f5f8119fb6..492b10bb09b 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { homepage = http://code.google.com/p/ocaml-extlib/; description = "Enhancements to the OCaml Standard Library modules"; license = stdenv.lib.licenses.lgpl21; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/ezjsonm/default.nix b/pkgs/development/ocaml-modules/ezjsonm/default.nix index 25a9e4128bf..fd8ce1c3389 100644 --- a/pkgs/development/ocaml-modules/ezjsonm/default.nix +++ b/pkgs/development/ocaml-modules/ezjsonm/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { homepage = https://github.com/mirage/ezjsonm; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/fieldslib/default.nix b/pkgs/development/ocaml-modules/fieldslib/default.nix index 38548790329..bbefcc0f3cc 100644 --- a/pkgs/development/ocaml-modules/fieldslib/default.nix +++ b/pkgs/development/ocaml-modules/fieldslib/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { description = "OCaml syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values"; license = licenses.asl20; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix index 7a8a80a446c..3ffcfada3d5 100644 --- a/pkgs/development/ocaml-modules/fileutils/default.nix +++ b/pkgs/development/ocaml-modules/fileutils/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = https://forge.ocamlcore.org/projects/ocaml-fileutils/; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; description = "Library to provide pure OCaml functions to manipulate real file (POSIX like) and filename"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = with stdenv.lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/fix/default.nix b/pkgs/development/ocaml-modules/fix/default.nix index b0429e0e910..77e2461bda0 100644 --- a/pkgs/development/ocaml-modules/fix/default.nix +++ b/pkgs/development/ocaml-modules/fix/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { description = "A simple OCaml module for computing the least solution of a system of monotone equations"; license = licenses.cecill-c; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/fontconfig/default.nix b/pkgs/development/ocaml-modules/fontconfig/default.nix index 65311683d0c..635572ea9c8 100644 --- a/pkgs/development/ocaml-modules/fontconfig/default.nix +++ b/pkgs/development/ocaml-modules/fontconfig/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Fontconfig bindings for OCaml"; license = stdenv.lib.licenses.gpl2Plus; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/functory/default.nix b/pkgs/development/ocaml-modules/functory/default.nix index 35dd542af9e..6d4deac38c4 100644 --- a/pkgs/development/ocaml-modules/functory/default.nix +++ b/pkgs/development/ocaml-modules/functory/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { description = "A distributed computing library for Objective Caml which facilitates distributed execution of parallelizable computations in a seamless fashion"; license = licenses.lgpl21; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index 51afb39ca65..ac85a03cc98 100644 --- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = http://gapi-ocaml.forge.ocamlcore.org; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ bennofs ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix index 0b8f4253e76..90f74b2c602 100644 --- a/pkgs/development/ocaml-modules/gen/default.nix +++ b/pkgs/development/ocaml-modules/gen/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { homepage = https://github.com/c-cube/gen; description = "Simple, efficient iterators for OCaml"; license = stdenv.lib.licenses.bsd3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/gg/default.nix b/pkgs/development/ocaml-modules/gg/default.nix index 653b627fc0b..9351bfa7520 100644 --- a/pkgs/development/ocaml-modules/gg/default.nix +++ b/pkgs/development/ocaml-modules/gg/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { raster data. ''; homepage = "${webpage}"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = licenses.bsd3; maintainers = [ maintainers.jirkamarsik ]; }; diff --git a/pkgs/development/ocaml-modules/gtktop/default.nix b/pkgs/development/ocaml-modules/gtktop/default.nix index ca068788287..de0334c2a18 100644 --- a/pkgs/development/ocaml-modules/gtktop/default.nix +++ b/pkgs/development/ocaml-modules/gtktop/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { description = "A small OCaml library to ease the creation of graphical toplevels"; license = stdenv.lib.licenses.lgpl3; maintainers = with stdenv.lib.maintainers; [ vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/hex/default.nix b/pkgs/development/ocaml-modules/hex/default.nix index a9d30f1a9e7..07b7773ff2c 100644 --- a/pkgs/development/ocaml-modules/hex/default.nix +++ b/pkgs/development/ocaml-modules/hex/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { homepage = https://github.com/mirage/ocaml-hex; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/http/default.nix b/pkgs/development/ocaml-modules/http/default.nix index 932a5811bec..d2fa675bbd8 100644 --- a/pkgs/development/ocaml-modules/http/default.nix +++ b/pkgs/development/ocaml-modules/http/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://ocaml-http.forge.ocamlcore.org/; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; description = "do it yourself (OCaml) HTTP daemon"; license = licenses.lgpl2; maintainers = with maintainers; [ roconnor vbgl ]; diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix index c883175f6e0..8580bb64713 100644 --- a/pkgs/development/ocaml-modules/io-page/default.nix +++ b/pkgs/development/ocaml-modules/io-page/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/mirage/io-page; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; description = "IO memory page library for Mirage backends"; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/iso8601/default.nix b/pkgs/development/ocaml-modules/iso8601/default.nix index 4b194332d08..0aad6f7b13b 100644 --- a/pkgs/development/ocaml-modules/iso8601/default.nix +++ b/pkgs/development/ocaml-modules/iso8601/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { homepage = http://sagotch.github.io/ISO8601.ml/; description = "ISO 8601 and RFC 3999 date parsing for OCaml"; license = stdenv.lib.licenses.mit; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index 7272e668aa2..894c93eba4d 100644 --- a/pkgs/development/ocaml-modules/javalib/default.nix +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { homepage = "${webpage}"; license = licenses.lgpl3; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/jsonm/default.nix b/pkgs/development/ocaml-modules/jsonm/default.nix index e81c94d8b24..cc5de781bee 100644 --- a/pkgs/development/ocaml-modules/jsonm/default.nix +++ b/pkgs/development/ocaml-modules/jsonm/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { homepage = http://erratique.ch/software/jsonm; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix b/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix index fbe9898fd81..dae81f1df16 100644 --- a/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix +++ b/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; homepage = http://gtk-extras.forge.ocamlcore.org/; description = "A collection of libraries and modules useful when developing OCaml/LablGtk2 applications"; diff --git a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix index 80e5a72abf5..68019113f38 100644 --- a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; homepage = http://gtk-extras.forge.ocamlcore.org/; description = "A collection of libraries and modules useful when developing OCaml/LablGtk2 applications"; diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index 1815bfc64dd..bc4b490e853 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (rec { meta = { branch = "2.14"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.z77z stdenv.lib.maintainers.roconnor diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 4c1665540ec..a4d4314cd02 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ z77z roconnor vbgl ]; diff --git a/pkgs/development/ocaml-modules/lambda-term/1.6.nix b/pkgs/development/ocaml-modules/lambda-term/1.6.nix index 9f4b17f9b61..026f67d8ef4 100644 --- a/pkgs/development/ocaml-modules/lambda-term/1.6.nix +++ b/pkgs/development/ocaml-modules/lambda-term/1.6.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/diml/lambda-term; license = stdenv.lib.licenses.bsd3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; branch = "1.6"; maintainers = [ stdenv.lib.maintainers.gal_bolle diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix index 0186ab055f5..ec9232645e7 100644 --- a/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/diml/lambda-term; license = stdenv.lib.licenses.bsd3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.gal_bolle ]; diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/pkgs/development/ocaml-modules/llvm/default.nix index 57cf9fe4678..2f58c41ba35 100644 --- a/pkgs/development/ocaml-modules/llvm/default.nix +++ b/pkgs/development/ocaml-modules/llvm/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { inherit (llvm.meta) license homepage; - inherit (ocaml.meta) platforms; + platforms = ocaml.meta.platforms or []; description = "OCaml bindings distributed with LLVM"; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index a018194a2ac..e8cdc180b72 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { homepage = http://ocsigen.org/lwt; description = "Lightweight thread library for Objective Caml"; license = licenses.lgpl21; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ z77z vbgl gal_bolle ]; diff --git a/pkgs/development/ocaml-modules/macaque/default.nix b/pkgs/development/ocaml-modules/macaque/default.nix index 99c2a292fe8..a24859892fa 100644 --- a/pkgs/development/ocaml-modules/macaque/default.nix +++ b/pkgs/development/ocaml-modules/macaque/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { description = "Macros for Caml Queries"; homepage = https://github.com/ocsigen/macaque; license = licenses.lgpl2; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/magic-mime/default.nix b/pkgs/development/ocaml-modules/magic-mime/default.nix index d77c3f68115..9c42aed37df 100644 --- a/pkgs/development/ocaml-modules/magic-mime/default.nix +++ b/pkgs/development/ocaml-modules/magic-mime/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/mirage/ocaml-magic-mime; description = "Convert file extensions to MIME types"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/menhir/generic.nix b/pkgs/development/ocaml-modules/menhir/generic.nix index 8758ff3cffb..088c2db061b 100644 --- a/pkgs/development/ocaml-modules/menhir/generic.nix +++ b/pkgs/development/ocaml-modules/menhir/generic.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { qpl /* generator */ lgpl2 /* library */ ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ z77z ]; }; } diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index a5d73839cb2..ed13a56955b 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/mirleft/ocaml-nocrypto; description = "Simplest possible crypto to support TLS"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index f77bd3acc62..f4076fbd95f 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation { homepage = http://cairographics.org/cairo-ocaml; description = "ocaml bindings for cairo library"; license = stdenv.lib.licenses.gpl2; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix index 97178ac701f..6b9f6f09ea3 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { and SVG file output. ''; license = licenses.lgpl3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.jirkamarsik ]; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-result/default.nix b/pkgs/development/ocaml-modules/ocaml-result/default.nix index 8b6e0966f7e..f531de5118e 100644 --- a/pkgs/development/ocaml-modules/ocaml-result/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-result/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { Result module defined in this library. ''; license = stdenv.lib.licenses.bsd3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-text/default.nix b/pkgs/development/ocaml-modules/ocaml-text/default.nix index 8bbf08e3c74..9c84045de60 100644 --- a/pkgs/development/ocaml-modules/ocaml-text/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-text/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { homepage = "http://ocaml-text.forge.ocamlcore.org/"; description = "A library for convenient text manipulation"; license = stdenv.lib.licenses.bsd3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix index c7427558314..bbef4e01015 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { homepage = http://ocamlgraph.lri.fr/; description = "Graph library for Objective Caml"; license = stdenv.lib.licenses.gpl2Oss; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.kkallio ]; diff --git a/pkgs/development/ocaml-modules/ocamlnat/default.nix b/pkgs/development/ocaml-modules/ocamlnat/default.nix index dc5d191f75a..1aeb43b8cf4 100644 --- a/pkgs/development/ocaml-modules/ocamlnat/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnat/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { x86 or x86-64 processors. Support for additional architectures and operating systems is planned, but not yet available. ''; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.z77z ]; diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index 0948b7132a4..8ef940e75b0 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { homepage = http://projects.camlcity.org/projects/ocamlnet.html; description = "A library implementing Internet protocols (http, cgi, email, etc.) for OCaml"; license = "Most Ocamlnet modules are released under the zlib/png license. The HTTP server module Nethttpd is, however, under the GPL."; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.z77z ]; diff --git a/pkgs/development/ocaml-modules/ocplib-endian/default.nix b/pkgs/development/ocaml-modules/ocplib-endian/default.nix index aede92fc0f0..351f667a8c9 100644 --- a/pkgs/development/ocaml-modules/ocplib-endian/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-endian/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { description = "Optimised functions to read and write int16/32/64"; homepage = https://github.com/OCamlPro/ocplib-endian; license = stdenv.lib.licenses.lgpl21; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix index 89efb58ecbb..d2d66994604 100644 --- a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { homepage = https://github.com/ocsigen/deriving; description = "Extension to OCaml for deriving functions from type declarations"; license = stdenv.lib.licenses.mit; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ gal_bolle vbgl ]; diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index a1bd7d16234..d2613830a7c 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { A full featured Web server. It implements most features of the HTTP protocol, and has a very powerful extension mechanism that make very easy to plug your own OCaml modules for generating pages. ''; license = stdenv.lib.licenses.lgpl21; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.gal_bolle ]; }; diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix index 2cfb6af68a8..d711bae0f34 100644 --- a/pkgs/development/ocaml-modules/ocurl/default.nix +++ b/pkgs/development/ocaml-modules/ocurl/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; homepage = http://ocurl.forge.ocamlcore.org/; maintainers = with stdenv.lib.maintainers; [ bennofs ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/odn/default.nix b/pkgs/development/ocaml-modules/odn/default.nix index eaeb7e7b22f..b3c7ddb8433 100644 --- a/pkgs/development/ocaml-modules/odn/default.nix +++ b/pkgs/development/ocaml-modules/odn/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { description = "Store data using OCaml notation"; homepage = https://forge.ocamlcore.org/projects/odn/; license = licenses.lgpl21; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ vbgl z77z ]; diff --git a/pkgs/development/ocaml-modules/ojquery/default.nix b/pkgs/development/ocaml-modules/ojquery/default.nix index c048f62e89c..054303ac850 100644 --- a/pkgs/development/ocaml-modules/ojquery/default.nix +++ b/pkgs/development/ocaml-modules/ojquery/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "jQuery Binding for Eliom"; homepage = http://ocsigen.org/ojquery/; license = stdenv.lib.licenses.lgpl3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/optcomp/default.nix b/pkgs/development/ocaml-modules/optcomp/default.nix index b134a842c5c..12075145415 100644 --- a/pkgs/development/ocaml-modules/optcomp/default.nix +++ b/pkgs/development/ocaml-modules/optcomp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { homepage = https://github.com/diml/optcomp; description = "Optional compilation for OCaml with cpp-like directives"; license = stdenv.lib.licenses.bsd3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.gal_bolle ]; diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/pkgs/development/ocaml-modules/otfm/default.nix index 5a118c0bcd8..a2047a0fe78 100644 --- a/pkgs/development/ocaml-modules/otfm/default.nix +++ b/pkgs/development/ocaml-modules/otfm/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { of them. ''; homepage = "${webpage}"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = licenses.bsd3; maintainers = [ maintainers.jirkamarsik ]; }; diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/pkgs/development/ocaml-modules/ounit/default.nix index ba0ce29bdf9..d449296ab70 100644 --- a/pkgs/development/ocaml-modules/ounit/default.nix +++ b/pkgs/development/ocaml-modules/ounit/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { homepage = http://ounit.forge.ocamlcore.org/; description = "Unit test framework for OCaml"; license = stdenv.lib.licenses.mit; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.z77z ]; diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix index 7f7caf8e5a8..dd152262ca7 100644 --- a/pkgs/development/ocaml-modules/pcre/default.nix +++ b/pkgs/development/ocaml-modules/pcre/default.nix @@ -22,7 +22,7 @@ buildOcaml { homepage = "https://bitbucket.org/mmottl/pcre-ocaml"; description = "An efficient C-library for pattern matching with Perl-style regular expressions in OCaml"; license = licenses.lgpl21; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ z77z vbmithr ]; }; } diff --git a/pkgs/development/ocaml-modules/pgocaml/default.nix b/pkgs/development/ocaml-modules/pgocaml/default.nix index 00c0d472f9a..f1bc4849a7f 100644 --- a/pkgs/development/ocaml-modules/pgocaml/default.nix +++ b/pkgs/development/ocaml-modules/pgocaml/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { description = "An interface to PostgreSQL databases for OCaml applications"; homepage = http://pgocaml.forge.ocamlcore.org/; license = licenses.lgpl2; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/pprint/default.nix b/pkgs/development/ocaml-modules/pprint/default.nix index 18cc4817b13..e28f85b475c 100644 --- a/pkgs/development/ocaml-modules/pprint/default.nix +++ b/pkgs/development/ocaml-modules/pprint/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { description = "An OCaml adaptation of Wadler’s and Leijen’s prettier printer"; license = licenses.cecill-c; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index 4e99dcd1af4..1fea9bbd191 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { description = "Tools for authors of ppx rewriters"; homepage = http://www.lexifi.com/ppx_tools; license = licenses.mit; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/pycaml/default.nix b/pkgs/development/ocaml-modules/pycaml/default.nix index 070bd270b11..403c39a465d 100644 --- a/pkgs/development/ocaml-modules/pycaml/default.nix +++ b/pkgs/development/ocaml-modules/pycaml/default.nix @@ -46,6 +46,6 @@ in stdenv.mkDerivation { homepage = "http://github.com/chemoelectric/pycaml"; description = "Bindings for python and ocaml"; license = "LGPL"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/qcheck/default.nix b/pkgs/development/ocaml-modules/qcheck/default.nix index 260a1fc9811..7d904e57633 100644 --- a/pkgs/development/ocaml-modules/qcheck/default.nix +++ b/pkgs/development/ocaml-modules/qcheck/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation { homepage = https://github.com/c-cube/qcheck/; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix index e68a8729c01..f7e585b43b0 100644 --- a/pkgs/development/ocaml-modules/qtest/default.nix +++ b/pkgs/development/ocaml-modules/qtest/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Inline (Unit) Tests for OCaml (formerly “qtest”)"; homepage = https://github.com/vincent-hugot/iTeML; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index 5e7ae1cba09..6b7ba1a13b2 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = https://github.com/ocaml/ocaml-re; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; description = "Pure OCaml regular expressions, with support for Perl and POSIX-style strings"; license = stdenv.lib.licenses.lgpl2; maintainers = with stdenv.lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix index dfc8dcd1439..943e5e1e8dc 100644 --- a/pkgs/development/ocaml-modules/react/default.nix +++ b/pkgs/development/ocaml-modules/react/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { homepage = http://erratique.ch/software/react; description = "Applicative events and signals for OCaml"; license = licenses.bsd3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ z77z vbmithr gal_bolle]; }; } diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix index eecae885302..ef0197f60f5 100644 --- a/pkgs/development/ocaml-modules/reactivedata/default.nix +++ b/pkgs/development/ocaml-modules/reactivedata/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { description = "An OCaml module for functional reactive programming (FRP) based on React"; homepage = https://github.com/hhugo/reactiveData; license = licenses.lgpl21; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/safepass/default.nix b/pkgs/development/ocaml-modules/safepass/default.nix index 7fc5dadda74..2f941b923e3 100644 --- a/pkgs/development/ocaml-modules/safepass/default.nix +++ b/pkgs/development/ocaml-modules/safepass/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { homepage = http://ocaml-safepass.forge.ocamlcore.org/; description = "An OCaml library offering facilities for the safe storage of user passwords"; license = stdenv.lib.licenses.lgpl21; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix index 534a7684cec..cfc74ad1668 100644 --- a/pkgs/development/ocaml-modules/sawja/default.nix +++ b/pkgs/development/ocaml-modules/sawja/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "${webpage}"; license = licenses.gpl3Plus; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/sequence/default.nix b/pkgs/development/ocaml-modules/sequence/default.nix index d9c49ece60d..c689aec1904 100644 --- a/pkgs/development/ocaml-modules/sequence/default.nix +++ b/pkgs/development/ocaml-modules/sequence/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation { sequence is iterated/folded on. ''; license = stdenv.lib.licenses.bsd2; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix index dd9e89bcef7..40b95e09e8b 100644 --- a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix +++ b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { description = "Library for serializing OCaml values to and from S-expressions"; license = licenses.asl20; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/sexplib/111.25.00.nix b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix index 61d46e205fa..55b09c3fdc3 100644 --- a/pkgs/development/ocaml-modules/sexplib/111.25.00.nix +++ b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation { description = "Library for serializing OCaml values to and from S-expressions"; license = licenses.asl20; maintainers = [ maintainers.vbgl maintainers.ericbmerritt ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index 53549791b25..804e33fc738 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { homepage = http://mmottl.github.io/sqlite3-ocaml/; description = "OCaml bindings to the SQLite 3 database access library"; license = licenses.mit; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ z77z vbgl ]; diff --git a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix index 94377a646c1..a6ff9f44116 100644 --- a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { description = "A thin wrapper for sqlite3-ocaml with a simplified interface"; license = licenses.mit; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index 6e3ded0b0f2..6eb43d07b68 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { homepage = http://savonet.rastageeks.org/; description = "OCaml bindings for libssl "; license = "LGPL+link exception"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.z77z ]; diff --git a/pkgs/development/ocaml-modules/stringext/default.nix b/pkgs/development/ocaml-modules/stringext/default.nix index 961ee4b1fcd..05aa2c2da68 100644 --- a/pkgs/development/ocaml-modules/stringext/default.nix +++ b/pkgs/development/ocaml-modules/stringext/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/rgrinberg/stringext; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; description = "Extra string functions for OCaml"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 85ea80aeafe..79a696632e1 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation { homepage = "${webpage}"; description = "Thin bindings to the cross-platform SDL library"; license = licenses.bsd3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/twt/default.nix b/pkgs/development/ocaml-modules/twt/default.nix index 4ddbc6705a5..e5831be93bd 100644 --- a/pkgs/development/ocaml-modules/twt/default.nix +++ b/pkgs/development/ocaml-modules/twt/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { description = "“The Whitespace Thing” for OCaml"; license = licenses.mit; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix index d3e32105f7d..e014da8b66a 100644 --- a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix +++ b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { description = "Support library for OCaml preprocessor type conversions"; license = licenses.asl20; branch = "108"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ z77z ]; }; } diff --git a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix index fe42dd5ddcb..b6747a48d95 100644 --- a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix +++ b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { homepage = "http://forge.ocamlcore.org/projects/type-conv/"; description = "Support library for OCaml preprocessor type conversions"; license = stdenv.lib.licenses.lgpl21; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ z77z ]; }; } diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix index d3a0b3557c5..64c1de13fb3 100644 --- a/pkgs/development/ocaml-modules/tyxml/default.nix +++ b/pkgs/development/ocaml-modules/tyxml/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { homepage = http://ocsigen.org/tyxml/; description = "A library that makes it almost impossible for your OCaml programs to generate wrong XML output, using static typing"; license = licenses.lgpl21; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ gal_bolle vbgl ]; diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix index 61c52278621..1e0632387e3 100644 --- a/pkgs/development/ocaml-modules/ulex/default.nix +++ b/pkgs/development/ocaml-modules/ulex/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { homepage = http://www.cduce.org/download.html; description = "A lexer generator for Unicode and OCaml"; license = stdenv.lib.licenses.mit; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix index 03620d05f54..dca989c88ef 100644 --- a/pkgs/development/ocaml-modules/uri/default.nix +++ b/pkgs/development/ocaml-modules/uri/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/mirage/ocaml-uri; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; description = "RFC3986 URI parsing library for OCaml"; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix index 476f0e9bbe8..8e497560c68 100644 --- a/pkgs/development/ocaml-modules/uucd/default.nix +++ b/pkgs/development/ocaml-modules/uucd/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An OCaml module to decode the data of the Unicode character database from its XML representation"; homepage = "${webpage}"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.vbgl ]; license = licenses.bsd3; }; diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix index 67df949ac8b..4e4dd67e210 100644 --- a/pkgs/development/ocaml-modules/uucp/default.nix +++ b/pkgs/development/ocaml-modules/uucp/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An OCaml library providing efficient access to a selection of character properties of the Unicode character database"; homepage = "${webpage}"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index 78869f2f130..07ba10a74a9 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { description = "An OCaml module implementing 128 bits universally unique identifiers version 3, 5 (name based with MD5, SHA-1 hashing) and 4 (random based) according to RFC 4122"; homepage = http://erratique.ch/software/uuidm; license = licenses.bsd3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.maurer ]; }; } diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index ece5fb5e3e3..4e5d73e4cb3 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An OCaml module for normalizing Unicode text"; homepage = "${webpage}"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix index 0101c43e504..5946fd2a70d 100644 --- a/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/pkgs/development/ocaml-modules/uuseg/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An OCaml library for segmenting Unicode text"; homepage = "${webpage}"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix index 26dc9742aeb..7c4cff57128 100644 --- a/pkgs/development/ocaml-modules/uutf/default.nix +++ b/pkgs/development/ocaml-modules/uutf/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Non-blocking streaming Unicode codec for OCaml"; homepage = "${webpage}"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index bfff4c68cef..17bb8eeb464 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { module. An API allows to implement new renderers. ''; homepage = "${webpage}"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = licenses.bsd3; maintainers = [ maintainers.jirkamarsik ]; }; diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index 0d9b657969d..c44ccb18982 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/mirleft/ocaml-x509; description = "X509 (RFC5280) handling in OCaml"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/xml-light/default.nix b/pkgs/development/ocaml-modules/xml-light/default.nix index 5eb4fbfd6b1..82f635afb68 100644 --- a/pkgs/development/ocaml-modules/xml-light/default.nix +++ b/pkgs/development/ocaml-modules/xml-light/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation { homepage = "http://tech.motion-twin.com/xmllight.html"; license = stdenv.lib.licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.romildo ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix index dacaeea49f4..5dedfb396d5 100644 --- a/pkgs/development/ocaml-modules/xmlm/default.nix +++ b/pkgs/development/ocaml-modules/xmlm/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An OCaml streaming codec to decode and encode the XML data format"; homepage = "${webpage}"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.vbgl ]; license = licenses.bsd3; }; diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index 34bcc08275b..ab949f4f1f2 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation { homepage = "http://mjambon.com/${pname}.html"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index ccd278a2faa..16a1ac3b30f 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "fast, arbitrary precision OCaml integers"; homepage = "http://forge.ocamlcore.org/projects/zarith"; license = licenses.lgpl2; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ thoughtpolice vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix index 935d3a56648..f9bf65cf814 100644 --- a/pkgs/development/ocaml-modules/zed/default.nix +++ b/pkgs/development/ocaml-modules/zed/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/diml/zed; license = stdenv.lib.licenses.bsd3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.gal_bolle ]; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 2cc1a82ca09..795019d0b41 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation { homepage = http://www.riverbankcomputing.co.uk; license = licenses.gpl3; platforms = platforms.mesaPlatforms; - maintainers = with maintainers; [ sander iyzsong ]; + maintainers = with maintainers; [ sander ]; }; src = fetchurl { diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 5955f34b58e..e89d8c113a1 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "085lm8v7biixy6rykq836gfy91jcccpz9qpk8i9x339dzy2b2q4l"; }; - buildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ]; + nativeBuildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ]; makeFlags = ''PREFIX=$(out) CFGDIR=$(out)/cfg''; diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index 29559bf8b0e..ab9954735f3 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -1,6 +1,9 @@ -{stdenv, fetchurl, yacc }: +{ stdenv, fetchurl, makeWrapper, yacc, gcc }: -stdenv.mkDerivation rec { +let + binPath = stdenv.lib.makeBinPath [ gcc ]; + +in stdenv.mkDerivation rec { name = "spin-${version}"; version = "6.4.5"; url-version = stdenv.lib.replaceChars ["."] [""] version; @@ -13,11 +16,16 @@ stdenv.mkDerivation rec { sha256 = "0x8qnwm2xa8f176c52mzpvnfzglxs6xgig7bcgvrvkb3xf114224"; }; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ yacc ]; sourceRoot = "Spin/Src${version}"; - installPhase = "install -D spin $out/bin/spin"; + installPhase = '' + install -D spin $out/bin/spin + wrapProgram $out/bin/spin \ + --prefix PATH : ${binPath} + ''; meta = with stdenv.lib; { description = "Formal verification tool for distributed software systems"; diff --git a/pkgs/development/tools/analysis/verasco/default.nix b/pkgs/development/tools/analysis/verasco/default.nix new file mode 100644 index 00000000000..9b3ff8e570d --- /dev/null +++ b/pkgs/development/tools/analysis/verasco/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, coq, ocamlPackages +, tools ? stdenv.cc +}: + +stdenv.mkDerivation rec { + name = "verasco-1.3"; + src = fetchurl { + url = "http://compcert.inria.fr/verasco/release/${name}.tgz"; + sha256 = "0zvljrpwnv443k939zlw1f7ijwx18nhnpr8jl3f01jc5v66hr2k8"; + }; + + buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml findlib menhir zarith ]); + + preConfigure = '' + substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc' + ''; + + configureFlags = [ + "-toolprefix ${tools}/bin/" + (if stdenv.isDarwin then "ia32-macosx" else "ia32-linux") + ]; + + prefixKey = "-prefix "; + + enableParallelBuilding = true; + buildFlags = "proof extraction ccheck"; + + installPhase = '' + mkdir -p $out/bin + cp ccheck $out/bin/ + ln -s $out/bin/ccheck $out/bin/verasco + if [ -e verasco.ini ] + then + mkdir -p $out/share + cp verasco.ini $out/share/ + fi + mkdir -p $out/lib/compcert + cp -riv runtime/include $out/lib/compcert + ''; + + meta = { + homepage = http://compcert.inria.fr/verasco/; + description = "A static analyzer for the CompCert subset of ISO C 1999"; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = stdenv.lib.licenses.unfree; + platforms = with stdenv.lib.platforms; darwin ++ linux; + }; +} diff --git a/pkgs/development/tools/chefdk/Gemfile b/pkgs/development/tools/chefdk/Gemfile index 9cd40fd3f4b..7d974e49891 100644 --- a/pkgs/development/tools/chefdk/Gemfile +++ b/pkgs/development/tools/chefdk/Gemfile @@ -1,3 +1,17 @@ -source "https://rubygems.org" +source 'https://rubygems.org' gem 'chef-dk' +gem 'pry' +gem 'test-kitchen' +gem 'inspec' +gem 'kitchen-inspec' +gem 'kitchen-vagrant' +gem 'berkshelf' +gem 'chef-vault' +gem 'foodcritic' +gem 'ohai' +gem 'rubocop' +gem 'knife-spork' +gem 'fauxhai' +gem 'chefspec' +gem 'chef-provisioning' diff --git a/pkgs/development/tools/chefdk/Gemfile.lock b/pkgs/development/tools/chefdk/Gemfile.lock index 28b0e7f8aa4..ddbb1f5f1dd 100644 --- a/pkgs/development/tools/chefdk/Gemfile.lock +++ b/pkgs/development/tools/chefdk/Gemfile.lock @@ -1,35 +1,74 @@ GEM remote: https://rubygems.org/ specs: + addressable (2.4.0) + app_conf (0.4.2) + ast (2.2.0) + berkshelf (4.3.0) + addressable (~> 2.3, >= 2.3.4) + berkshelf-api-client (~> 2.0, >= 2.0.2) + buff-config (~> 1.0) + buff-extensions (~> 1.0) + buff-shell_out (~> 0.1) + celluloid (= 0.16.0) + celluloid-io (~> 0.16.1) + cleanroom (~> 1.0) + faraday (~> 0.9) + httpclient (~> 2.7) + minitar (~> 0.5, >= 0.5.4) + octokit (~> 4.0) + retryable (~> 2.0) + ridley (~> 4.5) + solve (~> 2.0) + thor (~> 0.19) + berkshelf-api-client (2.0.2) + faraday (~> 0.9.1) + httpclient (~> 2.7.0) + ridley (~> 4.5) + buff-config (1.0.1) + buff-extensions (~> 1.0) + varia_model (~> 0.4) + buff-extensions (1.0.0) + buff-ignore (1.1.1) + buff-ruby_engine (0.1.0) + buff-shell_out (0.2.0) + buff-ruby_engine (~> 0.1.0) builder (3.2.2) - chef (12.5.1) - chef-config (= 12.5.1) - chef-zero (~> 4.2, >= 4.2.2) + celluloid (0.16.0) + timers (~> 4.0.0) + celluloid-io (0.16.2) + celluloid (>= 0.16.0) + nio4r (>= 1.1.0) + chef (12.8.1) + bundler (>= 1.10) + chef-config (= 12.8.1) + chef-zero (~> 4.5) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) ffi-yajl (~> 2.2) highline (~> 1.6, >= 1.6.9) - mixlib-authentication (~> 1.3) + mixlib-authentication (~> 1.4) mixlib-cli (~> 1.4) mixlib-log (~> 1.3) mixlib-shellout (~> 2.0) - net-ssh (~> 2.6) + net-ssh (>= 2.9, < 4.0) net-ssh-multi (~> 1.1) ohai (>= 8.6.0.alpha.1, < 9) plist (~> 3.1.0) - pry (~> 0.9) - rspec-core (~> 3.2) - rspec-expectations (~> 3.2) - rspec-mocks (~> 3.2) + proxifier (~> 1.0) + rspec-core (~> 3.4) + rspec-expectations (~> 3.4) + rspec-mocks (~> 3.4) rspec_junit_formatter (~> 0.2.0) serverspec (~> 2.7) specinfra (~> 2.10) syslog-logger (~> 1.6) - chef-config (12.5.1) + uuidtools (~> 2.1.5) + chef-config (12.8.1) mixlib-config (~> 2.0) mixlib-shellout (~> 2.0) - chef-dk (0.10.0) - chef (~> 12.0, >= 12.2.1) + chef-dk (0.11.2) + chef (~> 12.5) chef-provisioning (~> 1.2) cookbook-omnifetch (~> 0.2, >= 0.2.2) diff-lcs (~> 1.0) @@ -39,92 +78,184 @@ GEM mixlib-shellout (~> 2.0) paint (~> 1.0) solve (~> 2.0, >= 2.0.1) - chef-provisioning (1.5.0) - cheffish (~> 1.3, >= 1.3.1) + chef-provisioning (1.6.0) + cheffish (>= 1.3.1, < 3.0) inifile (~> 2.0) mixlib-install (~> 0.7.0) net-scp (~> 1.0) - net-ssh (~> 2.0) + net-ssh (>= 2.9, < 4.0) net-ssh-gateway (~> 1.2.0) winrm (~> 1.3) - chef-zero (4.3.2) + chef-vault (2.8.0) + chef-zero (4.5.0) ffi-yajl (~> 2.2) hashie (>= 2.0, < 4.0) mixlib-log (~> 1.3) rack uuidtools (~> 2.1) - cheffish (1.6.0) + cheffish (2.0.2) chef-zero (~> 4.3) - coderay (1.1.0) + compat_resource + chefspec (4.6.0) + chef (>= 11.14) + fauxhai (~> 3.0, >= 3.0.1) + rspec (~> 3.0) + cleanroom (1.0.0) + coderay (1.1.1) + compat_resource (12.8.0) cookbook-omnifetch (0.2.2) minitar (~> 0.5.4) diff-lcs (1.2.5) + diffy (3.1.0) + docker-api (1.26.2) + excon (>= 0.38.0) + json erubis (2.7.0) + excon (0.48.0) + faraday (0.9.2) + multipart-post (>= 1.2, < 3) + fauxhai (3.1.0) + net-ssh ffi (1.9.10) - ffi-yajl (2.2.2) + ffi-yajl (2.2.3) libyajl2 (~> 1.2) + foodcritic (6.0.1) + erubis + gherkin (~> 2.11) + nokogiri (>= 1.5, < 2.0) + rake + rufus-lru (~> 1.0) + treetop (~> 1.4) + yajl-ruby (~> 1.1) + gherkin (2.12.2) + multi_json (~> 1.3) + git (1.3.0) gssapi (1.2.0) ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) hashie (3.4.3) highline (1.7.8) - httpclient (2.7.0.1) + hitimes (1.2.3) + httpclient (2.7.1) inifile (2.0.2) - ipaddress (0.8.0) + inspec (0.14.8) + json (~> 1.8) + method_source (~> 0.8) + pry (~> 0) + r-train (~> 0.10.1) + rainbow (~> 2) + rspec (~> 3.3) + rspec-its (~> 1.2) + rubyzip (~> 1.1) + thor (~> 0.19) + ipaddress (0.8.3) + json (1.8.3) + kitchen-inspec (0.12.3) + inspec (~> 0.14.1) + test-kitchen (~> 1.6) + kitchen-vagrant (0.19.0) + test-kitchen (~> 1.4) + knife-spork (1.6.1) + app_conf (>= 0.4.0) + chef (>= 11.0.0) + diffy (>= 3.0.1) + git (>= 1.2.5) libyajl2 (1.2.0) little-plugger (1.1.4) logging (2.0.0) little-plugger (~> 1.1) multi_json (~> 1.10) method_source (0.8.2) - mime-types (2.99) + mini_portile2 (2.0.0) minitar (0.5.4) - mixlib-authentication (1.3.0) + mixlib-authentication (1.4.0) mixlib-log + rspec-core (~> 3.2) + rspec-expectations (~> 3.2) + rspec-mocks (~> 3.2) mixlib-cli (1.5.0) mixlib-config (2.2.1) - mixlib-install (0.7.0) + mixlib-install (0.7.1) mixlib-log (1.6.0) - mixlib-shellout (2.2.5) + mixlib-shellout (2.2.6) molinillo (0.2.3) multi_json (1.11.2) + multipart-post (2.0.0) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (2.9.2) + net-ssh (3.0.2) net-ssh-gateway (1.2.0) net-ssh (>= 2.6.5) net-ssh-multi (1.2.1) net-ssh (>= 2.6.5) net-ssh-gateway (>= 1.2.0) net-telnet (0.1.1) + nio4r (1.2.1) + nokogiri (1.6.7.2) + mini_portile2 (~> 2.0.0.rc2) nori (2.6.0) - ohai (8.7.0) + octokit (4.3.0) + sawyer (~> 0.7.0, >= 0.5.3) + ohai (8.12.0) chef-config (>= 12.5.0.alpha.1, < 13) ffi (~> 1.9) ffi-yajl (~> 2.2) ipaddress - mime-types (~> 2.0) mixlib-cli mixlib-config (~> 2.0) mixlib-log mixlib-shellout (~> 2.0) + plist rake (~> 10.1) systemu (~> 2.6.4) wmi-lite (~> 1.0) - paint (1.0.0) + paint (1.0.1) + parser (2.3.0.6) + ast (~> 2.2) plist (3.1.0) + polyglot (0.3.5) + powerpack (0.1.1) + proxifier (1.0.3) pry (0.10.3) coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) + r-train (0.10.3) + docker-api (~> 1.26.2) + json (~> 1.8) + mixlib-shellout (~> 2.1) + net-scp (~> 1.2) + net-ssh (>= 2.9, < 4.0) + winrm (~> 1.6) + winrm-fs (~> 0.3) rack (1.6.4) - rake (10.4.2) + rainbow (2.1.0) + rake (10.5.0) + retryable (2.0.3) + ridley (4.5.0) + addressable + buff-config (~> 1.0) + buff-extensions (~> 1.0) + buff-ignore (~> 1.1) + buff-shell_out (~> 0.1) + celluloid (~> 0.16.0) + celluloid-io (~> 0.16.1) + chef-config (>= 12.5.0) + erubis + faraday (~> 0.9.0) + hashie (>= 2.0.2, < 4.0.0) + httpclient (~> 2.7) + json (>= 1.7.7) + mixlib-authentication (>= 1.3.0) + retryable (~> 2.0) + semverse (~> 1.1) + varia_model (~> 0.4.0) rspec (3.4.0) rspec-core (~> 3.4.0) rspec-expectations (~> 3.4.0) rspec-mocks (~> 3.4.0) - rspec-core (3.4.1) + rspec-core (3.4.4) rspec-support (~> 3.4.0) rspec-expectations (3.4.0) diff-lcs (>= 1.2.0, < 2.0) @@ -132,49 +263,97 @@ GEM rspec-its (1.2.0) rspec-core (>= 3.0.0) rspec-expectations (>= 3.0.0) - rspec-mocks (3.4.0) + rspec-mocks (3.4.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.4.0) rspec-support (3.4.1) rspec_junit_formatter (0.2.3) builder (< 4) rspec-core (>= 2, < 4, != 2.12.0) - rubyntlm (0.4.0) + rubocop (0.38.0) + parser (>= 2.3.0.6, < 3.0) + powerpack (~> 0.1) + rainbow (>= 1.99.1, < 3.0) + ruby-progressbar (~> 1.7) + unicode-display_width (~> 1.0, >= 1.0.1) + ruby-progressbar (1.7.5) + rubyntlm (0.6.0) + rubyzip (1.2.0) + rufus-lru (1.0.5) + safe_yaml (1.0.4) + sawyer (0.7.0) + addressable (>= 2.3.5, < 2.5) + faraday (~> 0.8, < 0.10) semverse (1.2.1) - serverspec (2.24.3) + serverspec (2.31.0) multi_json rspec (~> 3.0) rspec-its - specinfra (~> 2.43) + specinfra (~> 2.53) sfl (2.2) slop (3.6.0) - solve (2.0.1) + solve (2.0.2) molinillo (~> 0.2.3) semverse (~> 1.1) - specinfra (2.44.5) + specinfra (2.53.1) net-scp - net-ssh (~> 2.7) + net-ssh (>= 2.7, < 3.1) net-telnet sfl syslog-logger (1.6.8) systemu (2.6.5) + test-kitchen (1.6.0) + mixlib-install (~> 0.7) + mixlib-shellout (>= 1.2, < 3.0) + net-scp (~> 1.1) + net-ssh (>= 2.9, < 4.0) + safe_yaml (~> 1.0) + thor (~> 0.18) + thor (0.19.1) + timers (4.0.4) + hitimes + treetop (1.6.5) + polyglot (~> 0.3) + unicode-display_width (1.0.2) uuidtools (2.1.5) - winrm (1.3.6) + varia_model (0.4.1) + buff-extensions (~> 1.0) + hashie (>= 2.0.2, < 4.0.0) + winrm (1.7.2) builder (>= 2.1.2) gssapi (~> 1.2) gyoku (~> 1.0) httpclient (~> 2.2, >= 2.2.0.2) logging (>= 1.6.1, < 3.0) nori (~> 2.0) - rubyntlm (~> 0.4.0) - uuidtools (~> 2.1.2) + rubyntlm (~> 0.6.0) + winrm-fs (0.3.2) + erubis (~> 2.7) + logging (>= 1.6.1, < 3.0) + rubyzip (~> 1.1) + winrm (~> 1.5) wmi-lite (1.0.0) + yajl-ruby (1.2.1) PLATFORMS ruby DEPENDENCIES + berkshelf chef-dk + chef-provisioning + chef-vault + chefspec + fauxhai + foodcritic + inspec + kitchen-inspec + kitchen-vagrant + knife-spork + ohai + pry + rubocop + test-kitchen BUNDLED WITH 1.10.5 diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix index 3b427aae4d2..80f9ef56abc 100644 --- a/pkgs/development/tools/chefdk/default.nix +++ b/pkgs/development/tools/chefdk/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, bundlerEnv, ruby, perl, autoconf }: bundlerEnv { - name = "chefdk-0.10.0"; + name = "chefdk-0.11.2"; inherit ruby; gemfile = ./Gemfile; diff --git a/pkgs/development/tools/chefdk/gemset.nix b/pkgs/development/tools/chefdk/gemset.nix index cb4c1fcb67d..87faa3105ad 100644 --- a/pkgs/development/tools/chefdk/gemset.nix +++ b/pkgs/development/tools/chefdk/gemset.nix @@ -1,4 +1,104 @@ { + "addressable" = { + version = "2.4.0"; + source = { + type = "gem"; + sha256 = "0mpn7sbjl477h56gmxsjqb89r5s3w7vx5af994ssgc3iamvgzgvs"; + }; + }; + "app_conf" = { + version = "0.4.2"; + source = { + type = "gem"; + sha256 = "1yqwhr7d9i0cgavqkkq0b4pfqpn213dbhj5ayygr293wplm0jh57"; + }; + }; + "ast" = { + version = "2.2.0"; + source = { + type = "gem"; + sha256 = "14md08f8f1mmr2v7lczqnf1n1v8bal73gvg6ldhvkds1bmbnkrlb"; + }; + }; + "berkshelf" = { + version = "4.3.0"; + source = { + type = "gem"; + sha256 = "1dsbyq3749b9133rmnzjak7rsysyps1ryalc2r4rxyihflmxhix9"; + }; + dependencies = [ + "addressable" + "berkshelf-api-client" + "buff-config" + "buff-extensions" + "buff-shell_out" + "celluloid" + "celluloid-io" + "cleanroom" + "faraday" + "httpclient" + "minitar" + "octokit" + "retryable" + "ridley" + "solve" + "thor" + ]; + }; + "berkshelf-api-client" = { + version = "2.0.2"; + source = { + type = "gem"; + sha256 = "0xbn8q2xi09x5a7ma6wqs13gkpzj4ly21vls7m7ffv3sw8x29cyc"; + }; + dependencies = [ + "faraday" + "httpclient" + "ridley" + ]; + }; + "buff-config" = { + version = "1.0.1"; + source = { + type = "gem"; + sha256 = "0r3h3mk1dj7pc4zymz450bdqp23faqprx363ji4zfdg8z6r31jfh"; + }; + dependencies = [ + "buff-extensions" + "varia_model" + ]; + }; + "buff-extensions" = { + version = "1.0.0"; + source = { + type = "gem"; + sha256 = "1jqb5sn38qgx66lc4km6rljzz05myijjw12hznz1fk0k4qfw6yzk"; + }; + }; + "buff-ignore" = { + version = "1.1.1"; + source = { + type = "gem"; + sha256 = "1ghzhkgbq7f5fc7xilw0c9gspxpdhqhq3ygi1ybjm6r0dxlmvdb4"; + }; + }; + "buff-ruby_engine" = { + version = "0.1.0"; + source = { + type = "gem"; + sha256 = "1llpwpmzkakbgz9fc3vr1298cx1n9zv1g25fwj80xnnr7428aj8p"; + }; + }; + "buff-shell_out" = { + version = "0.2.0"; + source = { + type = "gem"; + sha256 = "0sphb69vxm346ys2laiz174k5jx628vfwz9ch8g2w9plc4xkxf3p"; + }; + dependencies = [ + "buff-ruby_engine" + ]; + }; "builder" = { version = "3.2.2"; source = { @@ -6,11 +106,32 @@ sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2"; }; }; - "chef" = { - version = "12.5.1"; + "celluloid" = { + version = "0.16.0"; source = { type = "gem"; - sha256 = "0hf6766wmh1dg7f09hi80s8hn1knvzgnaimbhvc05b4q973k5lmb"; + sha256 = "044xk0y7i1xjafzv7blzj5r56s7zr8nzb619arkrl390mf19jxv3"; + }; + dependencies = [ + "timers" + ]; + }; + "celluloid-io" = { + version = "0.16.2"; + source = { + type = "gem"; + sha256 = "1l1x0p6daa5vskywrvaxdlanwib3k5pps16axwyy4p8d49pn9rnx"; + }; + dependencies = [ + "celluloid" + "nio4r" + ]; + }; + "chef" = { + version = "12.8.1"; + source = { + type = "gem"; + sha256 = "16wb3ymnl7rbayy8qp35fp0947cnq2y9bac7xzhc1njp5j2p6lhg"; }; dependencies = [ "chef-config" @@ -27,7 +148,7 @@ "net-ssh-multi" "ohai" "plist" - "pry" + "proxifier" "rspec-core" "rspec-expectations" "rspec-mocks" @@ -35,13 +156,14 @@ "serverspec" "specinfra" "syslog-logger" + "uuidtools" ]; }; "chef-config" = { - version = "12.5.1"; + version = "12.8.1"; source = { type = "gem"; - sha256 = "18iqlf9x3iavh6183zlkiasxsz45drshihmk8yj56prrzfiys67m"; + sha256 = "0chgbdv9c1xfkhzx3kmpr8lj0wjdbziixgln2y3ryn84x4fg84ic"; }; dependencies = [ "mixlib-config" @@ -49,10 +171,10 @@ ]; }; "chef-dk" = { - version = "0.10.0"; + version = "0.11.2"; source = { type = "gem"; - sha256 = "0gxm8dbq7y4bf9wb8zad9q5idsl88f1nm3rvnd2am0xka6bnxv29"; + sha256 = "1qfx5qclvh3kwjgfs18iwdn0knpgka5py7mwi4r0mz2sw14wq5wk"; }; dependencies = [ "chef" @@ -68,10 +190,10 @@ ]; }; "chef-provisioning" = { - version = "1.5.0"; + version = "1.6.0"; source = { type = "gem"; - sha256 = "1xln9hf8mcm81cmw96ccmyzrak54fbjrl9wgii37rx04v4a2435n"; + sha256 = "1nxgia4zyhyqbrz65q7lgjwx8ba5iyzxdxa181y0s4aqqpv0j45g"; }; dependencies = [ "cheffish" @@ -83,11 +205,18 @@ "winrm" ]; }; - "chef-zero" = { - version = "4.3.2"; + "chef-vault" = { + version = "2.8.0"; source = { type = "gem"; - sha256 = "1djnxs97kj13vj1hxx4v6978pkwm8i03p76gbirbp3z2zs6jyvjf"; + sha256 = "0dbvawlrfx9mqjyh8q71jjfh987xqqv3f6c0pmcjp6qxs95l1dqq"; + }; + }; + "chef-zero" = { + version = "4.5.0"; + source = { + type = "gem"; + sha256 = "1lqvmgjniviahrhim8k67qddnwh5p7wzw33r1wga4z136pfka1zx"; }; dependencies = [ "ffi-yajl" @@ -98,20 +227,47 @@ ]; }; "cheffish" = { - version = "1.6.0"; + version = "2.0.2"; source = { type = "gem"; - sha256 = "10aj660azybnf7444a604pjs8p9pvwm3n4mavy8mp3g30yr07paq"; + sha256 = "0mvp7kybgp3nm2sdcmlx8bv147hcdjx745a8k97bx1m47isv97ax"; }; dependencies = [ "chef-zero" + "compat_resource" ]; }; - "coderay" = { - version = "1.1.0"; + "chefspec" = { + version = "4.6.0"; source = { type = "gem"; - sha256 = "059wkzlap2jlkhg460pkwc1ay4v4clsmg1bp4vfzjzkgwdckr52s"; + sha256 = "1ikn8k6xdqixdjga50jmkqajz2z2z71dg4j3dsmd31hv1mdbp7wz"; + }; + dependencies = [ + "chef" + "fauxhai" + "rspec" + ]; + }; + "cleanroom" = { + version = "1.0.0"; + source = { + type = "gem"; + sha256 = "1r6qa4b248jasv34vh7rw91pm61gzf8g5dvwx2gxrshjs7vbhfml"; + }; + }; + "coderay" = { + version = "1.1.1"; + source = { + type = "gem"; + sha256 = "1x6z923iwr1hi04k6kz5a6llrixflz8h5sskl9mhaaxy9jx2x93r"; + }; + }; + "compat_resource" = { + version = "12.8.0"; + source = { + type = "gem"; + sha256 = "0zp1dd1wkbgxbazvs7acqyk1xjls0wq1pd5ilhj6zi63lpychgy5"; }; }; "cookbook-omnifetch" = { @@ -131,6 +287,24 @@ sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1"; }; }; + "diffy" = { + version = "3.1.0"; + source = { + type = "gem"; + sha256 = "1azibizfv91sjbzhjqj1pg2xcv8z9b8a7z6kb3wpl4hpj5hil5kj"; + }; + }; + "docker-api" = { + version = "1.26.2"; + source = { + type = "gem"; + sha256 = "0sg2xazcga21pmlb9yy1z5f3yyzqa2ly5b2h2cxfhyfda6k748wk"; + }; + dependencies = [ + "excon" + "json" + ]; + }; "erubis" = { version = "2.7.0"; source = { @@ -138,6 +312,33 @@ sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; }; }; + "excon" = { + version = "0.48.0"; + source = { + type = "gem"; + sha256 = "0hjfd2p2mhklavhy8gy1ygm390iz3imx71065dcr9r28s3wk63gf"; + }; + }; + "faraday" = { + version = "0.9.2"; + source = { + type = "gem"; + sha256 = "1kplqkpn2s2yl3lxdf6h7sfldqvkbkpxwwxhyk7mdhjplb5faqh6"; + }; + dependencies = [ + "multipart-post" + ]; + }; + "fauxhai" = { + version = "3.1.0"; + source = { + type = "gem"; + sha256 = "0ff8wappc4n4v7v6969zm64c36qiadfw3igl8cyqrpp36fnqm04d"; + }; + dependencies = [ + "net-ssh" + ]; + }; "ffi" = { version = "1.9.10"; source = { @@ -146,15 +347,48 @@ }; }; "ffi-yajl" = { - version = "2.2.2"; + version = "2.2.3"; source = { type = "gem"; - sha256 = "013n5cf80p2wfpmj1mdjkbmcyx3hg4c81wl3bamglaf4i12a2qk2"; + sha256 = "14wgy2isc5yir4zdkk0l3hzh1s1ycwblqb1hllbv4g9svb9naqbz"; }; dependencies = [ "libyajl2" ]; }; + "foodcritic" = { + version = "6.0.1"; + source = { + type = "gem"; + sha256 = "06pi4984g6vwfzqvsf73zpw4h1p63bl7yn2sjb9mqd896bb3v6cn"; + }; + dependencies = [ + "erubis" + "gherkin" + "nokogiri" + "rake" + "rufus-lru" + "treetop" + "yajl-ruby" + ]; + }; + "gherkin" = { + version = "2.12.2"; + source = { + type = "gem"; + sha256 = "1mxfgw15pii1jmq00xxbyp77v71mh3bp99ndgwzfwkxvbcisha25"; + }; + dependencies = [ + "multi_json" + ]; + }; + "git" = { + version = "1.3.0"; + source = { + type = "gem"; + sha256 = "1waikaggw7a1d24nw0sh8fd419gbf7awh000qhsf411valycj6q3"; + }; + }; "gssapi" = { version = "1.2.0"; source = { @@ -189,11 +423,18 @@ sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr"; }; }; - "httpclient" = { - version = "2.7.0.1"; + "hitimes" = { + version = "1.2.3"; source = { type = "gem"; - sha256 = "0k6bqsaqq6c824vrbfb5pkz8bpk565zikd10w85rzj2dy809ik6c"; + sha256 = "1fr9raz7652bnnx09dllyjdlnwdxsnl0ig5hq9s4s8vackvmckv4"; + }; + }; + "httpclient" = { + version = "2.7.1"; + source = { + type = "gem"; + sha256 = "1y01wgmvwz8r4ycr87d12niglpk0nlh2hkpgy9bnmm8as7kgs428"; }; }; "inifile" = { @@ -203,12 +444,71 @@ sha256 = "03rpacxnrnisjhd2zhc7629ica958bkdbakicl5kipw1wbprck25"; }; }; - "ipaddress" = { - version = "0.8.0"; + "inspec" = { + version = "0.14.8"; source = { type = "gem"; - sha256 = "0cwy4pyd9nl2y2apazp3hvi12gccj5a3ify8mi8k3knvxi5wk2ir"; + sha256 = "0whd57f82ml0awn7wgfi8gj3mwl7njww22hn2ciabxafqld9xrri"; }; + dependencies = [ + "json" + "method_source" + "pry" + "r-train" + "rainbow" + "rspec" + "rspec-its" + "rubyzip" + "thor" + ]; + }; + "ipaddress" = { + version = "0.8.3"; + source = { + type = "gem"; + sha256 = "1x86s0s11w202j6ka40jbmywkrx8fhq8xiy8mwvnkhllj57hqr45"; + }; + }; + "json" = { + version = "1.8.3"; + source = { + type = "gem"; + sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc"; + }; + }; + "kitchen-inspec" = { + version = "0.12.3"; + source = { + type = "gem"; + sha256 = "1vjb9pxb4ga9ppr35k6vsqh053k35b4fxamzg99g17y1rijp6dbj"; + }; + dependencies = [ + "inspec" + "test-kitchen" + ]; + }; + "kitchen-vagrant" = { + version = "0.19.0"; + source = { + type = "gem"; + sha256 = "0sydjihhvnr40vqnj7bg65zxf00crwvwdli1av03ghhggrp5scla"; + }; + dependencies = [ + "test-kitchen" + ]; + }; + "knife-spork" = { + version = "1.6.1"; + source = { + type = "gem"; + sha256 = "104f3xq4gfy7rszc8zbfakg9wlnwnf8k9zij9ahdq4id3sdf1ylb"; + }; + dependencies = [ + "app_conf" + "chef" + "diffy" + "git" + ]; }; "libyajl2" = { version = "1.2.0"; @@ -242,11 +542,11 @@ sha256 = "1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2"; }; }; - "mime-types" = { - version = "2.99"; + "mini_portile2" = { + version = "2.0.0"; source = { type = "gem"; - sha256 = "1hravghdnk9qbibxb3ggzv7mysl97djh8n0rsswy3ssjaw7cbvf2"; + sha256 = "056drbn5m4khdxly1asmiik14nyllswr6sh3wallvsywwdiryz8l"; }; }; "minitar" = { @@ -257,13 +557,16 @@ }; }; "mixlib-authentication" = { - version = "1.3.0"; + version = "1.4.0"; source = { type = "gem"; - sha256 = "1c5p5ipa3cssmwgdn0q3lyy1w7asikh9qfpnn7xcfz2f9m7v02zg"; + sha256 = "0qk6mln2bkp6jgkz3sh5r69lzipzjs4dqdixqq12wzvwapmgc0zj"; }; dependencies = [ "mixlib-log" + "rspec-core" + "rspec-expectations" + "rspec-mocks" ]; }; "mixlib-cli" = { @@ -281,10 +584,10 @@ }; }; "mixlib-install" = { - version = "0.7.0"; + version = "0.7.1"; source = { type = "gem"; - sha256 = "0ll1p7v7fp3rf11dz8pifz33jhl4bdg779n4hzlnbia2z7xfsa2w"; + sha256 = "1ws2syfimnqzlff2fp6yj5v7zgnzmi3pj9kbkg7xlmd9fhnkb0n7"; }; }; "mixlib-log" = { @@ -295,10 +598,10 @@ }; }; "mixlib-shellout" = { - version = "2.2.5"; + version = "2.2.6"; source = { type = "gem"; - sha256 = "1is07rar0x8n9h67j4iyrxz2yfgis4bnhh3x7vhbbi6khqqixg79"; + sha256 = "1xfs7yp533qx3nsd4x2q2r125awyxcizgdc4dwgdlxsa1n1pj0pd"; }; }; "molinillo" = { @@ -315,6 +618,13 @@ sha256 = "1rf3l4j3i11lybqzgq2jhszq7fh7gpmafjzd14ymp9cjfxqg596r"; }; }; + "multipart-post" = { + version = "2.0.0"; + source = { + type = "gem"; + sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; + }; + }; "net-scp" = { version = "1.2.1"; source = { @@ -326,10 +636,10 @@ ]; }; "net-ssh" = { - version = "2.9.2"; + version = "3.0.2"; source = { type = "gem"; - sha256 = "1p0bj41zrmw5lhnxlm1pqb55zfz9y4p9fkrr9a79nrdmzrk1ph8r"; + sha256 = "1k3hrgr899dlhkn53c4hnn5qzbhc7lwks0vaqgw95gg74hn1ivqw"; }; }; "net-ssh-gateway" = { @@ -360,6 +670,23 @@ sha256 = "13qxznpwmc3hs51b76wqx2w29r158gzzh8719kv2gpi56844c8fx"; }; }; + "nio4r" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "1adnm77xfxck0mrvid5d7lwng783gh580rh3y18nq4bwdikr6nha"; + }; + }; + "nokogiri" = { + version = "1.6.7.2"; + source = { + type = "gem"; + sha256 = "11sbmpy60ynak6s3794q32lc99hs448msjy8rkp84ay7mq7zqspv"; + }; + dependencies = [ + "mini_portile2" + ]; + }; "nori" = { version = "2.6.0"; source = { @@ -367,34 +694,54 @@ sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn"; }; }; - "ohai" = { - version = "8.7.0"; + "octokit" = { + version = "4.3.0"; source = { type = "gem"; - sha256 = "1f10kgxh89iwij54yx8q11n1q87653ckvdmdwg8cwz3qlgf4flhy"; + sha256 = "1hq47ck0z03vr3rzblyszihn7x2m81gv35chwwx0vrhf17nd27np"; + }; + dependencies = [ + "sawyer" + ]; + }; + "ohai" = { + version = "8.12.0"; + source = { + type = "gem"; + sha256 = "0l7vdfnfm4plla6q4qkngwpmy0ah53pnymlwfzc7iy6jn2n9ibpm"; }; dependencies = [ "chef-config" "ffi" "ffi-yajl" "ipaddress" - "mime-types" "mixlib-cli" "mixlib-config" "mixlib-log" "mixlib-shellout" + "plist" "rake" "systemu" "wmi-lite" ]; }; "paint" = { - version = "1.0.0"; + version = "1.0.1"; source = { type = "gem"; - sha256 = "0mhwj6w60q40w4f6jz8xx8bv1kghjvsjc3d8q8pnslax4fkmzbp1"; + sha256 = "1z1fqyyc2jiv6yabv467h652cxr2lmxl5gqqg7p14y28kdqf0nhj"; }; }; + "parser" = { + version = "2.3.0.6"; + source = { + type = "gem"; + sha256 = "1r14k5jlsc5ivxjm1kljhk9sqp50rnd71n0mzx18hz135nvw1hbz"; + }; + dependencies = [ + "ast" + ]; + }; "plist" = { version = "3.1.0"; source = { @@ -402,6 +749,27 @@ sha256 = "0rh8nddwdya888j1f4wix3dfan1rlana3mc7mwrvafxir88a1qcs"; }; }; + "polyglot" = { + version = "0.3.5"; + source = { + type = "gem"; + sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr"; + }; + }; + "powerpack" = { + version = "0.1.1"; + source = { + type = "gem"; + sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43"; + }; + }; + "proxifier" = { + version = "1.0.3"; + source = { + type = "gem"; + sha256 = "1abzlg39cfji1nx3i8kmb5k3anr2rd392yg2icms24wkqz9g9zj0"; + }; + }; "pry" = { version = "0.10.3"; source = { @@ -414,6 +782,22 @@ "slop" ]; }; + "r-train" = { + version = "0.10.3"; + source = { + type = "gem"; + sha256 = "1hn0aap2lq15p97mb91h32yfsw8rh4imhyjlbs4jx9x52h2q6nam"; + }; + dependencies = [ + "docker-api" + "json" + "mixlib-shellout" + "net-scp" + "net-ssh" + "winrm" + "winrm-fs" + ]; + }; "rack" = { version = "1.6.4"; source = { @@ -421,13 +805,53 @@ sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5"; }; }; - "rake" = { - version = "10.4.2"; + "rainbow" = { + version = "2.1.0"; source = { type = "gem"; - sha256 = "1rn03rqlf1iv6n87a78hkda2yqparhhaivfjpizblmxvlw2hk5r8"; + sha256 = "11licivacvfqbjx2rwppi8z89qff2cgs67d4wyx42pc5fg7g9f00"; }; }; + "rake" = { + version = "10.5.0"; + source = { + type = "gem"; + sha256 = "0jcabbgnjc788chx31sihc5pgbqnlc1c75wakmqlbjdm8jns2m9b"; + }; + }; + "retryable" = { + version = "2.0.3"; + source = { + type = "gem"; + sha256 = "0lr3wasxwdyzr0bag179003hs2ycn9w86m450pazc81v19j4x1dq"; + }; + }; + "ridley" = { + version = "4.5.0"; + source = { + type = "gem"; + sha256 = "0y0p45y3xp37gg8ab132x4i0iggl3p907wfklhr5gb7r5yj6sj4r"; + }; + dependencies = [ + "addressable" + "buff-config" + "buff-extensions" + "buff-ignore" + "buff-shell_out" + "celluloid" + "celluloid-io" + "chef-config" + "erubis" + "faraday" + "hashie" + "httpclient" + "json" + "mixlib-authentication" + "retryable" + "semverse" + "varia_model" + ]; + }; "rspec" = { version = "3.4.0"; source = { @@ -441,10 +865,10 @@ ]; }; "rspec-core" = { - version = "3.4.1"; + version = "3.4.4"; source = { type = "gem"; - sha256 = "0zl4fbrzl4gg2bn3fhv910q04sm2jvzdidmvd71gdgqwbzk0zngn"; + sha256 = "1z2zmy3xaq00v20ykamqvnynzv2qrrnbixc6dn0jw1c5q9mqq9fp"; }; dependencies = [ "rspec-support" @@ -473,10 +897,10 @@ ]; }; "rspec-mocks" = { - version = "3.4.0"; + version = "3.4.1"; source = { type = "gem"; - sha256 = "0iw9qvpawj3cfcg3xipi1v4y11g9q4f5lvmzgksn6f0chf97sjy1"; + sha256 = "0sk8ijq5d6bwhvjq94gfm02fssxkm99bgpasqazsmmll5m1cn7vr"; }; dependencies = [ "diff-lcs" @@ -501,12 +925,65 @@ "rspec-core" ]; }; - "rubyntlm" = { - version = "0.4.0"; + "rubocop" = { + version = "0.38.0"; source = { type = "gem"; - sha256 = "03xmi8mxcbc5laad10r6b705dk4vyhl9lr7h940f2rhibymxq45x"; + sha256 = "0qgwq558n41z2id7nwc3bh7z8h9yh7c9zdasqn8p30p0p72f5520"; }; + dependencies = [ + "parser" + "powerpack" + "rainbow" + "ruby-progressbar" + "unicode-display_width" + ]; + }; + "ruby-progressbar" = { + version = "1.7.5"; + source = { + type = "gem"; + sha256 = "0hynaavnqzld17qdx9r7hfw00y16ybldwq730zrqfszjwgi59ivi"; + }; + }; + "rubyntlm" = { + version = "0.6.0"; + source = { + type = "gem"; + sha256 = "00k1cll10mcyg6qpdzyrazm5pjbpj7wq54ki2y8vxz86842vbsgp"; + }; + }; + "rubyzip" = { + version = "1.2.0"; + source = { + type = "gem"; + sha256 = "10a9p1m68lpn8pwqp972lv61140flvahm3g9yzbxzjks2z3qlb2s"; + }; + }; + "rufus-lru" = { + version = "1.0.5"; + source = { + type = "gem"; + sha256 = "1vrsbvcsl7yspzb761p2gbl7dwz0d1j82msbjsksf8hi4cv970s5"; + }; + }; + "safe_yaml" = { + version = "1.0.4"; + source = { + type = "gem"; + sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; + }; + }; + "sawyer" = { + version = "0.7.0"; + source = { + type = "gem"; + sha256 = "1cn48ql00mf1ag9icmfpj7g7swh7mdn7992ggynjqbw1gh15bs3j"; + }; + dependencies = [ + "addressable" + "faraday" + ]; }; "semverse" = { version = "1.2.1"; @@ -516,10 +993,10 @@ }; }; "serverspec" = { - version = "2.24.3"; + version = "2.31.0"; source = { type = "gem"; - sha256 = "03v6qqshqjsvbbjf1pwbi2mzgqg84wdbhnqb3gdbl1m9bz7sxg1n"; + sha256 = "169mh6s4drxy9qs7f01gqcaq1qfkvy9hdc1ny3lnk0aiwfcm2s1p"; }; dependencies = [ "multi_json" @@ -543,10 +1020,10 @@ }; }; "solve" = { - version = "2.0.1"; + version = "2.0.2"; source = { type = "gem"; - sha256 = "0009xvg40y59bijds5njnwfshfw68wmj54yz3qy538g9rpxvmqp1"; + sha256 = "0mwdd6z3vbzna9vphnkgdghy40xawn0yiwhamvb6spfk6n2c80kb"; }; dependencies = [ "molinillo" @@ -554,10 +1031,10 @@ ]; }; "specinfra" = { - version = "2.44.5"; + version = "2.53.1"; source = { type = "gem"; - sha256 = "018i3bmmy7lc21hagvwfmz2sdfj0v87a7yy3z162lcpq62vxw89r"; + sha256 = "17jbrn7nm6c72qy1nw064c0yi9cimd295s7j6x9bm878cbyq9i6i"; }; dependencies = [ "net-scp" @@ -580,6 +1057,55 @@ sha256 = "0gmkbakhfci5wnmbfx5i54f25j9zsvbw858yg3jjhfs5n4ad1xq1"; }; }; + "test-kitchen" = { + version = "1.6.0"; + source = { + type = "gem"; + sha256 = "1glmvjm24fmlbhm8q4lzi1ynds77ip3s4s5q6fdjlhdanh6jrgwz"; + }; + dependencies = [ + "mixlib-install" + "mixlib-shellout" + "net-scp" + "net-ssh" + "safe_yaml" + "thor" + ]; + }; + "thor" = { + version = "0.19.1"; + source = { + type = "gem"; + sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z"; + }; + }; + "timers" = { + version = "4.0.4"; + source = { + type = "gem"; + sha256 = "1jx4wb0x182gmbcs90vz0wzfyp8afi1mpl9w5ippfncyk4kffvrz"; + }; + dependencies = [ + "hitimes" + ]; + }; + "treetop" = { + version = "1.6.5"; + source = { + type = "gem"; + sha256 = "1lg7j8xf8yxmnz1v8zkwhs4l6j30kq2pxvvrvpah2frlaqz077dh"; + }; + dependencies = [ + "polyglot" + ]; + }; + "unicode-display_width" = { + version = "1.0.2"; + source = { + type = "gem"; + sha256 = "1cffs73zrn788dyd1vv91p0mcxgx2g1sis6552ggmfib3f148gbi"; + }; + }; "uuidtools" = { version = "2.1.5"; source = { @@ -587,11 +1113,22 @@ sha256 = "0zjvq1jrrnzj69ylmz1xcr30skf9ymmvjmdwbvscncd7zkr8av5g"; }; }; - "winrm" = { - version = "1.3.6"; + "varia_model" = { + version = "0.4.1"; source = { type = "gem"; - sha256 = "1rx42y5w9d3w6axxwdj9zckzsgsjk172zxn52w2jj65spl98vxbc"; + sha256 = "1qm9fhizfry055yras9g1129lfd48fxg4lh0hck8h8cvjdjz1i62"; + }; + dependencies = [ + "buff-extensions" + "hashie" + ]; + }; + "winrm" = { + version = "1.7.2"; + source = { + type = "gem"; + sha256 = "1as865gd6f0g0hppw8plki1i4afpn6lcx89sgi52v1mlgwxfifff"; }; dependencies = [ "builder" @@ -601,7 +1138,19 @@ "logging" "nori" "rubyntlm" - "uuidtools" + ]; + }; + "winrm-fs" = { + version = "0.3.2"; + source = { + type = "gem"; + sha256 = "08j2ip9wx1vcx45kd9ws6lb6znfq9gib1n2j7shzs10rxwgs1bj8"; + }; + dependencies = [ + "erubis" + "logging" + "rubyzip" + "winrm" ]; }; "wmi-lite" = { @@ -611,4 +1160,11 @@ sha256 = "06pm7jr2gcnphhhswha2kqw0vhxy91i68942s7gqriadbc8pq9z3"; }; }; + "yajl-ruby" = { + version = "1.2.1"; + source = { + type = "gem"; + sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf"; + }; + }; } \ No newline at end of file diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index f416345028f..dc885f09b5b 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "1.650"; + version = "1.652"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "0iypkyjcsfj36j683a6yis4q0wil6m8l065fx8v2p7ba4j2ql00n"; + sha256 = "09xcsgfhxshfqgg0aighby8dx1qgzh7fkfkynyv5xg1m216z21jx"; }; meta = with stdenv.lib; { description = "An extendable open source continuous integration server"; diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index e5c2060b5e9..338f3323d94 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchzip, qt4, sqlite, cmake }: +{ stdenv, fetchFromGitHub, qt4, sqlite, cmake }: stdenv.mkDerivation rec { - version = "3.7.0"; + version = "3.8.0"; name = "sqlitebrowser-${version}"; - src = fetchzip { - name = "${name}-src"; - url = "https://github.com/sqlitebrowser/sqlitebrowser/archive/v${version}.tar.gz"; - sha256 = "1zsgylnxk4lyg7p6k6pv8d3mh1k0wkfcplh5c5da3x3i9a3qs78j"; + src = fetchFromGitHub { + repo = "sqlitebrowser"; + owner = "sqlitebrowser"; + rev = "v${version}"; + sha256 = "009yaamf6f654dl796f1gmj3rb34d55w87snsfgk33gpy6x19ccp"; }; buildInputs = [ qt4 sqlite cmake ]; diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix new file mode 100644 index 00000000000..a8806127d35 --- /dev/null +++ b/pkgs/development/tools/erlang/cuter/default.nix @@ -0,0 +1,43 @@ +{stdenv, autoconf, which, writeText, makeWrapper, fetchFromGitHub, erlang, + erlangPackages, z3, python27 }: + +stdenv.mkDerivation rec { + name = "cuter"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "aggelgian"; + repo = "cuter"; + rev = "v${version}"; + sha256 = "1ax1pj6ji4w2mg3p0nh2lzmg3n9mgfxk4cf07pll51yrcfpfrnfv"; + }; + + setupHook = writeText "setupHook.sh" '' + addToSearchPath ERL_LIBS "$1/lib/erlang/lib/" + ''; + buildInputs = with erlangPackages; [ autoconf erlang z3 python27 makeWrapper which ]; + + buildFlags = "PWD=$(out)/lib/erlang/lib/cuter-${version} cuter_target"; + configurePhase = '' + autoconf + ./configure --prefix $out + ''; + + installPhase = '' + mkdir -p "$out/lib/erlang/lib/cuter-${version}" + mkdir -p "$out/bin" + cp -r * "$out/lib/erlang/lib/cuter-${version}" + cp cuter "$out/bin/cuter" + wrapProgram $out/bin/cuter \ + --prefix PATH : "${python27}/bin" \ + --suffix PYTHONPATH : "${z3}/lib/python2.7/site-packages" \ + --suffix ERL_LIBS : "$out/lib/erlang/lib" + ''; + + meta = { + description = "A concolic testing tool for the Erlang functional programming language"; + license = stdenv.lib.licenses.gpl3; + homepage = "https://github.com/aggelgian/cuter"; + maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; + }; +} diff --git a/pkgs/development/tools/galen/default.nix b/pkgs/development/tools/galen/default.nix index 169c8fdd68a..7ff283176e1 100644 --- a/pkgs/development/tools/galen/default.nix +++ b/pkgs/development/tools/galen/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "galen"; - version = "2.2.1"; + version = "2.2.3"; name = "${pname}-${version}"; inherit jdk; src = fetchurl { - url = "https://github.com/galenframework/galen/releases/download/galen-2.2.1/galen-bin-${version}.zip"; - sha256 = "0zwrh3bxcgkwip6z9lvy3hn53kfr99cdij64c57ff8d95xilclhb"; + url = "https://github.com/galenframework/galen/releases/download/galen-${version}/galen-bin-${version}.zip"; + sha256 = "13kvxbw68g82rv8bp9g4fkrrsd7nag1a4bspilqi2wnxc51c8mqq"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/tools/guile/g-wrap/default.nix b/pkgs/development/tools/guile/g-wrap/default.nix index 14777b95b85..6cce86a8062 100644 --- a/pkgs/development/tools/guile/g-wrap/default.nix +++ b/pkgs/development/tools/guile/g-wrap/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "g-wrap-1.9.15"; src = fetchurl { url = "mirror://savannah/g-wrap/${name}.tar.gz"; - sha256 = "140fcvp24pqmfmiibhjxl3s75hj26ln7pkl2wxas84lnchbj9m4d"; + sha256 = "0ak0bha37dfpj9kmyw1r8fj8nva639aw5xr66wr5gd3l1rqf5xhg"; }; # Note: Glib support is optional, but it's quite useful (e.g., it's diff --git a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix index 68c85fb2951..87dc173dd87 100644 --- a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix +++ b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix @@ -6,12 +6,12 @@ mkDerivation rec { pname = "cabal2nix"; - version = "20151217"; + version = "20160308"; src = fetchFromGitHub { owner = "nixos"; repo = "cabal2nix"; rev = "v${version}"; - sha256 = "1140ym5j1prvzyfw8q784dr0hwvfw6s4h63j3a4j67cawa2dbkr5"; + sha256 = "02lj3x0rgpxvaimwbbjjgwm4ka0wkk4x5h35jjygz6bkr5lv3m52"; }; postUnpack = "sourceRoot+=/${pname}"; isLibrary = false; diff --git a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix index 7aac407e3ce..5aa4370b26f 100644 --- a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix +++ b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix @@ -11,8 +11,8 @@ mkDerivation rec { src = fetchFromGitHub { owner = "nixos"; repo = "cabal2nix"; - rev = "v20151217"; - sha256 = "1140ym5j1prvzyfw8q784dr0hwvfw6s4h63j3a4j67cawa2dbkr5"; + rev = "v20160308"; + sha256 = "02lj3x0rgpxvaimwbbjjgwm4ka0wkk4x5h35jjygz6bkr5lv3m52"; }; postUnpack = "sourceRoot+=/${pname}"; libraryHaskellDepends = [ diff --git a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix index b2b3b46581a..ce1d9303cdc 100644 --- a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix +++ b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix @@ -7,12 +7,12 @@ mkDerivation rec { pname = "hackage2nix"; - version = "20151217"; + version = "20160308"; src = fetchFromGitHub { owner = "nixos"; repo = "cabal2nix"; rev = "v${version}"; - sha256 = "1140ym5j1prvzyfw8q784dr0hwvfw6s4h63j3a4j67cawa2dbkr5"; + sha256 = "02lj3x0rgpxvaimwbbjjgwm4ka0wkk4x5h35jjygz6bkr5lv3m52"; }; postUnpack = "sourceRoot+=/${pname}"; isLibrary = false; diff --git a/pkgs/development/tools/jo/default.nix b/pkgs/development/tools/jo/default.nix new file mode 100644 index 00000000000..09b5edeeecd --- /dev/null +++ b/pkgs/development/tools/jo/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchFromGitHub, autoreconfHook}: + +stdenv.mkDerivation rec { + name = "jo-${version}"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "jpmens"; + repo = "jo"; + + rev = "v${version}"; + sha256="0vyi0aaxsp6x3cvym7mlcfdsxjhj5h0b00mqc42mg8kc95cyp2c1"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { + description = "A small utility to create JSON objects"; + homepage = https://github.com/jpmens/jo; + license = licenses.gpl2Plus; + maintainers = [maintainers.markus1189]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix index 0f99cabbb96..606cc514647 100644 --- a/pkgs/development/tools/misc/trv/default.nix +++ b/pkgs/development/tools/misc/trv/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation { description = "Shim for vrt to enable bootstrapping"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index 20373c923e7..ae253180aee 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A software system for writing extensible parsers for programming languages"; homepage = https://github.com/ocaml/camlp4; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/tools/ocaml/camlp5/5.15.nix b/pkgs/development/tools/ocaml/camlp5/5.15.nix index adfdb4bd204..e8cda36f101 100644 --- a/pkgs/development/tools/ocaml/camlp5/5.15.nix +++ b/pkgs/development/tools/ocaml/camlp5/5.15.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { homepage = "${webpage}"; license = stdenv.lib.licenses.bsd3; branch = "5"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.z77z ]; diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index d9f36423430..83dd74d321e 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { ''; homepage = http://pauillac.inria.fr/~ddr/camlp5/; license = licenses.bsd3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ z77z vbgl ]; diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 746be6dd081..5d9757f2666 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { homepage = http://projects.camlcity.org/projects/findlib.html; description = "O'Caml library manager"; license = stdenv.lib.licenses.mit; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.z77z stdenv.lib.maintainers.vbmithr diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index ca5230d1e08..3258aaf08c2 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { homepage = http://ocsigen.org/js_of_ocaml/; description = "Compiler of OCaml bytecode to Javascript. It makes it possible to run Ocaml programs in a Web browser"; license = licenses.lgpl2; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.gal_bolle ]; diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index e823466f417..70d90752ace 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { homepage = http://oasis.forge.ocamlcore.org/; description = "Configure, build and install system for OCaml projects"; license = licenses.lgpl21; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ vbgl z77z ]; diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix index 79c81c5c447..9bea3e9dc17 100644 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { homepage = http://www.typerex.org/ocaml-top.html; license = stdenv.lib.licenses.gpl3; description = "A simple cross-platform OCaml code editor built for top-level evaluation"; - platforms = ocamlPackages.ocaml.meta.platforms; + platforms = ocamlPackages.ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix index 0a402d4ba46..f3caa42b8fd 100644 --- a/pkgs/development/tools/ocaml/ocamlify/default.nix +++ b/pkgs/development/tools/ocaml/ocamlify/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = http://forge.ocamlcore.org/projects/ocamlmod/ocamlmod; description = "Generate OCaml modules from source files"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.lgpl21; maintainers = with stdenv.lib.maintainers; [ z77z diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix index 65359049a96..7ff73ff28dc 100644 --- a/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = http://forge.ocamlcore.org/projects/ocamlmod/ocamlmod; description = "Generate OCaml modules from source files"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ z77z ]; diff --git a/pkgs/development/tools/ocaml/ocamlscript/default.nix b/pkgs/development/tools/ocaml/ocamlscript/default.nix index 1b37c21fdfa..28efaf4cf3d 100644 --- a/pkgs/development/tools/ocaml/ocamlscript/default.nix +++ b/pkgs/development/tools/ocaml/ocamlscript/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = http://martin.jambon.free.fr/ocamlscript.html; license = licenses.boost; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; description = "Natively-compiled OCaml scripts"; maintainers = [ maintainers.vbgl ]; }; diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index 31b99ada2a3..48657a8e19d 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { between source files. ''; license = licenses.gpl3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.jirkamarsik ]; }; } diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix index 224ce57808f..d146dd5e973 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/default.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { homepage = "http://typerex.ocamlpro.com/ocp-indent.html"; description = "A customizable tool to indent OCaml code"; license = licenses.gpl3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.jirkamarsik ]; }; } diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index 76be5f8bd47..37f90c41100 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { homepage = http://typerex.ocamlpro.com/ocp-index.html; description = "A simple and light-weight documentation extractor for OCaml"; license = stdenv.lib.licenses.lgpl3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix index 40188734a99..9f318afc67d 100644 --- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix +++ b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation { description = "Omake build system"; homepage = "${webpage}"; license = "GPL"; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index c9addf55312..b5de65b7c10 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/diml/utop; license = stdenv.lib.licenses.bsd3; - platforms = ocaml.meta.platforms; + platforms = ocaml.meta.platforms or []; maintainers = [ stdenv.lib.maintainers.gal_bolle ]; diff --git a/pkgs/development/web/nodejs/v5.nix b/pkgs/development/web/nodejs/v5.nix index 185ad61680b..6e9b0bbf49e 100644 --- a/pkgs/development/web/nodejs/v5.nix +++ b/pkgs/development/web/nodejs/v5.nix @@ -7,7 +7,7 @@ assert stdenv.system != "armv5tel-linux"; let - version = "5.7.1"; + version = "5.8.0"; deps = { inherit openssl zlib libuv; @@ -31,7 +31,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "16016cjycg0filh15nqfh3k1fdw3kaykl87xf8dnzf666mirbm7c"; + sha256 = "165q4bbq1fjrr82ciiczbgyz37fl8sg3nqspccz0aqhwxh65ikg8"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ]; diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index beb2bb57908..a4f296da039 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -2,6 +2,7 @@ , pkgconfig, SDL2, SDL2_mixer }: let + year = "2015"; date = "20150420"; rev = "5160"; in stdenv.mkDerivation rec { @@ -9,7 +10,7 @@ in stdenv.mkDerivation rec { version = "${date}-${rev}"; src = fetchurl { - url = "http://dukeworld.duke4.net/eduke32/synthesis/${version}/eduke32_src_${version}.tar.xz"; + url = "http://dukeworld.duke4.net/eduke32/synthesis/old/${year}/${version}/eduke32_src_${version}.tar.xz"; sha256 = "1nlq5jbglg00c1z1vsyl627fh0mqfxvk5qyxav5vzla2b4svik2v"; }; diff --git a/pkgs/games/keen4/default.nix b/pkgs/games/keen4/default.nix index 562df3ac1b6..64522e568db 100644 --- a/pkgs/games/keen4/default.nix +++ b/pkgs/games/keen4/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, dosbox, unzip}: +{ lib, stdenv, fetchurl, dosbox, unzip }: stdenv.mkDerivation { name = "keen4"; @@ -15,5 +15,7 @@ stdenv.mkDerivation { meta = { description = "Commander Keen Episode 4: Secret of the Oracle"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.eelco ]; }; } diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix index b666ac2ecca..c79c0680410 100644 --- a/pkgs/games/openra/default.nix +++ b/pkgs/games/openra/default.nix @@ -12,7 +12,6 @@ in stdenv.mkDerivation rec { homepage = "http://www.open-ra.org/"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/games/performous/default.nix b/pkgs/games/performous/default.nix index ff4f370f04a..faeb11c3781 100644 --- a/pkgs/games/performous/default.nix +++ b/pkgs/games/performous/default.nix @@ -11,7 +11,6 @@ stdenv.mkDerivation { homepage = "http://performous.org/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchFromGitHub { diff --git a/pkgs/games/rimshot/default.nix b/pkgs/games/rimshot/default.nix new file mode 100644 index 00000000000..ac6fdee1f6b --- /dev/null +++ b/pkgs/games/rimshot/default.nix @@ -0,0 +1,62 @@ +{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }: + +let + pname = "rimshot"; + version = "1.0"; + + icon = fetchurl { + url = "http://stabyourself.net/images/screenshots/rimshot-2.png"; + sha256 = "08fyiqym3gcpq2vgb5dvafkban42fsbzfcr3iiyw03hz99q53psd"; + }; + + desktopItem = makeDesktopItem { + name = "rimshot"; + exec = "${pname}"; + icon = "${icon}"; + comment = "Create your own music"; + desktopName = "Rimshot"; + genericName = "rimshot"; + categories = "Audio;AudioVideo;Music"; + }; + +in + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://stabyourself.net/dl.php?file=${pname}/${pname}-source.zip"; + sha256 = "08pdkyvki92549605m9bqnr24ipkbwkp5nkr5aagdqnr8ai4rgmi"; + }; + + nativeBuildInputs = [ makeWrapper unzip ]; + buildInputs = [ lua love ]; + + phases = [ "unpackPhase" "installPhase" ]; + + unpackPhase = '' + unzip -j $src + ''; + + installPhase = + '' + mkdir -p $out/bin + mkdir -p $out/share/games/lovegames + + cp -v ./*.love $out/share/games/lovegames/${pname}.love + makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love + + chmod +x $out/bin/${pname} + mkdir -p $out/share/applications + ln -s ${desktopItem}/share/applications/* $out/share/applications/ + ''; + + meta = with stdenv.lib; { + description = "Create your own music"; + maintainers = with maintainers; [ leenaars ]; + platforms = platforms.linux; + license = licenses.free; + downloadPage = http://stabyourself.net/rimshot/; + }; + +} diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index 0ec52cc5804..c4dc96a4c4d 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, nasm +{ stdenv, lib, fetchpatch, fetchFromGitHub, cmake, nasm , gtk2, glib, ffmpeg, alsaLib, libmad, libogg, libvorbis , glew, libpulseaudio }: @@ -27,6 +27,14 @@ stdenv.mkDerivation rec { "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" ]; + patches = [ + # Fix compilation on i686 + (fetchpatch { + url = "https://github.com/stepmania/stepmania/commit/f1e114aa03c90884946427bb43a75badec21f163.patch"; + sha256 = "1cm14w92dilqvlyqfffiihf09ra97hxzgfal5gx08brc3j1yyzdw"; + }) + ]; + postInstall = '' mkdir -p $out/bin ln -s $out/stepmania-5.0/stepmania $out/bin/stepmania diff --git a/pkgs/misc/drivers/epson_201207w/default.nix b/pkgs/misc/drivers/epson_201207w/default.nix new file mode 100644 index 00000000000..2a92f8a59d9 --- /dev/null +++ b/pkgs/misc/drivers/epson_201207w/default.nix @@ -0,0 +1,72 @@ +{ stdenv, fetchurl, rpmextract, autoreconfHook, file, libjpeg, cups }: + +let + version = "1.0.0"; +in + stdenv.mkDerivation { + + name = "epson_201207w-${version}"; + + src = fetchurl { + url = "https://download.ebz.epson.net/dsc/op/stable/SRPMS/epson-inkjet-printer-201207w-${version}-1lsb3.2.src.rpm"; + sha256 = "1ixnhn2dk83nh9v8sdivzgc2bm9z2phvsbx8bc6ainbjq6vn7lns"; + }; + + nativeBuildInputs = [ rpmextract autoreconfHook file ]; + + buildInputs = [ libjpeg cups ]; + + unpackPhase = '' + rpmextract $src + tar -zxf epson-inkjet-printer-201207w-${version}.tar.gz + tar -zxf epson-inkjet-printer-filter-${version}.tar.gz + for ppd in epson-inkjet-printer-201207w-${version}/ppds/*; do + substituteInPlace $ppd --replace "/opt/epson-inkjet-printer-201207w" "$out" + substituteInPlace $ppd --replace "/cups/lib" "/lib/cups" + done + cd epson-inkjet-printer-filter-${version} + ''; + + preConfigure = '' + chmod +x configure + export LDFLAGS="$LDFLAGS -Wl,--no-as-needed" + ''; + + postInstall = '' + cd ../epson-inkjet-printer-201207w-${version} + cp -a lib64 resource watermark $out + mkdir -p $out/share/cups/model/epson-inkjet-printer-201207w + cp -a ppds $out/share/cups/model/epson-inkjet-printer-201207w/ + cp -a Manual.txt $out/doc/ + cp -a README $out/doc/README.driver + ''; + + meta = with stdenv.lib; { + homepage = https://www.openprinting.org/driver/epson-201207w; + description = "Epson printer driver (L110, L210, L300, L350, L355, L550, L555)"; + longDescription = '' + This software is a filter program used with the Common UNIX Printing + System (CUPS) under Linux. It supplies high quality printing with + Seiko Epson Color Ink Jet Printers. + + List of printers supported by this package: + Epson L110 Series + Epson L210 Series + Epson L300 Series + Epson L350 Series + Epson L355 Series + Epson L550 Series + Epson L555 Series + + To use the driver adjust your configuration.nix file: + services.printing = { + enable = true; + drivers = [ pkgs.epson_201207w ]; + }; + ''; + license = with licenses; [ lgpl21 epson ]; + maintainers = [ maintainers.romildo ]; + platforms = [ "x86_64-linux" ]; + }; + + } diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 332357e317e..35a55a8933a 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -158,6 +158,18 @@ in buildPhase = "make"; }; + mednafen-psx = (mkLibRetroCore rec { + core = "mednafen-psx"; + src = fetchRetro { + repo = "beetle-psx-libretro"; + rev = "20c9b0eb0062b8768cc40aca0e2b2d626f1002a2"; + sha256 = "1dhql8zy9wv55m1lgvqv412087cqmlw7zwcsmxkl3r4z199dsh3m"; + }; + description = "Port of Mednafen's PSX Engine core to libretro"; + }).override { + buildPhase = "make"; + }; + mupen64plus = (mkLibRetroCore rec { core = "mupen64plus"; src = fetchRetro { diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index bdac2980a39..87fb854c844 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -1,7 +1,21 @@ -{ stdenv, fetchgit, pkgconfig, ffmpeg, mesa, nvidia_cg_toolkit +{ stdenv, fetchgit, makeDesktopItem, pkgconfig, ffmpeg, mesa, nvidia_cg_toolkit , freetype, libxml2, libv4l, coreutils, python34, which, udev, alsaLib , libX11, libXext, libXxf86vm, libXdmcp, SDL, libpulseaudio ? null }: +let + desktopItem = makeDesktopItem { + name = "retroarch"; + exec = "retroarch"; + icon = "retroarch"; + comment = "Multi-Engine Platform"; + desktopName = "RetroArch"; + genericName = "Libretro Frontend"; + categories = "Game;Emulator;"; + #keywords = "multi;engine;emulator;xmb;"; + }; + +in + stdenv.mkDerivation rec { name = "retroarch-bare-${version}"; version = "2015-11-20"; @@ -20,6 +34,14 @@ stdenv.mkDerivation rec { sed -e 's#/bin/true#${coreutils}/bin/true#' -i qb/qb.libs.sh ''; + postInstall = '' + mkdir -p $out/share/icons/hicolor/scalable/apps + cp -p -T ./media/retroarch.svg $out/share/icons/hicolor/scalable/apps/retroarch.svg + + mkdir -p "$out/share/applications" + cp ${desktopItem}/share/applications/* $out/share/applications + ''; + enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/misc/emulators/retroarch/wrapper.nix b/pkgs/misc/emulators/retroarch/wrapper.nix index f7e903ef529..e6eb930695a 100644 --- a/pkgs/misc/emulators/retroarch/wrapper.nix +++ b/pkgs/misc/emulators/retroarch/wrapper.nix @@ -18,6 +18,9 @@ stdenv.mkDerivation { do $(ln -s $coreDir/*.so $out/lib/.) done) + + ln -s -t $out ${retroarch}/share + makeWrapper ${retroarch}/bin/retroarch $out/bin/retroarch \ --suffix-each LD_LIBRARY_PATH ':' "$cores" \ --add-flags "-L $out/lib/ --menu" \ diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index ce7813b237c..5e94f6f7771 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -88,6 +88,7 @@ mkDerivation { -e '1i initialPath="${toString initialPath}"' \ "$setupNew" > "$s" cat >> "$out/dev-envs/''${name/env-/}" << EOF + defaultNativeBuildInputs="$defaultNativeBuildInputs" nativeBuildInputs="$nativeBuildInputs" propagatedBuildInputs="$propagatedBuildInputs2" # the setup-new script wants to write some data to a temp file.. so just let it do that and tidy up afterwards diff --git a/pkgs/misc/my-env/loadenv.sh b/pkgs/misc/my-env/loadenv.sh index 2a990e8685c..816c1b8a711 100644 --- a/pkgs/misc/my-env/loadenv.sh +++ b/pkgs/misc/my-env/loadenv.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!@shell@ OLDPATH="$PATH" OLDTZ="$TZ" diff --git a/pkgs/misc/themes/mate-icon-theme/default.nix b/pkgs/misc/themes/mate-icon-theme/default.nix index ba732c6521f..6749b5e4c39 100644 --- a/pkgs/misc/themes/mate-icon-theme/default.nix +++ b/pkgs/misc/themes/mate-icon-theme/default.nix @@ -15,6 +15,5 @@ stdenv.mkDerivation { homepage = "http://mate-desktop.org"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; } diff --git a/pkgs/misc/themes/mate-themes/default.nix b/pkgs/misc/themes/mate-themes/default.nix index f7559ee2126..5c69bd78ed7 100644 --- a/pkgs/misc/themes/mate-themes/default.nix +++ b/pkgs/misc/themes/mate-themes/default.nix @@ -15,6 +15,5 @@ stdenv.mkDerivation { homepage = "http://mate-desktop.org"; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; } diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index c61947fc8f7..f1e64a8e6f3 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -163,11 +163,11 @@ rec { }; Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2016-02-20"; + name = "Syntastic-2016-03-08"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "8f97e64c78e9ade6cf09fc5d5446f5d2a8deaa35"; - sha256 = "1xxmcr5r0cf2nyp2c2dfxm38x4c19dmax1g2m4clnys5dak7lsdd"; + rev = "0f82191a74328ecb618ac74735645fbd1c36d9a1"; + sha256 = "1arai7blnicp28l6z92xzvvrwrblwg0z26lbr92nch4cpzsf1pzq"; }; dependencies = []; @@ -311,11 +311,11 @@ rec { }; fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-2016-02-24"; + name = "fugitive-2016-03-05"; src = fetchgit { url = "git://github.com/tpope/vim-fugitive"; - rev = "008b9570860f552534109b4f618cf2ddd145eeb4"; - sha256 = "0nj6airs00q3f1ly29k0nk3ypznzsylqm8n0wakllg86qic4xjlr"; + rev = "099d65826e0e0863552a92f7e574e3f24c8f4197"; + sha256 = "05ych7091gi1r22n8jkw2hxjyghcmbk0w227311ar3flgar6s197"; }; dependencies = []; @@ -332,6 +332,17 @@ rec { }; + vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-autoformat-2016-02-29"; + src = fetchgit { + url = "git://github.com/Chiel92/vim-autoformat"; + rev = "36282560c3514453ac2db4d96085e6b6cfdc7a49"; + sha256 = "1ppdy56i7l60x9jd346qqmv3pdx5k2w64gmxl5ah5qvgw2qcaz02"; + }; + dependencies = []; + + }; + vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-nix-2015-12-10"; src = fetchgit { @@ -343,23 +354,12 @@ rec { }; - vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-autoformat-2016-02-24"; - src = fetchgit { - url = "git://github.com/Chiel92/vim-autoformat"; - rev = "a2f9b88bcd66fe47a44ae8b5e1002c2d8e6f4ad4"; - sha256 = "1fahm3dzcmpr7f9rrhzhyrj6fz95fblxal57gajcc3g136bizbnj"; - }; - dependencies = []; - - }; - vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-css-color-2015-10-03"; + name = "vim-css-color-2016-03-07"; src = fetchgit { url = "git://github.com/ap/vim-css-color"; - rev = "7ad79c7b77bd83296d7a10e596860d9269070207"; - sha256 = "020phzw0pnsjsjx9l1ry5xbrjpspagmvifl3h00hqllxmpfx2smx"; + rev = "81ce9558b0f5c8f0b015042415566f02360c67d0"; + sha256 = "04if4ch5db7lkh0swb9rwqpqzk2k8kkc6aszy4bvqg08irk4lqsi"; }; dependencies = []; @@ -399,11 +399,11 @@ rec { }; ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-vim-2016-01-18"; + name = "ctrlp-vim-2016-03-09"; src = fetchgit { url = "git://github.com/ctrlpvim/ctrlp.vim"; - rev = "7f74368d85bb521951dd58123349ce66b947d058"; - sha256 = "0csz2624zw9p22gzlkf3dk24s9p2z1h1cgif3lmfgkswhhvi3kgy"; + rev = "0853394bee04fef74d96e536985765ea16c61b27"; + sha256 = "1ylh978kh6c6hznp20db9dmx4q6xmgb98j6lj227blc2936pg5fx"; }; dependencies = []; @@ -421,11 +421,11 @@ rec { }; neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-ghc-2016-02-13"; + name = "neco-ghc-2016-03-04"; src = fetchgit { url = "git://github.com/eagletmt/neco-ghc"; - rev = "a7b3dc018dff0cbe033c4c3939e1bd777f023083"; - sha256 = "0f48y8fnh9wp1iyq8w7sqzsw3vqm348vqs4p81nwnmwnhgpzxfri"; + rev = "df959a20468c2f455b599d1d21de8d2c4334c7aa"; + sha256 = "16gnrg8sa5d3w1lg0bsx24cbvyb9pfgkm67rgnxr39g8b9h9pr09"; }; dependencies = []; @@ -443,22 +443,22 @@ rec { }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2016-02-25"; + name = "vim-go-2016-03-03"; src = fetchgit { url = "git://github.com/fatih/vim-go"; - rev = "c264aec72eac21f868fdfff2aef67b9ca21aab74"; - sha256 = "1yld56l4bl17r9s1rn72fqfkrjpm96n4wx3qv9hk5vd0yn0nw7y1"; + rev = "fd5661a1e16a1fd41385d7011877bfa1f0a1353f"; + sha256 = "1ps6hmzad0pmr8amk5knhrmc7giww7586pr2j36f6h60wzjvxgnn"; }; dependencies = []; }; vim-colorschemes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-colorschemes-2015-07-25"; + name = "vim-colorschemes-2016-03-09"; src = fetchgit { url = "git://github.com/flazz/vim-colorschemes"; - rev = "28a989b28457e38df620e4c7ab23e224aff70efe"; - sha256 = "1r9nmlw6ranl5xc3cx0knkmq90rcp6vlmrg2xib35h2dldsch22k"; + rev = "93593970393b0b14d9ee1ac963bea8db2ae30481"; + sha256 = "1wq4pzfgd8scx8slmaz3l3ab9hsp286v6rydhw8ydp7wwi6ixpnr"; }; dependencies = []; @@ -476,11 +476,11 @@ rec { }; calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "calendar-vim-2016-01-19"; + name = "calendar-vim-2016-03-06"; src = fetchgit { url = "git://github.com/itchyny/calendar.vim"; - rev = "2a6c13ee8056fe5b82ce6529f426ed63096dc6bc"; - sha256 = "164xzzhavf852vz17y9sfmajzz574hgkjpp3x2w4w9a2gklvca42"; + rev = "b2bbf257fbcb71a7854daaa99aa8cd7f15709df5"; + sha256 = "1w1w8s90l0hs65sp69a7w6wq63281lpksn459zy21i7zhflnl57l"; }; dependencies = []; @@ -586,11 +586,11 @@ rec { }; vim-peekaboo = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-peekaboo-2015-07-16"; + name = "vim-peekaboo-2016-02-29"; src = fetchgit { url = "git://github.com/junegunn/vim-peekaboo"; - rev = "b14a7496897bb0a520bed4f519ca79a683bafeec"; - sha256 = "1hz8iaw6xj2s6v9raxam5zn2qj3p207pnvjjlgc5lfbi8bp44vwj"; + rev = "111c4bacbe5216022d56489c366bf4ce985506e9"; + sha256 = "0pblcxb467n4nxkvmb8sl8765nmz17h74hs5dy5dnmaxiy55v0d9"; }; dependencies = []; @@ -630,11 +630,11 @@ rec { }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2016-02-23"; + name = "vimtex-2016-03-08"; src = fetchgit { url = "git://github.com/lervag/vimtex"; - rev = "ec5e0df3607de6bf6562e60d4fe2759519e9f9a7"; - sha256 = "0ld27rr5lnqzlhqpjrkgvrgs7h1hdsrwswkg7whynw83vilal8bd"; + rev = "4ecf478faf24158839e0b6fcf4fd301a9128103e"; + sha256 = "04vb121c109h02393z7hr1kiy2bc02aa8lqfwwh57wx7mzxjsfs5"; }; dependencies = []; @@ -667,11 +667,11 @@ rec { }; vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2016-02-15"; + name = "vim-startify-2016-03-07"; src = fetchgit { url = "git://github.com/mhinz/vim-startify"; - rev = "23e043cc828b76524edc09f7dd091753dd1c7f12"; - sha256 = "0cplcpl9a2nhnmnh1h13pxf3hg823frhjmdxssyk35snf6ycgm24"; + rev = "193e0802ecde996a00ed58248d17a0e99ab077af"; + sha256 = "1zkqxhvc1cvsdgk5il38fxjcgds3x1fql2fjfn8v72rna1075xks"; }; dependencies = []; @@ -722,66 +722,66 @@ rec { }; vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-racer-2016-02-02"; + name = "vim-racer-2016-03-09"; src = fetchgit { url = "git://github.com/racer-rust/vim-racer"; - rev = "ec26ab4ca71a5a805339e1243a691c9f6472eeaa"; - sha256 = "0c70s1dymvp4ji81z2302j2dzl7z8sndvzpf2dwwl14fwlar52db"; + rev = "263d3f48ff96c0e8f347f660f97edca13ea36405"; + sha256 = "0aak5jhzps173k52ql6isdwhjhmp69bnzzjrqjqnriyy0xay2d38"; }; dependencies = []; }; neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neocomplete-vim-2016-02-20"; + name = "neocomplete-vim-2016-03-01"; src = fetchgit { url = "git://github.com/shougo/neocomplete.vim"; - rev = "fe8aa93a8a6030af3d208f2ecc92096cb3d52693"; - sha256 = "12lxb64jnjgppadli4g388cmf3mg5addkml03xmb94vpyf65cprx"; + rev = "a21f22f19d6dbd0fb0d58b555c186138c4c9cfc9"; + sha256 = "1kqg747s3pw6gc8g6h3s3bcsc3vjn00gav29zms6hpywiz6x931x"; }; dependencies = []; }; neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-snippets-2016-02-15"; + name = "neosnippet-snippets-2016-03-05"; src = fetchgit { url = "git://github.com/shougo/neosnippet-snippets"; - rev = "4e7b0a3962742eccaae298100e23e599d384ea67"; - sha256 = "1299wjmwc82x9z6jcy8332lk6jwnjhizgqzg9jf57704n312py8v"; + rev = "65810a15db3f09384d62ddcd42d9f97dcb96dde9"; + sha256 = "1zqw8mkljzq5mknridxp77gwfbhn2wrz8czhjlgg8k4q8alyziqp"; }; dependencies = []; }; neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-vim-2016-02-24"; + name = "neosnippet-vim-2016-03-05"; src = fetchgit { url = "git://github.com/shougo/neosnippet.vim"; - rev = "e908126f402c4c0f4ff6b21c9dd0e5349f39e585"; - sha256 = "09r0b199fk4m5zvc1f1x2lwyapxhaws1lvvm69jjwp1x4vhfdvjv"; + rev = "bcb7620a852a542d0940a2ff691deb9da9309f07"; + sha256 = "06f6flbv4zbdckjxchfwhm36syma6bzywassrf7hachnsx0s3ys3"; }; dependencies = []; }; unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "unite-vim-2016-02-25"; + name = "unite-vim-2016-03-06"; src = fetchgit { url = "git://github.com/shougo/unite.vim"; - rev = "65dffd7a27d9cbb0e026621c59d4ccc6073202bf"; - sha256 = "0m57f4kb8vh8z804qsahn94d3rcaqianpxfb3d0cd2d7v1cbgm71"; + rev = "c9d2ced6b993653a7ebbc572039f8d03ba2b997f"; + sha256 = "1b444a6zls7n321s03cljzv35id2rhp3aflpngyxk6l3j3ml2shx"; }; dependencies = []; }; vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimproc-vim-2016-02-16"; + name = "vimproc-vim-2016-03-09"; src = fetchgit { url = "git://github.com/shougo/vimproc.vim"; - rev = "78cbb5c683026085de133f160929ccc56a6b203a"; - sha256 = "0hw6ghldrg9zvnkh3j9r9ldi1lzhda71gd630zj09wlaz70x60nj"; + rev = "3ab0a236e65b277670266c1187da9a49064c1500"; + sha256 = "0vwrlds6dhvrq2sv2g2041cw1jx3c3snsv5pnlnma3nflxpxvry0"; }; dependencies = []; buildInputs = [ which ]; @@ -796,11 +796,11 @@ rec { }; vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimshell-vim-2016-02-18"; + name = "vimshell-vim-2016-03-05"; src = fetchgit { url = "git://github.com/shougo/vimshell.vim"; - rev = "f51ad1e3b4a897f32bb7ca0382f8fb25519e0d11"; - sha256 = "17zk2sm9n7cyhf92613vpqgaq74z4x61p4pxvvl25fc44bsddndf"; + rev = "ce19571a937c9cfa9d5c993c9c06c1457376759e"; + sha256 = "03fvzi4dlg7irljywy1kikkvq4sd4rnvvf8ji2pv68dl8s3zwmr2"; }; dependencies = [ "vimproc-vim" ]; }; @@ -883,11 +883,11 @@ rec { }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2016-02-25"; + name = "youcompleteme-2016-03-08"; src = fetchgit { url = "git://github.com/valloric/youcompleteme"; - rev = "35f6090b7661989518d64451ea4effa376fcb795"; - sha256 = "1n8wzsbw4saawpjmacw7kvk5mhcxckik0sw8zdpbp885812ly5wi"; + rev = "381b2132719a959f41e57ec0e6396fc1c3b6daf4"; + sha256 = "1gski3s1960pmxisyq85awda0a3kb22ji9y76f67k1a4smy5q9xa"; }; dependencies = []; buildInputs = [ @@ -930,11 +930,11 @@ rec { }; vim-pandoc-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-syntax-2016-02-22"; + name = "vim-pandoc-syntax-2016-03-08"; src = fetchgit { url = "git://github.com/vim-pandoc/vim-pandoc-syntax"; - rev = "c9f4eb129881fa48b82c181c84a77ec5ceacb6f6"; - sha256 = "117zl8fpzd34895f0i05zc8zx0jsdald0j2wb12yrhsxiw97fwlq"; + rev = "a7783e5834008c4bec3f38b78bd2e48e113c9d4c"; + sha256 = "0hzgnyjscljylgv4ss5w1hfff1mdl4kdpl0gm7yrl964rlifcgzg"; }; dependencies = []; @@ -1018,22 +1018,22 @@ rec { }; vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wakatime-2016-01-11"; + name = "vim-wakatime-2016-03-06"; src = fetchgit { url = "git://github.com/wakatime/vim-wakatime"; - rev = "91262cb3c04fe4d98ecdffe8da2197537c66359c"; - sha256 = "0h25j6gzkiwlik2zp4h2k3wp7away1n63cnqrq5vnxfm6ax42blr"; + rev = "115b02198233745c86ef453b5cf5f8fc2d493ae0"; + sha256 = "1jbwjg3fk59dkz6f7x8cyqgxh1cg0a3qy3aj7abg4k2aip67101y"; }; dependencies = []; buildInputs = [ python ]; }; command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "command-t-2016-02-09"; + name = "command-t-2016-03-09"; src = fetchgit { url = "git://github.com/wincent/command-t"; - rev = "4c7f02c5a9020bbbd498f643abfb059048388707"; - sha256 = "1ij3zkc29zn03kw82c6zv8sbhx3ma3m39fgy9c29419brspzg1r5"; + rev = "9740c9cd318d4e004f330358c76a27948dc5779e"; + sha256 = "0wb6wabd758xzh722d2vs3hrx77gf2sh24g9fnrzj4hwwglrld1s"; }; dependencies = []; buildInputs = [ perl ruby ]; @@ -1145,11 +1145,11 @@ rec { }; snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "snipmate-2015-10-27"; + name = "snipmate-2016-03-01"; src = fetchgit { url = "git://github.com/garbas/vim-snipmate"; - rev = "7f91de39088138491e40a35a855adb70677b02d3"; - sha256 = "0cv6xh0crnrp9qpnkxqnim0lygd96s3hgfsgh4317z4nsjx0piz8"; + rev = "71250b0ef2b03b40ded5e93f4abe66fc2ee4aa75"; + sha256 = "0nzpk9h31m73anb16hj19mp8q9ccq8aqgck482alxapgf1g0mzli"; }; dependencies = ["vim-addon-mw-utils" "tlib"]; @@ -1441,11 +1441,11 @@ rec { }; vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2016-02-25"; + name = "vim-airline-2016-03-08"; src = fetchgit { url = "git://github.com/bling/vim-airline"; - rev = "5cf193fa28d0c6f0f93fd1b481ba4845eac9a1ac"; - sha256 = "1dgh9xs4rhziayl18nrknvgjnx8ll5pw4xcy43wrcr7icnmddgrw"; + rev = "4395405628534b2c7f9c4be2bdba03315241393c"; + sha256 = "1fgq9jjdlmrak663iw7xbx348l7zz5jsx477n7l3s338wj4h9bsb"; }; dependencies = []; @@ -1463,33 +1463,33 @@ rec { }; vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easy-align-2016-02-05"; + name = "vim-easy-align-2016-03-06"; src = fetchgit { url = "git://github.com/junegunn/vim-easy-align"; - rev = "dd98d0a8957b7d43ac84be3318bbc950bc9ed467"; - sha256 = "1hdfcg07p4xvd5aa7hqmjg2zf6cmlrp4maid7qc4l0xcfx6wx4j1"; + rev = "0cb6b98fc155717b0a56c110551ac57d1d951ddb"; + sha256 = "089c4grk24albishgxdskb1zsvxbzlp2yq1baf0vy6cryxwm8ykq"; }; dependencies = []; }; vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gista-2016-02-22"; + name = "vim-gista-2016-03-02"; src = fetchgit { url = "git://github.com/lambdalisue/vim-gista"; - rev = "d4da4b6f53a93ebadc7c1dcc4e82836f96c706c9"; - sha256 = "19786fr2m44krq7l62j3h39ayl6a04474s2mkbv8szkg8jb4syzq"; + rev = "9b6719242c0dfbb8b01a49b8765fc8dfeb022118"; + sha256 = "0kl1f2w8pvmx3jkiwq2ygrdq9yccxnh9kl0fwjwjp5gqhhw0d2vp"; }; dependencies = []; }; vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2016-02-21"; + name = "vim-gitgutter-2016-03-07"; src = fetchgit { url = "git://github.com/airblade/vim-gitgutter"; - rev = "0af9f2a3ab029054d279f69364351e95e107008a"; - sha256 = "0kqj50sha1i1jsm9mirx6jn7kpdm0zl60n0zc3rh8z1zsjic0mqr"; + rev = "28353bd0609ae7b8c7e01c70dce31700d8c6e654"; + sha256 = "04dmbqpmk3da3wnklzv3ws0r3fjd55yc8z2j5f695x60f2cab8qz"; }; dependencies = []; @@ -1529,44 +1529,44 @@ rec { }; vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signature-2016-02-22"; + name = "vim-signature-2016-03-03"; src = fetchgit { url = "git://github.com/kshenoy/vim-signature"; - rev = "8b7b40041f938092d3cb5c5db33fec54c41a1854"; - sha256 = "0qqc785r84g1ckxyds0zmf881wslsfa1cmpcx35jwcyjwdaya0a6"; + rev = "85b22e21ad4276c54d557ac640e1d32b2b4e6b5e"; + sha256 = "1rygsgahcf9lbi0ddk3f2srda3mlmhnwpal842bms60crj9jimxk"; }; dependencies = []; }; vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signify-2016-02-25"; + name = "vim-signify-2016-03-03"; src = fetchgit { url = "git://github.com/mhinz/vim-signify"; - rev = "051dc1a853cb86231497c58a5c06dc82a17837ca"; - sha256 = "0iy03qxv9m301pqa495ydacx072pa1jwdqgk50dpd1z6711cdh44"; + rev = "a02c8793bfda7ddd386587c64246bec6aa78ff62"; + sha256 = "0lv37z8zcwz3fvlc6qjg8nbmgqkall776w46ifps51pn03qwp91d"; }; dependencies = []; }; vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2016-02-19"; + name = "vim-snippets-2016-03-09"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "732978ab1622c8d6fdf0384cd3b524e3fe7ba5f3"; - sha256 = "0i7jr48vwazdy3bm9y2wa0y5ay1rhp91dpi5kqgs06na85qvhsiz"; + rev = "743be1a6e0c93e84a7ae6bc7066bf6ed358b5fbe"; + sha256 = "0p0ld2m0mka5kq324vs0k3m7ffpvjg7kjh5vdqz9cm0ajmw3aa8p"; }; dependencies = []; }; vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-webdevicons-2016-02-08"; + name = "vim-webdevicons-2016-03-04"; src = fetchgit { url = "git://github.com/ryanoasis/vim-devicons"; - rev = "d0111ec77c3d7e3e3072e576bb26055643e64a2f"; - sha256 = "1lhycam07licxkf8isl641mwd64i2x8kjqqvzxndhr26incs9pv2"; + rev = "f8841e2bd46e9fed95c0389190e3ef1b6ba77440"; + sha256 = "0f0fxn7pck9k642sgmv0y68qi0hqnw46pl919c2sq542da7g4k0p"; }; dependencies = []; @@ -1606,11 +1606,11 @@ rec { }; vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vundle-2016-02-21"; + name = "vundle-2016-02-26"; src = fetchgit { url = "git://github.com/gmarik/vundle"; - rev = "8a054139a3623739321303cf06c09b0f9874dc0d"; - sha256 = "0hhjnp9i0glfa5fdfg9n9286zdfvfmdx1ln9ayfr8kmm9nwy24gp"; + rev = "4984767509e3d05ca051e253c8a8b37de784be45"; + sha256 = "0n2k3ip81yfx00ch45nqiwayhz8qxmwg5s34a4k5snapzcxcm2fn"; }; dependencies = []; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 4d875d15d48..dc0b061af14 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -17,6 +17,11 @@ in stdenv.mkDerivation { cp -R boot/* $out/share/raspberrypi/boot cp -R hardfp/opt/vc/* $out cp opt/vc/LICENCE $out/share/raspberrypi + + for f in $out/bin/*; do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" + patchelf --set-rpath "$out/lib" "$f" + done ''; meta = { diff --git a/pkgs/os-specific/linux/htop/default.nix b/pkgs/os-specific/linux/htop/default.nix index b722815f295..946b44346ab 100644 --- a/pkgs/os-specific/linux/htop/default.nix +++ b/pkgs/os-specific/linux/htop/default.nix @@ -1,26 +1,21 @@ -{ fetchFromGitHub, stdenv, autoreconfHook, ncurses }: +{ fetchurl, stdenv, ncurses }: stdenv.mkDerivation rec { - name = "htop-2.0.0"; + name = "htop-${version}"; + version = "2.0.1"; - src = fetchFromGitHub { - sha256 = "1z8rzf3ndswk3090qypl0bqzq9f32w0ik2k5x4zd7jg4hkx66k7z"; - rev = "2.0.0"; - repo = "htop"; - owner = "hishamhm"; + src = fetchurl { + sha256 = "0rjn9ybqx5sav7z4gn18f1q6k23nmqyb6yydfgghzdznz9nn447l"; + url = "http://hisham.hm/htop/releases/${version}/${name}.tar.gz"; }; buildInputs = [ ncurses ]; - nativeBuildInputs = [ autoreconfHook ]; - postPatch = '' - touch *.h */*.h # unnecessary regeneration requires Python - ''; - - meta = { + meta = with stdenv.lib; { description = "An interactive process viewer for Linux"; - homepage = "http://htop.sourceforge.net"; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ rob simons relrod ]; + homepage = http://htop.sourceforge.net; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ rob simons relrod nckx ]; }; } diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 254910cf842..f3dd32386bc 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -478,7 +478,9 @@ with stdenv.lib; ''} ${optionalString (versionAtLeast version "3.7") '' MEDIA_USB_SUPPORT y - MEDIA_PCI_SUPPORT y + ${optionalString (!(features.chromiumos or false)) '' + MEDIA_PCI_SUPPORT y + ''} ''} # Our initrd init uses shebang scripts, so can't be modular. diff --git a/pkgs/os-specific/linux/kernel/grsec-path.patch b/pkgs/os-specific/linux/kernel/grsecurity-path-3.14.patch similarity index 100% rename from pkgs/os-specific/linux/kernel/grsec-path.patch rename to pkgs/os-specific/linux/kernel/grsecurity-path-3.14.patch diff --git a/pkgs/os-specific/linux/kernel/grsecurity-path-4.4.patch b/pkgs/os-specific/linux/kernel/grsecurity-path-4.4.patch new file mode 100644 index 00000000000..bef1a75c23d --- /dev/null +++ b/pkgs/os-specific/linux/kernel/grsecurity-path-4.4.patch @@ -0,0 +1,18 @@ +diff --git a/kernel/kmod.c b/kernel/kmod.c +index a689506..30747b4 100644 +--- a/kernel/kmod.c ++++ b/kernel/kmod.c +@@ -294,11 +294,8 @@ static int ____call_usermodehelper(void *data) + out the path to be used prior to this point and are now operating + on that copy + */ +- if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) && +- strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) && +- strncmp(sub_info->path, "/usr/libexec/", 13) && strncmp(sub_info->path, "/usr/bin/", 9) && +- strncmp(sub_info->path, "/usr/sbin/", 10) && +- strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) { ++ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/nix/store/", 11) && ++ strncmp(sub_info->path, "/run/current-system/systemd/lib/", 32)) || strstr(sub_info->path, "..")) { + printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of permitted system paths\n", sub_info->path); + retval = -EPERM; + goto out; diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 6819dfedb13..36181308a8b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.4"; + version = "4.4.5"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0b4190mwmxf329n16yl32my7dfi02pi7qf39a8v61sl9b2gxffad"; + sha256 = "1daavrj2msl85aijh1izfm1cwf14c7mi75hldzidr1h2v629l89h"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity-3.14.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity-3.14.nix new file mode 100644 index 00000000000..a67a91b4d0c --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity-3.14.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, perl, buildLinux, ... } @ args: + +import ./generic.nix (args // rec { + version = "3.14.51"; + extraMeta.branch = "3.14"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "1gqsd69cqijff4c4br4ydmcjl226d0yy6vrmgfvy16xiraavq1mk"; + }; + + kernelPatches = args.kernelPatches; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity-4.1.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity-4.1.nix new file mode 100644 index 00000000000..4359f4586c5 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity-4.1.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, perl, buildLinux, ... } @ args: + +import ./generic.nix (args // rec { + version = "4.1.7"; + extraMeta.branch = "4.1"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "0g1dnvak0pd03d4miy1025bw64wq71w29a058dzspdr6jcf9qwbn"; + }; + + kernelPatches = args.kernelPatches; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity-4.4.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity-4.4.nix new file mode 100644 index 00000000000..36181308a8b --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity-4.4.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, perl, buildLinux, ... } @ args: + +import ./generic.nix (args // rec { + version = "4.4.5"; + extraMeta.branch = "4.4"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "1daavrj2msl85aijh1izfm1cwf14c7mi75hldzidr1h2v629l89h"; + }; + + kernelPatches = args.kernelPatches; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 3f7afd90322..67f6ad9c94a 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, pkgs }: let @@ -18,11 +18,14 @@ let }; }; - grsecPatch = { grversion ? "3.1", kversion, revision, branch, sha256 }: + grsecPatch = { grversion ? "3.1", kernel, patches, kversion, revision, branch ? "test", sha256 }: + assert kversion == kernel.version; { name = "grsecurity-${grversion}-${kversion}"; - inherit grversion kversion revision; + inherit grversion kernel patches kversion revision; patch = fetchurl { - url = "https://github.com/slashbeast/grsecurity-scrape/blob/master/${branch}/grsecurity-${grversion}-${kversion}-${revision}.patch?raw=true"; + url = if branch == "stable" + then "https://github.com/kdave/grsecurity-patches/blob/master/grsecurity_patches/grsecurity-${grversion}-${kversion}-${revision}.patch?raw=true" + else "https://github.com/slashbeast/grsecurity-scrape/blob/master/${branch}/grsecurity-${grversion}-${kversion}-${revision}.patch?raw=true"; inherit sha256; }; features.grsecurity = true; @@ -79,23 +82,41 @@ rec { sha256 = "00b1rqgd4yr206dxp4mcymr56ymbjcjfa4m82pxw73khj032qw3j"; }; - grsecurity_stable = grsecPatch - { kversion = "3.14.51"; + grsecurity_3_14 = grsecPatch + { kernel = pkgs.grsecurity_base_linux_3_14; + patches = [ grsecurity_fix_path_3_14 ]; + kversion = "3.14.51"; revision = "201508181951"; branch = "stable"; sha256 = "1sp1gwa7ahzflq7ayb51bg52abrn5zx1hb3pff3axpjqq7vfai6f"; }; - grsecurity_unstable = grsecPatch - { kversion = "4.3.4"; - revision = "201601231215"; - branch = "test"; - sha256 = "1dacld4zlp8mk6ykc0f1v5crppvq3znbdw9rwfrf6qi90984x0mr"; + grsecurity_4_1 = grsecPatch + { kernel = pkgs.grsecurity_base_linux_4_1; + patches = [ grsecurity_fix_path_3_14 ]; + kversion = "4.1.7"; + revision = "201509201149"; + sha256 = "1agv8c3c4vmh5algbzmrq2f6vwk72rikrlcbm4h7jbrb9js6fxk4"; }; - grsec_fix_path = - { name = "grsec-fix-path"; - patch = ./grsec-path.patch; + grsecurity_4_4 = grsecPatch + { kernel = pkgs.grsecurity_base_linux_4_4; + patches = [ grsecurity_fix_path_4_4 ]; + kversion = "4.4.5"; + revision = "201603131305"; + sha256 = "04k4nhshl6r5n41ha5620s7cd70dmmmvyf9mnn5359jr1720kxpf"; + }; + + grsecurity_latest = grsecurity_4_4; + + grsecurity_fix_path_3_14 = + { name = "grsecurity-fix-path-3.14"; + patch = ./grsecurity-path-3.14.patch; + }; + + grsecurity_fix_path_4_4 = + { name = "grsecurity-fix-path-4.4"; + patch = ./grsecurity-path-4.4.patch; }; crc_regression = diff --git a/pkgs/os-specific/linux/macchanger/default.nix b/pkgs/os-specific/linux/macchanger/default.nix index b6ae89afbaf..c335031f2e5 100644 --- a/pkgs/os-specific/linux/macchanger/default.nix +++ b/pkgs/os-specific/linux/macchanger/default.nix @@ -1,12 +1,8 @@ { stdenv, fetchFromGitHub, autoreconfHook, texinfo }: -let - pname = "macchanger"; - version = "1.7.0"; -in - stdenv.mkDerivation rec { - name = "${pname}-${version}"; + name = "macchanger-${version}"; + version = "1.7.0"; src = fetchFromGitHub { owner = "alobbs"; @@ -15,13 +11,15 @@ stdenv.mkDerivation rec { sha256 = "1hypx6sxhd2b1nsxj314hpkhj7q4x9p2kfaaf20rjkkkig0nck9r"; }; - buildInputs = [ autoreconfHook texinfo ]; + nativeBuildInputs = [ autoreconfHook texinfo ]; - meta = { + outputs = [ "out" "info" ]; + + meta = with stdenv.lib; { description = "A utility for viewing/manipulating the MAC address of network interfaces"; - maintainers = [ stdenv.lib.maintainers.joachifm ]; - license = stdenv.lib.licenses.gpl2Plus; - homepage = "https://www.gnu.org/software/macchanger"; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ joachifm ]; + license = licenses.gpl2Plus; + homepage = https://www.gnu.org/software/macchanger; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/mba6x_bl/default.nix b/pkgs/os-specific/linux/mba6x_bl/default.nix new file mode 100644 index 00000000000..010bda4bb15 --- /dev/null +++ b/pkgs/os-specific/linux/mba6x_bl/default.nix @@ -0,0 +1,32 @@ +{ fetchFromGitHub, kernel, stdenv }: + +with stdenv.lib; + +let pkgName = "mba6x_bl"; +in + +stdenv.mkDerivation rec { + name = "${pkgName}-2016-02-12"; + + src = fetchFromGitHub { + owner = "patjak"; + repo = pkgName; + rev = "9c2de8a24e7d4e8506170a19d32d6f11f380a142"; + sha256 = "1zaypai8lznqcaszb6an643amsvr5qjnqj6aq6jkr0qk37x0fjff"; + }; + + enableParallelBuilding = true; + + makeFlags = [ + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "INSTALL_MOD_PATH=$(out)" + ]; + + meta = { + description = "MacBook Air 6,1 and 6,2 (mid 2013) backlight driver"; + homepage = "https://github.com/patjak/mba6x_bl"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.simonvandel ]; + }; +} diff --git a/pkgs/os-specific/linux/nvidia-x11/beta.nix b/pkgs/os-specific/linux/nvidia-x11/beta.nix index d3111a4f75a..d53d5e19d40 100644 --- a/pkgs/os-specific/linux/nvidia-x11/beta.nix +++ b/pkgs/os-specific/linux/nvidia-x11/beta.nix @@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null; let - versionNumber = "349.12"; + versionNumber = "361.18"; # Policy: use the highest stable version as the default (on our master). inherit (stdenv.lib) makeLibraryPath; @@ -27,13 +27,13 @@ stdenv.mkDerivation { src = if stdenv.system == "i686-linux" then fetchurl { - url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "0x9zfw66nxv98zpkdkymlyqzspksk850bhfmza7g7pba4yba085h"; + url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; + sha256 = "1n6nrz59r3dgcpkcpr4yw997fygkpsdbv1x45c30w781w0j1q5s5"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "19mfkigzffxsik3h4bsjsl481q410h804fz3rdc7chs86q4bg9h3"; + url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; + sha256 = "12fi7vb697h38qh0f2j40q76yx9fqk6vwx20zfxhac3fvdhw2sj0"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index c1f165c45dd..09c104f09e7 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -19,7 +19,7 @@ buildPhase() { sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source) sysOut=$(echo $kernel/lib/modules/$kernelVersion/build) unset src # used by the nv makefile - make SYSSRC=$sysSrc SYSOUT=$sysOut module + make SYSSRC=$sysSrc SYSOUT=$sysOut module "-j${NIX_BUILD_CORES}" "-l${NIX_BUILD_CORES}" cd .. fi @@ -34,6 +34,14 @@ installPhase() { cp -prd *.so.* tls "$out/lib/" rm "$out"/lib/lib{glx,nvidia-wfb}.so.* # handled separately + # According to nvidia, we're supposed to use GLVND. + # But so far I've failed to make any applications run using that stack. + # + # If you want to try it, swap the two lines below. + + #rm "$out"/lib/libGL.so.${versionNumber} # Non-GLVND + rm $out/lib/libGL.so.1.* # GLVND + if test -z "$libsOnly"; then # Install the X drivers. mkdir -p $out/lib/xorg/modules @@ -61,7 +69,7 @@ installPhase() { libname_short=`echo -n "$libname" | sed 's/so\..*/so/'` # nvidia's EGL stack seems to expect libGLESv2.so.2 to be available - if [ $(basename "$libname_short") == "libGLESv2.so" ]; then + if [ $(basename "$libname_short") == "libGLESv2.so" -a "$libname" != "$libname_short.2" ]; then ln -srnf "$libname" "$libname_short.2" fi @@ -119,9 +127,6 @@ installPhase() { # For simplicity and dependency reduction, don't support the gtk3 interface. rm $out/lib/libnvidia-gtk3.* - # We distribute these separately in `libvdpau` - rm "$out"/lib/libvdpau{.*,_trace.*} - # Move VDPAU libraries to their place mkdir "$out"/lib/vdpau mv "$out"/lib/libvdpau* "$out"/lib/vdpau diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index fff1135d311..86abeeaa824 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null; let - versionNumber = "358.16"; + versionNumber = "361.28"; # Policy: use the highest stable version as the default (on our master). inherit (stdenv.lib) makeLibraryPath; @@ -28,12 +28,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "1cc0zsri92nz2mznabfd6pqckm9mlbszmysqqqh3w5mipwn898nk"; + sha256 = "013l9hfjc7gyk5g2v2h71lwjmx4dqlkczsb17cz833fnadcrn4hs"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "1xr16faam2zsx8ajwm9g9302m6qjzyjh1zd56g8jhc8jxg8h43sg"; + sha256 = "1kq335mdmwlgp0lp9z8wrwyh48p2xv2nwdlgfj7b83vsh6ib17a4"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix index 6bde91d0ffc..91813d67e1c 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation { src = if stdenv.system == "i686-linux" then fetchurl { - url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run"; + url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}-pkg0.run"; sha256 = "08xb7s7cxmj4zv4i3645kjhlhhwxiq6km9ixmsw3vv91f7rkb6d0"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg0.run"; + url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-pkg0.run"; sha256 = "1p2ls0xj81l8v4n6dbjj3p5wlw1iyhgzyvqcv4h5fdxhhs2cb3md"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix index 42e65f927b3..5cf3583e873 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix @@ -8,25 +8,23 @@ with stdenv.lib; -let versionNumber = "304.125"; in +let versionNumber = "304.131"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; builder = ./builder-legacy304.sh; - patches = [ ./nvidia-340.76-kernel-4.0.patch ]; - src = if stdenv.system == "i686-linux" then fetchurl { - url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "1xy4g3yc73mb932cfr25as648k12sxpyymppb8nia3lijakv7idf"; + url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; + sha256 = "1a1d0fsahgijcvs2p59vwhs0dpp7pp2wmvgcs1i7fzl6yyv4nmfj"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "08p6hikn7pbfg0apnsbaqyyh2s9m5r0ckqzgjvxirn5qcyll0g5a"; + url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; + sha256 = "0gpqzb5gvhrcgrp3kph1p0yjkndx9wfzgh5j88ysrlflkv3q4vig"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index a35b8181544..65cbf1c4589 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -2,21 +2,20 @@ stdenv.mkDerivation rec { name = "pax-utils-${version}"; - version = "1.1.1"; + version = "1.1.6"; src = fetchurl { - url = "http://dev.gentoo.org/~vapier/dist/${name}.tar.xz"; - sha256 = "0gldvyr96jgbcahq7rl3k4krzyhvlz95ckiqh3yhink56s5z58cy"; + url = "https://dev.gentoo.org/~vapier/dist/${name}.tar.xz"; + sha256 = "04hvsizzspfzfq6hhfif7ya9nwsc0cs6z6n2bq1zfh7agd8nqhzm"; }; makeFlags = [ - "DESTDIR=$(out)" "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "A suite of tools for PaX/grsecurity"; - homepage = "http://dev.gentoo.org/~vapier/dist/"; + homepage = "https://dev.gentoo.org/~vapier/dist/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/os-specific/linux/rtl8723bs/default.nix b/pkgs/os-specific/linux/rtl8723bs/default.nix new file mode 100644 index 00000000000..1739ac1faa7 --- /dev/null +++ b/pkgs/os-specific/linux/rtl8723bs/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, kernel }: + +let + ver = "c517f2b"; +in +stdenv.mkDerivation rec { + name = "rtl8723bs-${kernel.version}-c517f2b"; + + src = fetchFromGitHub { + owner = "hadess"; + repo = "rtl8723bs"; + rev = "c517f2bf8bcc3d57311252ea7cd49ae81466eead"; + sha256 = "0phzrhq85g52pi2b74a9sr9l2x6dzlz714k3pix486w2x5axw4xb"; + }; + + patchPhase = '' + substituteInPlace ./Makefile --replace /lib/modules/ "${kernel.dev}/lib/modules/" + substituteInPlace ./Makefile --replace '$(shell uname -r)' "${kernel.modDirVersion}" + substituteInPlace ./Makefile --replace /sbin/depmod # + substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + substituteInPlace ./Makefile --replace '/lib/firmware' "$out/lib/firmware" + ''; + + preInstall = '' + mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + mkdir -p "$out/lib/firmware/rtlwifi" + ''; + + meta = { + description = "Realtek SDIO Wi-Fi driver"; + homepage = "https://github.com/hadess/rtl8723bs"; + license = stdenv.lib.licenses.gpl2; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/servers/foswiki/default.nix b/pkgs/servers/foswiki/default.nix new file mode 100644 index 00000000000..c5831325958 --- /dev/null +++ b/pkgs/servers/foswiki/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, perlPackages }: + +perlPackages.buildPerlPackage rec { + name = "foswiki-${version}"; + version = "2.1.0"; + + src = fetchurl { + url = "mirror://sourceforge/foswiki/${version}/Foswiki-${version}.tgz"; + sha256 = "03286pb966h99zgickm2f20rgnqwp9wga5wfkdvirv084kjdh8vp"; + }; + + buildInputs = with perlPackages; [ + # minimum requirements from INSTALL.html#System_Requirements + AlgorithmDiff ArchiveTar AuthenSASL CGI CGISession CryptPasswdMD5 + DigestSHA EmailMIME Encode Error FileCopyRecursive HTMLParser HTMLTree + IOSocketIP IOSocketSSL JSON + LocaleMaketext LocaleMaketextLexicon LocaleMsgfmt + LWP URI perlPackages.version + /*# optional dependencies + libapreq2 DBI DBDmysql DBDPg DBDSQLite FCGI FCGIProcManager + CryptSMIME CryptX509 ConvertPEM + */ + ]; + + preConfigure = '' + touch Makefile.PL + patchShebangs . + ''; + configureScript = "bin/configure"; + + # there's even no makefile + doCheck = false; + installPhase = ''cp -r . "$out" ''; # TODO: some fixups will be needed for running it + + meta = with stdenv.lib; { + description = "An open, programmable collaboration platform"; + homepage = http://foswiki.org; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix new file mode 100644 index 00000000000..818cc30b054 --- /dev/null +++ b/pkgs/servers/freeradius/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, autoreconfHook, talloc, openssl ? null }: + +## TODO: include ldap optionally +## TODO: include sqlite optionally +## TODO: include mysql optionally + +stdenv.mkDerivation rec { + name = "freeradius-${version}"; + version = "3.0.11"; + + buildInputs = [ + autoreconfHook + talloc + openssl + ]; + + configureFlags = [ + "--sysconfdir=/etc" + "--localstatedir=/var" + ]; + + installFlags = [ + "sysconfdir=\${out}/etc" + "localstatedir=\${TMPDIR}" + ]; + + src = fetchurl { + url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz"; + sha256 = "0naxw9b060rbp4409904j6nr2zwl6wbjrbq1839xrwhmaf8p4yxr"; + }; + + meta = with stdenv.lib; { + homepage = http://freeradius.org/; + description = "A modular, high performance free RADIUS suite"; + license = stdenv.lib.licenses.gpl2; + }; + +} + diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index ddb1ec443a0..a2e039bd399 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, perl, zlib, apr, aprutil, pcre, libiconv , proxySupport ? true , sslSupport ? true, openssl +, http2Support ? true, libnghttp2 , ldapSupport ? true, openldap , libxml2Support ? true, libxml2 , luaSupport ? false, lua5 @@ -12,6 +13,7 @@ in assert sslSupport -> aprutil.sslSupport && openssl != null; assert ldapSupport -> aprutil.ldapSupport && openldap != null; +assert http2Support -> libnghttp2 != null; stdenv.mkDerivation rec { version = "2.4.18"; @@ -25,6 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [perl] ++ optional ldapSupport openldap ++ # there is no --with-ldap flag optional libxml2Support libxml2 ++ + optional http2Support libnghttp2 ++ optional stdenv.isDarwin libiconv; # Required for ‘pthread_cancel’. @@ -44,6 +47,7 @@ stdenv.mkDerivation rec { --enable-cgi ${optionalString proxySupport "--enable-proxy"} ${optionalString sslSupport "--enable-ssl --with-ssl=${openssl}"} + ${optionalString http2Support "--enable-http2 --with-nghttp2=${libnghttp2}"} ${optionalString luaSupport "--enable-lua --with-lua=${lua5}"} ${optionalString libxml2Support "--with-libxml2=${libxml2}/include/libxml2"} ''; diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix index f253cdba08e..625d9406641 100644 --- a/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/pkgs/servers/http/apt-cacher-ng/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "apt-cacher-ng-${version}"; - version = "0.8.6"; + version = "0.8.9"; src = fetchurl { url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz"; - sha256 = "0044dfks8djl11fs28jj8894i4rq424xix3d3fkvzz2i6lnp8nr5"; + sha256 = "15zkacy8n6fiklqpdk139pa7qssynrr9akv5h54ky1l53n0k70m6"; }; NIX_LDFLAGS = "-lpthread"; diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index efa84f0fa67..f58479e4478 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -1,6 +1,16 @@ { fetchFromGitHub, pkgs }: { + brotli = { + src = fetchFromGitHub { + owner = "google"; + repo = "ngx_brotli"; + rev = "788615eab7c5e0a984278113c55248305620df14"; + sha256 = "02514bbjdhm9m38vljdh626d3c1783jxsxawv5c6bzblwmb8xgvf"; + }; + inputs = [ pkgs.libbrotli ]; + }; + rtmp = { src = fetchFromGitHub { owner = "arut"; diff --git a/pkgs/servers/mail/postfix/2.11.nix b/pkgs/servers/mail/postfix/2.11.nix deleted file mode 100644 index f2f155cbf3f..00000000000 --- a/pkgs/servers/mail/postfix/2.11.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, gnused, db, openssl, cyrus_sasl, coreutils -, findutils, gnugrep, gawk -}: - -stdenv.mkDerivation rec { - - name = "postfix-${version}"; - - version = "2.11.5"; - - src = fetchurl { - url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; - sha256 = "11riz8ggaa09pi8d6xv2807qp7yjn918mrylfvkfwmvcdlgwck0a"; - }; - - patches = [ - ./postfix-2.11.0.patch - ./postfix-script-shell.patch - ]; - - buildInputs = [ makeWrapper gnused db openssl cyrus_sasl ]; - - preBuild = '' - sed -e '/^PATH=/d' -i postfix-install - - export command_directory=$out/sbin - export config_directory=$out/etc/postfix - export daemon_directory=$out/libexec/postfix - export data_directory=/var/lib/postfix - export html_directory=$out/share/postfix/doc/html - export mailq_path=$out/bin/mailq - export manpage_directory=$out/share/man - export newaliases_path=$out/bin/newaliases - export queue_directory=/var/spool/postfix - export readme_directory=$out/share/postfix/doc - export sendmail_path=$out/bin/sendmail - - make makefiles \ - CCARGS='-DUSE_TLS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${cyrus_sasl}/include/sasl' \ - AUXLIBS='-ldb -lnsl -lresolv -lsasl2 -lcrypto -lssl' - ''; - - installTargets = [ "non-interactive-package" ]; - - installFlags = [ " install_root=$out " ]; - - postInstall = '' - mkdir -p $out - mv -v ut/$out/* $out/ - sed -e '/^PATH=/d' -i $out/libexec/postfix/post-install - wrapProgram $out/libexec/postfix/post-install \ - --prefix PATH ":" ${coreutils}/bin:${findutils}/bin:${gnugrep}/bin - wrapProgram $out/libexec/postfix/postfix-script \ - --prefix PATH ":" ${coreutils}/bin:${findutils}/bin:${gnugrep}/bin:${gawk}/bin:${gnused}/bin - ''; - - meta = { - homepage = "http://www.postfix.org/"; - description = "A fast, easy to administer, and secure mail server"; - license = stdenv.lib.licenses.bsdOriginal; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.rickynils ]; - }; - -} diff --git a/pkgs/servers/mail/postfix/3.0.nix b/pkgs/servers/mail/postfix/3.0.nix deleted file mode 100644 index 9d208e8af4d..00000000000 --- a/pkgs/servers/mail/postfix/3.0.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ stdenv, lib, fetchurl, makeWrapper, gnused, db, openssl, cyrus_sasl -, coreutils, findutils, gnugrep, gawk, icu, pcre -, withPgSQL ? false, postgresql -, withMySQL ? false, libmysql -, withSQLite ? false, sqlite -}: - -let - ccargs = lib.concatStringsSep " " ([ - "-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl}/include/sasl" - "-DHAS_DB_BYPASS_MAKEDEFS_CHECK" - ] ++ lib.optional withPgSQL "-DHAS_PGSQL" - ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${libmysql}/include/mysql" ] - ++ lib.optional withSQLite "-DHAS_SQLITE"); - auxlibs = lib.concatStringsSep " " ([ - "-ldb" "-lnsl" "-lresolv" "-lsasl2" "-lcrypto" "-lssl" - ] ++ lib.optional withPgSQL "-lpq" - ++ lib.optional withMySQL "-lmysqlclient" - ++ lib.optional withSQLite "-lsqlite3"); - -in stdenv.mkDerivation rec { - - name = "postfix-${version}"; - - version = "3.0.3"; - - src = fetchurl { - url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; - sha256 = "00mc12k5p1zlrlqcf33vh5zizaqr5ai8q78dwv69smjh6kn4c7j0"; - }; - - buildInputs = [ makeWrapper gnused db openssl cyrus_sasl icu pcre ] - ++ lib.optional withPgSQL postgresql - ++ lib.optional withMySQL libmysql - ++ lib.optional withSQLite sqlite; - - patches = [ - ./postfix-script-shell.patch - ./postfix-3.0-no-warnings.patch - ./post-install-script.patch - ./relative-symlinks.patch - ]; - - hardeningEnable = [ "pie" ]; - - preBuild = '' - sed -e '/^PATH=/d' -i postfix-install - sed -e "s|@PACKAGE@|$out|" -i conf/post-install - - # post-install need skip permissions check/set on all symlinks following to /nix/store - sed -e "s|@NIX_STORE@|$NIX_STORE|" -i conf/post-install - - export command_directory=$out/sbin - export config_directory=/etc/postfix - export meta_directory=$out/etc/postfix - export daemon_directory=$out/libexec/postfix - export data_directory=/var/lib/postfix/data - export html_directory=$out/share/postfix/doc/html - export mailq_path=$out/bin/mailq - export manpage_directory=$out/share/man - export newaliases_path=$out/bin/newaliases - export queue_directory=/var/lib/postfix/queue - export readme_directory=$out/share/postfix/doc - export sendmail_path=$out/bin/sendmail - - make makefiles CCARGS='${ccargs}' AUXLIBS='${auxlibs}' - ''; - - installTargets = [ "non-interactive-package" ]; - - installFlags = [ "install_root=installdir" ]; - - postInstall = '' - mkdir -p $out - mv -v installdir/$out/* $out/ - cp -rv installdir/etc $out - sed -e '/^PATH=/d' -i $out/libexec/postfix/post-install - wrapProgram $out/libexec/postfix/post-install \ - --prefix PATH ":" ${coreutils}/bin:${findutils}/bin:${gnugrep}/bin - wrapProgram $out/libexec/postfix/postfix-script \ - --prefix PATH ":" ${coreutils}/bin:${findutils}/bin:${gnugrep}/bin:${gawk}/bin:${gnused}/bin - ''; - - meta = { - homepage = "http://www.postfix.org/"; - description = "A fast, easy to administer, and secure mail server"; - license = lib.licenses.bsdOriginal; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.rickynils ]; - }; - -} diff --git a/pkgs/servers/mail/postfix/db-linux3.patch b/pkgs/servers/mail/postfix/db-linux3.patch deleted file mode 100644 index c9dd4646798..00000000000 --- a/pkgs/servers/mail/postfix/db-linux3.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/makedefs b/makedefs -index b8b98c8..94443c0 100644 ---- a/makedefs -+++ b/makedefs -@@ -341,20 +341,20 @@ EOF - esac - ;; - Linux.3*) SYSTYPE=LINUX3 -- if [ -f /usr/include/db.h ] -- then -- : we are all set -- elif [ -f /usr/include/db/db.h ] -- then -- CCARGS="$CCARGS -I/usr/include/db" -- else -- # On a properly installed system, Postfix builds -- # by including and by linking with -ldb -- echo "No include file found." 1>&2 -- echo "Install the appropriate db*-devel package first." 1>&2 -- echo "See the RELEASE_NOTES file for more information." 1>&2 -- exit 1 -- fi -+ #if [ -f /usr/include/db.h ] -+ #then -+ #: we are all set -+ #elif [ -f /usr/include/db/db.h ] -+ #then -+ #CCARGS="$CCARGS -I/usr/include/db" -+ #else -+ ## On a properly installed system, Postfix builds -+ ## by including and by linking with -ldb -+ #echo "No include file found." 1>&2 -+ #echo "Install the appropriate db*-devel package first." 1>&2 -+ #echo "See the RELEASE_NOTES file for more information." 1>&2 -+ #exit 1 -+ #fi - SYSLIBS="-ldb" - for name in nsl resolv - do diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 886412b24cd..a92ffa4402f 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -1,73 +1,93 @@ -{ stdenv, fetchurl, db, glibc, openssl, cyrus_sasl -, coreutils, findutils, gnused, gnugrep, bison, perl +{ stdenv, lib, fetchurl, makeWrapper, gnused, db, openssl, cyrus_sasl +, coreutils, findutils, gnugrep, gawk, icu, pcre +, withPgSQL ? false, postgresql +, withMySQL ? false, libmysql +, withSQLite ? false, sqlite }: -assert stdenv.isLinux; +let + ccargs = lib.concatStringsSep " " ([ + "-DUSE_TLS" "-DUSE_SASL_AUTH" "-DUSE_CYRUS_SASL" "-I${cyrus_sasl}/include/sasl" + "-DHAS_DB_BYPASS_MAKEDEFS_CHECK" + ] ++ lib.optional withPgSQL "-DHAS_PGSQL" + ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${libmysql}/include/mysql" ] + ++ lib.optional withSQLite "-DHAS_SQLITE"); + auxlibs = lib.concatStringsSep " " ([ + "-ldb" "-lnsl" "-lresolv" "-lsasl2" "-lcrypto" "-lssl" + ] ++ lib.optional withPgSQL "-lpq" + ++ lib.optional withMySQL "-lmysqlclient" + ++ lib.optional withSQLite "-lsqlite3"); -stdenv.mkDerivation rec { - name = "postfix-2.8.12"; +in stdenv.mkDerivation rec { + + name = "postfix-${version}"; + + version = "3.0.3"; src = fetchurl { url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz"; - sha256 = "11z07mjy53l1fnl7k4101yk4ilibgqr1164628mqcbmmr8bh2szl"; + sha256 = "00mc12k5p1zlrlqcf33vh5zizaqr5ai8q78dwv69smjh6kn4c7j0"; }; - buildInputs = [db openssl cyrus_sasl bison perl]; + buildInputs = [ makeWrapper gnused db openssl cyrus_sasl icu pcre ] + ++ lib.optional withPgSQL postgresql + ++ lib.optional withMySQL libmysql + ++ lib.optional withSQLite sqlite; hardeningDisable = [ "format" ]; hardeningEnable = [ "pie" ]; patches = [ - ./postfix-2.2.9-db.patch - ./postfix-2.2.9-lib.patch - ./db-linux3.patch ./postfix-script-shell.patch + ./postfix-3.0-no-warnings.patch + ./post-install-script.patch + ./relative-symlinks.patch ]; - postPatch = '' - sed -i -e s,/usr/bin,/var/run/current-system/sw/bin, \ - -e s,/usr/sbin,/var/run/current-system/sw/bin, \ - -e s,:/sbin,, src/util/sys_defs.h - ''; - preBuild = '' - export daemon_directory=$out/libexec/postfix - export command_directory=$out/sbin - export queue_directory=/var/spool/postfix - export sendmail_path=$out/bin/sendmail - export mailq_path=$out/bin/mailq - export newaliases_path=$out/bin/newaliases - export html_directory=$out/share/postfix/doc/html - export manpage_directory=$out/share/man - export sample_directory=$out/share/postfix/doc/samples - export readme_directory=$out/share/postfix/doc - - make makefiles CCARGS='-DUSE_TLS -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${cyrus_sasl}/include/sasl' AUXLIBS='-lssl -lcrypto -lsasl2 -ldb -lnsl' - ''; - - installPhase = '' sed -e '/^PATH=/d' -i postfix-install - $SHELL postfix-install install_root=out -non-interactive -package + sed -e "s|@PACKAGE@|$out|" -i conf/post-install - mkdir -p $out - mv -v "out$out/"* $out/ + # post-install need skip permissions check/set on all symlinks following to /nix/store + sed -e "s|@NIX_STORE@|$NIX_STORE|" -i conf/post-install - mkdir -p $out/share/postfix - mv conf $out/share/postfix/ - mv LICENSE TLS_LICENSE $out/share/postfix/ + export command_directory=$out/sbin + export config_directory=/etc/postfix + export meta_directory=$out/etc/postfix + export daemon_directory=$out/libexec/postfix + export data_directory=/var/lib/postfix/data + export html_directory=$out/share/postfix/doc/html + export mailq_path=$out/bin/mailq + export manpage_directory=$out/share/man + export newaliases_path=$out/bin/newaliases + export queue_directory=/var/lib/postfix/queue + export readme_directory=$out/share/postfix/doc + export sendmail_path=$out/bin/sendmail - sed -e 's@^PATH=.*@PATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:'$out'/sbin@' -i $out/share/postfix/conf/post-install $out/libexec/postfix/post-install - sed -e '2aPATH=${coreutils}/bin:${findutils}/bin:${gnused}/bin:${gnugrep}/bin:'$out'/sbin' -i $out/share/postfix/conf/postfix-script $out/libexec/postfix/postfix-script - chmod a+x $out/share/postfix/conf/{postfix-script,post-install} + make makefiles CCARGS='${ccargs}' AUXLIBS='${auxlibs}' ''; - inherit glibc; + installTargets = [ "non-interactive-package" ]; + + installFlags = [ "install_root=installdir" ]; + + postInstall = '' + mkdir -p $out + mv -v installdir/$out/* $out/ + cp -rv installdir/etc $out + sed -e '/^PATH=/d' -i $out/libexec/postfix/post-install + wrapProgram $out/libexec/postfix/post-install \ + --prefix PATH ":" ${coreutils}/bin:${findutils}/bin:${gnugrep}/bin + wrapProgram $out/libexec/postfix/postfix-script \ + --prefix PATH ":" ${coreutils}/bin:${findutils}/bin:${gnugrep}/bin:${gawk}/bin:${gnused}/bin + ''; meta = { homepage = "http://www.postfix.org/"; - description = "a fast, easy to administer, and secure mail server"; - license = stdenv.lib.licenses.bsdOriginal; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + description = "A fast, easy to administer, and secure mail server"; + license = lib.licenses.bsdOriginal; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.rickynils ]; }; + } diff --git a/pkgs/servers/mail/postfix/postfix-2.11.0.patch b/pkgs/servers/mail/postfix/postfix-2.11.0.patch deleted file mode 100644 index cdc4521c428..00000000000 --- a/pkgs/servers/mail/postfix/postfix-2.11.0.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff -ruN postfix-2.11.0-orig/makedefs postfix-2.11.0/makedefs ---- postfix-2.11.0-orig/makedefs 2014-01-05 18:18:56.000000000 +0100 -+++ postfix-2.11.0/makedefs 2014-04-24 09:27:58.193869491 +0200 -@@ -290,36 +290,6 @@ - esac - ;; - Linux.2*) SYSTYPE=LINUX2 -- case "$CCARGS" in -- *-DNO_DB*) ;; -- *-DHAS_DB*) ;; -- *) if [ -f /usr/include/db.h ] -- then -- : we are all set -- elif [ -f /usr/include/db/db.h ] -- then -- CCARGS="$CCARGS -I/usr/include/db" -- else -- # No, we're not going to try db1 db2 db3 etc. -- # On a properly installed system, Postfix builds -- # by including and by linking with -ldb -- echo "No include file found." 1>&2 -- echo "Install the appropriate db*-devel package first." 1>&2 -- exit 1 -- fi -- SYSLIBS="-ldb" -- ;; -- esac -- for name in nsl resolv $GDBM_LIBS -- do -- for lib in /usr/lib64 /lib64 /usr/lib /lib -- do -- test -e $lib/lib$name.a -o -e $lib/lib$name.so && { -- SYSLIBS="$SYSLIBS -l$name" -- break -- } -- done -- done - # Kernel 2.4 added IPv6 - case "$RELEASE" in - 2.[0-3].*) CCARGS="$CCARGS -DNO_IPV6";; -@@ -363,35 +333,6 @@ - esac - ;; - Linux.3*) SYSTYPE=LINUX3 -- case "$CCARGS" in -- *-DNO_DB*) ;; -- *-DHAS_DB*) ;; -- *) if [ -f /usr/include/db.h ] -- then -- : we are all set -- elif [ -f /usr/include/db/db.h ] -- then -- CCARGS="$CCARGS -I/usr/include/db" -- else -- # On a properly installed system, Postfix builds -- # by including and by linking with -ldb -- echo "No include file found." 1>&2 -- echo "Install the appropriate db*-devel package first." 1>&2 -- exit 1 -- fi -- SYSLIBS="-ldb" -- ;; -- esac -- for name in nsl resolv -- do -- for lib in /usr/lib64 /lib64 /usr/lib /usr/lib/* /lib /lib/* -- do -- test -e $lib/lib$name.a -o -e $lib/lib$name.so && { -- SYSLIBS="$SYSLIBS -l$name" -- break -- } -- done -- done - ;; - GNU.0*|GNU/kFreeBSD.[567]*) - SYSTYPE=GNU0 diff --git a/pkgs/servers/mail/postfix/postfix-2.2.9-db.patch b/pkgs/servers/mail/postfix/postfix-2.2.9-db.patch deleted file mode 100644 index 65f55ffd8f0..00000000000 --- a/pkgs/servers/mail/postfix/postfix-2.2.9-db.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -ruN postfix-2.2.9/makedefs postfix-2.2.9.new/makedefs ---- postfix-2.2.9/makedefs 2006-01-03 21:50:25.000000000 +0000 -+++ postfix-2.2.9.new/makedefs 2006-03-11 00:38:30.000000000 +0000 -@@ -219,21 +219,21 @@ - ;; - Linux.2*) SYSTYPE=LINUX2 - # Postfix no longer needs DB 1.85 compatibility -- if [ -f /usr/include/db.h ] -- then -- : we are all set -- elif [ -f /usr/include/db/db.h ] -- then -- CCARGS="$CCARGS -I/usr/include/db" -- else -- # No, we're not going to try db1 db2 db3 etc. -- # On a properly installed system, Postfix builds -- # by including and by linking with -ldb -- echo "No include file found." 1>&2 -- echo "Install the appropriate db*-devel package first." 1>&2 -- echo "See the RELEASE_NOTES file for more information." 1>&2 -- exit 1 -- fi -+ #if [ -f /usr/include/db.h ] -+ #then -+ #: we are all set -+ #elif [ -f /usr/include/db/db.h ] -+ #then -+ #CCARGS="$CCARGS -I/usr/include/db" -+ #else -+ ## No, we're not going to try db1 db2 db3 etc. -+ ## On a properly installed system, Postfix builds -+ ## by including and by linking with -ldb -+ #echo "No include file found." 1>&2 -+ #echo "Install the appropriate db*-devel package first." 1>&2 -+ #echo "See the RELEASE_NOTES file for more information." 1>&2 -+ #exit 1 -+ #fi - # GDBM locks the DBM .pag file after open. This breaks postmap. - # if [ -f /usr/include/gdbm-ndbm.h ] - # then diff --git a/pkgs/servers/mail/postfix/postfix-2.2.9-lib.patch b/pkgs/servers/mail/postfix/postfix-2.2.9-lib.patch deleted file mode 100644 index 03dcaa87f23..00000000000 --- a/pkgs/servers/mail/postfix/postfix-2.2.9-lib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN postfix-2.2.9/makedefs postfix-2.2.9.new/makedefs ---- postfix-2.2.9/makedefs 2006-01-03 21:50:25.000000000 +0000 -+++ postfix-2.2.9.new/makedefs 2006-03-11 01:40:30.000000000 +0000 -@@ -247,7 +247,7 @@ - SYSLIBS="-ldb" - for name in nsl resolv $GDBM_LIBS - do -- for lib in /usr/lib64 /lib64 /usr/lib /lib -+ for lib in $glibc/usr/lib64 $glibc/lib64 $glibc/usr/lib $glibc/lib - do - test -e $lib/lib$name.a -o -e $lib/lib$name.so && { - SYSLIBS="$SYSLIBS -l$name" diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index a42212ade08..d58005f7be2 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -1,34 +1,26 @@ -{ stdenv, fetchFromGitHub, fetchpatch, git, mono, v8, icu }: +{ stdenv, fetchFromGitHub, fetchpatch, mono, v8 }: # There are some similarities with the pinta derivation. We should # have a helper to make it easy to package these Mono apps. stdenv.mkDerivation rec { name = "EventStore-${version}"; - version = "3.0.3"; + version = "3.5.0"; src = fetchFromGitHub { owner = "EventStore"; repo = "EventStore"; rev = "oss-v${version}"; - sha256 = "1xz1dpnbkqqd3ph9g3z5cghr8zp14sr9y31lrdjrdydr3gm4sll2"; + sha256 = "0dp5914hxwdzw62q49wavqfqkw3jy0dvml09y7gh8frnbiajcxq9"; }; - patches = [ - # see: https://github.com/EventStore/EventStore/issues/461 - (fetchpatch { - url = https://github.com/EventStore/EventStore/commit/9a0987f19935178df143a3cf876becaa1b11ffae.patch; - sha256 = "04qw0rb1pypa8dqvj94j2mwkc1y6b40zrpkn1d3zfci3k8cam79y"; - }) - ]; - buildPhase = '' - ln -s ${v8}/lib/libv8.so src/libs/libv8.so - ln -s ${icu}/lib/libicui18n.so src/libs/libicui18n.so - ln -s ${icu}/lib/libicuuc.so src/libs/libicuuc.so + mkdir -p src/libs/x64/nixos + pushd src/EventStore.Projections.v8Integration + cc -o ../libs/x64/nixos/libjs1.so -fPIC -lv8 -shared -std=c++0x *.cpp + popd patchShebangs build.sh - ./build.sh js1 - ./build.sh quick ${version} + ./build.sh ${version} release nixos ''; installPhase = '' @@ -41,8 +33,9 @@ stdenv.mkDerivation rec { chmod +x $out/bin/clusternode ''; - buildInputs = [ git v8 mono ]; + buildInputs = [ v8 mono ]; + phases = [ "unpackPhase" "buildPhase" "installPhase" ]; dontStrip = true; meta = { @@ -50,6 +43,6 @@ stdenv.mkDerivation rec { description = "Event sourcing database with processing logic in JavaScript"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; - platforms = with stdenv.lib.platforms; linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/servers/owncloud/default.nix b/pkgs/servers/owncloud/default.nix index 092e9c3ff3e..4e4424c5b00 100644 --- a/pkgs/servers/owncloud/default.nix +++ b/pkgs/servers/owncloud/default.nix @@ -56,4 +56,9 @@ in { sha256 = "d5b935f904744b8b40b310f19679702387c852498d0dc7aaeda4555a3db9ad5b"; }; + owncloud90 = common { + versiona = "9.0.0"; + sha256 = "0z57lc6z1h7yn1sa26q8qnhjxyjn0ydy3mf4yy4i9a3p198kfryi"; + }; + } diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 799fea0fe50..672e441875a 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -5,9 +5,9 @@ let plexpkg = if enablePlexPass then { - version = "0.9.15.6.1714"; - vsnHash = "7be11e1"; - sha256 = "1kyk41qnbm8w5bvnisp3d99cf0r72wvlggfi9h4np7sq4p8ksa0g"; + version = "0.9.16.0.1754"; + vsnHash = "23623fb"; + sha256 = "0yn5bqpgz28ig6y3qw3zxzm8gfvwaw7nh5krmav8h1ryws98cc6g"; } else { version = "0.9.15.6.1714"; vsnHash = "7be11e1"; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 4ef47122c28..0f3b9bb7a65 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -18,11 +18,11 @@ with lib; stdenv.mkDerivation rec { - name = "samba-4.3.1"; + name = "samba-4.3.6"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; - sha256 = "10ic9pxsk3ml5ycmi0bql8wraxhbr2l4fhzd0qwmiqmrjl6sh24r"; + sha256 = "0929fpk2pq4v389naai519xvsm9bzpar4jlgjxwlx1cnn6jyql9j"; }; patches = diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix index 59643fa3e00..e6c66707c4e 100644 --- a/pkgs/servers/sql/mysql/jdbc/default.nix +++ b/pkgs/servers/sql/mysql/jdbc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, ant, unzip}: stdenv.mkDerivation { - name = "mysql-connector-java-5.1.32"; + name = "mysql-connector-java-5.1.38"; builder = ./builder.sh; src = fetchurl { - url = http://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-5.1.32.zip; - sha256 = "11vjwws1pa8fdwn86rrmqdwsq3ld3sh2r0pp4lpr2gxw0w18ykc7"; + url = http://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-5.1.38.zip; + sha256 = "0b1j2dylnpk6b17gn3168qdrrwq8kdil57nxrd08n1lnkirdsx33"; }; buildInputs = [ unzip ant ]; diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index dc5f437977c..696777c7f1f 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "mksh-${version}"; - version = "52"; + version = "52c"; src = fetchurl { urls = [ "http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" "http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" ]; - sha256 = "13vnncwfx4zq3yi7llw3p6miw0px1bm5rrps3y1nlfn6sb6zbhj5"; + sha256 = "19ivsic15903hv3ipzk0kvkaxardw7b99s8l5iw3y415lz71ld66"; }; buildInputs = [ groff ]; diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix new file mode 100644 index 00000000000..297489fd7fc --- /dev/null +++ b/pkgs/shells/oh-my-zsh/default.nix @@ -0,0 +1,74 @@ +# This script was inspired by the ArchLinux User Repository package: +# +# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=oh-my-zsh-git + + +{ stdenv, fetchgit }: + +stdenv.mkDerivation rec { + name = "oh-my-zsh-git-${version}"; + version = "2016-02-27"; + + src = fetchgit { + url = "https://github.com/robbyrussell/oh-my-zsh"; + rev = "bd6dbd1d9b1fc8a523aaf588492eb3ed4113b49d"; + sha256 = "0bn3jijxjhrd00mc3biqs7jj6in3ivhr6d02mp4566i2rdp9x2d5"; + }; + + phases = "installPhase"; + + installPhase = '' + outdir=$out/share/oh-my-zsh + template=templates/zshrc.zsh-template + + mkdir -p $outdir + cp -r $src/* $outdir + cd $outdir + + rm MIT-LICENSE.txt + rm -rf .git* + + chmod -R +w templates + + # Change the path to oh-my-zsh dir and disable auto-updating. + sed -i -e "2c\\ZSH=$outdir/" \ + -e 's/\# \(DISABLE_AUTO_UPDATE="true"\)/\1/' \ + $template + + # Look for .zsh_variables, .zsh_aliases, and .zsh_funcs, and source + # them, if found. + cat >> $template <<- EOF + + # Load the variables. + if [ -f ~/.zsh_variables ]; then + . ~/.zsh_variables + fi + + # Load the functions. + if [ -f ~/.zsh_funcs ]; then + . ~/.zsh_funcs + fi + + # Load the aliases. + if [ -f ~/.zsh_aliases ]; then + . ~/.zsh_aliases + fi + EOF + ''; + + meta = with stdenv.lib; { + description = "A framework for managing your zsh configuration"; + longDescription = '' + Oh My Zsh is a framework for managing your zsh configuration. + + To copy the Oh My Zsh configuration file to your home directory, run + the following command: + + $ cp -v $(nix-env -q --out-path oh-my-zsh-git | cut -d' ' -f3)/share/oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc + ''; + homepage = "http://ohmyz.sh/"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ scolobb nequissimus ]; + }; +} diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 5ce686cb8fc..d65b7dc80a8 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, coreutils, pcre }: +{ stdenv, fetchurl, ncurses, pcre }: let @@ -19,7 +19,7 @@ stdenv.mkDerivation { sha256 = "0dsr450v8nydvpk8ry276fvbznlrjgddgp7zvhcw4cv69i9lr4ps"; }; - buildInputs = [ ncurses coreutils pcre ]; + buildInputs = [ ncurses pcre ]; configureFlags = [ "--enable-maildir-support" @@ -37,8 +37,10 @@ stdenv.mkDerivation { # XXX: think/discuss about this, also with respect to nixos vs nix-on-X postInstall = '' - mkdir -p $out/share/ + mkdir -p $out/share/info tar xf ${documentation} -C $out/share + ln -s $out/share/zsh-*/Doc/zsh.info* $out/share/info/ + mkdir -p $out/etc/ cat > $out/etc/zprofile < kerberos != null; +assert withGssapiPatches -> withKerberos; let @@ -17,18 +18,20 @@ let }; gssapiSrc = fetchpatch { - url = "http://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian/patches/gssapi.patch?h=debian/7.1p2-2"; - sha256 = "05nsch879nlpyyiwm240wlq9rasy71j9d03j1rfi8kp865zhjfbm"; + url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian/patches/gssapi.patch?id=46961f5704f8e86cea3e99253faad55aef4d8f35"; + sha256 = "01mf2vx1gavypbdx06mcbmcrkm2smff0h3jfmr61k6h6j3xk88y5"; }; in with stdenv.lib; stdenv.mkDerivation rec { - name = "openssh-7.2p1"; + # Please ensure that openssh_with_kerberos still builds when + # bumping the version here! + name = "openssh-7.2p2"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz"; - sha256 = "1hsa1f3641pdj57a55gmnvcya3wwww2fc2cvb77y95rm5xxw6g4p"; + sha256 = "132lh9aanb0wkisji1d6cmsxi520m8nh7c7i9wi6m1s3l38q29x7"; }; prePatch = optionalString hpnSupport @@ -81,7 +84,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = "http://www.openssh.org/"; + homepage = "http://www.openssh.com/"; description = "An implementation of the SSH protocol"; license = stdenv.lib.licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix index 10b35298461..80bcb7ae987 100644 --- a/pkgs/tools/networking/speedtest-cli/default.nix +++ b/pkgs/tools/networking/speedtest-cli/default.nix @@ -2,12 +2,11 @@ pythonPackages.buildPythonApplication rec { name = "speedtest-cli-${version}"; - version = "0.3.1"; - namePrefix = ""; + version = "0.3.4"; src = fetchurl { url = "https://pypi.python.org/packages/source/s/speedtest-cli/speedtest-cli-${version}.tar.gz"; - sha256 = "0ln2grbskh39ph79lhcim2axm7hp4xhzbrag8xfqbfihq7jdm6ya"; + sha256 = "19i671cd815fcv0x7h2m0a493slzwkzn7r926g8myx1srkss0q6d"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix new file mode 100644 index 00000000000..28d3f2c1633 --- /dev/null +++ b/pkgs/tools/networking/uget/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, pkgconfig, intltool, openssl, curl, libnotify, gstreamer, + gst_plugins_base, gst_plugins_good, gnome3, makeWrapper, aria2 ? null }: + +stdenv.mkDerivation rec { + name = "uget-${version}"; + version = "2.0.5"; + + src = fetchurl { + url = "mirror://sourceforge/urlget/${name}.tar.gz"; + sha256 = "0cqz8cd8dyciam07w6ipgzj52zhf9q0zvg6ag6wz481sxkpdnfh3"; + }; + + nativeBuildInputs = [ pkgconfig intltool makeWrapper ]; + + buildInputs = [ + openssl curl libnotify gstreamer gst_plugins_base gst_plugins_good + gnome3.gtk gnome3.dconf + ] + ++ (stdenv.lib.optional (aria2 != null) aria2); + + enableParallelBuilding = true; + + preFixup = '' + wrapProgram $out/bin/uget-gtk \ + ${stdenv.lib.optionalString (aria2 != null) ''--suffix PATH : "${aria2}/bin"''} \ + --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ + --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" + ''; + + meta = with stdenv.lib; { + description = "Download manager using gtk+ and libcurl"; + longDescription = '' + uGet is a VERY Powerful download manager application with a large + inventory of features but is still very light-weight and low on + resources, so don't let the impressive list of features scare you into + thinking that it "might be too powerful" because remember power is good + and lightweight power is uGet! + ''; + license = licenses.lgpl21; + homepage = http://www.ugetdm.com; + maintainers = with maintainers; [ romildo ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/security/gnupg/1compat.nix b/pkgs/tools/security/gnupg/1compat.nix index 9bd71467f0e..d875413cc79 100644 --- a/pkgs/tools/security/gnupg/1compat.nix +++ b/pkgs/tools/security/gnupg/1compat.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation { builder = writeScript "gnupg1compat-builder" '' # First symlink all top-level dirs ${coreutils}/bin/mkdir -p $out - ${coreutils}/bin/ln -s ${gnupg}/* $out + ${coreutils}/bin/ln -s "${gnupg}/"* $out # Replace bin with directory and symlink it contents ${coreutils}/bin/rm $out/bin ${coreutils}/bin/mkdir -p $out/bin - ${coreutils}/bin/ln -s ${gnupg}/bin/* $out/bin + ${coreutils}/bin/ln -s "${gnupg}/bin/"* $out/bin # Add gpg->gpg2 and gpgv->gpgv2 symlinks ${coreutils}/bin/ln -s gpg2 $out/bin/gpg diff --git a/pkgs/tools/security/gpgstats/default.nix b/pkgs/tools/security/gpgstats/default.nix index 480ef5bf3e7..e9929cb2e6f 100644 --- a/pkgs/tools/security/gpgstats/default.nix +++ b/pkgs/tools/security/gpgstats/default.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { cp gpgstats $out/bin ''; + NIX_CFLAGS_COMPILE = stdenv.lib.optionals (!stdenv.is64bit) + [ "-D_FILE_OFFSET_BITS=64" "-DLARGEFILE_SOURCE=1" ]; + meta = with stdenv.lib; { description = "Calculates statistics on the keys in your gpg key-ring"; longDescription = '' diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix index 01495156810..bfd1343f5e5 100644 --- a/pkgs/tools/security/lastpass-cli/default.nix +++ b/pkgs/tools/security/lastpass-cli/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "lastpass-cli-${version}"; - version = "0.7.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "lastpass"; repo = "lastpass-cli"; rev = "v${version}"; - sha256 = "18dn4sx173666w6aaqhwcya5x2z3q0fmhg8h76lgdmx8adrhzdzc"; + sha256 = "1iaz36bcyss2kahhlm92l7yh26rxvs12wnkkh1289yarl5wi0yld"; }; buildInputs = [ diff --git a/pkgs/tools/security/minisign/default.nix b/pkgs/tools/security/minisign/default.nix index 781ca6ca600..373ebc1e6ff 100644 --- a/pkgs/tools/security/minisign/default.nix +++ b/pkgs/tools/security/minisign/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "029g8ian72fy07k73nf451dw1yggav6crjjc2x6kv4nfpq3pl9pj"; }; - buildInputs = [ cmake libsodium ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libsodium ]; meta = with stdenv.lib; { description = "A simple tool for signing files and verifying signatures"; diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index b78eb43782e..4a8d7518e9c 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -3,10 +3,10 @@ pythonPackages.buildPythonApplication rec { name = "sshuttle-${version}"; - version = "0.76"; + version = "0.77.2"; src = fetchurl { - sha256 = "1q0hr0vhdvv23cw5dqndsmf61283mvs6b14662ci00xj6zp5v48b"; + sha256 = "1fwlhr5r9pl3pns65nn4mxf5ivypmd2a12gv3vpyznfy5f097k10"; url = "https://pypi.python.org/packages/source/s/sshuttle/${name}.tar.gz"; }; diff --git a/pkgs/tools/system/awstats/default.nix b/pkgs/tools/system/awstats/default.nix new file mode 100644 index 00000000000..f4a14155d68 --- /dev/null +++ b/pkgs/tools/system/awstats/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchurl, perlPackages, jdk }: + +perlPackages.buildPerlPackage rec { + name = "awstats-${version}"; + version = "7.4"; + + src = fetchurl { + url = "mirror://sourceforge/awstats/${name}.tar.gz"; + sha256 = "0mdbilsl8g9a84qgyws4pakhqr3mfhs5g5dqbgsn9gn285rzxas3"; + }; + + postPatch = '' + substituteInPlace wwwroot/cgi-bin/awstats.pl \ + --replace /usr/share/awstats/ "$out/wwwroot/cgi-bin/" + ''; + + outputs = [ "out" "bin" "doc" ]; + + buildInputs = with perlPackages; [ ]; # plugins will need some + + preConfigure = '' + touch Makefile.PL + patchShebangs . + ''; + + # build our own JAR + preBuild = '' + ( + cd wwwroot/classes/src + rm ../*.jar + PATH="${jdk}/bin" "$(type -P perl)" Makefile.pl + test -f ../*.jar + ) + ''; + + doCheck = false; + + installPhase = '' + mkdir "$out" + mv wwwroot "$out/wwwroot" + rm -r "$out/wwwroot/classes/src/" + + mkdir -p "$bin/bin" + ln -s "$out/wwwroot/cgi-bin/awstats.pl" "$bin/bin/awstats" + + mkdir -p "$doc/share/" + mv README.md docs/ + mv docs "$doc/share/awstats" + ''; + + meta = with stdenv.lib; { + description = "Real-time logfile analyzer to get advanced statistics"; + homepage = http://awstats.org; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/tools/system/rowhammer-test/default.nix b/pkgs/tools/system/rowhammer-test/default.nix new file mode 100644 index 00000000000..728b15bb298 --- /dev/null +++ b/pkgs/tools/system/rowhammer-test/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + name = "rowhammer-test-20150811"; + + src = fetchFromGitHub { + owner = "google"; + repo = "rowhammer-test"; + rev = "c1d2bd9f629281402c10bb10e52bc1f1faf59cc4"; # 2015-08-11 + sha256 = "1fbfcnm5gjish47wdvikcsgzlb5vnlfqlzzm6mwiw2j5qkq0914i"; + }; + + buildPhase = "sh -e make.sh"; + + installPhase = '' + mkdir -p $out/bin + cp rowhammer_test double_sided_rowhammer $out/bin + ''; + + meta = with stdenv.lib; { + description = "Test DRAM for bit flips caused by the rowhammer problem"; + homepage = https://github.com/google/rowhammer-test; + license = licenses.asl20; + maintainers = [ maintainers.viric ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/system/yeshup/default.nix b/pkgs/tools/system/yeshup/default.nix new file mode 100644 index 00000000000..806d6cc5b94 --- /dev/null +++ b/pkgs/tools/system/yeshup/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "yeshup-${builtins.substring 0 7 rev}"; + rev = "5461a8f957c686ccd0240be3f0fd8124d7381b08"; + + src = fetchFromGitHub { + owner = "RhysU"; + repo = "yeshup"; + inherit rev; + sha256 = "1wwbc158y46jsmdi1lp0m3dlbr9kvzvwxfvzj6646cpy9d6h21v9"; + }; + + installPhase = '' + mkdir -p $out/bin + cp -v yeshup $out/bin + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/RhysU/yeshup; + platforms = platforms.all; + license = licenses.cc-by-sa-30; # From Stackoverflow answer + maintainers = with maintainers; [ obadz ]; + }; +} diff --git a/pkgs/tools/text/diction/default.nix b/pkgs/tools/text/diction/default.nix new file mode 100644 index 00000000000..51366c36bc6 --- /dev/null +++ b/pkgs/tools/text/diction/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "diction-1.11"; + + src = fetchurl { + url = "mirror://gnu/diction/${name}.tar.gz"; + sha256 = "1xi4l1x1vvzmzmbhpx0ghmfnwwrhabjwizrpyylmy3fzinzz3him"; + }; + + meta = { + description = "GNU style and diction utilities"; + longDescription = '' + Diction and style are two old standard Unix commands. Diction identifies + wordy and commonly misused phrases. Style analyses surface + characteristics of a document, including sentence length and other + readability measures. + ''; + license = stdenv.lib.licenses.gpl3Plus; + }; +} diff --git a/pkgs/tools/text/kakasi/default.nix b/pkgs/tools/text/kakasi/default.nix index b73654da405..b6b647b4398 100644 --- a/pkgs/tools/text/kakasi/default.nix +++ b/pkgs/tools/text/kakasi/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { homepage = "http://kakasi.namazu.org/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ iyzsong ]; }; src = fetchurl { diff --git a/pkgs/tools/text/unrtf/default.nix b/pkgs/tools/text/unrtf/default.nix index 6b177b8b37b..c2b845064d9 100644 --- a/pkgs/tools/text/unrtf/default.nix +++ b/pkgs/tools/text/unrtf/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1pcdzf2h1prn393dkvg93v80vh38q0v817xnbwrlwxbdz4k7i8r2"; }; - buildInputs = [ autoconf automake ]; + nativeBuildInputs = [ autoconf automake ]; preConfigure = "./bootstrap"; diff --git a/pkgs/tools/typesetting/pygmentex/default.nix b/pkgs/tools/typesetting/pygmentex/default.nix new file mode 100644 index 00000000000..da029639c3d --- /dev/null +++ b/pkgs/tools/typesetting/pygmentex/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchzip, python2Packages }: + +python2Packages.buildPythonApplication rec { + name = "pygmentex-${version}"; + version = "0.8"; + + src = fetchzip { + url = "http://mirrors.ctan.org/macros/latex/contrib/pygmentex.zip"; + sha256 = "1nm19pvhlv51mv2sdankndhw64ys9r7ch6szzd6i4jz8zr86kn9v"; + }; + + pythonPath = [ python2Packages.pygments python2Packages.chardet ]; + + buildPhase = ":"; + + doCheck = false; + + installPhase = '' + + mkdir -p $out/bin + cp -a pygmentex.py $out/bin + ''; + + meta = with stdenv.lib; { + homepage = https://www.ctan.org/pkg/pygmentex; + description = "Auxiliary tool for typesetting code listings in LaTeX documents using Pygments"; + longDescription = '' + PygmenTeX is a Python-based LaTeX package that can be used for + typesetting code listings in a LaTeX document using Pygments. + + Pygments is a generic syntax highlighter for general use in all kinds of + software such as forum systems, wikis or other applications that need to + prettify source code. + + This package installs just the script needed to process code listings + snippets extracted from the a LaTeX document by the pygmentex LaTeX + package. In order to use it effectivelly the texlive package pygmentex + also has to be installed. This can be done by adding pygmentex to + texlive.combine. + ''; + license = licenses.lppl13c; + maintainers = with maintainers; [ romildo ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/typesetting/tex/nix/default.nix b/pkgs/tools/typesetting/tex/nix/default.nix index 5cd5515400d..ce5c025475a 100644 --- a/pkgs/tools/typesetting/tex/nix/default.nix +++ b/pkgs/tools/typesetting/tex/nix/default.nix @@ -17,7 +17,9 @@ rec { assert generatePDF -> !generatePS; let - tex = pkgs.texlive.combine texPackages; + tex = pkgs.texlive.combine + # always include basic stuff you need for LaTeX + ({inherit (pkgs.texlive) scheme-basic;} // texPackages); in pkgs.stdenv.mkDerivation { diff --git a/pkgs/tools/video/flvtool2/default.nix b/pkgs/tools/video/flvtool2/default.nix index dbda4e11770..65bc240af00 100644 --- a/pkgs/tools/video/flvtool2/default.nix +++ b/pkgs/tools/video/flvtool2/default.nix @@ -1,28 +1,15 @@ -{ stdenv, fetchurl, ruby }: +{ buildRubyGem, lib, ruby_2_2 }: -stdenv.mkDerivation rec { - name = "flvtool2-1.0.6"; - - src = fetchurl { - url = "http://rubyforge.org/frs/download.php/17497/${name}.tgz"; - sha256 = "1pbsf0fvqrs6xzfkqal020bplb68dfiz6c5sfcz36k255v7c5w9a"; - }; - - buildInputs = [ ruby ]; - - configurePhase = - '' - substituteInPlace bin/flvtool2 --replace "/usr/bin/env ruby" "ruby -I$out/lib/ruby/site_ruby/1.8" - ruby setup.rb config --prefix=$out --siterubyver=$out/lib/ruby/site_ruby/1.8 - ''; - - installPhase = - '' - ruby setup.rb install - ''; +buildRubyGem rec { + ruby = ruby_2_2; + name = "${gemName}-${version}"; + gemName = "flvtool2"; + version = "1.0.6"; + sha256 = "0xsla1061pi4ryh3jbvwsbs8qchprchbqjy7652g2g64v37i74qj"; meta = { - homepage = http://www.inlet-media.de/flvtool2/; + homepage = https://github.com/unnu/flvtool2; description = "A tool to manipulate Macromedia Flash Video files"; + platforms = ruby.meta.platforms; }; } diff --git a/pkgs/tools/virtualization/azure-cli/node-packages.nix b/pkgs/tools/virtualization/azure-cli/node-packages.nix index 2cf7380caee..84379ae4c4a 100644 --- a/pkgs/tools/virtualization/azure-cli/node-packages.nix +++ b/pkgs/tools/virtualization/azure-cli/node-packages.nix @@ -14,7 +14,7 @@ }; deps = { "date-utils-1.2.18" = self.by-version."date-utils"."1.2.18"; - "jws-3.1.1" = self.by-version."jws"."3.1.1"; + "jws-3.1.3" = self.by-version."jws"."3.1.3"; "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; "request-2.69.0" = self.by-version."request"."2.69.0"; "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; @@ -41,7 +41,7 @@ }; deps = { "date-utils-1.2.18" = self.by-version."date-utils"."1.2.18"; - "jws-3.1.1" = self.by-version."jws"."3.1.1"; + "jws-3.1.3" = self.by-version."jws"."3.1.3"; "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; "request-2.69.0" = self.by-version."request"."2.69.0"; "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; @@ -94,17 +94,18 @@ cpu = [ ]; }; by-spec."ansi-styles"."^2.1.0" = - self.by-version."ansi-styles"."2.1.0"; - by-version."ansi-styles"."2.1.0" = self.buildNodePackage { - name = "ansi-styles-2.1.0"; - version = "2.1.0"; + self.by-version."ansi-styles"."2.2.0"; + by-version."ansi-styles"."2.2.0" = self.buildNodePackage { + name = "ansi-styles-2.2.0"; + version = "2.2.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"; - name = "ansi-styles-2.1.0.tgz"; - sha1 = "990f747146927b559a932bf92959163d60c0d0e2"; + url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.0.tgz"; + name = "ansi-styles-2.2.0.tgz"; + sha1 = "c59191936e6ed1c1315a4b6b6b97f3acfbfa68b0"; }; deps = { + "color-convert-1.0.0" = self.by-version."color-convert"."1.0.0"; }; optionalDependencies = { }; @@ -190,6 +191,25 @@ }; by-spec."assert-plus"."^0.2.0" = self.by-version."assert-plus"."0.2.0"; + by-spec."assert-plus"."^1.0.0" = + self.by-version."assert-plus"."1.0.0"; + by-version."assert-plus"."1.0.0" = self.buildNodePackage { + name = "assert-plus-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + name = "assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."async"."0.1.x" = self.by-version."async"."0.1.22"; by-version."async"."0.1.22" = self.buildNodePackage { @@ -326,40 +346,18 @@ cpu = [ ]; }; by-spec."aws4"."^1.2.1" = - self.by-version."aws4"."1.2.1"; - by-version."aws4"."1.2.1" = self.buildNodePackage { - name = "aws4-1.2.1"; - version = "1.2.1"; + self.by-version."aws4"."1.3.2"; + by-version."aws4"."1.3.2" = self.buildNodePackage { + name = "aws4-1.3.2"; + version = "1.3.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/aws4/-/aws4-1.2.1.tgz"; - name = "aws4-1.2.1.tgz"; - sha1 = "52b5659a4d32583d405f65e1124ac436d07fe5ac"; + url = "http://registry.npmjs.org/aws4/-/aws4-1.3.2.tgz"; + name = "aws4-1.3.2.tgz"; + sha1 = "d39e0bee412ced0e8ed94a23e314f313a95b9fd1"; }; deps = { - "lru-cache-2.7.3" = self.by-version."lru-cache"."2.7.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-arm-apiapp"."0.1.3" = - self.by-version."azure-arm-apiapp"."0.1.3"; - by-version."azure-arm-apiapp"."0.1.3" = self.buildNodePackage { - name = "azure-arm-apiapp-0.1.3"; - version = "0.1.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-arm-apiapp/-/azure-arm-apiapp-0.1.3.tgz"; - name = "azure-arm-apiapp-0.1.3.tgz"; - sha1 = "5fcc896027965655e27b63bfba7c5592db44ee91"; - }; - deps = { - "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - "moment-2.6.0" = self.by-version."moment"."2.6.0"; + "lru-cache-4.0.0" = self.by-version."lru-cache"."4.0.0"; }; optionalDependencies = { }; @@ -408,20 +406,20 @@ os = [ ]; cpu = [ ]; }; - by-spec."azure-arm-compute"."0.14.0" = - self.by-version."azure-arm-compute"."0.14.0"; - by-version."azure-arm-compute"."0.14.0" = self.buildNodePackage { - name = "azure-arm-compute-0.14.0"; - version = "0.14.0"; + by-spec."azure-arm-compute"."0.15.0" = + self.by-version."azure-arm-compute"."0.15.0"; + by-version."azure-arm-compute"."0.15.0" = self.buildNodePackage { + name = "azure-arm-compute-0.15.0"; + version = "0.15.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.14.0.tgz"; - name = "azure-arm-compute-0.14.0.tgz"; - sha1 = "5c2d2b981541b703335294a60718bd96a19cd285"; + url = "http://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.15.0.tgz"; + name = "azure-arm-compute-0.15.0.tgz"; + sha1 = "a057ba240bd5ee9972c8813066d925204af09e27"; }; deps = { - "ms-rest-1.9.0" = self.by-version."ms-rest"."1.9.0"; - "ms-rest-azure-1.9.0" = self.by-version."ms-rest-azure"."1.9.0"; + "ms-rest-1.10.0" = self.by-version."ms-rest"."1.10.0"; + "ms-rest-azure-1.10.0" = self.by-version."ms-rest-azure"."1.10.0"; }; optionalDependencies = { }; @@ -442,7 +440,7 @@ }; deps = { "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - "moment-2.11.2" = self.by-version."moment"."2.11.2"; + "moment-2.12.0" = self.by-version."moment"."2.12.0"; "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7"; "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; }; @@ -557,20 +555,20 @@ os = [ ]; cpu = [ ]; }; - by-spec."azure-arm-network"."0.12.0" = - self.by-version."azure-arm-network"."0.12.0"; - by-version."azure-arm-network"."0.12.0" = self.buildNodePackage { - name = "azure-arm-network-0.12.0"; - version = "0.12.0"; + by-spec."azure-arm-network"."0.12.1" = + self.by-version."azure-arm-network"."0.12.1"; + by-version."azure-arm-network"."0.12.1" = self.buildNodePackage { + name = "azure-arm-network-0.12.1"; + version = "0.12.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.12.0.tgz"; - name = "azure-arm-network-0.12.0.tgz"; - sha1 = "676f042f643c49d2af0071dd809789b53a70162b"; + url = "http://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.12.1.tgz"; + name = "azure-arm-network-0.12.1.tgz"; + sha1 = "57c659e9d25f35e2ac0b79a0f78f7d025ceb20b8"; }; deps = { - "ms-rest-1.9.0" = self.by-version."ms-rest"."1.9.0"; - "ms-rest-azure-1.9.0" = self.by-version."ms-rest-azure"."1.9.0"; + "ms-rest-1.10.0" = self.by-version."ms-rest"."1.10.0"; + "ms-rest-azure-1.10.0" = self.by-version."ms-rest-azure"."1.10.0"; }; optionalDependencies = { }; @@ -578,20 +576,20 @@ os = [ ]; cpu = [ ]; }; - by-spec."azure-arm-rediscache"."0.2.0" = - self.by-version."azure-arm-rediscache"."0.2.0"; - by-version."azure-arm-rediscache"."0.2.0" = self.buildNodePackage { - name = "azure-arm-rediscache-0.2.0"; - version = "0.2.0"; + by-spec."azure-arm-rediscache"."0.2.1" = + self.by-version."azure-arm-rediscache"."0.2.1"; + by-version."azure-arm-rediscache"."0.2.1" = self.buildNodePackage { + name = "azure-arm-rediscache-0.2.1"; + version = "0.2.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.0.tgz"; - name = "azure-arm-rediscache-0.2.0.tgz"; - sha1 = "cd9a25e4a2e0e58accdba5064811ddaa62eafeef"; + url = "http://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.1.tgz"; + name = "azure-arm-rediscache-0.2.1.tgz"; + sha1 = "22e516e7519dd12583e174cca4eeb3b20c993d02"; }; deps = { - "ms-rest-1.9.0" = self.by-version."ms-rest"."1.9.0"; - "ms-rest-azure-1.9.0" = self.by-version."ms-rest-azure"."1.9.0"; + "ms-rest-1.10.0" = self.by-version."ms-rest"."1.10.0"; + "ms-rest-azure-1.10.0" = self.by-version."ms-rest-azure"."1.10.0"; }; optionalDependencies = { }; @@ -599,20 +597,20 @@ os = [ ]; cpu = [ ]; }; - by-spec."azure-arm-resource"."0.10.7" = - self.by-version."azure-arm-resource"."0.10.7"; - by-version."azure-arm-resource"."0.10.7" = self.buildNodePackage { - name = "azure-arm-resource-0.10.7"; - version = "0.10.7"; + by-spec."azure-arm-resource"."1.0.0-preview" = + self.by-version."azure-arm-resource"."1.0.0-preview"; + by-version."azure-arm-resource"."1.0.0-preview" = self.buildNodePackage { + name = "azure-arm-resource-1.0.0-preview"; + version = "1.0.0-preview"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-0.10.7.tgz"; - name = "azure-arm-resource-0.10.7.tgz"; - sha1 = "f637acc4c1f1ea17fc52a31164c75f6b4f7c70be"; + url = "http://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.0.0-preview.tgz"; + name = "azure-arm-resource-1.0.0-preview.tgz"; + sha1 = "c664d4d0f3c4394680106f34359340e3c6a0cac2"; }; deps = { - "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; + "ms-rest-1.10.0" = self.by-version."ms-rest"."1.10.0"; + "ms-rest-azure-1.10.0" = self.by-version."ms-rest-azure"."1.10.0"; }; optionalDependencies = { }; @@ -620,20 +618,20 @@ os = [ ]; cpu = [ ]; }; - by-spec."azure-arm-storage"."0.12.1-preview" = - self.by-version."azure-arm-storage"."0.12.1-preview"; - by-version."azure-arm-storage"."0.12.1-preview" = self.buildNodePackage { - name = "azure-arm-storage-0.12.1-preview"; - version = "0.12.1-preview"; + by-spec."azure-arm-storage"."0.12.2-preview" = + self.by-version."azure-arm-storage"."0.12.2-preview"; + by-version."azure-arm-storage"."0.12.2-preview" = self.buildNodePackage { + name = "azure-arm-storage-0.12.2-preview"; + version = "0.12.2-preview"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-0.12.1-preview.tgz"; - name = "azure-arm-storage-0.12.1-preview.tgz"; - sha1 = "e793fe390348d809763623bbdc7ab5a7d1dd0d27"; + url = "http://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-0.12.2-preview.tgz"; + name = "azure-arm-storage-0.12.2-preview.tgz"; + sha1 = "ecdfe608b58fe7e136f47cd2f4139ee010a724e6"; }; deps = { - "ms-rest-1.9.0" = self.by-version."ms-rest"."1.9.0"; - "ms-rest-azure-1.9.0" = self.by-version."ms-rest-azure"."1.9.0"; + "ms-rest-1.10.0" = self.by-version."ms-rest"."1.10.0"; + "ms-rest-azure-1.10.0" = self.by-version."ms-rest-azure"."1.10.0"; }; optionalDependencies = { }; @@ -683,16 +681,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."azure-asm-compute"."0.11.0" = - self.by-version."azure-asm-compute"."0.11.0"; - by-version."azure-asm-compute"."0.11.0" = self.buildNodePackage { - name = "azure-asm-compute-0.11.0"; - version = "0.11.0"; + by-spec."azure-asm-compute"."0.13.0" = + self.by-version."azure-asm-compute"."0.13.0"; + by-version."azure-asm-compute"."0.13.0" = self.buildNodePackage { + name = "azure-asm-compute-0.13.0"; + version = "0.13.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/azure-asm-compute/-/azure-asm-compute-0.11.0.tgz"; - name = "azure-asm-compute-0.11.0.tgz"; - sha1 = "348ffae392ac0ce4aade50be99b8c89fd89701a0"; + url = "http://registry.npmjs.org/azure-asm-compute/-/azure-asm-compute-0.13.0.tgz"; + name = "azure-asm-compute-0.13.0.tgz"; + sha1 = "321999c92fcabb7da852a251cd97f461a0758065"; }; deps = { "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; @@ -891,45 +889,44 @@ cpu = [ ]; }; by-spec."azure-cli"."*" = - self.by-version."azure-cli"."0.9.15"; - by-version."azure-cli"."0.9.15" = self.buildNodePackage { - name = "azure-cli-0.9.15"; - version = "0.9.15"; + self.by-version."azure-cli"."0.9.17"; + by-version."azure-cli"."0.9.17" = self.buildNodePackage { + name = "azure-cli-0.9.17"; + version = "0.9.17"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/azure-cli/-/azure-cli-0.9.15.tgz"; - name = "azure-cli-0.9.15.tgz"; - sha1 = "c629199efd96c217c8b4341c5b8489c119fdbe4a"; + url = "http://registry.npmjs.org/azure-cli/-/azure-cli-0.9.17.tgz"; + name = "azure-cli-0.9.17.tgz"; + sha1 = "1f1cd28719c5fb8e201c01bf2a257a0880e743eb"; }; deps = { "adal-node-0.1.17" = self.by-version."adal-node"."0.1.17"; "async-1.4.2" = self.by-version."async"."1.4.2"; "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - "azure-arm-apiapp-0.1.3" = self.by-version."azure-arm-apiapp"."0.1.3"; "azure-arm-authorization-2.0.0" = self.by-version."azure-arm-authorization"."2.0.0"; "azure-arm-commerce-0.1.1" = self.by-version."azure-arm-commerce"."0.1.1"; - "azure-arm-compute-0.14.0" = self.by-version."azure-arm-compute"."0.14.0"; + "azure-arm-compute-0.15.0" = self.by-version."azure-arm-compute"."0.15.0"; "azure-arm-hdinsight-0.1.0" = self.by-version."azure-arm-hdinsight"."0.1.0"; "azure-arm-hdinsight-jobs-0.1.0" = self.by-version."azure-arm-hdinsight-jobs"."0.1.0"; "azure-arm-insights-0.10.2" = self.by-version."azure-arm-insights"."0.10.2"; - "azure-arm-network-0.12.0" = self.by-version."azure-arm-network"."0.12.0"; + "azure-arm-network-0.12.1" = self.by-version."azure-arm-network"."0.12.1"; "azure-arm-trafficmanager-0.10.5" = self.by-version."azure-arm-trafficmanager"."0.10.5"; "azure-arm-dns-0.10.1" = self.by-version."azure-arm-dns"."0.10.1"; "azure-arm-website-0.10.0" = self.by-version."azure-arm-website"."0.10.0"; - "azure-arm-rediscache-0.2.0" = self.by-version."azure-arm-rediscache"."0.2.0"; + "azure-arm-rediscache-0.2.1" = self.by-version."azure-arm-rediscache"."0.2.1"; "azure-arm-datalake-analytics-0.1.2" = self.by-version."azure-arm-datalake-analytics"."0.1.2"; "azure-arm-datalake-store-0.1.2" = self.by-version."azure-arm-datalake-store"."0.1.2"; "azure-extra-0.2.12" = self.by-version."azure-extra"."0.2.12"; "azure-gallery-2.0.0-pre.18" = self.by-version."azure-gallery"."2.0.0-pre.18"; "azure-keyvault-0.10.1" = self.by-version."azure-keyvault"."0.10.1"; - "azure-asm-compute-0.11.0" = self.by-version."azure-asm-compute"."0.11.0"; + "azure-asm-compute-0.13.0" = self.by-version."azure-asm-compute"."0.13.0"; "azure-asm-hdinsight-0.10.2" = self.by-version."azure-asm-hdinsight"."0.10.2"; "azure-asm-trafficmanager-0.10.3" = self.by-version."azure-asm-trafficmanager"."0.10.3"; "azure-asm-mgmt-0.10.1" = self.by-version."azure-asm-mgmt"."0.10.1"; "azure-monitoring-0.10.2" = self.by-version."azure-monitoring"."0.10.2"; "azure-asm-network-0.10.2" = self.by-version."azure-asm-network"."0.10.2"; - "azure-arm-resource-0.10.7" = self.by-version."azure-arm-resource"."0.10.7"; - "azure-arm-storage-0.12.1-preview" = self.by-version."azure-arm-storage"."0.12.1-preview"; + "azure-arm-resource-1.0.0-preview" = self.by-version."azure-arm-resource"."1.0.0-preview"; + "azure-arm-storage-0.12.2-preview" = self.by-version."azure-arm-storage"."0.12.2-preview"; "azure-asm-sb-0.10.1" = self.by-version."azure-asm-sb"."0.10.1"; "azure-asm-sql-0.10.1" = self.by-version."azure-asm-sql"."0.10.1"; "azure-asm-storage-0.10.1" = self.by-version."azure-asm-storage"."0.10.1"; @@ -943,14 +940,11 @@ "event-stream-3.1.5" = self.by-version."event-stream"."3.1.5"; "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; "github-0.1.6" = self.by-version."github"."0.1.6"; - "image-size-0.3.5" = self.by-version."image-size"."0.3.5"; "js2xmlparser-1.0.0" = self.by-version."js2xmlparser"."1.0.0"; "jsrsasign-4.8.2" = self.by-version."jsrsasign"."4.8.2"; - "jszip-2.5.0" = self.by-version."jszip"."2.5.0"; "kuduscript-1.0.6" = self.by-version."kuduscript"."1.0.6"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; "moment-2.6.0" = self.by-version."moment"."2.6.0"; - "ms-rest-azure-1.9.0" = self.by-version."ms-rest-azure"."1.9.0"; + "ms-rest-azure-1.10.0" = self.by-version."ms-rest-azure"."1.10.0"; "node-forge-0.6.23" = self.by-version."node-forge"."0.6.23"; "node-uuid-1.2.0" = self.by-version."node-uuid"."1.2.0"; "number-is-nan-1.0.0" = self.by-version."number-is-nan"."1.0.0"; @@ -961,14 +955,10 @@ "ssh-key-to-pem-0.11.0" = self.by-version."ssh-key-to-pem"."0.11.0"; "streamline-0.10.17" = self.by-version."streamline"."0.10.17"; "streamline-streams-0.1.5" = self.by-version."streamline-streams"."0.1.5"; - "swagger-schema-official-2.0.0-a33091a" = self.by-version."swagger-schema-official"."2.0.0-a33091a"; "through-2.3.4" = self.by-version."through"."2.3.4"; - "tmp-0.0.25" = self.by-version."tmp"."0.0.25"; "tunnel-0.0.2" = self.by-version."tunnel"."0.0.2"; - "tv4-1.2.7" = self.by-version."tv4"."1.2.7"; "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; "validator-3.1.0" = self.by-version."validator"."3.1.0"; - "walk-2.3.9" = self.by-version."walk"."2.3.9"; "winston-0.6.2" = self.by-version."winston"."0.6.2"; "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2"; "xml2js-0.1.14" = self.by-version."xml2js"."0.1.14"; @@ -980,7 +970,7 @@ os = [ ]; cpu = [ ]; }; - "azure-cli" = self.by-version."azure-cli"."0.9.15"; + "azure-cli" = self.by-version."azure-cli"."0.9.17"; by-spec."azure-common"."0.9.12" = self.by-version."azure-common"."0.9.12"; by-version."azure-common"."0.9.12" = self.buildNodePackage { @@ -1176,35 +1166,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."base64url"."~0.0.4" = - self.by-version."base64url"."0.0.6"; - by-version."base64url"."0.0.6" = self.buildNodePackage { - name = "base64url-0.0.6"; - version = "0.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/base64url/-/base64url-0.0.6.tgz"; - name = "base64url-0.0.6.tgz"; - sha1 = "9597b36b330db1c42477322ea87ea8027499b82b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."base64url"."~1.0.4" = - self.by-version."base64url"."1.0.5"; - by-version."base64url"."1.0.5" = self.buildNodePackage { - name = "base64url-1.0.5"; - version = "1.0.5"; + self.by-version."base64url"."1.0.6"; + by-version."base64url"."1.0.6" = self.buildNodePackage { + name = "base64url-1.0.6"; + version = "1.0.6"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/base64url/-/base64url-1.0.5.tgz"; - name = "base64url-1.0.5.tgz"; - sha1 = "c54bcb4f9a2b7da422bca549e71c1640b533b825"; + url = "http://registry.npmjs.org/base64url/-/base64url-1.0.6.tgz"; + name = "base64url-1.0.6.tgz"; + sha1 = "d64d375d68a7c640d912e2358d170dca5bb54681"; }; deps = { "concat-stream-1.4.10" = self.by-version."concat-stream"."1.4.10"; @@ -1237,15 +1208,15 @@ cpu = [ ]; }; by-spec."bl"."~1.0.0" = - self.by-version."bl"."1.0.2"; - by-version."bl"."1.0.2" = self.buildNodePackage { - name = "bl-1.0.2"; - version = "1.0.2"; + self.by-version."bl"."1.0.3"; + by-version."bl"."1.0.3" = self.buildNodePackage { + name = "bl-1.0.3"; + version = "1.0.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/bl/-/bl-1.0.2.tgz"; - name = "bl-1.0.2.tgz"; - sha1 = "8c66490d825ba84d560de1f62196a29555b3a0c4"; + url = "http://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; + name = "bl-1.0.3.tgz"; + sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e"; }; deps = { "readable-stream-2.0.5" = self.by-version."readable-stream"."2.0.5"; @@ -1501,10 +1472,10 @@ sha1 = "509afb67066e7499f7eb3535c77445772ae2d019"; }; deps = { - "ansi-styles-2.1.0" = self.by-version."ansi-styles"."2.1.0"; - "escape-string-regexp-1.0.4" = self.by-version."escape-string-regexp"."1.0.4"; + "ansi-styles-2.2.0" = self.by-version."ansi-styles"."2.2.0"; + "escape-string-regexp-1.0.5" = self.by-version."escape-string-regexp"."1.0.5"; "has-ansi-2.0.0" = self.by-version."has-ansi"."2.0.0"; - "strip-ansi-3.0.0" = self.by-version."strip-ansi"."3.0.0"; + "strip-ansi-3.0.1" = self.by-version."strip-ansi"."3.0.1"; "supports-color-2.0.0" = self.by-version."supports-color"."2.0.0"; }; optionalDependencies = { @@ -1515,6 +1486,25 @@ }; by-spec."chalk"."^1.1.1" = self.by-version."chalk"."1.1.1"; + by-spec."color-convert"."^1.0.0" = + self.by-version."color-convert"."1.0.0"; + by-version."color-convert"."1.0.0" = self.buildNodePackage { + name = "color-convert-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/color-convert/-/color-convert-1.0.0.tgz"; + name = "color-convert-1.0.0.tgz"; + sha1 = "3c26fcd885d272d45beacf6e41baba75c89a8579"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."colors"."0.x.x" = self.by-version."colors"."0.6.2"; by-version."colors"."0.6.2" = self.buildNodePackage { @@ -1781,18 +1771,18 @@ cpu = [ ]; }; by-spec."dashdash".">=1.10.1 <2.0.0" = - self.by-version."dashdash"."1.12.2"; - by-version."dashdash"."1.12.2" = self.buildNodePackage { - name = "dashdash-1.12.2"; - version = "1.12.2"; + self.by-version."dashdash"."1.13.0"; + by-version."dashdash"."1.13.0" = self.buildNodePackage { + name = "dashdash-1.13.0"; + version = "1.13.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/dashdash/-/dashdash-1.12.2.tgz"; - name = "dashdash-1.12.2.tgz"; - sha1 = "1c6f70588498d047b8cd5777b32ba85a5e25be36"; + url = "http://registry.npmjs.org/dashdash/-/dashdash-1.13.0.tgz"; + name = "dashdash-1.13.0.tgz"; + sha1 = "a5aae6fd9d8e156624eb0dd9259eb12ba245385a"; }; deps = { - "assert-plus-0.2.0" = self.by-version."assert-plus"."0.2.0"; + "assert-plus-1.0.0" = self.by-version."assert-plus"."1.0.0"; }; optionalDependencies = { }; @@ -1993,15 +1983,15 @@ cpu = [ ]; }; by-spec."escape-string-regexp"."^1.0.2" = - self.by-version."escape-string-regexp"."1.0.4"; - by-version."escape-string-regexp"."1.0.4" = self.buildNodePackage { - name = "escape-string-regexp-1.0.4"; - version = "1.0.4"; + self.by-version."escape-string-regexp"."1.0.5"; + by-version."escape-string-regexp"."1.0.5" = self.buildNodePackage { + name = "escape-string-regexp-1.0.5"; + version = "1.0.5"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.4.tgz"; - name = "escape-string-regexp-1.0.4.tgz"; - sha1 = "b85e679b46f72d03fbbe8a3bf7259d535c21b62f"; + url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + name = "escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; deps = { }; @@ -2116,34 +2106,15 @@ by-spec."eyes"."0.x.x" = self.by-version."eyes"."0.1.8"; by-spec."fibers"."^1.0.1" = - self.by-version."fibers"."1.0.8"; - by-version."fibers"."1.0.8" = self.buildNodePackage { - name = "fibers-1.0.8"; - version = "1.0.8"; + self.by-version."fibers"."1.0.10"; + by-version."fibers"."1.0.10" = self.buildNodePackage { + name = "fibers-1.0.10"; + version = "1.0.10"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/fibers/-/fibers-1.0.8.tgz"; - name = "fibers-1.0.8.tgz"; - sha1 = "cbffda427c4e588a6f8601c2a07d134b092077f2"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."foreachasync"."^3.0.0" = - self.by-version."foreachasync"."3.0.0"; - by-version."foreachasync"."3.0.0" = self.buildNodePackage { - name = "foreachasync-3.0.0"; - version = "3.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz"; - name = "foreachasync-3.0.0.tgz"; - sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6"; + url = "http://registry.npmjs.org/fibers/-/fibers-1.0.10.tgz"; + name = "fibers-1.0.10.tgz"; + sha1 = "0ccea7287e5dafd2626c2c9d3f15113a1b5829cd"; }; deps = { }; @@ -2251,7 +2222,7 @@ deps = { "async-1.5.2" = self.by-version."async"."1.5.2"; "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5"; - "mime-types-2.1.9" = self.by-version."mime-types"."2.1.9"; + "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10"; }; optionalDependencies = { }; @@ -2408,7 +2379,7 @@ "bluebird-2.10.2" = self.by-version."bluebird"."2.10.2"; "chalk-1.1.1" = self.by-version."chalk"."1.1.1"; "commander-2.9.0" = self.by-version."commander"."2.9.0"; - "is-my-json-valid-2.12.4" = self.by-version."is-my-json-valid"."2.12.4"; + "is-my-json-valid-2.13.1" = self.by-version."is-my-json-valid"."2.13.1"; }; optionalDependencies = { }; @@ -2430,7 +2401,7 @@ deps = { "chalk-1.1.1" = self.by-version."chalk"."1.1.1"; "commander-2.9.0" = self.by-version."commander"."2.9.0"; - "is-my-json-valid-2.12.4" = self.by-version."is-my-json-valid"."2.12.4"; + "is-my-json-valid-2.13.1" = self.by-version."is-my-json-valid"."2.13.1"; "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0"; }; optionalDependencies = { @@ -2624,26 +2595,7 @@ deps = { "assert-plus-0.2.0" = self.by-version."assert-plus"."0.2.0"; "jsprim-1.2.2" = self.by-version."jsprim"."1.2.2"; - "sshpk-1.7.3" = self.by-version."sshpk"."1.7.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."image-size"."^0.3.5" = - self.by-version."image-size"."0.3.5"; - by-version."image-size"."0.3.5" = self.buildNodePackage { - name = "image-size-0.3.5"; - version = "0.3.5"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/image-size/-/image-size-0.3.5.tgz"; - name = "image-size-0.3.5.tgz"; - sha1 = "83240eab2fb5b00b04aab8c74b0471e9cba7ad8c"; - }; - deps = { + "sshpk-1.7.4" = self.by-version."sshpk"."1.7.4"; }; optionalDependencies = { }; @@ -2713,15 +2665,15 @@ cpu = [ ]; }; by-spec."is-my-json-valid"."^2.12.0" = - self.by-version."is-my-json-valid"."2.12.4"; - by-version."is-my-json-valid"."2.12.4" = self.buildNodePackage { - name = "is-my-json-valid-2.12.4"; - version = "2.12.4"; + self.by-version."is-my-json-valid"."2.13.1"; + by-version."is-my-json-valid"."2.13.1" = self.buildNodePackage { + name = "is-my-json-valid-2.13.1"; + version = "2.13.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.4.tgz"; - name = "is-my-json-valid-2.12.4.tgz"; - sha1 = "d4ed2bc1d7f88daf8d0f763b3e3e39a69bd37880"; + url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz"; + name = "is-my-json-valid-2.13.1.tgz"; + sha1 = "d55778a82feb6b0963ff4be111d5d1684e890707"; }; deps = { "generate-function-2.0.0" = self.by-version."generate-function"."2.0.0"; @@ -2736,7 +2688,7 @@ cpu = [ ]; }; by-spec."is-my-json-valid"."^2.12.4" = - self.by-version."is-my-json-valid"."2.12.4"; + self.by-version."is-my-json-valid"."2.13.1"; by-spec."is-property"."^1.0.0" = self.by-version."is-property"."1.0.2"; by-version."is-property"."1.0.2" = self.buildNodePackage { @@ -2975,39 +2927,19 @@ os = [ ]; cpu = [ ]; }; - by-spec."jszip"."^2.5.0" = - self.by-version."jszip"."2.5.0"; - by-version."jszip"."2.5.0" = self.buildNodePackage { - name = "jszip-2.5.0"; - version = "2.5.0"; + by-spec."jwa"."^1.1.2" = + self.by-version."jwa"."1.1.3"; + by-version."jwa"."1.1.3" = self.buildNodePackage { + name = "jwa-1.1.3"; + version = "1.1.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/jszip/-/jszip-2.5.0.tgz"; - name = "jszip-2.5.0.tgz"; - sha1 = "7444fd8551ddf3e5da7198fea0c91bc8308cc274"; + url = "http://registry.npmjs.org/jwa/-/jwa-1.1.3.tgz"; + name = "jwa-1.1.3.tgz"; + sha1 = "fa9f2f005ff0c630e7c41526a31f37f79733cd6d"; }; deps = { - "pako-0.2.8" = self.by-version."pako"."0.2.8"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jwa"."^1.1.0" = - self.by-version."jwa"."1.1.1"; - by-version."jwa"."1.1.1" = self.buildNodePackage { - name = "jwa-1.1.1"; - version = "1.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/jwa/-/jwa-1.1.1.tgz"; - name = "jwa-1.1.1.tgz"; - sha1 = "b83c05279f0707f55ca5387b7b3f23da9f80195f"; - }; - deps = { - "base64url-0.0.6" = self.by-version."base64url"."0.0.6"; + "base64url-1.0.6" = self.by-version."base64url"."1.0.6"; "buffer-equal-constant-time-1.0.1" = self.by-version."buffer-equal-constant-time"."1.0.1"; "ecdsa-sig-formatter-1.0.5" = self.by-version."ecdsa-sig-formatter"."1.0.5"; }; @@ -3018,19 +2950,19 @@ cpu = [ ]; }; by-spec."jws"."3.x.x" = - self.by-version."jws"."3.1.1"; - by-version."jws"."3.1.1" = self.buildNodePackage { - name = "jws-3.1.1"; - version = "3.1.1"; + self.by-version."jws"."3.1.3"; + by-version."jws"."3.1.3" = self.buildNodePackage { + name = "jws-3.1.3"; + version = "3.1.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/jws/-/jws-3.1.1.tgz"; - name = "jws-3.1.1.tgz"; - sha1 = "34f5a424e628af4551121e860ba279f55cfa6629"; + url = "http://registry.npmjs.org/jws/-/jws-3.1.3.tgz"; + name = "jws-3.1.3.tgz"; + sha1 = "b88f1b4581a2c5ee8813c06b3fdf90ea9b5c7e6c"; }; deps = { - "base64url-1.0.5" = self.by-version."base64url"."1.0.5"; - "jwa-1.1.1" = self.by-version."jwa"."1.1.1"; + "base64url-1.0.6" = self.by-version."base64url"."1.0.6"; + "jwa-1.1.3" = self.by-version."jwa"."1.1.3"; }; optionalDependencies = { }; @@ -3078,18 +3010,20 @@ os = [ ]; cpu = [ ]; }; - by-spec."lru-cache"."^2.6.5" = - self.by-version."lru-cache"."2.7.3"; - by-version."lru-cache"."2.7.3" = self.buildNodePackage { - name = "lru-cache-2.7.3"; - version = "2.7.3"; + by-spec."lru-cache"."^4.0.0" = + self.by-version."lru-cache"."4.0.0"; + by-version."lru-cache"."4.0.0" = self.buildNodePackage { + name = "lru-cache-4.0.0"; + version = "4.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz"; - name = "lru-cache-2.7.3.tgz"; - sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952"; + url = "http://registry.npmjs.org/lru-cache/-/lru-cache-4.0.0.tgz"; + name = "lru-cache-4.0.0.tgz"; + sha1 = "b5cbf01556c16966febe54ceec0fb4dc90df6c28"; }; deps = { + "pseudomap-1.0.2" = self.by-version."pseudomap"."1.0.2"; + "yallist-2.0.0" = self.by-version."yallist"."2.0.0"; }; optionalDependencies = { }; @@ -3177,8 +3111,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."mime"."~1.2.4" = - self.by-version."mime"."1.2.11"; by-spec."mime-db"."~1.12.0" = self.by-version."mime-db"."1.12.0"; by-version."mime-db"."1.12.0" = self.buildNodePackage { @@ -3198,16 +3130,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."mime-db"."~1.21.0" = - self.by-version."mime-db"."1.21.0"; - by-version."mime-db"."1.21.0" = self.buildNodePackage { - name = "mime-db-1.21.0"; - version = "1.21.0"; + by-spec."mime-db"."~1.22.0" = + self.by-version."mime-db"."1.22.0"; + by-version."mime-db"."1.22.0" = self.buildNodePackage { + name = "mime-db-1.22.0"; + version = "1.22.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz"; - name = "mime-db-1.21.0.tgz"; - sha1 = "9b5239e3353cf6eb015a00d890261027c36d4bac"; + url = "http://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz"; + name = "mime-db-1.22.0.tgz"; + sha1 = "ab23a6372dc9d86d3dc9121bd0ebd38105a1904a"; }; deps = { }; @@ -3218,18 +3150,18 @@ cpu = [ ]; }; by-spec."mime-types"."^2.1.3" = - self.by-version."mime-types"."2.1.9"; - by-version."mime-types"."2.1.9" = self.buildNodePackage { - name = "mime-types-2.1.9"; - version = "2.1.9"; + self.by-version."mime-types"."2.1.10"; + by-version."mime-types"."2.1.10" = self.buildNodePackage { + name = "mime-types-2.1.10"; + version = "2.1.10"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz"; - name = "mime-types-2.1.9.tgz"; - sha1 = "dfb396764b5fdf75be34b1f4104bc3687fb635f8"; + url = "http://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz"; + name = "mime-types-2.1.10.tgz"; + sha1 = "b93c7cb4362e16d41072a7e54538fb4d43070837"; }; deps = { - "mime-db-1.21.0" = self.by-version."mime-db"."1.21.0"; + "mime-db-1.22.0" = self.by-version."mime-db"."1.22.0"; }; optionalDependencies = { }; @@ -3279,7 +3211,7 @@ by-spec."mime-types"."~2.0.3" = self.by-version."mime-types"."2.0.14"; by-spec."mime-types"."~2.1.7" = - self.by-version."mime-types"."2.1.9"; + self.by-version."mime-types"."2.1.10"; by-spec."minimist"."^1.1.0" = self.by-version."minimist"."1.2.0"; by-version."minimist"."1.2.0" = self.buildNodePackage { @@ -3319,15 +3251,15 @@ cpu = [ ]; }; by-spec."moment"."^2.6.0" = - self.by-version."moment"."2.11.2"; - by-version."moment"."2.11.2" = self.buildNodePackage { - name = "moment-2.11.2"; - version = "2.11.2"; + self.by-version."moment"."2.12.0"; + by-version."moment"."2.12.0" = self.buildNodePackage { + name = "moment-2.12.0"; + version = "2.12.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/moment/-/moment-2.11.2.tgz"; - name = "moment-2.11.2.tgz"; - sha1 = "87968e5f95ac038c2e42ac959c75819cd3f52901"; + url = "http://registry.npmjs.org/moment/-/moment-2.12.0.tgz"; + name = "moment-2.12.0.tgz"; + sha1 = "dc2560d19838d6c0731b1a6afa04675264d360d6"; }; deps = { }; @@ -3337,53 +3269,51 @@ os = [ ]; cpu = [ ]; }; + by-spec."ms-rest"."^1.10.0" = + self.by-version."ms-rest"."1.10.0"; + by-version."ms-rest"."1.10.0" = self.buildNodePackage { + name = "ms-rest-1.10.0"; + version = "1.10.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ms-rest/-/ms-rest-1.10.0.tgz"; + name = "ms-rest-1.10.0.tgz"; + sha1 = "d1d9a93f3c7f7189500475ac680875ed1da56d99"; + }; + deps = { + "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; + "tunnel-0.0.4" = self.by-version."tunnel"."0.0.4"; + "request-2.69.0" = self.by-version."request"."2.69.0"; + "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1"; + "through-2.3.8" = self.by-version."through"."2.3.8"; + "moment-2.12.0" = self.by-version."moment"."2.12.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."ms-rest"."^1.8.0" = - self.by-version."ms-rest"."1.9.0"; - by-version."ms-rest"."1.9.0" = self.buildNodePackage { - name = "ms-rest-1.9.0"; - version = "1.9.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ms-rest/-/ms-rest-1.9.0.tgz"; - name = "ms-rest-1.9.0.tgz"; - sha1 = "12b20c5477874c1ec09133b5fa77ea4bb67824ce"; - }; - deps = { - "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; - "tunnel-0.0.4" = self.by-version."tunnel"."0.0.4"; - "request-2.52.0" = self.by-version."request"."2.52.0"; - "validator-3.1.0" = self.by-version."validator"."3.1.0"; - "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1"; - "through-2.3.8" = self.by-version."through"."2.3.8"; - "tough-cookie-2.2.1" = self.by-version."tough-cookie"."2.2.1"; - "moment-2.11.2" = self.by-version."moment"."2.11.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ms-rest"."^1.9.0" = - self.by-version."ms-rest"."1.9.0"; + self.by-version."ms-rest"."1.10.0"; by-spec."ms-rest-azure"."^1.8.0" = - self.by-version."ms-rest-azure"."1.9.0"; - by-version."ms-rest-azure"."1.9.0" = self.buildNodePackage { - name = "ms-rest-azure-1.9.0"; - version = "1.9.0"; + self.by-version."ms-rest-azure"."1.10.0"; + by-version."ms-rest-azure"."1.10.0" = self.buildNodePackage { + name = "ms-rest-azure-1.10.0"; + version = "1.10.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.9.0.tgz"; - name = "ms-rest-azure-1.9.0.tgz"; - sha1 = "b172ac72f890ac31511e9c68899f4aa4d50c5bd1"; + url = "http://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.10.0.tgz"; + name = "ms-rest-azure-1.10.0.tgz"; + sha1 = "467f481de7f3f10b5d020de393d0de71ada6278a"; }; deps = { "async-0.2.7" = self.by-version."async"."0.2.7"; "uuid-2.0.1" = self.by-version."uuid"."2.0.1"; "adal-node-0.1.16" = self.by-version."adal-node"."0.1.16"; - "ms-rest-1.9.0" = self.by-version."ms-rest"."1.9.0"; + "ms-rest-1.10.0" = self.by-version."ms-rest"."1.10.0"; "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; - "moment-2.11.2" = self.by-version."moment"."2.11.2"; + "moment-2.12.0" = self.by-version."moment"."2.12.0"; }; optionalDependencies = { }; @@ -3610,25 +3540,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."pako"."~0.2.5" = - self.by-version."pako"."0.2.8"; - by-version."pako"."0.2.8" = self.buildNodePackage { - name = "pako-0.2.8"; - version = "0.2.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/pako/-/pako-0.2.8.tgz"; - name = "pako-0.2.8.tgz"; - sha1 = "15ad772915362913f20de4a8a164b4aacc6165d6"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."pause-stream"."0.0.11" = self.by-version."pause-stream"."0.0.11"; by-version."pause-stream"."0.0.11" = self.buildNodePackage { @@ -3726,6 +3637,25 @@ os = [ ]; cpu = [ ]; }; + by-spec."pseudomap"."^1.0.1" = + self.by-version."pseudomap"."1.0.2"; + by-version."pseudomap"."1.0.2" = self.buildNodePackage { + name = "pseudomap-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; + name = "pseudomap-1.0.2.tgz"; + sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."q"."~0.9.3" = self.by-version."q"."0.9.7"; by-version."q"."0.9.7" = self.buildNodePackage { @@ -3939,7 +3869,7 @@ "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; }; optionalDependencies = { - "tough-cookie-2.2.1" = self.by-version."tough-cookie"."2.2.1"; + "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2"; "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1"; "oauth-sign-0.4.0" = self.by-version."oauth-sign"."0.4.0"; "hawk-1.1.1" = self.by-version."hawk"."1.1.1"; @@ -3971,7 +3901,7 @@ "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7"; "qs-2.3.3" = self.by-version."qs"."2.3.3"; "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2"; - "tough-cookie-2.2.1" = self.by-version."tough-cookie"."2.2.1"; + "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2"; "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1"; "oauth-sign-0.6.0" = self.by-version."oauth-sign"."0.6.0"; "hawk-2.3.1" = self.by-version."hawk"."2.3.1"; @@ -3986,6 +3916,46 @@ os = [ ]; cpu = [ ]; }; + by-spec."request"."2.69.0" = + self.by-version."request"."2.69.0"; + by-version."request"."2.69.0" = self.buildNodePackage { + name = "request-2.69.0"; + version = "2.69.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/request/-/request-2.69.0.tgz"; + name = "request-2.69.0.tgz"; + sha1 = "cf91d2e000752b1217155c005241911991a2346a"; + }; + deps = { + "aws-sign2-0.6.0" = self.by-version."aws-sign2"."0.6.0"; + "aws4-1.3.2" = self.by-version."aws4"."1.3.2"; + "bl-1.0.3" = self.by-version."bl"."1.0.3"; + "caseless-0.11.0" = self.by-version."caseless"."0.11.0"; + "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5"; + "extend-3.0.0" = self.by-version."extend"."3.0.0"; + "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1"; + "form-data-1.0.0-rc3" = self.by-version."form-data"."1.0.0-rc3"; + "har-validator-2.0.6" = self.by-version."har-validator"."2.0.6"; + "hawk-3.1.3" = self.by-version."hawk"."3.1.3"; + "http-signature-1.1.1" = self.by-version."http-signature"."1.1.1"; + "is-typedarray-1.0.0" = self.by-version."is-typedarray"."1.0.0"; + "isstream-0.1.2" = self.by-version."isstream"."0.1.2"; + "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1"; + "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10"; + "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7"; + "oauth-sign-0.8.1" = self.by-version."oauth-sign"."0.8.1"; + "qs-6.0.2" = self.by-version."qs"."6.0.2"; + "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5"; + "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2"; + "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."request"."2.9.x" = self.by-version."request"."2.9.203"; by-version."request"."2.9.203" = self.buildNodePackage { @@ -4007,44 +3977,6 @@ }; by-spec."request".">= 2.52.0" = self.by-version."request"."2.69.0"; - by-version."request"."2.69.0" = self.buildNodePackage { - name = "request-2.69.0"; - version = "2.69.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.69.0.tgz"; - name = "request-2.69.0.tgz"; - sha1 = "cf91d2e000752b1217155c005241911991a2346a"; - }; - deps = { - "aws-sign2-0.6.0" = self.by-version."aws-sign2"."0.6.0"; - "aws4-1.2.1" = self.by-version."aws4"."1.2.1"; - "bl-1.0.2" = self.by-version."bl"."1.0.2"; - "caseless-0.11.0" = self.by-version."caseless"."0.11.0"; - "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5"; - "extend-3.0.0" = self.by-version."extend"."3.0.0"; - "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1"; - "form-data-1.0.0-rc3" = self.by-version."form-data"."1.0.0-rc3"; - "har-validator-2.0.6" = self.by-version."har-validator"."2.0.6"; - "hawk-3.1.3" = self.by-version."hawk"."3.1.3"; - "http-signature-1.1.1" = self.by-version."http-signature"."1.1.1"; - "is-typedarray-1.0.0" = self.by-version."is-typedarray"."1.0.0"; - "isstream-0.1.2" = self.by-version."isstream"."0.1.2"; - "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1"; - "mime-types-2.1.9" = self.by-version."mime-types"."2.1.9"; - "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7"; - "oauth-sign-0.8.1" = self.by-version."oauth-sign"."0.8.1"; - "qs-6.0.2" = self.by-version."qs"."6.0.2"; - "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5"; - "tough-cookie-2.2.1" = self.by-version."tough-cookie"."2.2.1"; - "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."request".">= 2.9.203" = self.by-version."request"."2.69.0"; by-spec."request"."~2.57.0" = @@ -4068,7 +4000,7 @@ "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7"; "qs-3.1.0" = self.by-version."qs"."3.1.0"; "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2"; - "tough-cookie-2.2.1" = self.by-version."tough-cookie"."2.2.1"; + "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2"; "http-signature-0.11.0" = self.by-version."http-signature"."0.11.0"; "oauth-sign-0.8.1" = self.by-version."oauth-sign"."0.8.1"; "hawk-2.3.1" = self.by-version."hawk"."2.3.1"; @@ -4104,15 +4036,15 @@ cpu = [ ]; }; by-spec."sax".">=0.1.1" = - self.by-version."sax"."1.1.5"; - by-version."sax"."1.1.5" = self.buildNodePackage { - name = "sax-1.1.5"; - version = "1.1.5"; + self.by-version."sax"."1.1.6"; + by-version."sax"."1.1.6" = self.buildNodePackage { + name = "sax-1.1.6"; + version = "1.1.6"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/sax/-/sax-1.1.5.tgz"; - name = "sax-1.1.5.tgz"; - sha1 = "1da50a8d00cdecd59405659f5ff85349fe773743"; + url = "http://registry.npmjs.org/sax/-/sax-1.1.6.tgz"; + name = "sax-1.1.6.tgz"; + sha1 = "5d616be8a5e607d54e114afae55b7eaf2fcc3240"; }; deps = { }; @@ -4224,24 +4156,24 @@ cpu = [ ]; }; by-spec."sshpk"."^1.7.0" = - self.by-version."sshpk"."1.7.3"; - by-version."sshpk"."1.7.3" = self.buildNodePackage { - name = "sshpk-1.7.3"; - version = "1.7.3"; + self.by-version."sshpk"."1.7.4"; + by-version."sshpk"."1.7.4" = self.buildNodePackage { + name = "sshpk-1.7.4"; + version = "1.7.4"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/sshpk/-/sshpk-1.7.3.tgz"; - name = "sshpk-1.7.3.tgz"; - sha1 = "caa8ef95e30765d856698b7025f9f211ab65962f"; + url = "http://registry.npmjs.org/sshpk/-/sshpk-1.7.4.tgz"; + name = "sshpk-1.7.4.tgz"; + sha1 = "ad7b47defca61c8415d964243b62b0ce60fbca38"; }; deps = { "asn1-0.2.3" = self.by-version."asn1"."0.2.3"; "assert-plus-0.2.0" = self.by-version."assert-plus"."0.2.0"; - "dashdash-1.12.2" = self.by-version."dashdash"."1.12.2"; + "dashdash-1.13.0" = self.by-version."dashdash"."1.13.0"; }; optionalDependencies = { "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0"; - "tweetnacl-0.13.3" = self.by-version."tweetnacl"."0.13.3"; + "tweetnacl-0.14.1" = self.by-version."tweetnacl"."0.14.1"; "jodid25519-1.0.2" = self.by-version."jodid25519"."1.0.2"; "ecc-jsbn-0.1.1" = self.by-version."ecc-jsbn"."0.1.1"; }; @@ -4305,7 +4237,7 @@ "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; }; optionalDependencies = { - "fibers-1.0.8" = self.by-version."fibers"."1.0.8"; + "fibers-1.0.10" = self.by-version."fibers"."1.0.10"; "galaxy-0.1.12" = self.by-version."galaxy"."0.1.12"; }; peerDependencies = []; @@ -4389,15 +4321,15 @@ cpu = [ ]; }; by-spec."strip-ansi"."^3.0.0" = - self.by-version."strip-ansi"."3.0.0"; - by-version."strip-ansi"."3.0.0" = self.buildNodePackage { - name = "strip-ansi-3.0.0"; - version = "3.0.0"; + self.by-version."strip-ansi"."3.0.1"; + by-version."strip-ansi"."3.0.1" = self.buildNodePackage { + name = "strip-ansi-3.0.1"; + version = "3.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz"; - name = "strip-ansi-3.0.0.tgz"; - sha1 = "7510b665567ca914ccb5d7e072763ac968be3724"; + url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + name = "strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; }; deps = { "ansi-regex-2.0.0" = self.by-version."ansi-regex"."2.0.0"; @@ -4427,25 +4359,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."swagger-schema-official"."2.0.0-a33091a" = - self.by-version."swagger-schema-official"."2.0.0-a33091a"; - by-version."swagger-schema-official"."2.0.0-a33091a" = self.buildNodePackage { - name = "swagger-schema-official-2.0.0-a33091a"; - version = "2.0.0-a33091a"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/swagger-schema-official/-/swagger-schema-official-2.0.0-a33091a.tgz"; - name = "swagger-schema-official-2.0.0-a33091a.tgz"; - sha1 = "54cd2c83aac5b2203572fcd70e6e092d17b763fd"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."through"."2" = self.by-version."through"."2.3.8"; by-version."through"."2.3.8" = self.buildNodePackage { @@ -4490,48 +4403,27 @@ self.by-version."through"."2.3.8"; by-spec."through"."~2.3.4" = self.by-version."through"."2.3.8"; - by-spec."tmp"."0.0.25" = - self.by-version."tmp"."0.0.25"; - by-version."tmp"."0.0.25" = self.buildNodePackage { - name = "tmp-0.0.25"; - version = "0.0.25"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/tmp/-/tmp-0.0.25.tgz"; - name = "tmp-0.0.25.tgz"; - sha1 = "b29629768c55f38df0bff33f6dfde052443da27d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."tough-cookie"."*" = - self.by-version."tough-cookie"."2.2.1"; - by-version."tough-cookie"."2.2.1" = self.buildNodePackage { - name = "tough-cookie-2.2.1"; - version = "2.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"; - name = "tough-cookie-2.2.1.tgz"; - sha1 = "3b0516b799e70e8164436a1446e7e5877fda118e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."tough-cookie".">=0.12.0" = - self.by-version."tough-cookie"."2.2.1"; + self.by-version."tough-cookie"."2.2.2"; + by-version."tough-cookie"."2.2.2" = self.buildNodePackage { + name = "tough-cookie-2.2.2"; + version = "2.2.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz"; + name = "tough-cookie-2.2.2.tgz"; + sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."tough-cookie"."~2.2.0" = - self.by-version."tough-cookie"."2.2.1"; + self.by-version."tough-cookie"."2.2.2"; by-spec."tunnel"."0.0.2" = self.by-version."tunnel"."0.0.2"; by-version."tunnel"."0.0.2" = self.buildNodePackage { @@ -4591,35 +4483,16 @@ }; by-spec."tunnel-agent"."~0.4.1" = self.by-version."tunnel-agent"."0.4.2"; - by-spec."tv4"."^1.1.9" = - self.by-version."tv4"."1.2.7"; - by-version."tv4"."1.2.7" = self.buildNodePackage { - name = "tv4-1.2.7"; - version = "1.2.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/tv4/-/tv4-1.2.7.tgz"; - name = "tv4-1.2.7.tgz"; - sha1 = "bd29389afc73ade49ae5f48142b5d544bf68d120"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."tweetnacl".">=0.13.0 <1.0.0" = - self.by-version."tweetnacl"."0.13.3"; - by-version."tweetnacl"."0.13.3" = self.buildNodePackage { - name = "tweetnacl-0.13.3"; - version = "0.13.3"; + self.by-version."tweetnacl"."0.14.1"; + by-version."tweetnacl"."0.14.1" = self.buildNodePackage { + name = "tweetnacl-0.14.1"; + version = "0.14.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz"; - name = "tweetnacl-0.13.3.tgz"; - sha1 = "d628b56f3bcc3d5ae74ba9d4c1a704def5ab4b56"; + url = "http://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.1.tgz"; + name = "tweetnacl-0.14.1.tgz"; + sha1 = "37c6a1fb5cd4b63b7acee450d8419d9c0024cc03"; }; deps = { }; @@ -4786,26 +4659,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."walk"."^2.3.9" = - self.by-version."walk"."2.3.9"; - by-version."walk"."2.3.9" = self.buildNodePackage { - name = "walk-2.3.9"; - version = "2.3.9"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/walk/-/walk-2.3.9.tgz"; - name = "walk-2.3.9.tgz"; - sha1 = "31b4db6678f2ae01c39ea9fb8725a9031e558a7b"; - }; - deps = { - "foreachasync-3.0.0" = self.by-version."foreachasync"."3.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."winston"."0.6.x" = self.by-version."winston"."0.6.2"; by-version."winston"."0.6.2" = self.buildNodePackage { @@ -4863,7 +4716,7 @@ sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c"; }; deps = { - "sax-1.1.5" = self.by-version."sax"."1.1.5"; + "sax-1.1.6" = self.by-version."sax"."1.1.6"; }; optionalDependencies = { }; @@ -4969,4 +4822,23 @@ os = [ ]; cpu = [ ]; }; + by-spec."yallist"."^2.0.0" = + self.by-version."yallist"."2.0.0"; + by-version."yallist"."2.0.0" = self.buildNodePackage { + name = "yallist-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz"; + name = "yallist-2.0.0.tgz"; + sha1 = "306c543835f09ee1a4cb23b7bce9ab341c91cdd4"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eae12a8a77f..d4f87a47668 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -164,7 +164,7 @@ let in newpkgs; # Override system. This is useful to build i686 packages on x86_64-linux. - forceSystem = system: kernel: (import ./all-packages.nix) { + forceSystem = system: kernel: (import ./../..) { inherit system; platform = platform // { kernelArch = kernel; }; inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config @@ -211,7 +211,7 @@ let allStdenvs = import ../stdenv { inherit system platform config lib; - allPackages = args: import ./all-packages.nix ({ inherit config system; } // args); + allPackages = args: import ./../.. ({ inherit config system; } // args); }; defaultStdenv = allStdenvs.stdenv // { inherit platform; }; @@ -228,7 +228,7 @@ let in if changer != null then changer { # We import again all-packages to avoid recursivities. - pkgs = import ./all-packages.nix { + pkgs = import ./../.. { # We remove packageOverrides to avoid recursivities config = removeAttrs config [ "replaceStdenv" ]; }; @@ -676,6 +676,8 @@ let aws_mturk_clt = callPackage ../tools/misc/aws-mturk-clt { }; + awstats = callPackage ../tools/system/awstats { }; + axel = callPackage ../tools/networking/axel { }; azureus = callPackage ../tools/networking/p2p/azureus { }; @@ -1222,6 +1224,10 @@ let brotli = callPackage ../tools/compression/brotli { }; + brotliUnstable = callPackage ../tools/compression/brotli/unstable.nix { }; + + libbrotli = callPackage ../development/libraries/libbrotli { }; + biosdevname = callPackage ../tools/networking/biosdevname { }; checkbashism = callPackage ../development/tools/misc/checkbashisms { }; @@ -1380,6 +1386,8 @@ let di = callPackage ../tools/system/di { }; + diction = callPackage ../tools/text/diction { }; + diffoscope = callPackage ../tools/misc/diffoscope { jdk = jdk7; pythonPackages = python3Packages; @@ -1801,6 +1809,8 @@ let go-pup = goPackages.pup.bin // { outputs = [ "bin" ]; }; + go-upower-notify = goPackages.upower-notify.bin // { outputs = [ "bin" ]; }; + googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { }; google-cloud-sdk = callPackage ../tools/admin/google-cloud-sdk { }; @@ -2124,7 +2134,9 @@ let jpegoptim = callPackage ../applications/graphics/jpegoptim { }; - jq = callPackage ../development/tools/jq {}; + jq = callPackage ../development/tools/jq { }; + + jo = callPackage ../development/tools/jo { }; jscoverage = callPackage ../development/tools/misc/jscoverage { }; @@ -2619,6 +2631,8 @@ let # ntfsprogs are merged into ntfs-3g ntfsprogs = pkgs.ntfs3g; + ntfy = pythonPackages.ntfy; + ntopng = callPackage ../tools/networking/ntopng { }; ntp = callPackage ../tools/networking/ntp { @@ -2665,6 +2679,8 @@ let inherit (pythonPackages) sqlite3; }; + oh-my-zsh = callPackage ../shells/oh-my-zsh { }; + opencryptoki = callPackage ../tools/security/opencryptoki { }; opendbx = callPackage ../development/libraries/opendbx { }; @@ -2747,7 +2763,8 @@ let owncloud70 owncloud80 owncloud81 - owncloud82; + owncloud82 + owncloud90; owncloudclient = callPackage ../applications/networking/owncloud-client { }; @@ -2985,6 +3002,8 @@ let pydb = callPackage ../development/tools/pydb { }; + pygmentex = callPackage ../tools/typesetting/pygmentex { }; + pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; pythonDBus = dbus_python; @@ -3123,6 +3142,8 @@ let rosegarden = callPackage ../applications/audio/rosegarden { }; + rowhammer-test = callPackage ../tools/system/rowhammer-test { }; + rpPPPoE = callPackage ../tools/networking/rp-pppoe { }; rpm = callPackage ../tools/package-management/rpm { }; @@ -3527,6 +3548,8 @@ let ufraw = callPackage ../applications/graphics/ufraw { }; + uget = callPackage ../tools/networking/uget { }; + umlet = callPackage ../tools/misc/umlet { }; unetbootin = callPackage ../tools/cd-dvd/unetbootin { }; @@ -3810,7 +3833,7 @@ let # load into the Ben Nanonote gccCross = let - pkgsCross = (import ./all-packages.nix) { + pkgsCross = (import ./../..) { inherit system; inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config; # Ben Nanonote system @@ -3863,6 +3886,8 @@ let xmpppy = pythonPackages.xmpppy; + xiccd = callPackage ../tools/misc/xiccd { }; + xorriso = callPackage ../tools/cd-dvd/xorriso { }; xpf = callPackage ../tools/text/xml/xpf { @@ -3885,6 +3910,8 @@ let yaml-merge = callPackage ../tools/text/yaml-merge { }; + yeshup = callPackage ../tools/system/yeshup { }; + # To expose more packages for Yi, override the extraPackages arg. yi = callPackage ../applications/editors/yi/wrapper.nix { }; @@ -3999,6 +4026,10 @@ let bigloo = callPackage ../development/compilers/bigloo { }; + boo = callPackage ../development/compilers/boo { + inherit (gnome) gtksourceview; + }; + colm = callPackage ../development/compilers/colm { }; fetchegg = callPackage ../build-support/fetchegg { }; @@ -4502,6 +4533,7 @@ let julia = callPackage ../development/compilers/julia { gmp = gmp6; openblas = openblasCompat; + inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; julia-git = lowPrio (callPackage ../development/compilers/julia/git.nix { @@ -5085,6 +5117,13 @@ let llvm = llvm_36; }; + qcmm = callPackage ../development/compilers/qcmm { + lua = lua4; + ocaml = ocaml_3_08_0; + }; + + rgbds = callPackage ../development/compilers/rgbds { }; + rtags = callPackage ../development/tools/rtags/default.nix {}; rustcMaster = callPackage ../development/compilers/rustc/head.nix {}; @@ -5187,6 +5226,8 @@ let win32hello = callPackage ../development/compilers/visual-c++/test { }; + wla-dx = callPackage ../development/compilers/wla-dx { }; + wrapCCWith = ccWrapper: libc: extraBuildCommands: baseCC: ccWrapper { nativeTools = stdenv.cc.nativeTools or false; nativeLibc = stdenv.cc.nativeLibc or false; @@ -5286,6 +5327,7 @@ let fetchHex = callPackage ../development/tools/build-managers/rebar3/fetch-hex.nix { }; erlangPackages = callPackage ../development/erlang-modules { }; + cuter = erlangPackages.callPackage ../development/tools/erlang/cuter { }; hex2nix = erlangPackages.callPackage ../development/tools/erlang/hex2nix { }; elixir = callPackage ../development/interpreters/elixir { }; @@ -5542,8 +5584,6 @@ let rubygems = hiPrio (callPackage ../development/interpreters/ruby/rubygems.nix {}); - rq = callPackage ../applications/networking/cluster/rq { }; - scsh = callPackage ../development/interpreters/scsh { }; scheme48 = callPackage ../development/interpreters/scheme48 { }; @@ -6294,6 +6334,14 @@ let valkyrie = callPackage ../development/tools/analysis/valkyrie { }; + verasco = callPackage ../development/tools/analysis/verasco (( + if system == "x86_64-linux" + then { tools = pkgsi686Linux.stdenv.cc; } + else {} + ) // { + ocamlPackages = ocamlPackages_4_02; + }); + xc3sprog = callPackage ../development/tools/misc/xc3sprog { }; xmlindent = callPackage ../development/web/xmlindent {}; @@ -6329,7 +6377,9 @@ let acl = callPackage ../development/libraries/acl { }; - activemq = callPackage ../development/libraries/apache-activemq { }; + activemq = callPackage ../development/libraries/apache-activemq/5.8.nix { }; + + activemq512 = callPackage ../development/libraries/apache-activemq/5.12.nix { }; adns = callPackage ../development/libraries/adns { }; @@ -6556,6 +6606,12 @@ let dbus_java = callPackage ../development/libraries/java/dbus-java { }; dbus_python = pythonPackages.dbus; + dbus-sharp-1_0 = callPackage ../development/libraries/dbus-sharp/dbus-sharp-1.0.nix { }; + dbus-sharp-2_0 = callPackage ../development/libraries/dbus-sharp { }; + + dbus-sharp-glib-1_0 = callPackage ../development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix { }; + dbus-sharp-glib-2_0 = callPackage ../development/libraries/dbus-sharp-glib { }; + # Should we deprecate these? Currently there are many references. dbus_tools = pkgs.dbus.tools; dbus_libs = pkgs.dbus.libs; @@ -6769,7 +6825,13 @@ let giblib = callPackage ../development/libraries/giblib { }; - libgit2 = callPackage ../development/libraries/git2 { }; + gio-sharp = callPackage ../development/libraries/gio-sharp { }; + + libgit2 = callPackage ../development/libraries/git2 ( + stdenv.lib.optionalAttrs stdenv.isDarwin { + inherit (darwin) libiconv; + } + ); libgit2_0_21 = callPackage ../development/libraries/git2/0.21.nix { }; @@ -6979,6 +7041,8 @@ let pangox_compat = callPackage ../development/libraries/pangox-compat { }; + gdata-sharp = callPackage ../development/libraries/gdata-sharp { }; + gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; gnome-sharp = callPackage ../development/libraries/gnome-sharp {}; @@ -7000,12 +7064,22 @@ let gtksharp = gtk-sharp; }; - gtk-sharp = callPackage ../development/libraries/gtk-sharp-2 { + gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix { inherit (gnome) libglade libgtkhtml gtkhtml libgnomecanvas libgnomeui libgnomeprint libgnomeprintui GConf gnomepanel; }; + gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix { + inherit (gnome) libglade libgtkhtml gtkhtml + libgnomecanvas libgnomeui libgnomeprint + libgnomeprintui GConf gnomepanel; + }; + + gtk-sharp = gtk-sharp-2_0; + + gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { }; + gtkspell = callPackage ../development/libraries/gtkspell { }; gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { }; @@ -7500,6 +7574,7 @@ let libgpod = callPackage ../development/libraries/libgpod { inherit (pkgs.pythonPackages) mutagen; + monoSupport = false; }; libgsystem = callPackage ../development/libraries/libgsystem { }; @@ -7762,8 +7837,6 @@ let libotr = callPackage ../development/libraries/libotr { }; - libotr_3_2 = callPackage ../development/libraries/libotr/3.2.nix { }; - libp11 = callPackage ../development/libraries/libp11 { }; libpar2 = callPackage ../development/libraries/libpar2 { }; @@ -8116,6 +8189,10 @@ let qt = qt4; }; + mono-addins = callPackage ../development/libraries/mono-addins { }; + + mono-zeroconf = callPackage ../development/libraries/mono-zeroconf { }; + movit = callPackage ../development/libraries/movit { }; mosquitto = callPackage ../servers/mqtt/mosquitto { }; @@ -8158,6 +8235,8 @@ let nanomsg = callPackage ../development/libraries/nanomsg { }; + notify-sharp = callPackage ../development/libraries/notify-sharp { }; + ncurses = callPackage ../development/libraries/ncurses { }; neardal = callPackage ../development/libraries/neardal { }; @@ -8765,6 +8844,8 @@ let taglib_extras = callPackage ../development/libraries/taglib-extras { }; + taglib-sharp = callPackage ../development/libraries/taglib-sharp { }; + talloc = callPackage ../development/libraries/talloc { python = python2; }; @@ -9394,7 +9475,8 @@ let }; apacheHttpd_2_4 = lowPrio (callPackage ../servers/http/apache-httpd/2.4.nix { - sslSupport = true; + # 1.0.2+ for ALPN support + openssl = openssl_1_0_2; }); apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in { @@ -9526,8 +9608,12 @@ let fleet = callPackage ../servers/fleet { }; + foswiki = callPackage ../servers/foswiki { }; + freepops = callPackage ../servers/mail/freepops { }; + freeradius = callPackage ../servers/freeradius { }; + freeswitch = callPackage ../servers/sip/freeswitch { }; gatling = callPackage ../servers/http/gatling { }; @@ -9642,10 +9728,7 @@ let popa3d = callPackage ../servers/mail/popa3d { }; - postfix28 = callPackage ../servers/mail/postfix { }; - postfix211 = callPackage ../servers/mail/postfix/2.11.nix { }; - postfix30 = callPackage ../servers/mail/postfix/3.0.nix { }; - postfix = postfix30; + postfix = callPackage ../servers/mail/postfix { }; postsrsd = callPackage ../servers/mail/postsrsd { }; @@ -10406,30 +10489,72 @@ let to EC2, where Xen is the Hypervisor. */ + # Base kernels to apply the grsecurity patch onto + + grsecurity_base_linux_3_14 = callPackage ../os-specific/linux/kernel/linux-grsecurity-3.14.nix { + kernelPatches = [ kernelPatches.bridge_stp_helper ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + + grsecurity_base_linux_4_1 = callPackage ../os-specific/linux/kernel/linux-grsecurity-4.1.nix { + kernelPatches = [ kernelPatches.bridge_stp_helper ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + + grsecurity_base_linux_4_4 = callPackage ../os-specific/linux/kernel/linux-grsecurity-4.4.nix { + kernelPatches = [ kernelPatches.bridge_stp_helper ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + grFlavors = import ../build-support/grsecurity/flavors.nix; - mkGrsecurity = opts: + mkGrsecurity = patch: opts: (callPackage ../build-support/grsecurity { - grsecOptions = opts; + grsecOptions = { kernelPatch = patch; } // opts; }); - grKernel = opts: (mkGrsecurity opts).grsecKernel; - grPackage = opts: recurseIntoAttrs (mkGrsecurity opts).grsecPackage; + grKernel = patch: opts: (mkGrsecurity patch opts).grsecKernel; + grPackage = patch: opts: recurseIntoAttrs (mkGrsecurity patch opts).grsecPackage; - # Stable kernels - # This is no longer supported. Please see the official announcement on the - # grsecurity page. https://grsecurity.net/announce.php - linux_grsec_stable_desktop = throw "No longer supported due to https://grsecurity.net/announce.php. " - + "Please use linux_grsec_testing_desktop."; - linux_grsec_stable_server = throw "No longer supported due to https://grsecurity.net/announce.php. " - + "Please use linux_grsec_testing_server."; - linux_grsec_stable_server_xen = throw "No longer supporteddue to https://grsecurity.net/announce.php. " - + "Please use linux_grsec_testing_server_xen."; + # grsecurity kernels (see also linuxPackages_grsec_*) - # Testing kernels - linux_grsec_testing_desktop = grKernel grFlavors.linux_grsec_testing_desktop; - linux_grsec_testing_server = grKernel grFlavors.linux_grsec_testing_server; - linux_grsec_testing_server_xen = grKernel grFlavors.linux_grsec_testing_server_xen; + linux_grsec_desktop_3_14 = grKernel kernelPatches.grsecurity_3_14 grFlavors.desktop; + linux_grsec_server_3_14 = grKernel kernelPatches.grsecurity_3_14 grFlavors.server; + linux_grsec_server_xen_3_14 = grKernel kernelPatches.grsecurity_3_14 grFlavors.server_xen; + + linux_grsec_desktop_4_1 = grKernel kernelPatches.grsecurity_4_1 grFlavors.desktop; + linux_grsec_server_4_1 = grKernel kernelPatches.grsecurity_4_1 grFlavors.server; + linux_grsec_server_xen_4_1 = grKernel kernelPatches.grsecurity_4_1 grFlavors.server_xen; + + linux_grsec_desktop_4_4 = grKernel kernelPatches.grsecurity_4_4 grFlavors.desktop; + linux_grsec_server_4_4 = grKernel kernelPatches.grsecurity_4_4 grFlavors.server; + linux_grsec_server_xen_4_4 = grKernel kernelPatches.grsecurity_4_4 grFlavors.server_xen; + + linux_grsec_desktop_latest = grKernel kernelPatches.grsecurity_latest grFlavors.desktop; + linux_grsec_server_latest = grKernel kernelPatches.grsecurity_latest grFlavors.server; + linux_grsec_server_xen_latest = grKernel kernelPatches.grsecurity_latest grFlavors.server_xen; + + # grsecurity: old names + + linux_grsec_testing_desktop = linux_grsec_desktop_latest; + linux_grsec_testing_server = linux_grsec_server_latest; + linux_grsec_testing_server_xen = linux_grsec_server_xen_latest; + + linux_grsec_stable_desktop = linux_grsec_desktop_3_14; + linux_grsec_stable_server = linux_grsec_server_3_14; + linux_grsec_stable_server_xen = linux_grsec_server_xen_3_14; /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a @@ -10473,9 +10598,12 @@ let nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { }; nvidia_x11_legacy304 = callPackage ../os-specific/linux/nvidia-x11/legacy304.nix { }; nvidia_x11_legacy340 = callPackage ../os-specific/linux/nvidia-x11/legacy340.nix { }; - nvidia_x11_beta = callPackage ../os-specific/linux/nvidia-x11/beta.nix { }; + nvidia_x11_beta = nvidia_x11; # latest beta is lower version ATM + # callPackage ../os-specific/linux/nvidia-x11/beta.nix { }; nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; + rtl8723bs = callPackage ../os-specific/linux/rtl8723bs { }; + rtl8812au = callPackage ../os-specific/linux/rtl8812au { }; openafsClient = callPackage ../servers/openafs-client { }; @@ -10490,6 +10618,8 @@ let jool = callPackage ../os-specific/linux/jool { }; + mba6x_bl = callPackage ../os-specific/linux/mba6x_bl { }; + /* compiles but has to be integrated into the kernel somehow Let's have it uncommented and finish it.. */ @@ -10570,16 +10700,33 @@ let # Build a kernel for Xen dom0 linuxPackages_latest_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; }) linuxPackages_latest); - # grsecurity flavors - # Stable kernels - linuxPackages_grsec_stable_desktop = grPackage grFlavors.linux_grsec_stable_desktop; - linuxPackages_grsec_stable_server = grPackage grFlavors.linux_grsec_stable_server; - linuxPackages_grsec_stable_server_xen = grPackage grFlavors.linux_grsec_stable_server_xen; + # grsecurity packages - # Testing kernels - linuxPackages_grsec_testing_desktop = grPackage grFlavors.linux_grsec_testing_desktop; - linuxPackages_grsec_testing_server = grPackage grFlavors.linux_grsec_testing_server; - linuxPackages_grsec_testing_server_xen = grPackage grFlavors.linux_grsec_testing_server_xen; + linuxPackages_grsec_desktop_3_14 = grPackage kernelPatches.grsecurity_3_14 grFlavors.desktop; + linuxPackages_grsec_server_3_14 = grPackage kernelPatches.grsecurity_3_14 grFlavors.server; + linuxPackages_grsec_server_xen_3_14 = grPackage kernelPatches.grsecurity_3_14 grFlavors.server_xen; + + linuxPackages_grsec_desktop_4_1 = grPackage kernelPatches.grsecurity_4_1 grFlavors.desktop; + linuxPackages_grsec_server_4_1 = grPackage kernelPatches.grsecurity_4_1 grFlavors.server; + linuxPackages_grsec_server_xen_4_1 = grPackage kernelPatches.grsecurity_4_1 grFlavors.server_xen; + + linuxPackages_grsec_desktop_4_4 = grPackage kernelPatches.grsecurity_4_4 grFlavors.desktop; + linuxPackages_grsec_server_4_4 = grPackage kernelPatches.grsecurity_4_4 grFlavors.server; + linuxPackages_grsec_server_xen_4_4 = grPackage kernelPatches.grsecurity_4_4 grFlavors.server_xen; + + linuxPackages_grsec_desktop_latest = grPackage kernelPatches.grsecurity_latest grFlavors.desktop; + linuxPackages_grsec_server_latest = grPackage kernelPatches.grsecurity_latest grFlavors.server; + linuxPackages_grsec_server_xen_latest = grPackage kernelPatches.grsecurity_latest grFlavors.server_xen; + + # grsecurity: old names + + linuxPackages_grsec_testing_desktop = linuxPackages_grsec_desktop_latest; + linuxPackages_grsec_testing_server = linuxPackages_grsec_server_latest; + linuxPackages_grsec_testing_server_xen = linuxPackages_grsec_server_xen_latest; + + linuxPackages_grsec_stable_desktop = linuxPackages_grsec_desktop_3_14; + linuxPackages_grsec_stable_server = linuxPackages_grsec_server_3_14; + linuxPackages_grsec_stable_server_xen = linuxPackages_grsec_server_xen_3_14; # ChromiumOS kernels linuxPackages_chromiumos_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_14 linuxPackages_chromiumos_3_14); @@ -11175,6 +11322,8 @@ let mobile_broadband_provider_info = callPackage ../data/misc/mobile-broadband-provider-info { }; + montserrat = callPackage ../data/fonts/montserrat { }; + mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { }; mplus-outline-fonts = callPackage ../data/fonts/mplus-outline-fonts { }; @@ -11469,6 +11618,11 @@ let ffmpeg = ffmpeg_1; }; + banshee = callPackage ../applications/audio/banshee { + gconf = pkgs.gnome.GConf; + libgpod = pkgs.libgpod.override { monoSupport = true; }; + }; + batik = callPackage ../applications/graphics/batik { }; batti = callPackage ../applications/misc/batti { }; @@ -11621,7 +11775,7 @@ let pulseaudioSupport = config.pulseaudio or false; }; - communi = callPackage ../applications/networking/irc/communi { }; + communi = qt5.callPackage ../applications/networking/irc/communi { }; CompBus = callPackage ../applications/audio/CompBus { }; @@ -12262,7 +12416,7 @@ let gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {}); - inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar transcrypt; + inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar transcrypt git-crypt; gitMinimal = git.override { withManual = false; @@ -13306,7 +13460,10 @@ let eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { lua5 = lua5_1; }; - qemu = callPackage ../applications/virtualization/qemu { }; + qemu = callPackage ../applications/virtualization/qemu { + inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa; + inherit (darwin.stubs) rez setfile; + }; qjackctl = callPackage ../applications/audio/qjackctl { }; @@ -14040,6 +14197,7 @@ let ++ optional (cfg.enableGenesisPlusGX or false) genesis-plus-gx ++ optional (cfg.enableMAME or false) mame ++ optional (cfg.enableMednafenPCEFast or false) mednafen-pce-fast + ++ optional (cfg.enableMednafenPSX or false) mednafen-psx ++ optional (cfg.enableMupen64Plus or false) mupen64plus ++ optional (cfg.enableNestopia or false) nestopia ++ optional (cfg.enablePicodrive or false) picodrive @@ -14653,6 +14811,8 @@ let rili = callPackage ../games/rili { }; + rimshot = callPackage ../games/rimshot { love = love_0_7; }; + rogue = callPackage ../games/rogue { }; saga = callPackage ../applications/gis/saga { }; @@ -14869,10 +15029,8 @@ let clearlooks-phenix = callPackage ../misc/themes/gtk3/clearlooks-phenix { }; - enlightenment = callPackage ../desktops/enlightenment { }; - - e19 = recurseIntoAttrs (callPackage ../desktops/e19 { - callPackage = newScope pkgs.e19; + enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { + callPackage = newScope pkgs.enlightenment; }); gnome2 = callPackage ../desktops/gnome-2 { @@ -15136,6 +15294,8 @@ let libyamlcpp = callPackage ../development/libraries/libyaml-cpp { boost = boost; }; }; + colord-kde = callPackage ../tools/misc/colord-kde/0.5.nix {}; + dfilemanager = callPackage ../applications/misc/dfilemanager { }; fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; @@ -15730,6 +15890,8 @@ let epson-escpr = callPackage ../misc/drivers/epson-escpr { }; + epson_201207w = callPackage ../misc/drivers/epson_201207w { }; + gutenprint = callPackage ../misc/drivers/gutenprint { }; gutenprintBin = callPackage ../misc/drivers/gutenprint/bin.nix { }; @@ -15768,7 +15930,9 @@ let faust1 = callPackage ../applications/audio/faust/faust1.nix { }; - faust2 = callPackage ../applications/audio/faust/faust2.nix { }; + faust2 = callPackage ../applications/audio/faust/faust2.nix { + llvm = llvm_37; + }; faust2alqt = callPackage ../applications/audio/faust/faust2alqt.nix { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 888ffe474f2..e49fe451681 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -290,6 +290,23 @@ let ''; }; + azure-sdk-for-go = buildFromGitHub { + rev = "v2.0.0-beta"; + owner = "Azure"; + repo = "azure-sdk-for-go"; + sha256 = "04bixwh4bzgysa79azis1p755rb6zxjjzhpskpvpmvkv49baharc"; + propagatedBuildInputs = [ go-autorest cli-go ]; + }; + + azure-vhd-tools-for-go = buildFromGitHub { + rev = "7db4795475aeab95590f8643969e06b633ead4ec"; + owner = "Microsoft"; + repo = "azure-vhd-utils-for-go"; + sha256 = "0xg6a1qw8jjxqhgvy9zlvq5b8xnnvfkjnkjz9f8g4y1kcw09lird"; + + propagatedBuildInputs = [ azure-sdk-for-go ]; + }; + hashicorp.aws-sdk-go = buildFromGitHub { rev = "e6ea0192eee4640f32ec73c0cbb71f63e4f2b65a"; owner = "hashicorp"; @@ -596,17 +613,20 @@ let sha256 = "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s"; }; - dbus = buildGoPackage rec { - rev = "a5942dec6340eb0d57f43f2003c190ce06e43dea"; - name = "dbus-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/godbus/dbus"; + dbus-old-2015-05-19 = buildFromGitHub { + rev = "a5942dec6340eb0d57f43f2003c190ce06e43dea"; + date = "2015-05-19"; + owner = "godbus"; + repo = "dbus"; + sha256 = "1vk31wal7ncvjwvnb8q1myrkihv1np46f3q8dndi5k0csflbxxdf"; + }; - src = fetchFromGitHub { - inherit rev; - owner = "godbus"; - repo = "dbus"; - sha256 = "1vk31wal7ncvjwvnb8q1myrkihv1np46f3q8dndi5k0csflbxxdf"; - }; + dbus = buildFromGitHub { + rev = "230e4b23db2fd81c53eaa0073f76659d4849ce51"; + date = "2016-03-02"; + owner = "godbus"; + repo = "dbus"; + sha256 = "1wxv2cbihzcsz2z7iycyzl7f3arhhgagcc5kqln1k1mkm4l85z0q"; }; deis = buildFromGitHub { @@ -1237,6 +1257,14 @@ let propagatedBuildInputs = [ pretty ]; }; + go-autorest = buildFromGitHub { + rev = "v6.0.0"; + owner = "Azure"; + repo = "go-autorest"; + sha256 = "07zrbw8p3jc5xfjwn0qj1hrn1r7nbnryc5zmvk42qgximyxsls26"; + propagatedBuildInputs = [ jwt-go crypto ]; + }; + go-backblaze = buildFromGitHub { buildInputs = [ go-flags go-humanize uilive uiprogress ]; goPackagePath = "gopkg.in/kothar/go-backblaze.v0"; @@ -1684,18 +1712,13 @@ let sha256 = "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3"; }; - go-systemd = buildGoPackage rec { - rev = "2688e91251d9d8e404e86dd8f096e23b2f086958"; - name = "go-systemd-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/coreos/go-systemd"; - - src = fetchFromGitHub { - inherit rev; - owner = "coreos"; - repo = "go-systemd"; - sha256 = "0c1k3y5msc1xplhx0ksa7g08yqjaavns8s5zrfg4ig8az30gwlpa"; - }; - + go-systemd = buildFromGitHub { + rev = "7b2428fec40033549c68f54e26e89e7ca9a9ce31"; + date = "2016-03-10"; + owner = "coreos"; + repo = "go-systemd"; + sha256 = "0kfbxvm9zsjgvgmiq2jl807y4s5z0rya65rm399llr5rr7vz1lxd"; + nativeBuildInputs = [ pkgs.pkgconfig pkgs.systemd ]; buildInputs = [ dbus ]; }; @@ -1705,7 +1728,7 @@ let owner = "stgraber"; repo = "lxd-go-systemd"; sha256 = "006dhy3j8ld0kycm8hrjxvakd7xdn1b6z2dsjp1l4sqrxdmm188w"; - buildInputs = [ dbus ]; + buildInputs = [ dbus-old-2015-05-19 ]; }; go-update-v0 = buildFromGitHub { @@ -2002,6 +2025,13 @@ let sha256 = "0m8867afsvka5gp2idrmlarpjg7kxx7qacpwrz1wl8y3zxyn3945"; }; + jwt-go = buildFromGitHub { + rev = "v2.4.0"; + owner = "dgrijalva"; + repo = "jwt-go"; + sha256 = "00rvv1d2f62svd6311dkr8j56ysx8wgk9yfkb9vqf2mp5ix37dc0"; + }; + kagome = buildFromGitHub { rev = "1bbdbdd590e13a8c2f4508c67a079113cd7b9f51"; date = "2016-01-19"; @@ -3803,4 +3833,19 @@ let sha256 = "153hf4dq4jh1yv35pv30idmxhc917qzl590qy5394l48d4rapgb5"; buildInputs = [ go-colortext yaml-v2 godotenv ]; }; + + # To use upower-notify, the maintainer suggests adding something like this to your configuration.nix: + # + # service.xserver.displayManager.sessionCommands = '' + # ${pkgs.dunst}/bin/dunst -shrink -geometry 0x0-50-50 -key space & # ...if don't already have a dbus notification display app + # (sleep 3; exec ${pkgs.yeshup}/bin/yeshup ${pkgs.go-upower-notify}/bin/upower-notify) & + # ''; + upower-notify = buildFromGitHub rec { + rev = "14c581e683a7e90ec9fa6d409413c16599a5323c"; + date = "2016-03-10"; + owner = "omeid"; + repo = "upower-notify"; + sha256 = "16zlvn53p9m10ph8n9gps51fkkvl6sf4afdzni6azk05j0ng49jw"; + propagatedBuildInputs = [ dbus ]; + }; }; in self diff --git a/pkgs/top-level/guile-2-test.nix b/pkgs/top-level/guile-2-test.nix index 3219fc9108a..56a0769da0b 100644 --- a/pkgs/top-level/guile-2-test.nix +++ b/pkgs/top-level/guile-2-test.nix @@ -4,7 +4,7 @@ -- ludo@gnu.org */ let - allPackages = import ./all-packages.nix; + allPackages = import ./../..; pkgsFun = { system ? builtins.currentSystem }: allPackages { diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index ebf19af943f..ea7e7e89d37 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -48,8 +48,8 @@ releaseTools.sourceTarball rec { # Make sure that derivation paths do not depend on the Nixpkgs path. mkdir $TMPDIR/foo ln -s $(readlink -f .) $TMPDIR/foo/bar - p1=$(nix-instantiate pkgs/top-level/all-packages.nix --dry-run -A firefox --show-trace) - p2=$(nix-instantiate $TMPDIR/foo/bar/pkgs/top-level/all-packages.nix --dry-run -A firefox) + p1=$(nix-instantiate ./. --dry-run -A firefox --show-trace) + p2=$(nix-instantiate $TMPDIR/foo/bar --dry-run -A firefox) if [ "$p1" != "$p2" ]; then echo "Nixpkgs evaluation depends on Nixpkgs path ($p1 vs $p2)!" exit 1 diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index af668f5251a..47d8c2814ad 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -370,6 +370,18 @@ let self = _self // overrides; _self = with self; { }; }; + ArchiveTar = buildPerlPackage { + name = "Archive-Tar-2.04"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BI/BINGOS/Archive-Tar-2.04.tar.gz; + sha256 = "c3741bba06a468a5a4db6a79d772c55cf2f6673cf33241a6e6a758707a71d293"; + }; + meta = { + description = "Manipulates TAR archives"; + license = "perl"; + }; + }; + ArchiveZip = buildPerlPackage { name = "Archive-Zip-1.16"; src = fetchurl { @@ -3175,6 +3187,7 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ TestMost ]; propagatedBuildInputs = [ DateTime DateTimeFormatFlexible DateTimeFormatICal DateTimeFormatNatural TimeDate ]; + doCheck = false; meta = { description = "Parse a date/time string using the best method available"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -4682,6 +4695,18 @@ let self = _self // overrides; _self = with self; { buildInputs = [ ]; }; + FCGIProcManager = buildPerlPackage { + name = "FCGI-ProcManager-0.25"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AR/ARODLAND/FCGI-ProcManager-0.25.tar.gz; + sha256 = "b9ae1146e2638f3aa477c9ab3ceb728f92c5e36e4cce8f0b5847efad601d024d"; + }; + meta = { + description = "A perl-based FastCGI process manager"; + license = "unknown"; + }; + }; + FennecLite = buildPerlModule { name = "Fennec-Lite-0.004"; src = fetchurl { @@ -6077,6 +6102,18 @@ let self = _self // overrides; _self = with self; { }; }; + IOSocketIP = buildPerlPackage { + name = "IO-Socket-IP-0.37"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PE/PEVANS/IO-Socket-IP-0.37.tar.gz; + sha256 = "2adc5f0b641d41f662b4d99c0795780c62f9af9119884d053265fc8858ae6f7b"; + }; + meta = { + description = "Family-neutral IP socket supporting both IPv4 and IPv6"; + license = "perl"; + }; + }; + IOSocketInet6 = buildPerlPackage rec { name = "IO-Socket-INET6-2.72"; src = fetchurl { @@ -6728,6 +6765,18 @@ let self = _self // overrides; _self = with self; { }; }; + LocaleMsgfmt = buildPerlPackage { + name = "Locale-Msgfmt-0.15"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AZ/AZAWAWI/Locale-Msgfmt-0.15.tar.gz; + sha256 = "c3276831cbeecf58be02081bcc180bd348daa35da21a7737b7b038a59f643ab4"; + }; + meta = { + description = "Compile .po files to .mo files"; + license = "perl"; + }; + }; + LocalePO = buildPerlPackage { name = "Locale-PO-0.23"; src = fetchurl { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ade98083aa3..4ef8ba4409d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -99,12 +99,11 @@ in modules // { homepage = "https://python-discid.readthedocs.org/"; license = licenses.lgpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ iyzsong ]; }; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/discid/${name}.tar.gz"; - md5 = "2ad2141452dd10b03ad96ccdad075235"; + sha256 = "b39d443051b26d0230be7a6c616243daae93337a8711dd5d4119bb6a0e516fa8"; }; patchPhase = '' @@ -196,7 +195,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/a/aafigure/${name}.tar.gz"; - md5 = "5322888a21eb0bb2e749fbf98eddf574"; + sha256 = "090c88beb091d28a233f854e239713aa15d8d1906ea16211855345c912e8a091"; }; propagatedBuildInputs = with self; [ pillow ]; @@ -533,7 +532,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/a/almir/${name}.zip"; - md5 = "9a1f3c72a039622ca72b74be7a1cd37e"; + sha256 = "5dc0b8a5071f3ff46cd2d92608f567ba446e4c733c063b17d89703caeb9868fe"; }; buildInputs = with self; [ @@ -627,7 +626,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/a/anyjson/${name}.tar.gz"; - md5 = "2ea28d6ec311aeeebaf993cb3008b27c"; + sha256 = "37812d863c9ad3e35c0734c42e0bf0320ce8c3bed82cd20ad54cb34d158157ba"; }; buildInputs = with self; [ self.nose ]; @@ -664,7 +663,7 @@ in modules // { src = pkgs.fetchurl { url = "http://py-amqplib.googlecode.com/files/${name}.tgz"; - sha1 = "f124e5e4a6644bf6d1734032a01ac44db1b25a29"; + sha256 = "0f2618b74d95cd360a6d46a309a3fb1c37d881a237e269ac195a69a34e0e2f62"; }; # error: invalid command 'test' @@ -745,7 +744,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/a/apipkg/${name}.tar.gz"; - md5 = "17e5668601a2322aff41548cb957e7c8"; + sha256 = "2e38399dbe842891fe85392601aab8f40a8f4cc5a9053c326de35a1cc0297ac6"; }; buildInputs = with self; [ pytest ]; @@ -762,7 +761,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/a/appdirs/appdirs-1.4.0.tar.gz"; - md5 = "1d17b4c9694ab84794e228f28dc3275b"; + sha256 = "8fc245efb4387a4e3e0ac8ebcc704582df7d72ff6a42a53f5600bbb18fdaadc5"; }; meta = { @@ -805,7 +804,7 @@ in modules // { src = pkgs.fetchurl { url = "http://apsw.googlecode.com/files/${name}.zip"; - sha1 = "fa4aec08e59fa5964197f59ba42408d64031675b"; + sha256 = "cb121b2bce052609570a2f6def914c0aa526ede07b7096dddb78624d77f013eb"; }; buildInputs = with self; [ pkgs.sqlite ]; @@ -841,7 +840,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/f/funcsigs/${name}.tar.gz"; - md5 = "fb1d031f284233e09701f6db1281c2a5"; + sha256 = "d83ce6df0b0ea6618700fe1db353526391a8a3ada1b7aba52fed7a61da772033"; }; buildInputs = with self; [ @@ -895,7 +894,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/a/args/${name}.tar.gz"; - md5 = "66faf79ba2511def7b8b81d542482046"; + sha256 = "a785b8d837625e9b61c39108532d95b85274acd679693b71ebb5156848fcf814"; }; meta = { @@ -1049,7 +1048,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/a/attrdict/${name}.tar.gz"; - md5 = "8a7c1a4e737fe9e2b2b8844c0f7746f8"; + sha256 = "86aeb6d3809e0344409f8148d7cac9eabce5f0b577c160b5e90d10df3f8d2ad3"; }; propagatedBuildInputs = with self; [ coverage nose six ]; @@ -1119,6 +1118,29 @@ in modules // { }; }); + av = buildPythonPackage rec { + name = "av-${version}"; + version = "0.2.4"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/a/av/${name}.tar.gz"; + sha256 = "bdc7e2e213cb9041d9c5c0497e6f8c47e84f89f1f2673a46d891cca0fb0d19a0"; + }; + + buildInputs + = (with self; [ nose pillow numpy ]) + ++ (with pkgs; [ ffmpeg git libav pkgconfig ]); + + # Because of https://github.com/mikeboers/PyAV/issues/152 + doCheck = false; + + meta = { + description = "Pythonic bindings for FFmpeg/Libav"; + homepage = https://github.com/mikeboers/PyAV/; + license = licenses.bsd2; + }; + }; + avro = buildPythonPackage (rec { name = "avro-1.7.6"; @@ -1126,7 +1148,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/a/avro/${name}.tar.gz"; - md5 = "7f4893205e5ad69ac86f6b44efb7df72"; + sha256 = "edf14143cabb2891f05a73d60a57a9fc5a9ebd305c2188abb3f5db777c707ad5"; }; meta = { @@ -1249,7 +1271,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/a/azure/${name}.zip"; - md5 = "5499efd85c54c757c0e757b5407ee47f"; + sha256 = "89c20b2efaaed3c6f56345d55c32a8d4e7d2a16c032d0acb92f8f490c508fe24"; }; propagatedBuildInputs = with self; [ dateutil futures pyopenssl requests2 ]; @@ -1456,7 +1478,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/backports.ssl_match_hostname/backports.ssl_match_hostname-3.4.0.2.tar.gz"; - md5 = "788214f20214c64631f0859dc79f23c6"; + sha256 = "07410e7fb09aab7bdaf5e618de66c3dac84e2e3d628352814dc4c37de321d6ae"; }; meta = { @@ -1471,7 +1493,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/backports.lzma/${name}.tar.gz"; - md5 = "c3d109746aefa86268e500c07d7e8e0f"; + sha256 = "bac58aec8d39ac3d22250840fb24830d0e4a0ef05ad8f3f09172dc0cc80cdbca"; }; buildInputs = [ pkgs.lzma ]; @@ -1795,7 +1817,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/c/circus/${name}.tar.gz"; - md5 = "5c07cdbe9bb4a9b82e52737ad590617b"; + sha256 = "3757344aa5073ea29e6e2607b3de8ba1652502c61964316116931884293fe846"; }; doCheck = false; # weird error @@ -1961,7 +1983,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/i/iowait/${name}.tar.gz"; - md5 = "f49ca7766fe4a67e03a731e575614f87"; + sha256 = "ab1bc2eb84c22ccf61f17a0024f9fb6df781b39f1852764a66a7769d5adfb299"; }; meta = { @@ -1989,7 +2011,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/r/rarfile/rarfile-2.6.tar.gz"; - md5 = "50ce3f3fdb9196a00059a5ea7b3739fd"; + sha256 = "326700c5450cfb367f612e918866ea27551bac02f4656f340003c88873fa1a56"; }; meta = { @@ -2003,7 +2025,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/proboscis/proboscis-1.2.6.0.tar.gz"; - md5 = "e4b36449ef7c18f70b8243f4c8bddbca"; + sha256 = "b822b243a7c82030fce0de97bdc432345941306d2c24ef227ca561dd019cd238"; }; propagatedBuildInputs = with self; [ nose ]; @@ -2021,7 +2043,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pyechonest/pyechonest-8.0.2.tar.gz"; - md5 = "5586fe8ece7af4e24f71ea740185127e"; + sha256 = "496265f4b7d33483ec153b9e1b8333fe959b115f7e781510089c8313b7d86560"; }; meta = { @@ -2061,7 +2083,7 @@ in modules // { sha256 = "1j4f51dxic39mdwf6alj7gd769wy6mhk916v031wjali51xkh3xb"; }; - buildInputs = with self; [ hypothesis sqlite3 ]; + buildInputs = with self; [ hypothesis1 sqlite3 ]; propagatedBuildInputs = with self; [ chardet ]; @@ -2078,7 +2100,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/b/bitbucket-api/${name}.tar.gz"; - md5 = "6f3cee3586c4aad9c0b2e04fce9704fb"; + sha256 = "e890bc3893d59a6f203c1eb2bae60e78ac4d3869da7ea4fb104dca588aea85b2"; }; propagatedBuildInputs = with self; [ requests_oauth2 nose sh ]; @@ -2096,7 +2118,7 @@ in modules // { name = "bitbucket-cli-0.4.1"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/bitbucket-cli/${name}.tar.gz"; - md5 = "79cdbdc6c95dfa313d12cbdef406c9f2"; + sha256 = "d8909627ae7a46519379c6343698d49f9ffd5de839ff44796974828d843a9419"; }; pythonPath = [ self.requests ]; @@ -2210,7 +2232,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/blinker/${name}.tar.gz"; - md5 = "66e9688f2d287593a0e698cd8a5fbc57"; + sha256 = "6811010809262261e41ab7b92f3f6d23f35cf816fbec2bc05077992eebec6e2f"; }; meta = { @@ -2460,7 +2482,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/B/Box2D/Box2D-2.3b0.zip"; - md5="25fc4f69cd580bdca0022ac3ace53865"; + sha256 = "4519842c650b0153550eb0c9864da46b5a4ec8555c68b70f5cd2952a21c788b0"; }; patches = [ ../development/python-modules/box2d/disable-test.patch ]; @@ -2563,7 +2585,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/c/check-manifest/check-manifest-${version}.tar.gz"; - md5 = "b18f7f0bcd02f52d40148c388ace9290"; + sha256 = "b19fd0d8b9286532ba3dc0282484fd76d11200cf24b340dc3d08f293c7dd0500"; }; doCheck = false; @@ -2582,7 +2604,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/devpi-common/devpi-common-${version}.tar.gz"; - md5 = "3739af0f59151d1aaa67035fec8f97c6"; + sha256 = "a059c4099002d4af8f3ccfc8a9f4bf133b20ea404049b21a31fc1003e1d79452"; }; propagatedBuildInputs = [ self.requests2 self.py ]; @@ -2606,7 +2628,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zc.buildout/${name}.tar.gz"; - md5 = "476a06eed08506925c700109119b6e41"; + sha256 = "a6122ea5c06c6c044a9efce4a3df452c8573e1aebfda7b24262655daac894ef5"; }; meta = { @@ -2624,7 +2646,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zc.buildout/${name}.tar.gz"; - md5 = "8834a21586bf2be53dc412002241a996"; + sha256 = "a5c2fafa4d073ad3dabec267c44a996cbc624700a9a49467cd6b1ef63d35e029"; }; meta = { @@ -2642,7 +2664,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zc.buildout/${name}.tar.gz"; - md5 = "87f7b3f8d13926c806242fd5f6fe36f7"; + sha256 = "0ac5a325d3ffbc5a988fb3ba87f4159d4769cc73e3331cb5234edc8839b6506b"; }; # TODO: consider if this patch should be an option @@ -2772,7 +2794,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/carrot/${name}.tar.gz"; - md5 = "530a0614de3a669314c3acd4995c54d5"; + sha256 = "cb46374f3c883c580d142a79d2609883713a867cc86e0514163adce784ce2468"; }; buildInputs = with self; [ self.nose ]; @@ -2913,7 +2935,7 @@ in modules // { name = "characteristic-14.1.0"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/c/characteristic/${name}.tar.gz"; - md5 = "68ea7e28997fc57d3631791ec0567a05"; + sha256 = "91e254948180678dd69e6143202b4686f2fa47cce136936079bb4d9a3b82419d"; }; buildInputs = with self; [ self.pytest ]; @@ -2932,7 +2954,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/C/Cheetah/Cheetah-${version}.tar.gz"; - md5 = "853917116e731afbc8c8a43c37e6ddba"; + sha256 = "be308229f0c1e5e5af4f27d7ee06d90bb19e6af3059794e5fd536a6f29a9b550"; }; propagatedBuildInputs = with self; [ self.markdown ]; @@ -3232,7 +3254,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/C/CoilMQ/CoilMQ-0.6.1.tar.gz"; - md5 = "5f39727415b837abd02651eeb2721749"; + sha256 = "9755733bdae33a9d87630232d166a7da2382f68c2cffb3bb81503806e8d310cb"; }; propagatedBuildInputs = with self; [ self.stompclient ]; @@ -3260,7 +3282,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/colander/${name}.tar.gz"; - md5 = "058576123da7216288c079c9f47693f8"; + sha256 = "7389413266b9e680c9529c16d56284edf87e0d5de557948e75f41d65683c23b3"; }; propagatedBuildInputs = with self; [ self.translationstring self.iso8601 ]; @@ -3297,7 +3319,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/C/ColanderAlchemy/${name}.tar.gz"; - md5 = "b054837bd2753cbf15f7d5028cba421b"; + sha256 = "d10e97b5f4648dcdc38c5e5c9f9b77fe39c8fa7f594d89d558b0d82e5631bfd7"; }; buildInputs = with self; [ unittest2 ]; @@ -3319,7 +3341,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/configobj/${name}.tar.gz"; - md5 = "e472a3a1c2a67bb0ec9b5d54c13a47d6"; + sha256 = "a2f5650770e1c87fb335af19a9b7eb73fc05ccf22144eb68db7d00cd2bcb0902"; }; # error: invalid command 'test' @@ -3403,7 +3425,7 @@ in modules // { src = pkgs.fetchurl rec { url = "https://pypi.python.org/packages/source/c/contextlib2/${name}.tar.gz"; - md5 = "ea687207db25f65552061db4a2c6727d"; + sha256 = "55a5dc78f7a742a0e756645134ffb39bbe11da0fea2bc0f7070d40dac208b732"; }; }; @@ -3471,7 +3493,7 @@ in modules // { name = "cov-core-1.15.0"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/cov-core/${name}.tar.gz"; - md5 = "f519d4cb4c4e52856afb14af52919fe6"; + sha256 = "4a14c67d520fda9d42b0da6134638578caae1d374b9bb462d8de00587dba764c"; }; meta = { description = "plugin core for use by pytest-cov, nose-cov and nose2-cov"; @@ -3556,7 +3578,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/cryptacular/${name}.tar.gz"; - md5 = "fe12232ac660185186dd8057d8ca7b0e"; + sha256 = "273f03d03f9b316671ae4f1c1c6b8d3c883da19a5706873e8f3d6543e13dd4a1"; }; # TODO: tests fail: TypeError: object of type 'NoneType' has no len() @@ -3577,7 +3599,7 @@ in modules // { }; buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors - self.iso8601 self.pyasn1 self.pytest self.py self.hypothesis ] + self.iso8601 self.pyasn1 self.pytest self.py self.hypothesis1 ] ++ optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Security; propagatedBuildInputs = with self; [ six idna ipaddress pyasn1 cffi pyasn1-modules modules.sqlite3 ] ++ optional (pythonOlder "3.4") self.enum34; @@ -3896,7 +3918,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/detox/detox-0.9.3.tar.gz"; - md5 = "b52588ec61cd4c2d33e419677a5eac8c"; + sha256 = "39d48b6758c43ba579f694507d54da96931195eb1b72ad79b46f50af9520b2f3"; }; meta = { @@ -3911,7 +3933,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pbkdf2/${name}.tar.gz"; - md5 = "40cda566f61420490206597243dd869f"; + sha256 = "ac6397369f128212c43064a2b4878038dab78dab41875364554aaf2a684e6979"; }; # ImportError: No module named test @@ -4205,7 +4227,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pytest-xdist/pytest-xdist-1.8.zip"; - md5 = "9c0b8efe9d43b460f8cf049fa46ce14d"; + sha256 = "b02135db7080c0978b7ce5d8f43a5879231441c2062a4791bc42b6f98c94fa69"; }; buildInputs = with self; [ pytest ]; @@ -4217,6 +4239,49 @@ in modules // { }; }; + pytest-localserver = buildPythonPackage rec { + name = "pytest-localserver-${version}"; + version = "0.3.5"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pytest-localserver/${name}.tar.gz"; + sha256 = "0dvqspjr6va55zwmnnc2mmpqc7mm65kxig9ya44x1z8aadzxpa4p"; + }; + + propagatedBuildInputs = with self; [ werkzeug ]; + buildInputs = with self; [ pytest six requests2 ]; + + checkPhase = '' + py.test + ''; + + meta = { + description = "Plugin for the pytest testing framework to test server connections locally"; + homepage = https://pypi.python.org/pypi/pytest-localserver; + license = licenses.mit; + }; + }; + + pytest-subtesthack = buildPythonPackage rec { + name = "pytest-subtesthack-${version}"; + version = "0.1.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pytest-subtesthack/${name}.tar.gz"; + sha256 = "15kzcr5pchf3id4ikdvlv752rc0j4d912n589l4rifp8qsj19l1x"; + }; + + propagatedBuildInputs = with self; [ pytest ]; + + # no upstream test + doCheck = false; + + meta = { + description = "Terrible plugin to set up and tear down fixtures within the test function itself"; + homepage = https://github.com/untitaker/pytest-subtesthack; + license = licenses.publicDomain; + }; + }; tinycss = buildPythonPackage rec { name = "tinycss-${version}"; @@ -4571,7 +4636,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/d/deform/${name}.tar.gz"; - md5 = "7a90d41f7fbc18002ce74f39bd90a5e4"; + sha256 = "3fa4d287c8da77a83556e4a5686de006ddd69da359272120b915dc8f5a70cabd"; }; buildInputs = with self; [] ++ optional isPy26 unittest2; @@ -4675,7 +4740,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/derpconf/${name}.tar.gz"; - md5 = "a164807d7bf0c4adf1de781305f29b82"; + sha256 = "9129419e3a6477fe6366c339d2df8c614bdde82a639f33f2f40d4de9a1ed236a"; }; meta = { @@ -4745,7 +4810,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/discogs-client/${name}.tar.gz"; - md5 = "2cc57e1d134aa93404e779b9311676fa"; + sha256 = "0a3616a818dd9fa61a61c3d9731d176e9123130d1b1b97a6beee63b4c72306b7"; }; propagatedBuildInputs = with self; [ oauth2 requests2 ]; @@ -4802,7 +4867,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/dockerpty/${name}.tar.gz"; - md5 = "92fb66d28aa19bf5268e7e3935670e5d"; + sha256 = "a51044cc49089a2408fdf6769a63eebe0b16d91f34716ecee681984446ce467d"; }; propagatedBuildInputs = with self; [ six ]; @@ -4820,7 +4885,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/docker-registry-core/${name}.tar.gz"; - md5 = "610ef9395f2e9a2f91c68d13325fce7b"; + sha256 = "347e804f1f35b28dbe27bf8d7a0b630fca29d684032139bf26e3940572360360"; }; DEPS = "loose"; @@ -4875,7 +4940,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/docopt/${name}.tar.gz"; - md5 = "4bc74561b37fad5d3e7d037f82a4c3b1"; + sha256 = "49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491"; }; meta = { @@ -4910,7 +4975,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/dogpile.cache/dogpile.cache-0.5.4.tar.gz"; - md5 = "513b77ba1bd0c31bb15dd9dd0d8471af"; + sha256 = "9eab7a5dc05ad1b6573144c4a2717226b5c38811f9ec29b514e774535a91ea24"; }; doCheck = false; @@ -4927,7 +4992,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/dogpile.core/dogpile.core-0.4.1.tar.gz"; - md5 = "01cb19f52bba3e95c9b560f39341f045"; + sha256 = "be652fb11a8eaf66f7e5c94d418d2eaa60a2fe81dae500f3743a863cc9dbed76"; }; doCheck = false; @@ -4944,7 +5009,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/dotfiles/${name}.tar.gz"; - md5 = "95a0792eb92a8fc0db8a7e59389470fe"; + sha256 = "45ecfd7f2ed9d0f2a7ac632c9bd0ebdca758d8bbc2b6f11562579d525f0467b8"; }; doCheck = true; @@ -5107,7 +5172,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/E/EasyProcess/${name}.tar.gz"; - md5 = "3da72e2fe16781fe5c7b3b0c6c40ee7b"; + sha256 = "c9980c0b0eeab97969305d8829bed966a3e28a77284e4f45a9b38fb23ce83633"; }; meta = { @@ -5303,7 +5368,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/e/execnet/${name}.zip"; - md5 = "be885ccd9612966bb81839670d2da099"; + sha256 = "fa1d8bd6b6d2282ff4df474b8ac687e1775bff4fc6462b219a5f89d5e9e6908c"; }; doCheck = !isPy3k; # failures.. @@ -5321,7 +5386,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/f/facebook-sdk/facebook-sdk-0.4.0.tar.gz"; - md5 = "ac9f38e197e54b8ba9f3a61988cc33b7"; + sha256 = "5a96c54d06213039dff1fe1fabc51972e394666cd6d83ea70f7c2e67472d9b72"; }; meta = with pkgs.stdenv.lib; { @@ -5469,7 +5534,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/f/funcparserlib/${name}.tar.gz"; - md5 = "3aba546bdad5d0826596910551ce37c0"; + sha256 = "b7992eac1a3eb97b3d91faa342bfda0729e990bd8a43774c1592c091e563c91d"; }; checkPhase = '' @@ -5494,7 +5559,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/singledispatch/${name}.tar.gz"; - md5 = "af2fc6a3d6cc5a02d0bf54d909785fcb"; + sha256 = "5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c"; }; meta = { @@ -5577,7 +5642,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/g/gmpy/${name}.zip"; - md5 = "2bf419076b06e107167e219f60ac6d27"; + sha256 = "1a79118a5332b40aba6aa24b051ead3a31b9b3b9642288934da754515da8fa14"; }; buildInputs = [ @@ -5597,7 +5662,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/g/gmpy2/${name}.zip"; - md5 = "7365d880953ba54c2cdcf171c7e19b2b"; + sha256 = "5041d0ae24407c24487106099f5bcc4abb1a5f58d90e6712cc95321975eddbd4"; }; buildInputs = [ @@ -5902,7 +5967,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/h/humanize/${name}.tar.gz"; - md5 = "e8473d9dc1b220911cac2edd53b1d973"; + sha256 = "a43f57115831ac7c70de098e6ac46ac13be00d69abbf60bdcac251344785bb19"; }; buildInputs = with self; [ mock ]; @@ -5949,7 +6014,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/h/httpauth/${name}.tar.gz"; - md5 = "78d1835a80955e68e98a3ca5ab7f7dbd"; + sha256 = "294029b5dfed27bca5746a31e3ffb5ed99268761536705e8bbd44231b7ca15ec"; }; doCheck = false; @@ -5977,6 +6042,7 @@ in modules // { pkgs.libpng pkgs.libtiff pkgs.libwebp + pkgs.pkgconfig ]; propagatedBuildInputs = with self; [ numpy ]; @@ -6094,7 +6160,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/j/jsonpatch/${name}.tar.gz"; - md5 = "9f2d0aa31f99cc97089a203c5bed3924"; + sha256 = "22d0bc0f5522a4a03dd9fb4c4cdf7c1f03256546c88be4c61e5ceabd22280e47"; }; propagatedBuildInputs = with self; [ jsonpointer ]; @@ -6111,7 +6177,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/j/jsonpointer/${name}.tar.gz"; - md5 = "c4d3f28e72ba77062538d1c0864c40a9"; + sha256 = "39403b47a71aa782de6d80db3b78f8a5f68ad8dfc9e674ca3bb5b32c15ec7308"; }; meta = { @@ -6413,7 +6479,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.pediapress.com/packages/mirror/${name}.zip"; - md5 = "36193837359204d3337b297ba0f20bc8"; + sha256 = "9229193ee719568d482192d9d913b3c4bb96af7c589d6c31ed4a62caf5054278"; }; meta = { @@ -6429,7 +6495,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.pediapress.com/packages/mirror/${name}.zip"; - md5 = "49d72b0172f69cbe039f62dd4efb65ea"; + sha256 = "7f596fd60eb24d8d3da3ab4880f095294028880eafb653810a7bdaabdb031238"; }; buildInputs = with self; @@ -6451,12 +6517,12 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/n/natsort/${name}.tar.gz"; - md5 = "38cc0bb27c95bf549fe737d9f267f453"; + sha256 = "a0d4239bd609eae5cd5163db6f9794378ce0e3f43ae16c10c35472d866ae20cd"; }; buildInputs = with self; [ - hypothesis + hypothesis1 pytestcov pytestflakes pytestpep8 @@ -6543,7 +6609,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/o/odfpy/${name}.tar.gz"; - md5 = "3f570ead2b5f5eb6eab97eecce22d491"; + sha256 = "e458f969f1ccd7ed77d70a45fe69ad656ac61b39e36e4d32c42d4e3216030891"; }; buildInputs = with self; with pkgs; [ ]; @@ -6603,8 +6669,8 @@ in modules // { name = "passlib-${version}"; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/p/passlib/passlib-${version}.tar.gz"; - md5 = "2f872ae7c72ca338634c618f2cff5863"; + url = "https://pypi.python.org/packages/source/p/passlib/passlib-${version}.tar.gz"; + sha256 = "e987f6000d16272f75314c7147eb015727e8532a3b747b1a8fb58e154c68392d"; }; buildInputs = with self; [ nose pybcrypt]; @@ -6641,7 +6707,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/peppercorn/${name}.tar.gz"; - md5 = "f08efbca5790019ab45d76b7244abd40"; + sha256 = "921cba5d51fa211e6da0fbd2120b9a98d663422a80f5bb669ad81ffb0909774b"; }; meta = { @@ -6676,7 +6742,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pies/${name}.tar.gz"; - md5 = "caba1ce15d312bf68d65a5d2cf9ccff2"; + sha256 = "d8d6ae4faa0a7da5d634ad8c6ca4bb22b70ad53bb7ecd91af23d490fcd2a88e8"; }; deps = if !isPy3k then [ self.pies2overrides self.enum34 ] @@ -6698,7 +6764,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pies2overrides/${name}.tar.gz"; - md5 = "e73716454a2560341edf99d8f6fe5135"; + sha256 = "2a91445afc7f692bdbabfbf00d3defb1d47ad7825eb568a6464359758ab35763"; }; propagatedBuildInputs = with self; [ ipaddress ]; @@ -6739,7 +6805,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/plotly/${name}.tar.gz"; - md5 = "56fb77dff80325413c8cf40cf229ce90"; + sha256 = "628679e880caab22e2a46273e85e1d1ce1382b631e1c7bbfe539f804c5269b21"; }; propagatedBuildInputs = with self; [ self.pytz self.six self.requests ]; @@ -6760,7 +6826,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/python-poppler-qt4/" + "python-poppler-qt4-${version}.tar.gz"; - md5 = "9c4c5a59b878aed78e96a6ae58c6c185"; + sha256 = "00e3f89f4e23a844844d082918a89c2cbb1e8231ecb011b81d592e7e3c33a74c"; }; propagatedBuildInputs = [ pkgs.pyqt4 pkgs.pkgconfig pkgs.poppler_qt4 ]; @@ -6785,7 +6851,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pudb/${name}.tar.gz"; - md5 = "063030763bf914166a0b2bc8c011143b"; + sha256 = "81b20a995803c4be513e6d36c8ec9a531d3ccb24670b2416abc20f3933ddb8be"; }; propagatedBuildInputs = with self; [ self.pygments self.urwid ]; @@ -6930,7 +6996,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyramid_beaker/${name}.tar.gz"; - md5 = "acb863517a98b90b5f29648ce55dd563"; + sha256 = "c76578dac3ea717e9ca89c327daf13975987d0b8827d15157319c20614fab74a"; }; propagatedBuildInputs = with self; [ beaker pyramid ]; @@ -6947,7 +7013,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pyramid_chameleon/${name}.tar.gz"; - md5 = "5bb5938356dfd13fce06e095f132e137"; + sha256 = "d176792a50eb015d7865b44bd9b24a7bd0489fa9a5cebbd17b9e05048cef9017"; }; propagatedBuildInputs = with self; [ @@ -7013,7 +7079,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyramid_exclog/${name}.tar.gz"; - md5 = "05df86758b0d30ee6f8339ff36cef7a0"; + sha256 = "a58c82866c3e1a350684e6b83b440d5dc5e92ca5d23794b56d53aac06fb65a2c"; }; propagatedBuildInputs = with self; [ pyramid ]; @@ -7030,7 +7096,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyramid_tm/${name}.tar.gz"; - md5 = "89a293488093d6c30036345fa46184d2"; + sha256 = "99528c54accf2bd5860d10634fe8972e8375b2d0f50ee08f208ed0484ffafc1d"; }; propagatedBuildInputs = with self; [ transaction pyramid ]; @@ -7047,7 +7113,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pyramid_multiauth/${name}.tar.gz"; - md5 = "044e423abc4fb76937ac0c21c1205e9c"; + sha256 = "c33f357e0a216cd6ef7d143d40d4679c9fb0796a1eabaf1249aeef63ed000828"; }; propagatedBuildInputs = with self; [ pyramid ]; @@ -7126,7 +7192,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/r/raven/${name}.tar.gz"; - md5 = "6a9264133bf646149ffb9118d81445be"; + sha256 = "c27e40ab3ccf37f30a9f77acb4917370d9341e25abda8e94b9bd48c7127f7d48"; }; # way too many dependencies to run tests @@ -7144,7 +7210,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/r/roman/${name}.zip"; - md5 = "aa71d131eec16d45c030fd06a27c9d17"; + sha256 = "90e83b512b44dd7fc83d67eb45aa5eb707df623e6fc6e66e7f273abd4b2613ae"; }; buildInputs = with self; with pkgs; [ ]; @@ -7165,7 +7231,7 @@ in modules // { version = "0.4.0"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/l/librosa/librosa-0.4.0.tar.gz"; - md5 = "8149a70a5a5783c3cceeb69de3e07458"; + sha256 = "cc11dcc41f51c08e442292e8a2fc7d7ee77e0d47ff771259eb63f57fcee6f6e7"; }; propagatedBuildInputs = with self; @@ -7250,7 +7316,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/h/hypatia/${name}.tar.gz"; - md5 = "d74c6dda31ff459a39fa5da9e98f2425"; + sha256 = "fb4d394eeac4b06ff2259cada6174aebbe77edd243ffd1deda320cb327f98bd9"; }; buildInputs = with self; [ zope_interface zodb ]; @@ -7266,7 +7332,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.copy/${name}.zip"; - md5 = "36aa2c96dec4cfeea57f54da2b733eb9"; + sha256 = "eb2a95866df1377741876a3ee62d8600e80089e6246e1a235e86791b29534457"; }; buildInputs = with self; [ zope_interface zope_location zope_schema ]; @@ -7352,7 +7418,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyramid_zodbconn/${name}.tar.gz"; - md5 = "3c7746a227fbcda3e138ab8bfab7700b"; + sha256 = "56cfdb6b13dc87b1c51c7abc1557c63960d6b858e14a2d4c9693c3f7877f5f63"; }; # should be fixed in next release @@ -7372,7 +7438,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyramid_mailer/${name}.tar.gz"; - md5 = "43800c7c894097a23140da58e3638c93"; + sha256 = "4debfad05ee65a05ba6f43e2af913e6e30db75ba42254e4aa0291500c4caa1fc"; }; buildInputs = with self; [ pyramid transaction ]; @@ -7388,7 +7454,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyrtlsdr/${name}.zip"; - md5 = "646336675a00d38e6f54e77a17011b95"; + sha256 = "cbb9086efe4320858c48f4856d09f7face191c4156510b1459ef4e5588935b6a"; }; postPatch = '' @@ -7410,7 +7476,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/r/repoze.sendmail/${name}.tar.gz"; - md5 = "81d15f1f03cc67d6f56f2091c594ef57"; + sha256 = "51813730adc24728d5ce2609038f7bb81aa1632539d7a79045ef4aa6942eaba2"; }; buildInputs = with self; [ transaction ]; @@ -7426,7 +7492,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zodburi/${name}.tar.gz"; - md5 = "7876893829c2f784506c80d49f861b67"; + sha256 = "c04b9beca032bb7b968a3464417596ba4607a927c5e65929860962ddba1cccc0"; }; buildInputs = with self; [ zodb mock ZEO ]; @@ -7443,7 +7509,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/Z/ZEO/${name}.tar.gz"; - md5 = "494d8320549185097ba4a6b6b76017d6"; + sha256 = "63555b6d2b5f98d215c4b5fdce004fb0475daa6efc8b70f39c77d646c12d7e51"; }; meta = { @@ -7458,7 +7524,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/r/random2/${name}.zip"; - md5 = "48a0a86fe00e447212d0095de8cf3e21"; + sha256 = "34ad30aac341039872401595df9ab2c9dc36d0b7c077db1cea9ade430ed1c007"; }; }; @@ -7546,7 +7612,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/r/repoze.lru/${name}.tar.gz"; - md5 = "2c3b64b17a8e18b405f55d46173e14dd"; + sha256 = "0f7a323bf716d3cb6cb3910cd4fccbee0b3d3793322738566ecce163b01bbd31"; }; meta = { @@ -7562,7 +7628,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/r/repoze.sphinx.autointerface/${name}.tar.gz"; - md5 = "f2fee996ae28dc16eb48f1a3e8f64801"; + sha256 = "97ef5fac0ab0a96f1578017f04aea448651fa9f063fc43393a8253bff8d8d504"; }; propagatedBuildInputs = with self; [ zope_interface sphinx ]; @@ -7604,7 +7670,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/setuptools-git/${name}.tar.gz"; - md5 = "7b5967e9527c789c3113b07a1f196f6e"; + sha256 = "047d7595546635edebef226bc566579d422ccc48a8a91c7d32d8bd174f68f831"; }; propagatedBuildInputs = [ pkgs.git ]; @@ -7647,7 +7713,7 @@ in modules // { version = "1.3.0"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pywatchman/pywatchman-${version}.tar.gz"; - md5 = "852eab2b7d2f4f56580c3cfff4803350"; + sha256 = "c3d5be183b5b04f6ad575fc71b06dd196185dea1558d9f4d0598ba9beaab8245"; }; postPatch = '' substituteInPlace pywatchman/__init__.py \ @@ -7662,7 +7728,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/z/zope.tales/${name}.zip"; - md5 = "902b03a5f9774f6e2decf3f06d18a09d"; + sha256 = "c0485f09c3f23c7a0ceddabcb02d4a40ebecf8f8f36c87fa9a02c415f96c969e"; }; }; @@ -7672,7 +7738,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.deprecation/${name}.tar.gz"; - md5 = "e9a663ded58f4f9f7881beb56cae2782"; + sha256 = "fed622b51ffc600c13cc5a5b6916b8514c115f34f7ea2730409f30c061eb0b78"; }; buildInputs = with self; [ zope_testing ]; @@ -7688,7 +7754,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/v/validictory/validictory-1.0.0a2.tar.gz"; - md5 = "54c206827931cc4ed8a9b1cc78e380c5"; + sha256 = "c02388a70f5b854e71e2e09bd6d762a2d8c2a017557562e866d8ffafb0934b07"; }; doCheck = false; @@ -7705,7 +7771,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/v/venusian/${name}.tar.gz"; - md5 = "dccf2eafb7113759d60c86faf5538756"; + sha256 = "1720cff2ca9c369c840c1d685a7c7a21da1afa687bfe62edd93cae4bf429ca5a"; }; # TODO: https://github.com/Pylons/venusian/issues/23 @@ -7723,7 +7789,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/C/Chameleon/${name}.tar.gz"; - md5 = "0214647152fcfcb9ce357624f8f9f203"; + sha256 = "bd1dfc96742c2a5b0b2adcab823bdd848e70c45a994dc4e51dd2cc31e2bae3be"; }; buildInputs = with self; [] ++ optionals isPy26 [ ordereddict unittest2 ]; @@ -7742,7 +7808,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/ddt/${name}.tar.gz"; - md5 = "29688456f9ee42d09d7d7c864ce6e17b"; + sha256 = "e24ecb7e2cf0bf43fa9d4255d3ae2bd0b7ce30b1d1b89ace7aa68aca1152f37a"; }; meta = { @@ -7759,7 +7825,7 @@ in modules // { src = pkgs.fetchurl { url = "http://launchpad.net/python-distutils-extra/trunk/2.26/+download/python-${name}.tar.gz"; - md5 = "7caded30a45907b5cdb10ac4182846eb"; + sha256 = "11a3d16efffb00c2b50f40c48531dadaf553ed7a36c5621fde437a16ca40f7ea"; }; meta = { @@ -7803,7 +7869,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyxdg/${name}.tar.gz"; - md5 = "bedcdb3a0ed85986d40044c87f23477c"; + sha256 = "81e883e0b9517d624e8b0499eb267b82a815c0b7146d5269f364988ae031279d"; }; # error: invalid command 'test' @@ -7822,7 +7888,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/chardet/${name}.tar.gz"; - md5 = "25274d664ccb5130adae08047416e1a8"; + sha256 = "e53e38b3a4afe6d1132de62b7400a4ac363452dc5dfcf8d88e8e0cce663c68aa"; }; meta = { @@ -7847,12 +7913,12 @@ in modules // { django_1_9 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.9.3"; + version = "1.9.4"; disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.9/${name}.tar.gz"; - sha256 = "0miv4jb2p4xpcdif0zqimmqw1jypzyq6q5v4m79jc9yyhwj1l685"; + sha256 = "1sdxixj4p3wx245dm608bqw5bdabl701qab0ar5wjivyd6mfga5d"; }; # patch only $out/bin to avoid problems with starter templates (see #3134) @@ -7871,12 +7937,12 @@ in modules // { django_1_8 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.8.10"; + version = "1.8.11"; disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz"; - sha256 = "08qsgnqq97rg4v80kmbkccr9hm90nw4zh6c46xblk64lnqgb3rfj"; + sha256 = "1yrmlj3h2hp5kc5m11ybya21x2wfr5bqqbkcsw6hknj86pkqn57c"; }; # too complicated to setup @@ -8002,6 +8068,28 @@ in modules // { }; }; + django_compat = buildPythonPackage rec { + name = "django-compat-${version}"; + version = "1.0.8"; + + # build process attempts to access a missing README.rst + disabled = isPy35; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/django-compat/${name}.tar.gz"; + sha256 = "195dgr55vzpw1fbjvbw2h35k9bfhvm5zchh2p7nzbq57xmwb3sra"; + }; + + buildInputs = with self; [ django_nose ]; + propagatedBuildInputs = with self; [ django six ]; + + meta = { + description = "Forward and backwards compatibility layer for Django 1.4, 1.7, 1.8, and 1.9"; + homepage = https://github.com/arteria/django-compat; + license = licenses.mit; + }; + }; + django_evolution = buildPythonPackage rec { name = "django_evolution-0.7.5"; disabled = isPy3k; @@ -8025,7 +8113,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/d/django-tagging/${name}.tar.gz"; - md5 = "a0855f2b044db15f3f8a025fa1016ddf"; + sha256 = "e5fbeb7ca6e0c22a9a96239095dff508040ec95171e51c69e6f8ada72ea4bce2"; }; # error: invalid command 'test' @@ -8062,6 +8150,45 @@ in modules // { }; }; + django_hijack = buildPythonPackage rec { + name = "django-hijack-${version}"; + version = "2.0.7"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/django-hijack/${name}.tar.gz"; + sha256 = "0rpi1bkfx74xfbb2nk874kfdra1jcqp2vzky1r3z7zidlc9kah04"; + }; + + propagatedBuildInputs = with self; [ django django_compat ]; + + meta = { + description = "Allows superusers to hijack (=login as) and work on behalf of another user"; + homepage = https://github.com/arteria/django-hijack; + license = licenses.mit; + }; + }; + + django_nose = buildPythonPackage rec { + name = "django-nose-${version}"; + version = "1.4.3"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/django-nose/${name}.tar.gz"; + sha256 = "0rl9ipa98smprlw56xqlhzhps28p84wg0640qlyn0rjyrpsdmf0r"; + }; + + # vast dependency list + doCheck = false; + + propagatedBuildInputs = with self; [ django nose ]; + + meta = { + description = "Provides all the goodness of nose in your Django tests"; + homepage = https://github.com/django-nose/django-nose; + license = licenses.bsd3; + }; + }; + django_modelcluster = buildPythonPackage rec { name = "django-modelcluster-${version}"; version = "0.6.2"; @@ -8364,7 +8491,7 @@ in modules // { src = pkgs.fetchurl { url = "mirror://sourceforge/docutils/${name}.tar.gz"; - md5 = "4622263b62c5c771c03502afa3157768"; + sha256 = "c7db717810ab6965f66c8cf0398a98c9d8df982da39b4cd7f162911eb89596fa"; }; # error: invalid command 'test' @@ -8399,7 +8526,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/d/dtopt/${name}.tar.gz"; - md5 = "9a41317149e926fcc408086aedee6bab"; + sha256 = "06ae07a12294a7ba708abaa63f838017d1a2faf6147a1e7a14ca4fa28f86da7f"; }; meta = { @@ -8437,7 +8564,7 @@ in modules // { version = "1.9.0"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/e/elpy/${name}.tar.gz"; - md5 = "651f6f46767b7132e5c0f83d5ac3b1f7"; + sha256 = "419f7b05b19182bc1aedde1ae80812c1534e59a0493476aa01ea819e76ba26f0"; }; python2Deps = if isPy3k then [ ] else [ self.rope ]; propagatedBuildInputs = with self; [ flake8 autopep8 jedi importmagic ] ++ python2Deps; @@ -8457,7 +8584,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/e/enum/${name}.tar.gz"; - md5 = "ce75c7c3c86741175a84456cc5bd531e"; + sha256 = "9bdfacf543baf2350df7613eb37f598a802f346985ca0dc1548be6494140fdff"; }; doCheck = !isPyPy; @@ -8494,7 +8621,7 @@ in modules // { name = "epc-0.0.3"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/e/epc/${name}.tar.gz"; - md5 = "04a93c0cd32b496969ead09f414dac74"; + sha256 = "30b594bd4a4acbd5bda0d3fa3d25b4e8117f2ff8f24d2d1e3e36c90374f3c55e"; }; propagatedBuildInputs = with self; [ sexpdata ]; @@ -8587,7 +8714,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/f/feedgenerator/${name}.tar.gz"; - md5 = "92978492871342ad64e8ae0ccfcf200c"; + sha256 = "5d6b0b10134ac392be0c0c3a39c0e1d7e9c17cc7894590f75981e3f497a4a60f"; }; buildInputs = [ pkgs.glibcLocales ]; @@ -8629,7 +8756,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pyfribidi/${name}.zip"; - md5 = "a3fc1f9d34571305782d1a54ee36f904"; + sha256 = "6f7d83c09eae0cb98a40b85ba3dedc31af4dbff8fc4425f244c1e9f44392fded"; }; meta = { @@ -8719,12 +8846,34 @@ in modules // { }; }; + flaky = buildPythonPackage rec { + name = "flaky-${version}"; + version = "3.1.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/f/flaky/${name}.tar.gz"; + sha256 = "1x9ixika7wqjj52x8wnsh1vk7jadkdqpx01plj7mlh8slwyq4s41"; + }; + + propagatedBuildInputs = with self; [ pytest ]; + buildInputs = with self; [ mock ]; + + # waiting for feedback https://github.com/box/flaky/issues/97 + doCheck = false; + + meta = { + homepage = https://github.com/box/flaky; + description = "Plugin for nose or py.test that automatically reruns flaky tests"; + license = licenses.asl20; + }; + }; + flask = buildPythonPackage { name = "flask-0.10.1"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/F/Flask/Flask-0.10.1.tar.gz"; - md5 = "378670fe456957eb3c27ddaef60b2b24"; + sha256 = "4c83829ff83d408b5e1d4995472265411d2c414112298f2eb4b359d9e4563373"; }; propagatedBuildInputs = with self; [ itsdangerous click werkzeug jinja2 ]; @@ -8761,7 +8910,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/F/Flask-Cache/${name}.tar.gz"; - md5 = "ab82a9cd0844891ccdb54fbb93fd6c59"; + sha256 = "90126ca9bc063854ef8ee276e95d38b2b4ec8e45fd77d5751d37971ee27c7ef4"; }; propagatedBuildInputs = with self; [ werkzeug flask ]; @@ -8946,7 +9095,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/F/FlexGet/${name}.tar.gz"; - md5 = "2c249c43bc594726f908b1425a8b8081"; + sha256 = "0f7aaf0bf37860f0c5adfb0ba59ca228aa3f5c582131445623a4c3bc82d45346"; }; doCheck = false; @@ -8980,7 +9129,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/g/grappelli_safe/${name}.tar.gz"; - md5 = "5c8c681a0b1df94ecd6dc0b3a8b80892"; + sha256 = "8b21b4724bce449cc4f22dc74ed0be9b3e841d968f3271850bf4836864304eb6"; }; meta = { @@ -9008,7 +9157,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/python-tvrage/python-tvrage-${version}.tar.gz"; - md5 = "cdfec252158c5047b626861900186dfb"; + sha256 = "f8a530376c5cf1bc573d1945a8504c3394b228c731a3eff5100c705997a72063"; }; # has mostly networking dependent tests @@ -9386,7 +9535,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/g/gcovr/${name}.tar.gz"; - md5 = "672db629469882b93c40016aebff50ac"; + sha256 = "2c878e03c2eff2282e64035bec0a30532b2b1173aadf08486401883b79e4dab1"; }; meta = { @@ -9536,7 +9685,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/g/genzshcomp/genzshcomp-0.5.1.tar.gz"; - md5 = "7a954f1835875002e9044fe55ed1b488"; + sha256 = "c77d007cc32cdff836ecf8df6192371767976c108a75b055e057bb6f4a09cd42"; }; buildInputs = with self; [ pkgs.setuptools ] ++ (optional isPy26 argparse); @@ -9765,7 +9914,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/g/gspread/${name}.tar.gz"; - md5 = "5a71e4e3fc509dc1c4d34722f102dec1"; + sha256 = "dba45ef9e652dcd8cf561ae65569bd6ecd18fcc77b991521490698fb2d847106"; }; meta = { @@ -9853,7 +10002,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/g/gunicorn/${name}.tar.gz"; - md5 = "3d759bec3c46a680ff010775258c4c56"; + sha256 = "ae1dd6452f62b3470bc9acaf62cb5301545fbb9c697d863a5bfe35097ed7a0b3"; }; buildInputs = with self; [ pytest ]; @@ -9926,7 +10075,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/h/htmllaundry/${name}.tar.gz"; - md5 = "6db6909de76c4b259e65d90b5debdbda"; + sha256 = "e428cba78d5a965e959f5dac2eb7d5f7d627dd889990d5efa8d4e03f3dd768d9"; }; buildInputs = with self; [ nose ]; @@ -9979,7 +10128,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/h/http_signature/${name}.tar.gz"; - md5 = "015061846254bd5d8c5dbc2913985153"; + sha256 = "14acc192ef20459d5e11b4e800dd3a4542f6bd2ab191bf5717c696bf30936c62"; }; propagatedBuildInputs = with self; [pycrypto]; @@ -9996,7 +10145,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/h/httpbin/${name}.tar.gz"; - md5 = "9b2bb2fab45f5fa839e9a776a64d6089"; + sha256 = "6b57f563900ecfe126015223a259463848daafbdc2687442317c0992773b9054"; }; propagatedBuildInputs = with self; [ flask markupsafe decorator itsdangerous six ]; @@ -10025,7 +10174,7 @@ in modules // { }; }; - hypothesis = buildPythonPackage rec { + hypothesis1 = buildPythonPackage rec { name = "hypothesis-1.14.0"; buildInputs = with self; [fake_factory django numpy pytz flake8 pytest ]; @@ -10044,6 +10193,35 @@ in modules // { }; }; + hypothesis = buildPythonPackage rec { + # http://hypothesis.readthedocs.org/en/latest/packaging.html + + name = "hypothesis-${version}"; + version = "3.1.0"; + + # Upstream prefers github tarballs + src = pkgs.fetchFromGitHub { + owner = "DRMacIver"; + repo = "hypothesis"; + rev = "${version}"; + sha256 = "1fhdb2vwc4blas5fvcly6pmha8psqm4bhi67jz32ypjryzk09iyf"; + }; + + buildInputs = with self; [ flake8 pytest flaky ]; + propagatedBuildInputs = with self; ([ pytz fake_factory django numpy ] ++ optionals isPy27 [ enum34 modules.sqlite3 ]); + + # https://github.com/DRMacIver/hypothesis/issues/300 + checkPhase = '' + ${python.interpreter} -m pytest tests/cover + ''; + + meta = { + description = "A Python library for property based testing"; + homepage = https://github.com/DRMacIver/hypothesis; + license = licenses.mpl20; + }; + }; + httpretty = buildPythonPackage rec { name = "httpretty-${version}"; version = "0.8.6"; @@ -10084,7 +10262,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/i/icalendar/${name}.tar.gz"; - md5 = "072c67a4c461864abd604631d7cf67e7"; + sha256 = "93d0b94eab23d08f62962542309916a9681f16de3d5eca1c75497f30f1b07792"; }; buildInputs = with self; [ setuptools ]; @@ -10114,7 +10292,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/i/influxdb/${name}.tar.gz"; - md5 = "6c975058ccc4df41dad8d8234c52d754"; + sha256 = "6b5ea154454b86d14f2a3960d180e666ba9863da964032dacf2b50628e774a33"; }; # ImportError: No module named tests @@ -10240,7 +10418,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/i/iptools/iptools-${version}.tar.gz"; - md5 = "aed4045638fd40c16f8d9bb04606f700"; + sha256 = "0f03875a5bed740ba4bf44decb6a78679cca914a1ee8a6cc468114485c4d98e3"; }; buildInputs = with self; [ nose ]; @@ -10258,7 +10436,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/I/IPy/IPy-${version}.tar.gz"; - md5 = "f4f7ddc7c5e55a47222a5cc6c0a87b6d"; + sha256 = "5d6abb870c25f946c45c35cf50e66155598660f2765b35cb12e36ed5223c2b89"; }; # error: invalid command 'test' @@ -10456,7 +10634,7 @@ in modules // { name = "ipdbplugin-1.4"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/i/ipdbplugin/ipdbplugin-1.4.tar.gz"; - md5 = "f9a41512e5d901ea0fa199c3f648bba7"; + sha256 = "4778d78b5d0af1a2a6d341aed9e72eb73b1df6b179e145b4845d3a209137029c"; }; propagatedBuildInputs = with self; [ self.nose self.ipython ]; }; @@ -10648,7 +10826,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/j/jrnl/${name}.tar.gz"; - md5 = "395faff36de8a08a5bfeedbf123e9067"; + sha256 = "af599a863ac298533685a7236fb86307eebc00a38eb8bb96f4f67b5d83227ec8"; }; propagatedBuildInputs = with self; [ @@ -10725,7 +10903,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/j/jsonpath-rw/${name}.tar.gz"; - md5 = "3a807e05c2c12158fc6bb0a402fd5778"; + sha256 = "05c471281c45ae113f6103d1268ec7a4831a2e96aa80de45edc89b11fac4fbec"; }; propagatedBuildInputs = with self; [ @@ -10858,7 +11036,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pylast/${name}.tar.gz"; - md5 = "506cf1b13020b3ed2f3c845ea0c9830e"; + sha256 = "bf35820be35447d55564d36072d40b09ac8a7fd41a6f1a7a9d408f4d0eaefac4"; }; # error: invalid command 'test' @@ -11011,7 +11189,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/l/linode/linode-${version}.tar.gz"; - md5 = "03a306575cf274719b3206ecee0bda9e"; + sha256 = "db3c2a7fab8966d903a63f16c515bff241533e4ef2d746aa7aae4a49bba5e573"; }; propagatedBuildInputs = with self; [ requests2 ]; @@ -11048,7 +11226,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/l/locustio/${name}.tar.gz"; - md5 = "90cf4d029d58ad58d19ea17a16e59c34"; + sha256 = "c9ca6fdfe6a6fb187a3d54ddf9b1518196348e8f20537f0a14ca81a264ffafa2"; }; propagatedBuildInputs = [ self.msgpack self.requests2 self.flask self.gevent self.pyzmq ]; @@ -11224,7 +11402,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${version}.tar.gz"; - md5 = "89557730e245294a6cab06de8ad4fb42"; + sha256 = "1ac3b6eafa5ff7e2a0796675316d7569b28aada45a7ab74042ad089d15a9567f"; }; buildInputs = with self; [ pkgs.swig2 pkgs.openssl ]; @@ -11373,7 +11551,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/m/mccabe/${name}.tar.gz"; - md5 = "81640948ff226f8c12b3277059489157"; + sha256 = "3d8ca9bf65c5014f469180544d1dd5bb5b9df709aad6304f9c2e4370ae0a7b7c"; }; # See https://github.com/flintwork/mccabe/issues/31 @@ -11441,7 +11619,7 @@ in modules // { src = pkgs.fetchurl { url = https://pypi.python.org/packages/source/m/meld3/meld3-1.0.0.tar.gz; - md5 = "ca270506dd4ecb20ae26fa72fbd9b0be"; + sha256 = "57b41eebbb5a82d4a928608962616442e239ec6d611fe6f46343e765e36f0b2b"; }; doCheck = false; @@ -11776,7 +11954,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pymox.googlecode.com/files/${name}.tar.gz"; - sha1 = "b71aeaacf31898c3b38d8b9ca5bcc0664499c0de"; + sha256 = "4d18a4577d14da13d032be21cbdfceed302171c275b72adaa4c5997d589a5030"; }; # error: invalid command 'test' @@ -11840,7 +12018,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/python-mpd/python-mpd-0.3.0.tar.gz"; - md5 = "5b3849b131e2fb12f251434597d65635"; + sha256 = "02812eba1d2e0f46e37457f5a6fa23ba203622e4bcab0a19b265e66b08cd21b4"; }; meta = with pkgs.stdenv.lib; { @@ -11924,7 +12102,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/m/msgpack-python/${name}.tar.gz"; - md5 = "8b317669314cf1bc881716cccdaccb30"; + sha256 = "bfcc581c9dbbf07cc2f951baf30c3249a57e20dcbd60f7e6ffc43ab3cc614794"; }; propagatedBuildInputs = with self; [ ]; @@ -11964,7 +12142,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/m/munkres/${name}.tar.gz"; - md5 = "d7ba3b8c5001578ae229a2d5a655872f"; + sha256 = "c78f803b9b776bfb20a25c9c7bb44adbf0f9202c2024d51aa5969d21e560208d"; }; # error: invalid command 'test' @@ -11984,7 +12162,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/m/musicbrainzngs/${name}.tar.gz"; - md5 = "9e17a181af72d04a291c9a960bc73d44"; + sha256 = "281388ab750d2996e9feca4580fd4215d616a698e02cd6719cb9b8562945c489"; }; buildInputs = [ pkgs.glibcLocales ]; @@ -12022,7 +12200,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/m/mutagen/${name}.tar.gz"; - md5 = "6a9bb5cc33214add35348f1bb3448340"; + sha256 = "cc884fe1e20fe220be7ce7c3b269f4cadc69a8310150a3a41162fba1ca9c88bd"; }; # Needed for tests only @@ -12231,7 +12409,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/m/mysql-connector-repackaged/${name}.tar.gz"; - md5 = "0b17ad1cb3fe763fd44487cb97cf45b2"; + sha256 = "170fbf11c54def1b5fcc919be0a890b760bb2eca81f56123a5dda0c69b5b099e"; }; meta = { @@ -12365,15 +12543,13 @@ in modules // { sleekxmpp = buildPythonPackage rec { name = "sleekxmpp-${version}"; - version = "1.2.5"; - - disabled = (!isPy3k); + version = "1.3.1"; propagatedBuildInputs = with self ; [ dns pyasn1 ]; src = pkgs.fetchurl { - url = "https://github.com/fritzy/SleekXMPP/archive/sleek-${version}.tar.gz"; - sha256 = "07zz0bm098zss0xww11gj45aw417nrkp9k1szzs1zm88wyfr1z31"; + url = "https://pypi.python.org/packages/source/s/sleekxmpp/${name}.tar.gz"; + sha256 = "1krkhkvj8xw5a6c2xlf7h1rg9xdcm9d8x2niivwjahahpvbl6krr"; }; meta = { @@ -12529,7 +12705,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/n/nibabel/${name}.tar.gz"; - md5 = "3be518fde5ec5b09483d4f28c81dc974"; + sha256 = "e559bcb40ae395c7f75c51079f815a13a94cd8a035a47315fc9fba0d2ae2ecaf"; }; propagatedBuildInputs = with self; [ @@ -12566,7 +12742,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/n/nipype/${name}.tar.gz"; - md5 = "480013709633a6d292e2ef668443e0c9"; + sha256 = "7fb143cd4d05f18db1cb7f0b83dba13d3dcf55b4eb3d16df08c97033ccae507b"; }; # Tests fail due to getcwd returning ENOENT??? @@ -12691,7 +12867,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/n/nosexcover/${name}.tar.gz"; - md5 = "12bf494a801b376debeb6a167c247391"; + sha256 = "f5b3a7c936c4f703f15418c1f325775098184b69fa572f868edb8a99f8f144a8"; }; propagatedBuildInputs = with self; [ coverage nose ]; @@ -12725,7 +12901,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/n/nose-cprof/${name}.tar.gz"; - md5 = "5db27c3b8f01915335ae6fc5fd3afd44"; + sha256 = "d1edd5cb3139e897752294d2968bfb066abdd754743fa416e024e5c688893344"; }; meta = { @@ -12816,11 +12992,53 @@ in modules // { }; }; - ntplib = buildPythonPackage rec { - name = "ntplib-0.3.2"; + emoji = buildPythonPackage rec { + name = "emoji-${version}"; + version = "0.3.9"; + src = pkgs.fetchurl { - url = https://pypi.python.org/packages/source/n/ntplib/ntplib-0.3.2.tar.gz; - md5 = "0f386dc00c0056ac4d77af0b4c21bb8e"; + url = "https://pypi.python.org/packages/source/e/emoji/${name}.tar.gz"; + sha256 = "19p5c2nlq0w9972rf9fghyswnijwgig5f8cyzs32kppnmzvzbkxw"; + }; + + buildInputs = with self; [ nose ]; + + checkPhase = ''nosetests''; + + meta = { + description = "Emoji for Python"; + homepage = https://pypi.python.org/pypi/emoji/; + license = licenses.bsd3; + maintainers = with maintainers; [ joachifm ]; + }; + }; + + ntfy = buildPythonPackage rec { + version = "1.2.0"; + name = "ntfy-${version}"; + src = pkgs.fetchFromGitHub { + owner = "dschep"; + repo = "ntfy"; + rev = "v${version}"; + sha256 = "0yjxwisxpxy3vpnqk9nw5k3db3xx6wyf6sk1px9m94s30glcq2cc"; + }; + + propagatedBuildInputs = with self; [ appdirs pyyaml requests2 dbus emoji sleekxmpp mock ]; + + meta = { + description = "A utility for sending notifications, on demand and when commands finish"; + homepage = http://ntfy.rtfd.org/; + license = licenses.gpl3; + maintainers = with maintainers; [ kamilchm ]; + }; + }; + + ntplib = buildPythonPackage rec { + name = "ntplib-0.3.3"; + src = pkgs.fetchurl { + url = https://pypi.python.org/packages/source/n/ntplib/ntplib-0.3.3.tar.gz; + + sha256 = "c4621b64d50be9461d9bd9a71ba0b4af06fbbf818bbd483752d95c1a4e273ede"; }; meta = { @@ -14563,7 +14781,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pagerduty/pagerduty-${version}.tar.gz"; - md5 = "8109a330d16751a7f4041c0ccedec787"; + sha256 = "e8c237239d3ffb061069aa04fc5b3d8ae4fb0af16a9713fe0977f02261d323e9"; }; }; @@ -14709,7 +14927,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/parsedatetime/${name}.tar.gz"; - md5 = "3aca729761be5259a508ed184df73c68"; + sha256 = "09bfcd8f3c239c75e77b3ff05d782ab2c1aed0892f250ce2adf948d4308fe9dc"; }; }; @@ -14718,7 +14936,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/paramiko/${name}.tar.gz"; - md5 = "48c274c3f9b1282932567b21f6acf3b5"; + sha256 = "6ed97e2281bb48728692cdc621f6b86a65fdc1d46b178ce250cfec10b977a04c"; }; propagatedBuildInputs = with self; [ pycrypto ecdsa ]; @@ -14753,7 +14971,7 @@ in modules // { src = pkgs.fetchurl{ url = "https://pypi.python.org/packages/source/p/patsy/${name}.zip"; - md5 = "7545518b413136ba8343dcebea07e5e2"; + sha256 = "a55dd4ca09af4b9608b81f30322beb450510964c022708ab50e83a065ccf15f0"; }; buildInputs = with self; [ nose ]; @@ -14772,7 +14990,7 @@ in modules // { src = pkgs.fetchurl { url = http://pypi.python.org/packages/source/P/Paste/Paste-1.7.5.1.tar.gz; - md5 = "7ea5fabed7dca48eb46dc613c4b6c4ed"; + sha256 = "11645842ba8ec986ae8cfbe4c6cacff5c35f0f4527abf4f5581ae8b4ad49c0b6"; }; buildInputs = with self; [ nose ]; @@ -14792,7 +15010,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/P/PasteDeploy/PasteDeploy-${version}.tar.gz"; - md5 = "352b7205c78c8de4987578d19431af3b"; + sha256 = "d5858f89a255e6294e63ed46b73613c56e3b9a2d82a42f1df4d06c8421a9e3cb"; }; buildInputs = with self; [ nose ]; @@ -15078,7 +15296,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pg8000/${name}.tar.gz"; - md5 = "173275fd76628b0e0cbed70ed9ce9eb9"; + sha256 = "188658db63c2ca931ae1bf0167b34efaac0ecc743b707f0118cc4b87e90ce488"; }; propagatedBuildInputs = with self; [ pytz ]; @@ -15184,7 +15402,7 @@ in modules // { disabled = isPy3k; src = pkgs.fetchurl { url = https://pypi.python.org/packages/source/p/pika/pika-0.9.12.tar.gz; - md5 = "7174fc7cc5570314fa3cfaa729106482"; + sha256 = "670787ee6ade47cadd1ec8220876b9b7ae4df7bc4b9dd1d808261a6b47e9ce5d"; }; buildInputs = with self; [ nose mock pyyaml ]; @@ -15354,8 +15572,7 @@ in modules // { doCheck = false; buildInputs = with self; [ - pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.tcl nose ] - ++ optionals (isPy26 || isPy27 || isPy33 || isPyPy) [ pkgs.lcms2 ] + pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.tcl nose pkgs.lcms2 ] ++ optionals (isPyPy) [ pkgs.tk pkgs.xorg.libX11 ]; # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. @@ -15531,7 +15748,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/P/PrettyTable/${name}.tar.bz2"; - sha1 = "ad346a18d92c1d95f2295397c7a8a4f489e48851"; + sha256 = "599bc5b4b9602e28294cf795733c889c26dd934aa7e0ee9cff9b905d4fbad188"; }; buildInputs = [ pkgs.glibcLocales ]; @@ -15687,7 +15904,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/publicsuffix/${name}.tar.gz"; - md5 = "f86babf56f6e58b564d3853adebcf37a"; + sha256 = "f6dfcb8a33fb3ac4f09e644cd26f8af6a09d1a45a019d105c8da58e289ca0096"; }; meta = { @@ -15723,7 +15940,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pyacoustid/${name}.tar.gz"; - md5 = "b27c714d530300b917eb869726334226"; + sha256 = "0117039cb116af245e6866e8e8bf3c9c8b2853ad087142bd0c2dfc0acc09d452"; }; propagatedBuildInputs = with self; [ requests2 audioread ]; @@ -15749,7 +15966,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/P/PyAlgoTrade/PyAlgoTrade-0.16.tar.gz"; - md5 = "01d70583ab15eb3bad21027bdeb30ae5"; + sha256 = "a253617254194b91cfebae7bfd184cb109d4e48a8c70051b9560000a2c0f94b3"; }; propagatedBuildInputs = with self; [ numpy scipy pytz ]; @@ -16016,7 +16233,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pybfd/${name}.tar.gz"; - md5 = "79dd6e12c90ad0515d0ad7fb1bd2f571"; + sha256 = "d99b32ad077e704ddddc0b488c83cae851c14919e5cbc51715d00464a1932df4"; }; preConfigure = '' @@ -16036,11 +16253,12 @@ in modules // { pyblock = stdenv.mkDerivation rec { name = "pyblock-${version}"; version = "0.53"; + md5_path = "f6d33a8362dee358517d0a9e2ebdd044"; src = pkgs.fetchurl rec { url = "http://pkgs.fedoraproject.org/repo/pkgs/python-pyblock/" - + "${name}.tar.bz2/${md5}/${name}.tar.bz2"; - md5 = "f6d33a8362dee358517d0a9e2ebdd044"; + + "${name}.tar.bz2/${md5_path}/${name}.tar.bz2"; + sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815"; }; postPatch = '' @@ -16067,7 +16285,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/py-bcrypt/py-bcrypt-${version}.tar.gz"; - md5 = "dd8b367d6b716a2ea2e72392525f4e36"; + sha256 = "5fa13bce551468350d66c4883694850570f3da28d6866bb638ba44fe5eabda78"; }; meta = { @@ -16269,7 +16487,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pydot/${name}.tar.gz"; - md5 = "cd739651ae5e1063a89f7efd5a9ec72b"; + sha256 = "80ea01a7ba75671a3b7890375be0ad8d5321b07bfb6f572192c31409062b59f3"; }; propagatedBuildInputs = with self; [pyparsing pkgs.graphviz]; meta = { @@ -16329,7 +16547,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pyenchant/pyenchant-1.6.6.tar.gz"; - md5 = "9f5acfd87d04432bf8df5f9710a17358"; + sha256 = "25c9d2667d512f8fc4410465fdd2e868377ca07eb3d56e2b6e534a86281d64d3"; }; propagatedBuildInputs = [ pkgs.enchant ]; @@ -16470,7 +16688,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pygeoip/pygeoip-0.3.2.tar.gz"; - md5 = "861664f8be3bed44820356539f2ea5b6"; + sha256 = "f22c4e00ddf1213e0fae36dc60b46ee7c25a6339941ec1a975539014c1f9a96d"; }; # requires geoip samples @@ -16798,11 +17016,12 @@ in modules // { pykickstart = buildPythonPackage rec { name = "pykickstart-${version}"; version = "1.99.39"; + md5_path = "d249f60aa89b1b4facd63f776925116d"; src = pkgs.fetchurl rec { url = "http://pkgs.fedoraproject.org/repo/pkgs/pykickstart/" - + "${name}.tar.gz/${md5}/${name}.tar.gz"; - md5 = "d249f60aa89b1b4facd63f776925116d"; + + "${name}.tar.gz/${md5_path}/${name}.tar.gz"; + sha256 = "e0d0f98ac4c5607e6a48d5c1fba2d50cc804de1081043f9da68cbfc69cad957a"; }; postPatch = '' @@ -16868,7 +17087,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyparsing/${name}.tar.gz"; - md5 = "9be0fcdcc595199c646ab317c1d9a709"; + sha256 = "646e14f90b3689b005c19ac9b6b390c9a39bf976481849993e277d7380e6e79f"; }; meta = { @@ -16993,7 +17212,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/P/PyStemmer/${name}.tar.gz"; - md5 = "46ee623eeeba5a7cc0d95cbfa7e18abd"; + sha256 = "d1ac14eb64978c1697fcfba76e3ac7ebe24357c9428e775390f634648947cb91"; }; checkPhase = '' @@ -17014,7 +17233,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/P/Pyro/${name}.tar.gz"; - md5 = "59d4d3f4a8786776c9d7f9051b8f1a69"; + sha256 = "1bed508453ef7a7556b51424a58101af2349b662baab7e7331c5cb85dbe7e578"; }; meta = { @@ -17034,7 +17253,7 @@ in modules // { sha256 = "0jgyhkkq36wn36rymn4jiyqh2vdslmradq4a2mjkxfbk2cz6wpi5"; }; - buildInputs = with self; [ six pytest hypothesis ] ++ optional (!isPy3k) modules.sqlite3; + buildInputs = with self; [ six pytest hypothesis1 ] ++ optional (!isPy3k) modules.sqlite3; checkPhase = '' py.test @@ -17053,7 +17272,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/P/PyRSS2Gen/${name}.tar.gz"; - md5 = "eae2bc6412c5679c287ecc1a59588f75"; + sha256 = "4929d022713129401160fd47550d5158931e4ea6a7136b5d8dfe3b13ac16f2f0"; }; meta = { @@ -17127,7 +17346,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/python-simple-hipchat/python-simple-hipchat-${version}.zip"; - md5 = "3806b3729a021511bac065360832f197"; + sha256 = "404e5ff7187abb09c2227f22063d06baf0fd525725e9c9ad280176bed1c94a3f"; }; buildInputs = [ pkgs.unzip ]; @@ -17158,7 +17377,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pyudev/${name}.tar.gz"; - md5 = "4034de584b6d9efcbfc590a047c63285"; + sha256 = "765d1c14bd9bd031f64e2612225621984cb2bbb8cbc0c03538bcc4c735ff1c95"; }; postPatch = '' @@ -17183,7 +17402,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pynzb/${name}.tar.gz"; - md5 = "63c74a36348ac28aa99732dcb8be8c59"; + sha256 = "0735b3889a1174bbb65418ee503629d3f5e4a63f04b16f46ffba18253ec3ef17"; }; meta = { @@ -17199,7 +17418,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/progressbar/${name}.tar.gz"; - md5 = "8ea4e2c17a8ec9e7d153767c5f2a7b28"; + sha256 = "dfee5201237ca0e942baa4d451fee8bf8a54065a337fabe7378b8585aeda56a3"; }; # invalid command 'test' @@ -17347,7 +17566,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pyPdf/${name}.tar.gz"; - md5 = "7a75ef56f227b78ae62d6e38d4b6b1da"; + sha256 = "3aede4c3c9c6ad07c98f059f90db0b09ed383f7c791c46100f649e1cabda0e3b"; }; buildInputs = with self; [ ]; @@ -17472,7 +17691,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pyreport/${name}.tar.gz"; - md5 = "3076164a7079891d149a23f9435581db"; + sha256 = "1584607596b7b310bf0b6ce79f424bd44238a017fd870aede11cd6732dbe0d4d"; }; # error: invalid command 'test' @@ -17581,7 +17800,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pysphere.googlecode.com/files/${name}.zip"; - md5 = "c57cba33626ac4b1e3d1974923d59232"; + sha256 = "b3f9ba1f67afb17ac41725b01737cd42e8a39d9e745282dd9b692ae631af0add"; }; disabled = isPy3k; @@ -17699,7 +17918,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/python-wifi/${name}.tar.bz2"; - md5 = "f9d520a8c17b0dfffce95a8a7efba7dd"; + sha256 = "504639e5953eaec0e41758900fbe143d33d82ea86762b19b659a118c77d8403d"; }; meta = { @@ -17872,7 +18091,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pyaml/${name}.tar.gz"; - md5 = "e98cf27f50b9ca291ca4937c135db1c9"; + sha256 = "8dfe1b295116115695752acc84d15ecf5c1c469975fbed7672bf41a6bc6d6d51"; }; buildInputs = with self; [ pyyaml ]; @@ -17927,7 +18146,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/r/recaptcha-client/${name}.tar.gz"; - md5 = "74228180f7e1fb76c4d7089160b0d919"; + sha256 = "28c6853c1d13d365b7dc71a6b05e5ffb56471f70a850de318af50d3d7c0dea2f"; }; meta = { @@ -18015,7 +18234,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz"; - md5 = "adbd3f18445f7fe5e77f65c502e264fb"; + sha256 = "156bf3ec27ba9ec7e0cf8fbe02808718099d218de403eb64a714d73ba1a29ab1"; }; meta = { @@ -18136,7 +18355,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/q/qserve/${name}.zip"; - md5 = "d481f0dad66a93d0479022fe0487e8ee"; + sha256 = "0b04b2d4d11b464ff1efd42a9ea9f8136187d59f4076f57c9ba95361d41cd7ed"; }; buildInputs = with self; [ ]; @@ -18176,7 +18395,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/q/quantities/quantities-0.10.1.tar.gz"; - md5 = "e924e21c0a5ddc9ebcdacbbe511b8ec7"; + sha256 = "2d27caf31a5e0c37130ac0c14bfa8f9412a5ff1fbf3378a1d6085594776c4315"; }; meta = with pkgs.stdenv.lib; { @@ -18191,7 +18410,7 @@ in modules // { src = pkgs.fetchurl { url = "https://qutip.googlecode.com/files/QuTiP-2.2.0.tar.gz"; - sha1 = "76ba4991322a991d580e78a197adc80d58bd5fb3"; + sha256 = "a26a639d74b2754b3a1e329d91300e587e8c399d8a81d8f18a4a74c6d6f02ba3"; }; propagatedBuildInputs = with self; [ numpy scipy matplotlib pyqt4 @@ -18413,6 +18632,24 @@ in modules // { }; }; + geoalchemy2 = buildPythonPackage rec { + name = "GeoAlchemy2-${version}"; + version = "0.3.0.dev1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/G/GeoAlchemy2/${name}.tar.gz"; + sha256 = "1j95p860ikpcpcirs5791yjpy8rf18zsz7vvsdy6v3x32hkim0k6"; + }; + + propagatedBuildInputs = with self ; [ sqlalchemy shapely ]; + + meta = { + homepage = http://geoalchemy.org/; + license = licenses.mit; + description = "Toolkit for working with spatial databases"; + }; + }; + geopy = buildPythonPackage rec { name = "geopy-${version}"; version = "1.11.0"; @@ -18514,7 +18751,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/R/RoboMachine/RoboMachine-0.6.tar.gz"; - md5 = "4e95eaa43afda0f363c78a88e9da7159"; + sha256 = "6c9a9bae7bffa272b2a09b05df06c29a3a776542c70cae8041a8975a061d2e54"; }; propagatedBuildInputs = with self; [ pyparsing argparse robotframework ]; @@ -18716,7 +18953,7 @@ in modules // { src = pkgs.fetchurl { url = http://pypi.python.org/packages/source/R/Routes/Routes-1.12.3.tar.gz; - md5 = "9740ff424ff6b841632c784a38fb2be3"; + sha256 = "eacc0dfb7c883374e698cebaa01a740d8c78d364b6e7f3df0312de042f77aa36"; }; propagatedBuildInputs = with self; [ paste webtest ]; @@ -18749,7 +18986,7 @@ in modules // { disabled = isPyPy; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/r/rpy2/${name}.tar.gz"; - md5 = "a36e758b633ce6aec6a5f450bfee980f"; + sha256 = "d0d584c435b5ed376925a95a4525dbe87de7fa9260117e9f208029e0c919ad06"; }; buildInputs = with pkgs; [ readline R pcre lzma bzip2 zlib icu ]; propagatedBuildInputs = [ self.singledispatch ]; @@ -18767,7 +19004,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/r/rpyc/${name}.tar.gz"; - md5 = "6931cb92c41f547591b525142ccaeef1"; + sha256 = "43fa845314f0bf442f5f5fab15bb1d1b5fe2011a8fc603f92d8022575cef8b4b"; }; propagatedBuildInputs = with self; [ nose plumbum ]; @@ -18808,7 +19045,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/S/SquareMap/SquareMap-1.0.4.tar.gz"; - md5 = "e36a453baddb97c19af6f79d5ba51f38"; + sha256 = "feab6cb3b222993df68440e34825d8a16de2c74fdb290ae3974c86b1d5f3eef8"; }; meta = { @@ -18875,7 +19112,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/R/RunSnakeRun/RunSnakeRun-2.0.4.tar.gz"; - md5 = "3220b5b89994baee70b1c24d7e42a306"; + sha256 = "61d03a13f1dcb3c1829f5a146da1fe0cc0e27947558a51e848b6d469902815ef"; }; propagatedBuildInputs = [ self.squaremap self.wxPython28 ]; @@ -19081,7 +19318,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/scripttest/scripttest-${version}.tar.gz"; - md5 = "1d1c5117ccfc7b5961cae6c1020c0848"; + sha256 = "951cfc25219b0cd003493a565f2e621fd791beaae9f9a3bdd7024d8626419c38"; }; buildInputs = with self; [ pytest ]; @@ -19099,7 +19336,7 @@ in modules // { name = "seaborn-0.6.0"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/seaborn/${name}.tar.gz"; - md5 = "bc518f1f45dadb9deb2bb57ca3af3cad"; + sha256 = "e078399b56ed0d53a4aa8bd4d6bd4a9a9deebc0b4acad259d0ef81830affdb68"; }; buildInputs = with self; [ nose ]; @@ -19201,7 +19438,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/setuptools_trial/setuptools_trial-0.5.12.tar.gz"; - md5 = "f16f4237c9ee483a0cd13208849d96ad"; + sha256 = "9cc4ca5fd432944eb95e193f28b5a602e8b07201fea4d7077c0976a40f073432"; }; propagatedBuildInputs = with self; [ twisted ]; @@ -19309,7 +19546,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/simpleldap/simpleldap-${version}.tar.gz"; - md5 = "f8a95b24895596338032ca4b4450f1de"; + sha256 = "a5916680a7fe1b2c5d74dc76351be2941d03b7b94a50d8520280e3f588a84e61"; }; meta = { @@ -19408,7 +19645,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/sqlite3dbm/${name}.tar.gz"; - md5 = "fc2f8fb09a4bbc0260b97e835b369184"; + sha256 = "4721607e0b817b89efdba7e79cab881a03164b94777f4cf796ad5dd59a7612c5"; }; buildInputs = with self; [ modules.sqlite3 ]; @@ -19425,7 +19662,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pgpdump/pgpdump-1.5.tar.gz"; - md5 = "040a451c8e63de3e61fc5b66efa7fca5"; + sha256 = "1c4700857bf7ba735b08cfe4101aa3a4f5fd839657af249c17b2697c20829668"; }; meta = { @@ -19581,7 +19818,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pytidylib/pytidylib-${version}.tar.gz"; - md5 = "2a28267370c9409b592cdb786649cb25"; + sha256 = "0af07bd8ebd256af70ca925ada9337faf16d85b3072624f975136a5134150ab6"; }; # Judging from SyntaxError in tests @@ -19631,7 +19868,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/timelib/${name}.zip"; - md5 = "400e316f81001ec0842fa9b2cef5ade9"; + sha256 = "49142233bdb5971d64a41e05a1f80a408a02be0dc7d9f8c99e7bdd0613ba81cb"; }; buildInputs = with self; [ ]; @@ -19685,7 +19922,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pilkit/${name}.tar.gz"; - md5 = "659dd67440f4b576889f2cd350f43d7b"; + sha256 = "e00585f5466654ea2cdbf7decef9862cb00e16fd363017fa7ef6623a16b0d2c7"; }; preConfigure = '' @@ -19791,7 +20028,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/semantic/semantic-1.0.3.tar.gz"; - md5 = "78a150190e3e7d0f6f357b4c828e5f0d"; + sha256 = "bbc47dad03dddb1ba5895612fdfa1e43cfb3c497534976cebacd4f3684b505b4"; }; # strange setuptools error (can not import semantic.test) @@ -19828,7 +20065,7 @@ in modules // { name = "semantic_version-2.4.2"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/semantic_version/${name}.tar.gz"; - md5 = "fd7d5ade76e78d8540b9a4044496a57c"; + sha256 = "7e8b7fa74a3bc9b6e90b15b83b9bc2377c78eaeae3447516425f475d5d6932d2"; }; meta = { @@ -19842,7 +20079,7 @@ in modules // { name = "sexpdata-0.0.2"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/sexpdata/${name}.tar.gz"; - md5 = "efc44265bc27cb3d6ffed4fbf5733fc1"; + sha256 = "eb696bc66b35def5fb356de09481447dff4e9a3ed926823134e1d0f35eade428"; }; doCheck = false; @@ -19859,7 +20096,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/sh/${name}.tar.gz"; - md5 = "7af8df6c92d29ff927b6db0146bddec3"; + sha256 = "590fb9b84abf8b1f560df92d73d87965f1e85c6b8330f8a5f6b336b36f0559a4"; }; doCheck = false; @@ -19944,7 +20181,7 @@ in modules // { src = pkgs.fetchurl { url = https://pypi.python.org/packages/source/s/smartdc/smartdc-0.1.12.tar.gz; - md5 = "b960f61facafc879142b699050f6d8b4"; + sha256 = "36206f4fddecae080c66faf756712537e650936b879abb23a8c428731d2415fe"; }; propagatedBuildInputs = with self; [ requests http_signature ]; @@ -19994,7 +20231,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/supervisor/${name}.tar.gz"; - md5 = "8c9714feaa63902f03871317e3ebf62e"; + sha256 = "e3c3b35804c24b6325b5ba462553ebee80d5f4d1766274737b5c532cd4a11d59"; }; buildInputs = with self; [ mock ]; @@ -20015,7 +20252,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/subprocess32/${name}.tar.gz"; - md5 = "754c5ab9f533e764f931136974b618f1"; + sha256 = "ddf4d46ed2be2c7e7372dfd00c464cabb6b3e29ca4113d85e26f82b3d2c220f6"; }; buildInputs = [ pkgs.bash ]; @@ -20109,7 +20346,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/sphinxcontrib-httpdomain/${name}.tar.gz"; - md5 = "ad7ea42bd4c7c0ee57b1cb25bbf24aab"; + sha256 = "ba8fbe82eddc96cfa9d7b975b0422801a14ace9d7e051b8b2c725b92ea6137b5"; }; propagatedBuildInputs = with self; [sphinx]; @@ -20129,7 +20366,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/sphinxcontrib-plantuml/${name}.tar.gz"; - md5 = "4a8840fe3475a19c2af3fa877ab9d296"; + sha256 = "654a1c206156634398ffdc87c481c67777610a9311c6677d280963cf28813400"; }; propagatedBuildInputs = with self; [sphinx plantuml]; @@ -20149,7 +20386,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/S/Sphinx-PyPI-upload/${name}.tar.gz"; - md5 = "b9f1df5c8443197e4d49abbba1cfddc4"; + sha256 = "5f919a47ce7a7e6028dba809de81ae1297ac192347cf6fc54efca919d4865159"; }; meta = { @@ -20206,7 +20443,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz"; - md5 = "4f3377306309e46739696721b1785335"; + sha256 = "9edb47d137db42d57fd26673d6c841e189b1aeb9b566cca908962fcc8448c0bc"; }; preConfigure = optionalString isPy3k '' @@ -20255,11 +20492,11 @@ in modules // { sqlalchemy = buildPythonPackage rec { name = "SQLAlchemy-${version}"; - version = "1.0.10"; + version = "1.0.12"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz"; - sha256 = "963415bf4ea4fa13698893464bc6917d291331e0e8202dddd0ebfed2864ef7e3"; + sha256 = "1l8qclhd0s90w3pvwhi5mjxdwr5j7gw7cjka2fx6f2vqmq7f4yb6"; }; buildInputs = with self; [ nose mock ] @@ -20398,7 +20635,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/python-statsd/${name}.tar.gz"; - md5 = "3a0c71a160b504b843703c3041c7d7fb"; + sha256 = "3d2fc153e0d894aa9983531ef47d20d75bd4ee9fd0e46a9d82f452dde58a0a71"; }; buildInputs = with self; [ mock nose coverage ]; @@ -20417,7 +20654,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/stompclient/${name}.tar.gz"; - md5 = "af0a314b6106dd80da24a918c24a1eab"; + sha256 = "95a4e98dd0bba348714439ea11a25ee8a74acb8953f95a683924b5bf2a527e4e"; }; buildInputs = with self; [ mock nose ]; @@ -20772,7 +21009,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/T/Tempita/Tempita-${version}.tar.gz"; - md5 = "4c2f17bb9d481821c41b6fbee904cea1"; + sha256 = "cacecf0baa674d356641f1d406b8bff1d756d739c46b869a54de515d08e6fc9c"; }; disabled = isPy3k; @@ -21063,7 +21300,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/tmdb3/${name}.zip"; - md5 = "cd259427454472164c9a2479504c9cbb"; + sha256 = "64a6c3f1a60a9d8bf18f96a5403f3735b334040345ac3646064931c209720972"; }; meta = { @@ -21175,7 +21412,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/t/traits/${name}.tar.gz"; - md5 = "3ad558eebaedc63c29c80183c0371d2f"; + sha256 = "5293a8786030b0b243e059f52004355b6939d7c0f1be2eb5a605b63cca484c84"; }; # Use pytest because its easier to discover tests @@ -21206,7 +21443,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/t/transaction/${name}.tar.gz"; - md5 = "b4ca5983c9e3a0808ff5ff7648092c76"; + sha256 = "1b2304a886a85ad014f73d93346c14350fc214ae22a4f565f42f6761cfb9ecc5"; }; propagatedBuildInputs = with self; [ zope_interface ]; @@ -21224,7 +21461,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/transmissionrpc/${name}.tar.gz"; - md5 = "b2f918593e509f0e66e2e643291b436d"; + sha256 = "ec43b460f9fde2faedbfa6d663ef495b3fd69df855a135eebe8f8a741c0dde60"; }; propagatedBuildInputs = with self; [ six ]; @@ -21242,7 +21479,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/t/tl.eggdeps/tl.${name}.tar.gz"; - md5 = "2472204a2abd0d8cd4d11ff0fbf36ae7"; + sha256 = "a99de5e4652865224daab09b2e2574a4f7c1d0d9a267048f9836aa914a2caf3a"; }; # tests fail, see http://hydra.nixos.org/build/4316603/log/raw @@ -21418,7 +21655,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/tzlocal/tzlocal-1.1.1.zip"; - md5 = "56c2a04501b98f2a1188d003fd6d3dba"; + sha256 = "696bfd8d7c888de039af6c6fdf86fd52e32508277d89c75d200eb2c150487ed4"; }; # test fail (timezone test fail) @@ -21599,7 +21836,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/u/update_checker/${name}.tar.gz"; - md5 = "1daa54bac316be6624d7ee77373144bb"; + sha256 = "681bc7c26cffd1564eb6f0f3170d975a31c2a9f2224a32f80fe954232b86f173"; }; propagatedBuildInputs = with self; [ requests2 ]; @@ -21644,7 +21881,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/u/urwid/${name}.tar.gz"; - md5 = "a989acd54f4ff1a554add464803a9175"; + sha256 = "29f04fad3bf0a79c5491f7ebec2d50fa086e9d16359896c9204c6a92bc07aba2"; }; meta = { @@ -21704,7 +21941,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/P/PyVirtualDisplay/${name}.tar.gz"; - md5 = "90b65fe15b81788c2e208d124e3a3c14"; + sha256 = "aa6aef08995e14c20cc670d933bfa6e70d736d0b555af309b2e989e2faa9ee53"; }; meta = { @@ -21745,7 +21982,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/v/virtualenv-clone/${name}.tar.gz"; - md5 = "23e71d255058b2543d839af7f4ce3208"; + sha256 = "7087ba4eb48acfd5209a3fd03e15d072f28742619127c98333057e32748d91c4"; }; buildInputs = with self; [pytest]; @@ -21856,7 +22093,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/w/waitress/${name}.tar.gz"; - md5 = "da3f2e62b3676be5dd630703a68e2a04"; + sha256 = "826527dc9d334ed4ed76cdae672fdcbbccf614186657db71679ab58df869458a"; }; doCheck = false; @@ -21892,7 +22129,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/w/webcolors/${name}.tar.gz"; - md5 = "35de9d785b5c04a9cc66a2eae0519254"; + sha256 = "304fc95dab2848c7bf64f378356766e692c2f8b4a8b15fa3509544e6412936e8"; }; # error: invalid command 'test' @@ -21912,7 +22149,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/W/Wand/${name}.tar.gz"; - md5 = "10bab03bf86ce8da2a95a3b15197ae2e"; + sha256 = "31e2186ce8d1da0d2ea84d1428fc4d441c2e9d0e25156cc746b35b781026bcff"; }; buildInputs = with self; [ pkgs.imagemagick pytest psutil memory_profiler pytest_xdist ]; @@ -21958,7 +22195,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/w/web.py/web.py-${version}.tar.gz"; - md5 = "93375e3f03e74d6bf5c5096a4962a8db"; + sha256 = "748c7e99ad9e36f62ea19f7965eb7dd7860b530e8f563ed60ce3e53e7409a550"; }; meta = { @@ -22016,7 +22253,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/W/WebTest/WebTest-${version}.zip"; - md5 = "49314bdba23f4d0bd807facb2a6d3f90"; + sha256 = "c320adc2cd862ea71ca9e2012e6157eb12f5f8d1632d1541f2eabf984aaa3ecc"; }; preConfigure = '' @@ -22093,7 +22330,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/w/willie/willie-5.2.0.tar.gz"; - md5 = "a19f8c34e10e3c2d0d915c894224e521"; + sha256 = "2da2e91b65c471b4c8e5e5e11471b25887635258d24aaf76b5354147b3ab577d"; }; propagatedBuildInputs = with self; [ feedparser pytz lxml praw pyenchant pygeoip backports_ssl_match_hostname_3_4_0_2 ]; @@ -22283,7 +22520,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/Z/ZConfig/ZConfig-${version}.tar.gz"; - md5 = "60a107c5857c3877368dfe5930559804"; + sha256 = "6577da957511d8c2f805fefd2e31cacc4117bb5c54aec03ad8ce374020c021f3"; }; propagatedBuildInputs = with self; [ zope_testrunner ]; @@ -22303,7 +22540,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zc.lockfile/${name}.tar.gz"; - md5 = "f099d4cf2583a0c7bea0146a44dc4d59"; + sha256 = "96bb2aa0438f3e29a31e4702316f832ec1482837daef729a92e28c202d8fba5c"; }; meta = { @@ -22321,7 +22558,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zdaemon/${name}.tar.gz"; - md5 = "4056e2ea35855695ed15389d9c168b92"; + sha256 = "82d7eaa4d831ff1ecdcffcb274f3457e095c0cc86e630bc72009a863c341ab9f"; }; propagatedBuildInputs = [ self.zconfig ]; @@ -22375,7 +22612,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/Z/ZODB3/ZODB3-${version}.tar.gz"; - md5 = "21975c1609296e7834e8cf4025af3039"; + sha256 = "b5767028e732c619f45c27189dd001e14ec155d7984807991fce751b35b4fcb0"; }; propagatedBuildInputs = with self; [ manuel transaction zc_lockfile zconfig zdaemon zope_interface zope_event BTrees persistent ZEO ]; @@ -22396,7 +22633,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/Z/ZODB/ZODB-${version}.tar.gz"; - md5 = "092d787524b095164231742c96b32f50"; + sha256 = "c5d8ffcca37ab4d0a9bfffead6228d58c00cf1c78135abc98a8dbf05b8c8fb58"; }; propagatedBuildInputs = with self; [ manuel transaction zc_lockfile zconfig zdaemon zope_interface persistent BTrees ] @@ -22421,7 +22658,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/z/zodbpickle/${name}.tar.gz"; - md5 = "d401bd89f99ec8d56c22493e6f8c0443"; + sha256 = "f65c00fbc13523fced63de6cc11747aa1a6343aeb2895c89838ed55a5ab12cca"; }; # fails.. @@ -22459,7 +22696,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/persistent/${name}.tar.gz"; - md5 = "2942f1ca7764b1bef8d48fa0d9a236b7"; + sha256 = "678902217c5370d33694c6dc95b89e1e6284b4dc41f04c056326194a3f6f3e22"; }; meta = { @@ -22473,7 +22710,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/x/xdot/xdot-0.6.tar.gz"; - md5 = "a8e5fc5208657b03ad1bd4c46de75724"; + sha256 = "c71d82bad0fec696af36af788c2a1dbb5d9975bd70bfbdc14bda15b5c7319e6c"; }; propagatedBuildInputs = with self; [ pygtk pygobject pkgs.graphviz ]; @@ -22490,7 +22727,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.broken/${name}.zip"; - md5 = "eff24d7918099a3e899ee63a9c31bee6"; + sha256 = "b9b8776002da4f7b6b12dfcce77eb642ae62b39586dbf60e1d9bdc992c9f2999"; }; buildInputs = with self; [ zope_interface ]; @@ -22529,7 +22766,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/z/zope.browserresource/zope.browserresource-4.0.1.zip"; - md5 = "81bbe92c1f04725561470f89d73222c5"; + sha256 = "d580184562e7098950ae377b5b37fbb88becdaa2256ac2a6760b69a3e86a99b2"; }; }; @@ -22578,7 +22815,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.container/${name}.tar.gz"; - md5 = "b24d2303ece65a2d9ce23a5bd074c335"; + sha256 = "5c04e61b52fd04d8b7103476532f557c2278c86281aae30d44f88a5fbe888940"; }; # a test is failing @@ -22601,7 +22838,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.contenttype/${name}.tar.gz"; - md5 = "171be44753e86742da8c81b3ad008ce0"; + sha256 = "9decc7531ad6925057f1a667ac0ef9d658577a92b0b48dafa7daa97b78a02bbb"; }; meta = { @@ -22615,7 +22852,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.dottedname/${name}.tar.gz"; - md5 = "62d639f75b31d2d864fe5982cb23959c"; + sha256 = "331d801d98e539fa6c5d50c3835ecc144c429667f483281505de53fc771e6bf5"; }; meta = { maintainers = with maintainers; [ goibhniu ]; @@ -22669,7 +22906,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.filerepresentation/${name}.tar.gz"; - md5 = "4a7a434094f4bfa99a7f22e75966c359"; + sha256 = "d775ebba4aff7687e0381f050ebda4e48ce50900c1438f3f7e901220634ed3e0"; }; propagatedBuildInputs = with self; [ zope_schema ]; @@ -22773,7 +23010,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.publisher/${name}.tar.gz"; - md5 = "495131970cc7cb14de8e517fb3857ade"; + sha256 = "d994d8eddfba504841492115032a9a7d86b1713ebc96d0ca16fbc6ee93168ba4"; }; propagatedBuildInputs = with self; [ @@ -22807,7 +23044,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.security/${name}.tar.gz"; - md5 = "27d1f2873a0ee9c1f485f7b8f22d8e1c"; + sha256 = "8da30b03d5491464d59397e03b88192f31f587325ee6c6eb1ca596a1e487e2ec"; }; propagatedBuildInputs = with self; [ @@ -22844,7 +23081,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.sqlalchemy/${name}.zip"; - md5 = "0a468bd5b8884cd29fb71acbf7eaa31e"; + sha256 = "e196d1b2cf796f46e2c6127717e359ddd35d8d084a8ba059f0f0fabff245b9e1"; }; buildInputs = with self; [ zope_testing zope_interface ]; @@ -22904,7 +23141,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/z/zope.traversing/${name}.zip"; - md5 = "5cc40c552f953939f7c597ebbedd586f"; + sha256 = "79d38b92ec1d9a2467966ee954b792d83ac66f22e45e928113d4b5dc1f5e74eb"; }; propagatedBuildInputs = with self; [ zope_location zope_security zope_publisher transaction zope_tales ]; @@ -23033,23 +23270,6 @@ in modules // { propagatedBuildInputs = with self; [ requests webob ]; }; - tornadokick = buildPythonPackage rec { - name = "tornadokick-0.2.1"; - - propagatedBuildInputs = with self; [ tornado ]; - - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/t/tornadokick/${name}.tar.gz"; - md5 = "95ee5a295ce3f361c6f843c4f39cbb8c"; - }; - - meta = { - description = "A Toolkit for the Tornado Web Framework"; - homepage = http://github.com/multoncore/tornadokick; - license = licenses.asl20; - }; - }; - tunigo = buildPythonPackage rec { name = "tunigo-${version}"; version = "0.1.3"; @@ -23238,7 +23458,7 @@ in modules // { name = "tissue-0.9.2"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/t/tissue/${name}.tar.gz"; - md5 = "87dbcdafff41bfa1b424413f79aa9153"; + sha256 = "7e34726c3ec8fae358a7faf62de172db15716f5582e5192a109e33348bd76c2e"; }; buildInputs = with self; [ nose ]; @@ -23277,7 +23497,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/t/translationstring/${name}.tar.gz"; - md5 = "a4b62e0f3c189c783a1685b3027f7c90"; + sha256 = "4ee44cfa58c52ade8910ea0ebc3d2d84bdcad9fa0422405b1801ec9b9a65b72d"; }; meta = { @@ -23337,7 +23557,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/w/websocket-client/${name}.tar.gz"; - md5 = "b07a897511a3c585251fe2ea85a9d9d9"; + sha256 = "cb3ab95617ed2098d24723e3ad04ed06c4fde661400b96daa1859af965bfe040"; }; propagatedBuildInputs = with self; [ six backports_ssl_match_hostname_3_4_0_2 unittest2 argparse ]; @@ -23355,7 +23575,7 @@ in modules // { src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/W/WebHelpers/${name}.tar.gz"; - md5 = "32749ffadfc40fea51075a7def32588b"; + sha256 = "ea86f284e929366b77424ba9a89341f43ae8dee3cbeb8702f73bcf86058aa583"; }; buildInputs = with self; [ routes markupsafe webob nose ]; @@ -23393,7 +23613,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/w/whisper/${name}.tar.gz"; - md5 = "5fac757cc4822ab0678dbe0d781d904e"; + sha256 = "0eca66449d6ceb29e2ab5457b01618e0fe525710dd130a286a18282d849ae5b2"; }; # error: invalid command 'test' @@ -23432,7 +23652,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/u/ujson/${name}.zip"; - md5 = "8148a2493fff78940feab1e11dc0a893"; + sha256 = "68cf825f227c82e1ac61e423cfcad923ff734c27b5bdd7174495d162c42c602b"; }; meta = { @@ -23469,7 +23689,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pyusb/${name}.tar.gz"; - md5 = "5cc9c7dd77b4d12fcc22fee3b39844bc"; + sha256 = "14ec66077bdcd6f1aa9e892a0a35a54bb3c1ec56aa740ead64349c18f0186d19"; }; # Fix the USB backend library lookup @@ -23581,7 +23801,7 @@ in modules // { src = pkgs.fetchurl rec { url = "https://pypi.python.org/packages/source/g/graphite-web/${name}.tar.gz"; - md5 = "8edbb61f1ffe11c181bd2cb9ec977c72"; + sha256 = "472a4403fd5b5364939aee10e78f171b1489e5f6bfe6f150ed9cae8476410114"; }; propagatedBuildInputs = with self; [ django_1_5 django_tagging modules.sqlite3 whisper pkgs.pycairo ldap memcached ]; @@ -23652,7 +23872,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/g/graphite_beacon/${name}.tar.gz"; - md5 = "3d7b2bf8a41b6c3ec5ba2c14db321096"; + sha256 = "ebde1aba8030c8aeffaeea39f9d44a2be464b198583ad4a390a2bff5f4172543"; }; propagatedBuildInputs = [ self.tornado ]; @@ -23980,11 +24200,11 @@ in modules // { pushbullet = buildPythonPackage rec { name = "pushbullet.py-${version}"; - version = "0.5.0"; + version = "0.10.0"; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/p/pushbullet.py/pushbullet.py-0.5.0.tar.gz"; - md5 = "36c83ba5f7d5208bb86c00eba633f921"; + url = "https://pypi.python.org/packages/source/p/pushbullet.py/pushbullet.py-0.10.0.tar.gz"; + sha256 = "537d3132e1dbc91e31ade4cccf4c7def6f9d48e904a67f341d35b8a54a9be74d"; }; propagatedBuildInputs = with self; [requests websocket_client python_magic ]; @@ -24047,12 +24267,13 @@ in modules // { }; }; - pythonefl_1_16 = buildPythonPackage rec { + # Should be bumped along with EFL! + pythonefl = buildPythonPackage rec { name = "python-efl-${version}"; - version = "1.16.0"; + version = "1.17.0"; src = pkgs.fetchurl { url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz"; - sha256 = "142ffki41xj0z2dnf011g8j4b35waviprk4x1dhvy1wgqdywl61l"; + sha256 = "0yciffcgmyfmy95gidg9jhczv96jyi38zcdj0q19fjmx704zx84y"; }; preConfigure = '' @@ -24061,7 +24282,7 @@ in modules // { preBuild = "${python}/bin/${python.executable} setup.py build_ext"; installPhase= "${python}/bin/${python.executable} setup.py install --prefix=$out"; - buildInputs = with self; [ pkgs.pkgconfig pkgs.e19.efl pkgs.e19.elementary ]; + buildInputs = with self; [ pkgs.pkgconfig pkgs.enlightenment.efl pkgs.enlightenment.elementary ]; doCheck = false; meta = { @@ -24535,7 +24756,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/thumbor-pexif/${name}.tar.gz"; - md5 = "fb4cdb60f4a0bead5193fb483ccd3430"; + sha256 = "715cd24760c7c28d6270c79c9e29b55b8d952a24e0e56833d827c2c62451bc3c"; }; meta = { @@ -24600,7 +24821,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/datadiff/datadiff-1.1.6.zip"; - md5 = "c34a690db75eead148aa5fa89e575d1e"; + sha256 = "f1402701063998f6a70609789aae8dc05703f3ad0a34882f6199653654c55543"; }; buildInputs = with self; [ nose ]; @@ -24617,7 +24838,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/termcolor/termcolor-1.1.0.tar.gz"; - md5 = "043e89644f8909d462fbbfa511c768df"; + sha256 = "1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b"; }; meta = { @@ -24700,7 +24921,7 @@ in modules // { name = "ofxclient-1.3.8"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/o/ofxclient/${name}.tar.gz"; - md5 = "a632e157f9c98524bf9302a0c6788174"; + sha256 = "99ab03bffdb30d9ec98724898f428f8e73129483417d5892799a0f0d2249f233"; }; # ImportError: No module named tests @@ -24713,7 +24934,7 @@ in modules // { name = "ofxhome-0.3.1"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/o/ofxhome/${name}.tar.gz"; - md5 = "98e8ef92ccd443ab750fcb0741efe816"; + sha256 = "0000db437fd1a8c7c65cea5d88ce9d3b54642a1f4844dde04f860e29330ac68d"; }; buildInputs = with self; [ nose ]; @@ -24732,7 +24953,7 @@ in modules // { name = "ofxparse-0.14"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/o/ofxparse/${name}.tar.gz"; - md5 = "4ad8a34e008d4893a61eadd593176f0f"; + sha256 = "d8c486126a94d912442d040121db44fbc4a646ea70fa935df33b5b4dbfbbe42a"; }; propagatedBuildInputs = with self; [ six beautifulsoup4 ]; @@ -24748,7 +24969,7 @@ in modules // { name = "ofxtools-0.3.8"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/o/ofxtools/${name}.tar.gz"; - md5 = "4ac3c3f5223816bc2c48dd818fd434d8"; + sha256 = "88f289a60f4312a1599c38a8fb3216e2b46d10cc34476f9a16a33ac8aac7ec35"; }; meta = { homepage = "https://github.com/csingley/ofxtools"; @@ -24799,7 +25020,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/dicttoxml/dicttoxml-1.6.4.tar.gz"; - md5 = "154b47d2b7405280b871a81502a05657"; + sha256 = "5f29e95fec56680823dc41911c04c2af08727ee53c1b60e83c489212bab71161"; }; propagatedBuildInputs = with self; [ ]; @@ -24928,7 +25149,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/trollius/${name}.tar.gz"; - md5 = "3631a464d49d0cbfd30ab2918ef2b783"; + sha256 = "8884cae4ec6a2d593abcffd5e700626ad4618f42b11beb2b75998f2e8247de76"; }; buildInputs = with self; [ mock ] @@ -24986,7 +25207,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/n/neovim/${name}.tar.gz"; - md5 = "8b723417d3bf15bab0b245d080d45298"; + sha256 = "93f475d5583a053af919ba0729b32b3fefef1dbde4717b5657d806bdc69b76b3"; }; propagatedBuildInputs = with self; [ msgpack ] @@ -25034,7 +25255,7 @@ in modules // { name = "ghp-import-${version}"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/g/ghp-import/${name}.tar.gz"; - md5 = "99e018372990c03ab355aa62c34965c5"; + sha256 = "6058810e1c46dd3b5b1eee87e203bdfbd566e10cfc77566edda7aa4dbf6a3053"; }; disabled = isPyPy; buildInputs = [ pkgs.glibcLocales ]; @@ -25053,7 +25274,7 @@ in modules // { name = "typogrify-2.0.7"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/t/typogrify/${name}.tar.gz"; - md5 = "63f38f80531996f187d2894cc497ba08"; + sha256 = "8be4668cda434163ce229d87ca273a11922cb1614cb359970b7dc96eed13cb38"; }; disabled = isPyPy; # Wants to set up Django @@ -25144,7 +25365,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/dot2tex/dot2tex-2.9.0.tar.gz"; - md5 = "2dbaeac905424d0410751235bde4b8b2"; + sha256 = "7d3e54add7dccdaeb6cc9e61ceaf7b587914cf8ebd6821cfea008acdc1e50d4a"; }; propagatedBuildInputs = with self; [ @@ -25231,7 +25452,7 @@ in modules // { src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/x/xcffib/${name}.tar.gz"; - md5 = "fa13f3fee67c83016a1242982a7c8bda"; + sha256 = "a84eecd5a1bb7570e26c83aca87a2016578ca4e353e1fa56189e95bdef063e6a"; }; patchPhase = '' @@ -25503,7 +25724,7 @@ in modules // { version = "0.7.2"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/x/xlsx2csv/${name}.tar.gz"; - md5 = "eea39d8ab08ff4503bb145171d0a46f6"; + sha256 = "7c6c8fa6c2774224d03a6a96049e116822484dccfa3634893397212ebcd23866"; }; meta = { homepage = https://github.com/bitprophet/alabaster; diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 2f0296223a0..343a3f47a4b 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -1,5 +1,5 @@ { supportedSystems -, packageSet ? (import ./all-packages.nix) +, packageSet ? (import ./../..) , allowTexliveBuilds ? false , scrubJobs ? true }: diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 79bbd9d21a0..cb21a660eb5 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -3,7 +3,7 @@ $ hydra-eval-jobs pkgs/top-level/release-python.nix */ -{ nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } +{ nixpkgs ? { outPath = (import ./../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , officialRelease ? false , # The platforms for which we build Nixpkgs. supportedSystems ? [ "x86_64-linux" ] diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 5a43fbda53e..95df07ea709 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -1,7 +1,7 @@ /* A small release file, with few packages to be built. The aim is to reduce the load on Hydra when testing the `stdenv-updates' branch. */ -{ nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } +{ nixpkgs ? { outPath = (import ./../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ] }: diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 81bab2d6c0c..8d86149e4f9 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -9,7 +9,7 @@ $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux */ -{ nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } +{ nixpkgs ? { outPath = (import ./../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , officialRelease ? false , # The platforms for which we build Nixpkgs. supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ] diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 765eb43e845..3acd9c4843d 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,15 +7,15 @@ { runCommand, fetchFromGitHub, git }: let - version = "2016-02-25"; - rev = "a43392dd266a3e5c982f6bee3451187fc35ebfa8"; + version = "2016-03-10"; + rev = "5e78a14c1b82522e019586687f7dbfd36ce67fa5"; src = fetchFromGitHub { inherit rev; owner = "rust-lang"; repo = "crates.io-index"; - sha256 = "45ad457fb1d13f1c0d0b09d36d5ea3e44baffc7884b82dfcbdff5ae7ab350bbd"; + sha256 = "0hzhfhlv8qbqb5nm9id36dlzvhalhlrh2k82ks67ap4mdcs3c650"; }; in