diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml index b3f7f093835c..3e8a0ea4a703 100644 --- a/doc/coding-conventions.xml +++ b/doc/coding-conventions.xml @@ -842,9 +842,12 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae"; - sha256 = "04yri911rj9j19qqqn6m82266fl05pz98inasni0vxr1cf1gdgv9"; + sha256 = "1i2yxndxb6yc9l6c99pypbd92lfq5aac4klq7y2v93c9qvx2cgpc"; } + Find the value to put as sha256 by running + nix run -f '<nixpkgs>' nix-prefetch-github -c nix-prefetch-github --rev 1f795f9f44607cc5bec70d1300150bfefcef2aae NixOS nix + or nix-prefetch-url --unpack https://github.com/NixOS/nix/archive/1f795f9f44607cc5bec70d1300150bfefcef2aae.tar.gz. diff --git a/lib/debug.nix b/lib/debug.nix index 383eb32d75d0..2879f72ed2ba 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -23,27 +23,54 @@ rec { # -- TRACING -- - /* Trace msg, but only if pred is true. + /* Conditionally trace the supplied message, based on a predicate. + + Type: traceIf :: bool -> string -> a -> a Example: traceIf true "hello" 3 trace: hello => 3 */ - traceIf = pred: msg: x: if pred then trace msg x else x; + traceIf = + # Predicate to check + pred: + # Message that should be traced + msg: + # Value to return + x: if pred then trace msg x else x; - /* Trace the value and also return it. + /* Trace the supplied value after applying a function to it, and + return the original value. + + Type: traceValFn :: (a -> b) -> a -> a Example: traceValFn (v: "mystring ${v}") "foo" trace: mystring foo => "foo" */ - traceValFn = f: x: trace (f x) x; + traceValFn = + # Function to apply + f: + # Value to trace and return + x: trace (f x) x; + + /* Trace the supplied value and return it. + + Type: traceVal :: a -> a + + Example: + traceVal 42 + # trace: 42 + => 42 + */ traceVal = traceValFn id; /* `builtins.trace`, but the value is `builtins.deepSeq`ed first. + Type: traceSeq :: a -> b -> b + Example: trace { a.b.c = 3; } null trace: { a = ; } @@ -52,7 +79,11 @@ rec { trace: { a = { b = { c = 3; }; }; } => null */ - traceSeq = x: y: trace (builtins.deepSeq x x) y; + traceSeq = + # The value to trace + x: + # The value to return + y: trace (builtins.deepSeq x x) y; /* Like `traceSeq`, but only evaluate down to depth n. This is very useful because lots of `traceSeq` usages @@ -76,27 +107,49 @@ rec { in trace (generators.toPretty { allowPrettyValues = true; } (modify depth snip x)) y; - /* A combination of `traceVal` and `traceSeq` */ - traceValSeqFn = f: v: traceValFn f (builtins.deepSeq v v); + /* A combination of `traceVal` and `traceSeq` that applies a + provided function to the value to be traced after `deepSeq`ing + it. + */ + traceValSeqFn = + # Function to apply + f: + # Value to trace + v: traceValFn f (builtins.deepSeq v v); + + /* A combination of `traceVal` and `traceSeq`. */ traceValSeq = traceValSeqFn id; + /* A combination of `traceVal` and `traceSeqN` that applies a + provided function to the value to be traced. */ + traceValSeqNFn = + # Function to apply + f: + depth: + # Value to trace + v: traceSeqN depth (f v) v; + /* A combination of `traceVal` and `traceSeqN`. */ - traceValSeqNFn = f: depth: v: traceSeqN depth (f v) v; traceValSeqN = traceValSeqNFn id; # -- TESTING -- - /* Evaluate a set of tests. A test is an attribute set {expr, - expected}, denoting an expression and its expected result. The - result is a list of failed tests, each represented as {name, - expected, actual}, denoting the attribute name of the failing - test and its expected and actual results. Used for regression - testing of the functions in lib; see tests.nix for an example. - Only tests having names starting with "test" are run. - Add attr { tests = ["testName"]; } to run these test only + /* Evaluate a set of tests. A test is an attribute set `{expr, + expected}`, denoting an expression and its expected result. The + result is a list of failed tests, each represented as `{name, + expected, actual}`, denoting the attribute name of the failing + test and its expected and actual results. + + Used for regression testing of the functions in lib; see + tests.nix for an example. Only tests having names starting with + "test" are run. + + Add attr { tests = ["testName"]; } to run these tests only. */ - runTests = tests: lib.concatLists (lib.attrValues (lib.mapAttrs (name: test: + runTests = + # Tests to run + tests: lib.concatLists (lib.attrValues (lib.mapAttrs (name: test: let testsToRun = if tests ? tests then tests.tests else []; in if (substring 0 4 name == "test" || elem name testsToRun) && ((testsToRun == []) || elem name tests.tests) @@ -105,8 +158,11 @@ rec { then [ { inherit name; expected = test.expected; result = test.expr; } ] else [] ) tests)); - # create a test assuming that list elements are true - # usage: { testX = allTrue [ true ]; } + /* Create a test assuming that list elements are `true`. + + Example: + { testX = allTrue [ true ]; } + */ testAllTrue = expr: { inherit expr; expected = map (x: true) expr; }; diff --git a/lib/licenses.nix b/lib/licenses.nix index 611e6ddb35b7..940baf53b7c3 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -309,6 +309,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "GNU General Public License v2.0 only"; }; + gpl2Classpath = { + spdxId = "GPL-2.0-with-classpath-exception"; + fullName = "GNU General Public License v2.0 only (with Classpath exception)"; + url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception; + }; + gpl2ClasspathPlus = { fullName = "GNU General Public License v2.0 or later (with Classpath exception)"; url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception; diff --git a/lib/lists.nix b/lib/lists.nix index 9ecd8f220038..be541427c247 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -1,4 +1,5 @@ # General list operations. + { lib }: with lib.trivial; let @@ -8,21 +9,23 @@ 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]' + /* 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. + Type: singleton :: a -> [a] + Example: singleton "foo" => [ "foo" ] */ singleton = x: [x]; - /* “right fold” a binary function `op' between successive elements of - `list' with `nul' as the starting value, i.e., - `foldr op nul [x_1 x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))'. - Type: - foldr :: (a -> b -> b) -> b -> [a] -> b + /* “right fold” a binary function `op` between successive elements of + `list` with `nul' as the starting value, i.e., + `foldr op nul [x_1 x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))`. + + Type: foldr :: (a -> b -> b) -> b -> [a] -> b Example: concat = foldr (a: b: a + b) "z" @@ -42,16 +45,15 @@ rec { else op (elemAt list n) (fold' (n + 1)); in fold' 0; - /* `fold' is an alias of `foldr' for historic reasons */ + /* `fold` is an alias of `foldr` for historic reasons */ # FIXME(Profpatsch): deprecate? fold = foldr; - /* “left fold”, like `foldr', but from the left: + /* “left fold”, like `foldr`, but from the left: `foldl op nul [x_1 x_2 ... x_n] == op (... (op (op nul x_1) x_2) ... x_n)`. - Type: - foldl :: (b -> a -> b) -> b -> [a] -> b + Type: foldl :: (b -> a -> b) -> b -> [a] -> b Example: lconcat = foldl (a: b: a + b) "z" @@ -70,16 +72,20 @@ 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.) + + Type: foldl' :: (b -> a -> b) -> b -> [a] -> b */ foldl' = builtins.foldl' or foldl; /* Map with index starting from 0 + Type: imap0 :: (int -> a -> b) -> [a] -> [b] + Example: imap0 (i: v: "${v}-${toString i}") ["a" "b"] => [ "a-0" "b-1" ] @@ -88,6 +94,8 @@ rec { /* Map with index starting from 1 + Type: imap1 :: (int -> a -> b) -> [a] -> [b] + Example: imap1 (i: v: "${v}-${toString i}") ["a" "b"] => [ "a-1" "b-2" ] @@ -96,6 +104,8 @@ rec { /* Map and concatenate the result. + Type: concatMap :: (a -> [b]) -> [a] -> [b] + Example: concatMap (x: [x] ++ ["z"]) ["a" "b"] => [ "a" "z" "b" "z" ] @@ -118,15 +128,21 @@ rec { /* Remove elements equal to 'e' from a list. Useful for buildInputs. + Type: remove :: a -> [a] -> [a] + Example: remove 3 [ 1 3 4 3 ] => [ 1 4 ] */ - remove = e: filter (x: x != e); + remove = + # Element to remove from the list + 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. + predicate, returns `default` if no such element exists, or + `multiple` if there are multiple matching elements. + + Type: findSingle :: (a -> bool) -> a -> a -> [a] -> a Example: findSingle (x: x == 3) "none" "multiple" [ 1 3 3 ] @@ -136,14 +152,24 @@ rec { findSingle (x: x == 3) "none" "multiple" [ 1 9 ] => "none" */ - findSingle = pred: default: multiple: list: + findSingle = + # Predicate + pred: + # Default value to return if element was not found. + default: + # Default value to return if more than one element was found + multiple: + # Input list + 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. + predicate or return `default` if no such element exists. + + Type: findFirst :: (a -> bool) -> a -> [a] -> a Example: findFirst (x: x > 3) 7 [ 1 6 4 ] @@ -151,12 +177,20 @@ rec { findFirst (x: x > 9) 7 [ 1 6 4 ] => 7 */ - findFirst = pred: default: list: + findFirst = + # Predicate + pred: + # Default value to return + default: + # Input list + 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 if function `pred` returns true for at least one + element of `list`. + + Type: any :: (a -> bool) -> [a] -> bool Example: any isString [ 1 "a" { } ] @@ -166,8 +200,10 @@ rec { */ any = builtins.any or (pred: foldr (x: y: if pred x then true else y) false); - /* Return true iff function `pred' returns true for all elements of - `list'. + /* Return true if function `pred` returns true for all elements of + `list`. + + Type: all :: (a -> bool) -> [a] -> bool Example: all (x: x < 3) [ 1 2 ] @@ -177,19 +213,25 @@ rec { */ all = builtins.all or (pred: foldr (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 elements of `list` match the supplied predicate + function. + + Type: count :: (a -> bool) -> [a] -> int 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; + count = + # Predicate + 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'). + Type: optional :: bool -> a -> [a] + Example: optional true "foo" => [ "foo" ] @@ -200,13 +242,19 @@ rec { /* Return a list or an empty list, depending on a boolean value. + Type: optionals :: bool -> [a] -> [a] + Example: optionals true [ 2 3 ] => [ 2 3 ] optionals false [ 2 3 ] => [ ] */ - optionals = cond: elems: if cond then elems else []; + optionals = + # Condition + cond: + # List to return if condition is true + elems: if cond then elems else []; /* If argument is a list, return it; else, wrap it in a singleton @@ -223,20 +271,28 @@ rec { /* Return a list of integers from `first' up to and including `last'. + Type: range :: int -> int -> [int] + Example: range 2 4 => [ 2 3 4 ] range 3 2 => [ ] */ - range = first: last: + range = + # First integer in the range + first: + # Last integer in the range + last: if first > last then [] else genList (n: first + n) (last - first + 1); - /* Splits the elements of a list in two lists, `right' and - `wrong', depending on the evaluation of a predicate. + /* Splits the elements of a list in two lists, `right` and + `wrong`, depending on the evaluation of a predicate. + + Type: (a -> bool) -> [a] -> { right :: [a], wrong :: [a] } Example: partition (x: x > 2) [ 5 1 2 3 4 ] @@ -252,7 +308,7 @@ rec { /* Splits the elements of a list into many lists, using the return value of a predicate. Predicate should return a string which becomes keys of attrset `groupBy' returns. - `groupBy'' allows to customise the combining function and initial value + `groupBy'` allows to customise the combining function and initial value Example: groupBy (x: boolToString (x > 2)) [ 5 1 2 3 4 ] @@ -268,10 +324,6 @@ rec { xfce = [ { name = "xfce"; script = "xfce4-session &"; } ]; } - - groupBy' allows to customise the combining function and initial value - - Example: groupBy' builtins.add 0 (x: boolToString (x > 2)) [ 5 1 2 3 4 ] => { true = 12; false = 3; } */ @@ -289,17 +341,27 @@ rec { the merging stops at the shortest. How both lists are merged is defined by the first argument. + Type: zipListsWith :: (a -> b -> c) -> [a] -> [b] -> [c] + Example: zipListsWith (a: b: a + b) ["h" "l"] ["e" "o"] => ["he" "lo"] */ - zipListsWith = f: fst: snd: + zipListsWith = + # Function to zip elements of both lists + f: + # First list + fst: + # Second list + snd: genList (n: f (elemAt fst n) (elemAt snd n)) (min (length fst) (length snd)); /* Merges two lists of the same size together. If the sizes aren't the same the merging stops at the shortest. + Type: zipLists :: [a] -> [b] -> [{ fst :: a, snd :: b}] + Example: zipLists [ 1 2 ] [ "a" "b" ] => [ { fst = 1; snd = "a"; } { fst = 2; snd = "b"; } ] @@ -308,6 +370,8 @@ rec { /* Reverse the order of the elements of a list. + Type: reverseList :: [a] -> [a] + Example: reverseList [ "b" "o" "j" ] @@ -321,8 +385,7 @@ rec { `before a b == true` means that `b` depends on `a` (there's an edge from `b` to `a`). - Examples: - + Example: listDfs true hasPrefix [ "/home/user" "other" "/" "/home" ] == { minimal = "/"; # minimal element visited = [ "/home/user" ]; # seen elements (in reverse order) @@ -336,7 +399,6 @@ rec { rest = [ "/home" "other" ]; # everything else */ - listDfs = stopOnCycles: before: list: let dfs' = us: visited: rest: @@ -361,7 +423,7 @@ rec { `before a b == true` means that `b` should be after `a` in the result. - Examples: + Example: toposort hasPrefix [ "/home/user" "other" "/" "/home" ] == { result = [ "/" "/home" "/home/user" "other" ]; } @@ -376,7 +438,6 @@ rec { toposort (a: b: a < b) [ 3 2 1 ] == { result = [ 1 2 3 ]; } */ - toposort = before: list: let dfsthis = listDfs true before list; @@ -467,26 +528,38 @@ rec { /* Return the first (at most) N elements of a list. + Type: take :: int -> [a] -> [a] + Example: take 2 [ "a" "b" "c" "d" ] => [ "a" "b" ] take 2 [ ] => [ ] */ - take = count: sublist 0 count; + take = + # Number of elements to take + count: sublist 0 count; /* Remove the first (at most) N elements of a list. + Type: drop :: int -> [a] -> [a] + Example: drop 2 [ "a" "b" "c" "d" ] => [ "c" "d" ] drop 2 [ ] => [ ] */ - drop = count: list: sublist count (length list) list; + drop = + # Number of elements to drop + count: + # Input list + list: sublist count (length list) list; - /* 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`. + + Type: sublist :: int -> int -> [a] -> [a] Example: sublist 1 3 [ "a" "b" "c" "d" "e" ] @@ -494,7 +567,13 @@ rec { sublist 1 3 [ ] => [ ] */ - sublist = start: count: list: + sublist = + # Index at which to start the sublist + start: + # Number of elements to take + count: + # Input list + list: let len = length list; in genList (n: elemAt list (n + start)) @@ -504,6 +583,10 @@ rec { /* Return the last element of a list. + This function throws an error if the list is empty. + + Type: last :: [a] -> a + Example: last [ 1 2 3 ] => 3 @@ -512,7 +595,11 @@ rec { assert lib.assertMsg (list != []) "lists.last: list must not be empty!"; elemAt list (length list - 1); - /* Return all elements but the last + /* Return all elements but the last. + + This function throws an error if the list is empty. + + Type: init :: [a] -> [a] Example: init [ 1 2 3 ] @@ -523,7 +610,7 @@ rec { take (length list - 1) list; - /* return the image of the cross product of some lists by a function + /* Return the image of the cross product of some lists by a function. Example: crossLists (x:y: "${toString x}${toString y}") [[1 2] [3 4]] @@ -534,8 +621,9 @@ rec { /* Remove duplicate elements from the list. O(n^2) complexity. - Example: + Type: unique :: [a] -> [a] + Example: unique [ 3 2 3 4 ] => [ 3 2 4 ] */ diff --git a/lib/options.nix b/lib/options.nix index 0e3421175306..791930eafbd0 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -8,61 +8,72 @@ with lib.strings; rec { - # Returns true when the given argument is an option - # - # Examples: - # isOption 1 // => false - # isOption (mkOption {}) // => true + /* Returns true when the given argument is an option + + Type: isOption :: a -> bool + + Example: + isOption 1 // => false + isOption (mkOption {}) // => true + */ isOption = lib.isType "option"; - # Creates an Option attribute set. mkOption accepts an attribute set with the following keys: - # - # default: Default value used when no definition is given in the configuration. - # defaultText: Textual representation of the default, for in the manual. - # example: Example value used in the manual. - # description: String describing the option. - # type: Option type, providing type-checking and value merging. - # apply: Function that converts the option value to something else. - # internal: Whether the option is for NixOS developers only. - # visible: Whether the option shows up in the manual. - # readOnly: Whether the option can be set only once - # options: Obsolete, used by types.optionSet. - # - # All keys default to `null` when not given. - # - # Examples: - # mkOption { } // => { _type = "option"; } - # mkOption { defaultText = "foo"; } // => { _type = "option"; defaultText = "foo"; } + /* Creates an Option attribute set. mkOption accepts an attribute set with the following keys: + + All keys default to `null` when not given. + + Example: + mkOption { } // => { _type = "option"; } + mkOption { defaultText = "foo"; } // => { _type = "option"; defaultText = "foo"; } + */ mkOption = - { default ? null # Default value used when no definition is given in the configuration. - , defaultText ? null # Textual representation of the default, for in the manual. - , example ? null # Example value used in the manual. - , description ? null # String describing the option. - , relatedPackages ? null # Related packages used in the manual (see `genRelatedPackages` in ../nixos/doc/manual/default.nix). - , type ? null # Option type, providing type-checking and value merging. - , apply ? null # Function that converts the option value to something else. - , internal ? null # Whether the option is for NixOS developers only. - , visible ? null # Whether the option shows up in the manual. - , readOnly ? null # Whether the option can be set only once - , options ? null # Obsolete, used by types.optionSet. + { + # Default value used when no definition is given in the configuration. + default ? null, + # Textual representation of the default, for the manual. + defaultText ? null, + # Example value used in the manual. + example ? null, + # String describing the option. + description ? null, + # Related packages used in the manual (see `genRelatedPackages` in ../nixos/doc/manual/default.nix). + relatedPackages ? null, + # Option type, providing type-checking and value merging. + type ? null, + # Function that converts the option value to something else. + apply ? null, + # Whether the option is for NixOS developers only. + internal ? null, + # Whether the option shows up in the manual. + visible ? null, + # Whether the option can be set only once + readOnly ? null, + # Obsolete, used by types.optionSet. + options ? null } @ attrs: attrs // { _type = "option"; }; - # Creates a Option attribute set for a boolean value option i.e an option to be toggled on or off: - # - # Examples: - # mkEnableOption "foo" // => { _type = "option"; default = false; description = "Whether to enable foo."; example = true; type = { ... }; } - mkEnableOption = name: mkOption { + /* Creates an Option attribute set for a boolean value option i.e an + option to be toggled on or off: + + Example: + mkEnableOption "foo" + => { _type = "option"; default = false; description = "Whether to enable foo."; example = true; type = { ... }; } + */ + mkEnableOption = + # Name for the created option + name: mkOption { default = false; example = true; description = "Whether to enable ${name}."; type = lib.types.bool; }; - # This option accept anything, but it does not produce any result. This - # is useful for sharing a module across different module sets without - # having to implement similar features as long as the value of the options - # are not expected. + /* This option accepts anything, but it does not produce any result. + + This is useful for sharing a module across different module sets + without having to implement similar features as long as the + values of the options are not accessed. */ mkSinkUndeclaredOptions = attrs: mkOption ({ internal = true; visible = false; @@ -102,18 +113,24 @@ rec { else val) (head defs).value defs; - # Extracts values of all "value" keys of the given list - # - # Examples: - # getValues [ { value = 1; } { value = 2; } ] // => [ 1 2 ] - # getValues [ ] // => [ ] + /* Extracts values of all "value" keys of the given list. + + Type: getValues :: [ { value :: a } ] -> [a] + + Example: + getValues [ { value = 1; } { value = 2; } ] // => [ 1 2 ] + getValues [ ] // => [ ] + */ getValues = map (x: x.value); - # Extracts values of all "file" keys of the given list - # - # Examples: - # getFiles [ { file = "file1"; } { file = "file2"; } ] // => [ "file1" "file2" ] - # getFiles [ ] // => [ ] + /* Extracts values of all "file" keys of the given list + + Type: getFiles :: [ { file :: a } ] -> [a] + + Example: + getFiles [ { file = "file1"; } { file = "file2"; } ] // => [ "file1" "file2" ] + getFiles [ ] // => [ ] + */ getFiles = map (x: x.file); # Generate documentation template from the list of option declaration like @@ -146,10 +163,13 @@ rec { /* This function recursively removes all derivation attributes from - `x' except for the `name' attribute. This is to make the - generation of `options.xml' much more efficient: the XML - representation of derivations is very large (on the order of - megabytes) and is not actually used by the manual generator. */ + `x` except for the `name` attribute. + + This is to make the generation of `options.xml` much more + efficient: the XML representation of derivations is very large + (on the order of megabytes) and is not actually used by the + manual generator. + */ scrubOptionValue = x: if isDerivation x then { type = "derivation"; drvPath = x.name; outPath = x.name; name = x.name; } @@ -158,20 +178,21 @@ rec { else x; - /* For use in the ‘example’ option attribute. It causes the given - text to be included verbatim in documentation. This is necessary - for example values that are not simple values, e.g., - functions. */ + /* For use in the `example` option attribute. It causes the given + text to be included verbatim in documentation. This is necessary + for example values that are not simple values, e.g., functions. + */ literalExample = text: { _type = "literalExample"; inherit text; }; + # Helper functions. - /* Helper functions. */ + /* Convert an option, described as a list of the option parts in to a + safe, human readable version. - # Convert an option, described as a list of the option parts in to a - # safe, human readable version. ie: - # - # (showOption ["foo" "bar" "baz"]) == "foo.bar.baz" - # (showOption ["foo" "bar.baz" "tux"]) == "foo.\"bar.baz\".tux" + Example: + (showOption ["foo" "bar" "baz"]) == "foo.bar.baz" + (showOption ["foo" "bar.baz" "tux"]) == "foo.\"bar.baz\".tux" + */ showOption = parts: let escapeOptionPart = part: let diff --git a/lib/strings.nix b/lib/strings.nix index 0c4095bb55cd..4d7fa1e774d5 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -12,6 +12,8 @@ rec { /* Concatenate a list of strings. + Type: concatStrings :: [string] -> string + Example: concatStrings ["foo" "bar"] => "foobar" @@ -20,15 +22,19 @@ rec { /* Map a function over a list and concatenate the resulting strings. + Type: concatMapStrings :: (a -> string) -> [a] -> string + 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 + /* Like `concatMapStrings` except that the f functions also gets the position as a parameter. + Type: concatImapStrings :: (int -> a -> string) -> [a] -> string + Example: concatImapStrings (pos: x: "${toString pos}-${x}") ["foo" "bar"] => "1-foo2-bar" @@ -37,17 +43,25 @@ rec { /* Place an element between each element of a list + Type: intersperse :: a -> [a] -> [a] + Example: intersperse "/" ["usr" "local" "bin"] => ["usr" "/" "local" "/" "bin"]. */ - intersperse = separator: list: + intersperse = + # Separator to add between elements + separator: + # Input list + 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 + Type: concatStringsSep :: string -> [string] -> string + Example: concatStringsSep "/" ["usr" "local" "bin"] => "usr/local/bin" @@ -55,43 +69,77 @@ rec { concatStringsSep = builtins.concatStringsSep or (separator: list: concatStrings (intersperse separator list)); - /* First maps over the list and then concatenates it. + /* Maps a function over a list of strings and then concatenates the + result with the specified separator interspersed between + elements. + + Type: concatMapStringsSep :: string -> (string -> string) -> [string] -> string Example: concatMapStringsSep "-" (x: toUpper x) ["foo" "bar" "baz"] => "FOO-BAR-BAZ" */ - concatMapStringsSep = sep: f: list: concatStringsSep sep (map f list); + concatMapStringsSep = + # Separator to add between elements + sep: + # Function to map over the list + f: + # List of input strings + list: concatStringsSep sep (map f list); - /* First imaps over the list and then concatenates it. + /* Same as `concatMapStringsSep`, but the mapping function + additionally receives the position of its argument. + + Type: concatMapStringsSep :: string -> (int -> string -> string) -> [string] -> string Example: - concatImapStringsSep "-" (pos: x: toString (x / pos)) [ 6 6 6 ] => "6-3-2" */ - concatImapStringsSep = sep: f: list: concatStringsSep sep (lib.imap1 f list); + concatImapStringsSep = + # Separator to add between elements + sep: + # Function that receives elements and their positions + f: + # List of input strings + list: concatStringsSep sep (lib.imap1 f list); - /* Construct a Unix-style search path consisting of each `subDir" - directory of the given list of packages. + /* Construct a Unix-style, colon-separated search path consisting of + the given `subDir` appended to each of the given paths. + + Type: makeSearchPath :: string -> [string] -> string Example: makeSearchPath "bin" ["/root" "/usr" "/usr/local"] => "/root/bin:/usr/bin:/usr/local/bin" - makeSearchPath "bin" ["/"] - => "//bin" + makeSearchPath "bin" [""] + => "/bin" */ - makeSearchPath = subDir: packages: - concatStringsSep ":" (map (path: path + "/" + subDir) (builtins.filter (x: x != null) packages)); + makeSearchPath = + # Directory name to append + subDir: + # List of base paths + paths: + concatStringsSep ":" (map (path: path + "/" + subDir) (builtins.filter (x: x != null) paths)); - /* Construct a Unix-style search path, using given package output. - If no output is found, fallback to `.out` and then to the default. + /* Construct a Unix-style search path by appending the given + `subDir` to the specified `output` of each of the packages. If no + output by the given name is found, fallback to `.out` and then to + the default. + + Type: string -> string -> [package] -> string Example: makeSearchPathOutput "dev" "bin" [ pkgs.openssl pkgs.zlib ] => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-dev/bin:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8/bin" */ - makeSearchPathOutput = output: subDir: pkgs: makeSearchPath subDir (map (lib.getOutput output) pkgs); + makeSearchPathOutput = + # Package output to use + output: + # Directory name to append + subDir: + # List of packages + pkgs: makeSearchPath subDir (map (lib.getOutput output) pkgs); /* Construct a library search path (such as RPATH) containing the libraries for a set of packages @@ -117,13 +165,12 @@ rec { /* Construct a perl search path (such as $PERL5LIB) - FIXME(zimbatm): this should be moved in perl-specific code - Example: pkgs = import { } makePerlPath [ pkgs.perlPackages.libnet ] => "/nix/store/n0m1fk9c960d8wlrs62sncnadygqqc6y-perl-Net-SMTP-1.25/lib/perl5/site_perl" */ + # FIXME(zimbatm): this should be moved in perl-specific code makePerlPath = makeSearchPathOutput "lib" "lib/perl5/site_perl"; /* Construct a perl search path recursively including all dependencies (such as $PERL5LIB) @@ -138,34 +185,51 @@ rec { /* Depending on the boolean `cond', return either the given string or the empty string. Useful to concatenate against a bigger string. + Type: optionalString :: bool -> string -> string + Example: optionalString true "some-string" => "some-string" optionalString false "some-string" => "" */ - optionalString = cond: string: if cond then string else ""; + optionalString = + # Condition + cond: + # String to return if condition is true + string: if cond then string else ""; /* Determine whether a string has given prefix. + Type: hasPrefix :: string -> string -> bool + Example: hasPrefix "foo" "foobar" => true hasPrefix "foo" "barfoo" => false */ - hasPrefix = pref: str: - substring 0 (stringLength pref) str == pref; + hasPrefix = + # Prefix to check for + pref: + # Input string + str: substring 0 (stringLength pref) str == pref; /* Determine whether a string has given suffix. + Type: hasSuffix :: string -> string -> bool + Example: hasSuffix "foo" "foobar" => false hasSuffix "foo" "barfoo" => true */ - hasSuffix = suffix: content: + hasSuffix = + # Suffix to check for + suffix: + # Input string + content: let lenContent = stringLength content; lenSuffix = stringLength suffix; @@ -180,6 +244,8 @@ rec { Also note that Nix treats strings as a list of bytes and thus doesn't handle unicode. + Type: stringtoCharacters :: string -> [string] + Example: stringToCharacters "" => [ ] @@ -194,18 +260,25 @@ rec { /* Manipulate a string character by character and replace them by strings before concatenating the results. + Type: stringAsChars :: (string -> string) -> string -> string + Example: stringAsChars (x: if x == "a" then "i" else x) "nax" => "nix" */ - stringAsChars = f: s: - concatStrings ( + stringAsChars = + # Function to map over each individual character + f: + # Input string + s: concatStrings ( map f (stringToCharacters s) ); - /* Escape occurrence of the elements of ‘list’ in ‘string’ by + /* Escape occurrence of the elements of `list` in `string` by prefixing it with a backslash. + Type: escape :: [string] -> string -> string + Example: escape ["(" ")"] "(foo)" => "\\(foo\\)" @@ -214,6 +287,8 @@ rec { /* Quote string to be used safely within the Bourne shell. + Type: escapeShellArg :: string -> string + Example: escapeShellArg "esc'ape\nme" => "'esc'\\''ape\nme'" @@ -222,6 +297,8 @@ rec { /* Quote all arguments to be safely passed to the Bourne shell. + Type: escapeShellArgs :: [string] -> string + Example: escapeShellArgs ["one" "two three" "four'five"] => "'one' 'two three' 'four'\\''five'" @@ -230,13 +307,15 @@ rec { /* Turn a string into a Nix expression representing that string + Type: string -> string + Example: escapeNixString "hello\${}\n" => "\"hello\\\${}\\n\"" */ escapeNixString = s: escape ["$"] (builtins.toJSON s); - /* Obsolete - use replaceStrings instead. */ + # Obsolete - use replaceStrings instead. replaceChars = builtins.replaceStrings or ( del: new: s: let @@ -256,6 +335,8 @@ rec { /* Converts an ASCII string to lower-case. + Type: toLower :: string -> string + Example: toLower "HOME" => "home" @@ -264,6 +345,8 @@ rec { /* Converts an ASCII string to upper-case. + Type: toUpper :: string -> string + Example: toUpper "home" => "HOME" @@ -273,7 +356,7 @@ rec { /* Appends string context from another string. This is an implementation detail of Nix. - Strings in Nix carry an invisible `context' which is a list of strings + 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. @@ -319,8 +402,9 @@ rec { in recurse 0 0; - /* Return the suffix of the second argument if the first argument matches - its prefix. + /* Return a string without the specified prefix, if the prefix matches. + + Type: string -> string -> string Example: removePrefix "foo." "foo.bar.baz" @@ -328,18 +412,23 @@ rec { removePrefix "xxx" "foo.bar.baz" => "foo.bar.baz" */ - removePrefix = pre: s: + removePrefix = + # Prefix to remove if it matches + prefix: + # Input string + str: let - preLen = stringLength pre; - sLen = stringLength s; + preLen = stringLength prefix; + sLen = stringLength str; in - if hasPrefix pre s then - substring preLen (sLen - preLen) s + if hasPrefix prefix str then + substring preLen (sLen - preLen) str else - s; + str; - /* Return the prefix of the second argument if the first argument matches - its suffix. + /* Return a string without the specified suffix, if the suffix matches. + + Type: string -> string -> string Example: removeSuffix "front" "homefront" @@ -347,17 +436,21 @@ rec { removeSuffix "xxx" "homefront" => "homefront" */ - removeSuffix = suf: s: + removeSuffix = + # Suffix to remove if it matches + suffix: + # Input string + str: let - sufLen = stringLength suf; - sLen = stringLength s; + sufLen = stringLength suffix; + sLen = stringLength str; in - if sufLen <= sLen && suf == substring (sLen - sufLen) sufLen s then - substring 0 (sLen - sufLen) s + if sufLen <= sLen && suffix == substring (sLen - sufLen) sufLen str then + substring 0 (sLen - sufLen) str else - s; + str; - /* Return true iff string v1 denotes a version older than v2. + /* Return true if string v1 denotes a version older than v2. Example: versionOlder "1.1" "1.2" @@ -367,7 +460,7 @@ rec { */ versionOlder = v1: v2: builtins.compareVersions v2 v1 == 1; - /* Return true iff string v1 denotes a version equal to or newer than v2. + /* Return true if string v1 denotes a version equal to or newer than v2. Example: versionAtLeast "1.1" "1.0" @@ -459,6 +552,11 @@ rec { /* Create a fixed width string with additional prefix to match required width. + This function will fail if the input string is longer than the + requested length. + + Type: fixedWidthString :: int -> string -> string + Example: fixedWidthString 5 "0" (toString 15) => "00015" @@ -502,12 +600,16 @@ rec { => false */ isStorePath = x: - isCoercibleToString x - && builtins.substring 0 1 (toString x) == "/" - && dirOf x == builtins.storeDir; + if isCoercibleToString x then + let str = toString x; in + builtins.substring 0 1 str == "/" + && dirOf str == builtins.storeDir + else + false; - /* Convert string to int - Obviously, it is a bit hacky to use fromJSON that way. + /* Parse a string string as an int. + + Type: string -> int Example: toInt "1337" @@ -517,17 +619,18 @@ rec { toInt "3.14" => error: floating point JSON numbers are not supported */ + # Obviously, it is a bit hacky to use fromJSON this way. 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 + NOTE: This function is not performant and should be avoided. Example: readPathsFromFile /prefix @@ -549,6 +652,8 @@ rec { /* Read the contents of a file removing the trailing \n + Type: fileContents :: path -> string + Example: $ echo "1.0" > ./version diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 8f5ef44ae72f..0b3475fefb9c 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -32,6 +32,7 @@ rec { else if final.isUClibc then "uclibc" else if final.isAndroid then "bionic" else if final.isLinux /* default */ then "glibc" + else if final.isAvr then "avrlibc" # TODO(@Ericson2314) think more about other operating systems else "native/impure"; extensions = { diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 8ba03a63fd8d..a40c38924245 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -99,6 +99,34 @@ rec { riscv64 = riscv "64"; riscv32 = riscv "32"; + avr = { + config = "avr"; + }; + + arm-embedded = { + config = "arm-none-eabi"; + libc = "newlib"; + }; + + aarch64-embedded = { + config = "aarch64-none-elf"; + libc = "newlib"; + }; + + ppc-embedded = { + config = "powerpc-none-eabi"; + libc = "newlib"; + }; + + i686-embedded = { + config = "i686-elf"; + libc = "newlib"; + }; + + x86_64-embedded = { + config = "x86_64-elf"; + libc = "newlib"; + }; # # Darwin diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 65f560328af5..2fcf1afe4628 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -19,6 +19,7 @@ rec { isRiscV = { cpu = { family = "riscv"; }; }; isSparc = { cpu = { family = "sparc"; }; }; isWasm = { cpu = { family = "wasm"; }; }; + isAvr = { cpu = { family = "avr"; }; }; is32bit = { cpu = { bits = 32; }; }; is64bit = { cpu = { bits = 64; }; }; diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index bb26c93f3d7a..db97a5c4b33b 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -101,6 +101,8 @@ rec { wasm32 = { bits = 32; significantByte = littleEndian; family = "wasm"; }; wasm64 = { bits = 64; significantByte = littleEndian; family = "wasm"; }; + + avr = { bits = 8; family = "avr"; }; }; ################################################################################ @@ -117,6 +119,7 @@ rec { apple = {}; pc = {}; + none = {}; unknown = {}; }; @@ -200,6 +203,7 @@ rec { cygnus = {}; msvc = {}; eabi = {}; + elf = {}; androideabi = {}; android = { @@ -255,9 +259,16 @@ rec { setType "system" components; mkSkeletonFromList = l: { + "1" = if elemAt l 0 == "avr" + then { cpu = elemAt l 0; kernel = "none"; abi = "unknown"; } + else throw "Target specification with 1 components is ambiguous"; "2" = # We only do 2-part hacks for things Nix already supports if elemAt l 1 == "cygwin" then { cpu = elemAt l 0; kernel = "windows"; abi = "cygnus"; } + else if (elemAt l 1 == "eabi") + then { cpu = elemAt l 0; vendor = "none"; kernel = "none"; abi = elemAt l 1; } + else if (elemAt l 1 == "elf") + then { cpu = elemAt l 0; vendor = "none"; kernel = "none"; abi = elemAt l 1; } else { cpu = elemAt l 0; kernel = elemAt l 1; }; "3" = # Awkwards hacks, beware! if elemAt l 1 == "apple" @@ -268,6 +279,10 @@ rec { then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "windows"; abi = "gnu"; } else if hasPrefix "netbsd" (elemAt l 2) then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; } + else if (elemAt l 2 == "eabi") + then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "none"; abi = elemAt l 2; } + else if (elemAt l 2 == "elf") + then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "none"; abi = elemAt l 2; } else throw "Target specification with 3 components is ambiguous"; "4" = { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; abi = elemAt l 3; }; }.${toString (length l)} diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 853d911cdc81..1604fbb39cbb 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -112,7 +112,7 @@ runTests { storePathAppendix = isStorePath "${goodPath}/bin/python"; nonAbsolute = isStorePath (concatStrings (tail (stringToCharacters goodPath))); - asPath = isStorePath goodPath; + asPath = isStorePath (/. + goodPath); otherPath = isStorePath "/something/else"; otherVals = { attrset = isStorePath {}; diff --git a/lib/trivial.nix b/lib/trivial.nix index 938df6ced476..e31cf73d27c4 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -9,23 +9,37 @@ rec { Type: id :: a -> a */ - id = x: x; + id = + # The value to return + x: x; /* The constant function - Ignores the second argument. - Or: Construct a function that always returns a static value. + + Ignores the second argument. If called with only one argument, + constructs a function that always returns a static value. Type: const :: a -> b -> a Example: let f = const 5; in f 10 => 5 */ - const = x: y: x; + const = + # Value to return + x: + # Value to ignore + y: x; ## Named versions corresponding to some builtin operators. - /* Concatenate two lists */ + /* Concatenate two lists + + Type: concat :: [a] -> [a] -> [a] + + Example: + concat [ 1 2 ] [ 3 4 ] + => [ 1 2 3 4 ] + */ concat = x: y: x ++ y; /* boolean “or” */ @@ -53,27 +67,40 @@ rec { bitNot = builtins.sub (-1); /* Convert a boolean to a string. - Note that toString on a bool returns "1" and "". + + This function uses the strings "true" and "false" to represent + boolean values. Calling `toString` on a bool instead returns "1" + and "" (sic!). + + Type: boolToString :: bool -> string */ boolToString = b: if b then "true" else "false"; /* Merge two attribute sets shallowly, right side trumps left + mergeAttrs :: attrs -> attrs -> attrs + Example: mergeAttrs { a = 1; b = 2; } { b = 3; c = 4; } => { a = 1; b = 3; c = 4; } */ - mergeAttrs = x: y: x // y; + mergeAttrs = + # Left attribute set + x: + # Right attribute set (higher precedence for equal keys) + y: x // y; /* Flip the order of the arguments of a binary function. + Type: flip :: (a -> b -> c) -> (b -> a -> c) + Example: flip concat [1] [2] => [ 2 1 ] */ flip = f: a: b: f b a; - /* Apply function if argument is non-null. + /* Apply function if the supplied argument is non-null. Example: mapNullable (x: x+1) null @@ -81,7 +108,11 @@ rec { mapNullable (x: x+1) 22 => 23 */ - mapNullable = f: a: if isNull a then a else f a; + mapNullable = + # Function to call + f: + # Argument to check for null before passing it to `f` + a: if isNull a then a else f a; # Pull in some builtins not included elsewhere. inherit (builtins) @@ -92,21 +123,27 @@ rec { ## nixpks version strings - # The current full nixpkgs version number. + /* Returns the current full nixpkgs version number. */ version = release + versionSuffix; - # The current nixpkgs version number as string. + /* Returns the current nixpkgs release number as string. */ release = lib.strings.fileContents ../.version; - # The current nixpkgs version suffix as string. + /* Returns the current nixpkgs version suffix as string. */ versionSuffix = let suffixFile = ../.version-suffix; in if pathExists suffixFile then lib.strings.fileContents suffixFile else "pre-git"; - # Attempt to get the revision nixpkgs is from - revisionWithDefault = default: + /* Attempts to return the the current revision of nixpkgs and + returns the supplied default value otherwise. + + Type: revisionWithDefault :: string -> string + */ + revisionWithDefault = + # Default value to return if revision can not be determined + default: let revisionFile = "${toString ./..}/.git-revision"; gitRepo = "${toString ./..}/.git"; @@ -117,14 +154,20 @@ rec { nixpkgsVersion = builtins.trace "`lib.nixpkgsVersion` is deprecated, use `lib.version` instead!" version; - # Whether we're being called by nix-shell. + /* Determine whether the function is being called from inside a Nix + shell. + + Type: inNixShell :: bool + */ inNixShell = builtins.getEnv "IN_NIX_SHELL" != ""; ## Integer operations - # Return minimum/maximum of two numbers. + /* Return minimum of two numbers. */ min = x: y: if x < y then x else y; + + /* Return maximum of two numbers. */ max = x: y: if x > y then x else y; /* Integer modulus @@ -158,8 +201,9 @@ rec { second subtype, compare elements of a single subtype with `yes` and `no` respectively. - Example: + Type: (a -> bool) -> (a -> a -> int) -> (a -> a -> int) -> (a -> a -> int) + Example: let cmp = splitByAndCompare (hasPrefix "foo") compare compare; in cmp "a" "z" => -1 @@ -170,31 +214,44 @@ rec { # while compare "fooa" "a" => 1 */ - splitByAndCompare = p: yes: no: a: b: + splitByAndCompare = + # Predicate + p: + # Comparison function if predicate holds for both values + yes: + # Comparison function if predicate holds for neither value + no: + # First value to compare + a: + # Second value to compare + b: if p a then if p b then yes a b else -1 else if p b then 1 else no a b; - /* Reads a JSON file. */ + /* Reads a JSON file. + + Type :: path -> any + */ importJSON = path: builtins.fromJSON (builtins.readFile path); ## Warnings - /* See https://github.com/NixOS/nix/issues/749. Eventually we'd like these - to expand to Nix builtins that carry metadata so that Nix can filter out - the INFO messages without parsing the message string. + # See https://github.com/NixOS/nix/issues/749. Eventually we'd like these + # to expand to Nix builtins that carry metadata so that Nix can filter out + # the INFO messages without parsing the message string. + # + # Usage: + # { + # foo = lib.warn "foo is deprecated" oldFoo; + # } + # + # TODO: figure out a clever way to integrate location information from + # something like __unsafeGetAttrPos. - Usage: - { - foo = lib.warn "foo is deprecated" oldFoo; - } - - TODO: figure out a clever way to integrate location information from - something like __unsafeGetAttrPos. - */ warn = msg: builtins.trace "WARNING: ${msg}"; info = msg: builtins.trace "INFO: ${msg}"; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 22ea07b9f118..a9116f411767 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -495,6 +495,11 @@ github = "bennofs"; name = "Benno Fünfstück"; }; + benpye = { + email = "ben@curlybracket.co.uk"; + github = "benpye"; + name = "Ben Pye"; + }; benwbooth = { email = "benwbooth@gmail.com"; github = "benwbooth"; @@ -2967,6 +2972,11 @@ github = "nequissimus"; name = "Tim Steinbach"; }; + nikitavoloboev = { + email = "nikita.voloboev@gmail.com"; + github = "nikitavoloboev"; + name = "Nikita Voloboev"; + }; nfjinjing = { email = "nfjinjing@gmail.com"; github = "nfjinjing"; @@ -4618,6 +4628,11 @@ github = "wucke13"; name = "Wucke"; }; + wykurz = { + email = "wykurz@gmail.com"; + github = "wykurz"; + name = "Mateusz Wykurz"; + }; wyvie = { email = "elijahrum@gmail.com"; github = "wyvie"; diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml index 2a98fb126231..d03dbc4d7055 100644 --- a/nixos/doc/manual/administration/declarative-containers.xml +++ b/nixos/doc/manual/administration/declarative-containers.xml @@ -15,7 +15,7 @@ containers.database = { config = { config, pkgs, ... }: { = true; - = pkgs.postgresql96; + = pkgs.postgresql_9_6; }; }; diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml index 8a1a39c98c10..c77cfe137baa 100644 --- a/nixos/doc/manual/configuration/config-file.xml +++ b/nixos/doc/manual/configuration/config-file.xml @@ -197,10 +197,10 @@ swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; pkgs.emacs ]; - = pkgs.postgresql90; + = pkgs.postgresql_10; The latter option definition changes the default PostgreSQL package used - by NixOS’s PostgreSQL service to 9.0. For more information on packages, + by NixOS’s PostgreSQL service to 10.x. For more information on packages, including how to add new ones, see . diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 0ddf40acbfcc..8715a05f508b 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -637,6 +637,11 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' anyways for clarity. + + + Groups kvm and render are introduced now, as systemd requires them. + + diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index 839d75b53bd1..9c07184613e4 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -137,6 +137,21 @@ make sure to update your configuration if you want to keep proglodyte-wasm + + + OpenSMTPD has been upgraded to version 6.4.0p1. This release makes + backwards-incompatible changes to the configuration file format. See + man smtpd.conf for more information on the new file + format. + + + + + The versioned postgresql have been renamed to use + underscore number seperators. For example, postgresql96 + has been renamed to postgresql_9_6. + + @@ -155,6 +170,15 @@ Matomo version. + + + The deprecated truecrypt package has been removed + and truecrypt attribute is now an alias for + veracrypt. VeraCrypt is backward-compatible with + TrueCrypt volumes. Note that cryptsetup also + supports loading TrueCrypt volumes. + + diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index f71e264c3478..5f05b037bdde 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -53,7 +53,8 @@ in rec { inherit prefix check; modules = modules ++ extraModules ++ baseModules ++ [ pkgsModule ]; args = extraArgs; - specialArgs = { modulesPath = ../modules; } // specialArgs; + specialArgs = + { modulesPath = builtins.toString ../modules; } // specialArgs; }) config options; # These are the extra arguments passed to every module. In diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index a00fe25c2b8e..abcc1c50d4d8 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -250,7 +250,8 @@ sub connect { $self->start; local $SIG{ALRM} = sub { die "timed out waiting for the VM to connect\n"; }; - alarm 300; + # 50 minutes -- increased as a test, see #49441 + alarm 3000; readline $self->{socket} or die "the VM quit before connecting\n"; alarm 0; diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index 1ef5313d3fdd..1eb6fb43604a 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -16,6 +16,13 @@ let resolvconfOptions = cfg.resolvconfOptions ++ optional cfg.dnsSingleRequest "single-request" ++ optional cfg.dnsExtensionMechanism "edns0"; + + + localhostMapped4 = cfg.hosts ? "127.0.0.1" && elem "localhost" cfg.hosts."127.0.0.1"; + localhostMapped6 = cfg.hosts ? "::1" && elem "localhost" cfg.hosts."::1"; + + localhostMultiple = any (elem "localhost") (attrValues (removeAttrs cfg.hosts [ "127.0.0.1" "::1" ])); + in { @@ -23,8 +30,7 @@ in options = { networking.hosts = lib.mkOption { - type = types.attrsOf ( types.listOf types.str ); - default = {}; + type = types.attrsOf (types.listOf types.str); example = literalExample '' { "127.0.0.1" = [ "foo.bar.baz" ]; @@ -192,6 +198,29 @@ in config = { + assertions = [{ + assertion = localhostMapped4; + message = ''`networking.hosts` doesn't map "127.0.0.1" to "localhost"''; + } { + assertion = !cfg.enableIPv6 || localhostMapped6; + message = ''`networking.hosts` doesn't map "::1" to "localhost"''; + } { + assertion = !localhostMultiple; + message = '' + `networking.hosts` maps "localhost" to something other than "127.0.0.1" + or "::1". This will break some applications. Please use + `networking.extraHosts` if you really want to add such a mapping. + ''; + }]; + + networking.hosts = { + "127.0.0.1" = [ "localhost" ]; + } // optionalAttrs (cfg.hostName != "") { + "127.0.1.1" = [ cfg.hostName ]; + } // optionalAttrs cfg.enableIPv6 { + "::1" = [ "localhost" ]; + }; + environment.etc = { # /etc/services: TCP/UDP port assignments. "services".source = pkgs.iana-etc + "/etc/services"; @@ -203,25 +232,13 @@ in "rpc".source = pkgs.glibc.out + "/etc/rpc"; # /etc/hosts: Hostname-to-IP mappings. - "hosts".text = - let oneToString = set : ip : ip + " " + concatStringsSep " " ( getAttr ip set ); - allToString = set : concatMapStringsSep "\n" ( oneToString set ) ( attrNames set ); - userLocalHosts = optionalString - ( builtins.hasAttr "127.0.0.1" cfg.hosts ) - ( concatStringsSep " " ( remove "localhost" cfg.hosts."127.0.0.1" )); - userLocalHosts6 = optionalString - ( builtins.hasAttr "::1" cfg.hosts ) - ( concatStringsSep " " ( remove "localhost" cfg.hosts."::1" )); - otherHosts = allToString ( removeAttrs cfg.hosts [ "127.0.0.1" "::1" ]); - in - '' - 127.0.0.1 ${userLocalHosts} localhost - ${optionalString cfg.enableIPv6 '' - ::1 ${userLocalHosts6} localhost - ''} - ${otherHosts} - ${cfg.extraHosts} - ''; + "hosts".text = let + oneToString = set: ip: ip + " " + concatStringsSep " " set.${ip}; + allToString = set: concatMapStringsSep "\n" (oneToString set) (attrNames set); + in '' + ${allToString cfg.hosts} + ${cfg.extraHosts} + ''; # /etc/host.conf: resolver configuration file "host.conf".text = cfg.hostConf; @@ -296,4 +313,4 @@ in }; - } +} diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix index 3dc0f606bf60..bcdbffdc20b7 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix @@ -7,4 +7,6 @@ imports = [ ./installation-cd-base.nix ]; + + fonts.fontconfig.enable = false; } diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix index 8ca3592f3800..2e1b4b3998b5 100644 --- a/nixos/modules/installer/virtualbox-demo.nix +++ b/nixos/modules/installer/virtualbox-demo.nix @@ -22,4 +22,42 @@ with lib; powerManagement.enable = false; system.stateVersion = mkDefault "18.03"; + + installer.cloneConfigExtra = '' + # Let demo build as a trusted user. + # nix.trustedUsers = [ "demo" ]; + + # Mount a VirtualBox shared folder. + # This is configurable in the VirtualBox menu at + # Machine / Settings / Shared Folders. + # fileSystems."/mnt" = { + # fsType = "vboxsf"; + # device = "nameofdevicetomount"; + # options = [ "rw" ]; + # }; + + # By default, the NixOS VirtualBox demo image includes SDDM and Plasma. + # If you prefer another desktop manager or display manager, you may want + # to disable the default. + # services.xserver.desktopManager.plasma5.enable = lib.mkForce false; + # services.xserver.displayManager.sddm.enable = lib.mkForce false; + + # Enable GDM/GNOME by uncommenting above two lines and two lines below. + # services.xserver.displayManager.gdm.enable = true; + # services.xserver.desktopManager.gnome3.enable = true; + + # Set your time zone. + # time.timeZone = "Europe/Amsterdam"; + + # List packages installed in system profile. To search, run: + # \$ nix search wget + # environment.systemPackages = with pkgs; [ + # wget vim + # ]; + + # Enable the OpenSSH daemon. + # services.openssh.enable = true; + + system.stateVersion = mkDefault "18.03"; + ''; } diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index bd921f230bd0..660644eade8d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -126,6 +126,7 @@ ./programs/udevil.nix ./programs/venus.nix ./programs/vim.nix + ./programs/wavemon.nix ./programs/way-cooler.nix ./programs/wireshark.nix ./programs/xfs_quota.nix diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 5aaffa4f1f2a..7e14b0e21143 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -7,7 +7,7 @@ # Include some utilities that are useful for installing or repairing # the system. environment.systemPackages = [ - pkgs.w3m-nox # needed for the manual anyway + pkgs.w3m-nographics # needed for the manual anyway pkgs.testdisk # useful for repairing boot problems pkgs.ms-sys # for writing Microsoft boot sectors / MBRs pkgs.efibootmgr @@ -19,6 +19,9 @@ pkgs.cryptsetup # needed for dm-crypt volumes pkgs.mkpasswd # for generating password files + # Some text editors. + pkgs.vim + # Some networking tools. pkgs.fuse pkgs.fuse3 diff --git a/nixos/modules/profiles/clone-config.nix b/nixos/modules/profiles/clone-config.nix index 99d4774584f1..3f669ba7d2e1 100644 --- a/nixos/modules/profiles/clone-config.nix +++ b/nixos/modules/profiles/clone-config.nix @@ -48,6 +48,8 @@ let { imports = [ ${toString config.installer.cloneConfigIncludes} ]; + + ${config.installer.cloneConfigExtra} } ''; @@ -73,6 +75,13 @@ in ''; }; + installer.cloneConfigExtra = mkOption { + default = ""; + description = '' + Extra text to include in the cloned configuration.nix included in this + installer. + ''; + }; }; config = { diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index d51ed195580d..580ea4a58e5b 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -63,7 +63,7 @@ with lib; # Tell the Nix evaluator to garbage collect more aggressively. # This is desirable in memory-constrained environments that don't # (yet) have swap set up. - environment.variables.GC_INITIAL_HEAP_SIZE = "100000"; + environment.variables.GC_INITIAL_HEAP_SIZE = "1M"; # Make the installer more likely to succeed in low memory # environments. The kernel's overcommit heustistics bite us @@ -87,9 +87,6 @@ with lib; # console less cumbersome if the machine has a public IP. networking.firewall.logRefusedConnections = mkDefault false; - environment.systemPackages = [ pkgs.vim ]; - - # Allow the user to log in as root without a password. users.users.root.initialHashedPassword = ""; }; diff --git a/nixos/modules/programs/wavemon.nix b/nixos/modules/programs/wavemon.nix new file mode 100644 index 000000000000..ac665fe4a023 --- /dev/null +++ b/nixos/modules/programs/wavemon.nix @@ -0,0 +1,28 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.wavemon; +in { + options = { + programs.wavemon = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to add wavemon to the global environment and configure a + setcap wrapper for it. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ wavemon ]; + security.wrappers.wavemon = { + source = "${pkgs.wavemon}/bin/wavemon"; + capabilities = "cap_net_admin+ep"; + }; + }; +} diff --git a/nixos/modules/security/rngd.nix b/nixos/modules/security/rngd.nix index 81e04a44b115..63e00b548120 100644 --- a/nixos/modules/security/rngd.nix +++ b/nixos/modules/security/rngd.nix @@ -20,7 +20,6 @@ with lib; KERNEL=="random", TAG+="systemd" SUBSYSTEM=="cpu", ENV{MODALIAS}=="cpu:type:x86,*feature:*009E*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service" KERNEL=="hw_random", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service" - ${if config.services.tcsd.enable then "" else ''KERNEL=="tpm0", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"''} ''; systemd.services.rngd = { @@ -30,8 +29,7 @@ with lib; description = "Hardware RNG Entropy Gatherer Daemon"; - serviceConfig.ExecStart = "${pkgs.rng-tools}/sbin/rngd -f -v" + - (if config.services.tcsd.enable then " --no-tpm=1" else ""); + serviceConfig.ExecStart = "${pkgs.rng-tools}/sbin/rngd -f -v"; }; }; } diff --git a/nixos/modules/services/admin/salt/master.nix b/nixos/modules/services/admin/salt/master.nix index 165580b97837..c6b1b0cc0bd8 100644 --- a/nixos/modules/services/admin/salt/master.nix +++ b/nixos/modules/services/admin/salt/master.nix @@ -53,6 +53,9 @@ in Type = "notify"; NotifyAccess = "all"; }; + restartTriggers = [ + config.environment.etc."salt/master".source + ]; }; }; diff --git a/nixos/modules/services/admin/salt/minion.nix b/nixos/modules/services/admin/salt/minion.nix index 9ecefb32cfa8..c8fa9461a209 100644 --- a/nixos/modules/services/admin/salt/minion.nix +++ b/nixos/modules/services/admin/salt/minion.nix @@ -15,7 +15,6 @@ let # Default is in /etc/salt/pki/minion pki_dir = "/var/lib/salt/pki/minion"; } cfg.configuration; - configDir = pkgs.writeTextDir "minion" (builtins.toJSON fullConfig); in @@ -28,15 +27,24 @@ in default = {}; description = '' Salt minion configuration as Nix attribute set. - See - for details. + See + for details. ''; }; }; }; config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ salt ]; + environment = { + # Set this up in /etc/salt/minion so `salt-call`, etc. work. + # The alternatives are + # - passing --config-dir to all salt commands, not just the minion unit, + # - setting aglobal environment variable. + etc."salt/minion".source = pkgs.writeText "minion" ( + builtins.toJSON fullConfig + ); + systemPackages = with pkgs; [ salt ]; + }; systemd.services.salt-minion = { description = "Salt Minion"; wantedBy = [ "multi-user.target" ]; @@ -45,11 +53,14 @@ in utillinux ]; serviceConfig = { - ExecStart = "${pkgs.salt}/bin/salt-minion --config-dir=${configDir}"; + ExecStart = "${pkgs.salt}/bin/salt-minion"; LimitNOFILE = 8192; Type = "notify"; NotifyAccess = "all"; }; + restartTriggers = [ + config.environment.etc."salt/minion".source + ]; }; }; } diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index de2a757196a5..6edb1503c233 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -55,7 +55,7 @@ in package = mkOption { type = types.package; - example = literalExample "pkgs.postgresql96"; + example = literalExample "pkgs.postgresql_9_6"; description = '' PostgreSQL package to use. ''; @@ -118,7 +118,7 @@ in extraPlugins = mkOption { type = types.listOf types.path; default = []; - example = literalExample "[ (pkgs.postgis.override { postgresql = pkgs.postgresql94; }) ]"; + example = literalExample "[ (pkgs.postgis.override { postgresql = pkgs.postgresql_9_4; }) ]"; description = '' When this list contains elements a new store path is created. PostgreSQL and the elements are symlinked into it. Then pg_config, @@ -167,9 +167,9 @@ in # Note: when changing the default, make it conditional on # ‘system.stateVersion’ to maintain compatibility with existing # systems! - mkDefault (if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql96 - else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql95 - else pkgs.postgresql94); + mkDefault (if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6 + else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql_9_5 + else pkgs.postgresql_9_4); services.postgresql.dataDir = mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}" diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml index f89f0d653164..14f4d4909bc0 100644 --- a/nixos/modules/services/databases/postgresql.xml +++ b/nixos/modules/services/databases/postgresql.xml @@ -27,12 +27,12 @@ configuration.nix: = true; - = pkgs.postgresql94; + = pkgs.postgresql_9_4; Note that you are required to specify the desired version of PostgreSQL - (e.g. pkgs.postgresql94). Since upgrading your PostgreSQL - version requires a database dump and reload (see below), NixOS cannot - provide a default value for + (e.g. pkgs.postgresql_9_4). Since upgrading your + PostgreSQL version requires a database dump and reload (see below), NixOS + cannot provide a default value for such as the most recent release of PostgreSQL. diff --git a/nixos/modules/services/hardware/upower.nix b/nixos/modules/services/hardware/upower.nix index 2198842a4511..1da47349c077 100644 --- a/nixos/modules/services/hardware/upower.nix +++ b/nixos/modules/services/hardware/upower.nix @@ -56,6 +56,32 @@ in { Type = "dbus"; BusName = "org.freedesktop.UPower"; ExecStart = "@${cfg.package}/libexec/upowerd upowerd"; + Restart = "on-failure"; + # Upstream lockdown: + # Filesystem lockdown + ProtectSystem = "strict"; + # Needed by keyboard backlight support + ProtectKernelTunables = false; + ProtectControlGroups = true; + ReadWritePaths = "/var/lib/upower"; + ProtectHome = true; + PrivateTmp = true; + + # Network + # PrivateNetwork=true would block udev's netlink socket + RestrictAddressFamilies = "AF_UNIX AF_NETLINK"; + + # Execute Mappings + MemoryDenyWriteExecute = true; + + # Modules + ProtectKernelModules = true; + + # Real-time + RestrictRealtime = true; + + # Privilege escalation + NoNewPrivileges = true; }; }; diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix index 46e3b7457610..274b36171608 100644 --- a/nixos/modules/services/networking/bitlbee.nix +++ b/nixos/modules/services/networking/bitlbee.nix @@ -33,7 +33,7 @@ let purple_plugin_path = lib.concatMapStringsSep ":" - (plugin: "${plugin}/lib/pidgin/") + (plugin: "${plugin}/lib/pidgin/:${plugin}/lib/purple-2/") cfg.libpurple_plugins ; diff --git a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix index b16d299917fe..d4f7e95f859f 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix @@ -248,6 +248,14 @@ in { ''; + ppk_id = mkOptionalStrParam '' + String identifying the Postquantum Preshared Key (PPK) to be used. + ''; + + ppk_required = mkYesNoParam no '' + Whether a Postquantum Preshared Key (PPK) is required for this connection. + ''; + keyingtries = mkIntParam 1 '' Number of retransmission sequences to perform during initial connect. Instead of giving up initiation after the first retransmission @@ -922,6 +930,36 @@ in { 0xffffffff. ''; + set_mark_in = mkStrParam "0/0x00000000" '' + Netfilter mark applied to packets after the inbound IPsec SA processed + them. This way it's not necessary to mark packets via Netfilter before + decryption or right afterwards to match policies or process them + differently (e.g. via policy routing). + + An additional mask may be appended to the mark, separated by + /. The default mask if omitted is 0xffffffff. The + special value %same uses the value (but not the mask) + from as mark value, which can be fixed, + %unique or %unique-dir. + + Setting marks in XFRM input requires Linux 4.19 or higher. + ''; + + set_mark_out = mkStrParam "0/0x00000000" '' + Netfilter mark applied to packets after the outbound IPsec SA processed + them. This allows processing ESP packets differently than the original + traffic (e.g. via policy routing). + + An additional mask may be appended to the mark, separated by + /. The default mask if omitted is 0xffffffff. The + special value %same uses the value (but not the mask) + from as mark value, which can be fixed, + %unique_ or %unique-dir. + + Setting marks in XFRM output is supported since Linux 4.14. Setting a + mask requires at least Linux 4.19. + ''; + tfc_padding = mkParamOfType (with lib.types; either int (enum ["mtu"])) 0 '' Pads ESP packets with additional data to have a consistent ESP packet size for improved Traffic Flow Confidentiality. The padding defines the @@ -946,6 +984,33 @@ in { supported, but the installation does not fail otherwise. ''; + copy_df = mkYesNoParam yes '' + Whether to copy the DF bit to the outer IPv4 header in tunnel mode. This + effectively disables Path MTU discovery (PMTUD). Controlling this + behavior is not supported by all kernel interfaces. + ''; + + copy_ecn = mkYesNoParam yes '' + Whether to copy the ECN (Explicit Congestion Notification) header field + to/from the outer IP header in tunnel mode. Controlling this behavior is + not supported by all kernel interfaces. + ''; + + copy_dscp = mkEnumParam [ "out" "in" "yes" "no" ] "out" '' + Whether to copy the DSCP (Differentiated Services Field Codepoint) + header field to/from the outer IP header in tunnel mode. The value + out only copies the field from the inner to the outer + header, the value in does the opposite and only + copies the field from the outer to the inner header when decapsulating, + the value yes copies the field in both directions, + and the value no disables copying the field + altogether. Setting this to yes or + in could allow an attacker to adversely affect other + traffic at the receiver, which is why the default is + out. Controlling this behavior is not supported by + all kernel interfaces. + ''; + start_action = mkEnumParam ["none" "trap" "start"] "none" '' Action to perform after loading the configuration. @@ -1060,6 +1125,24 @@ in { defined in a unique section having the ike prefix. ''; + ppk = mkPrefixedAttrsOfParams { + secret = mkOptionalStrParam '' + Value of the PPK. It may either be an ASCII string, a hex encoded string + if it has a 0x prefix or a Base64 encoded string if + it has a 0s prefix in its value. Should have at least + 256 bits of entropy for 128-bit security. + ''; + + id = mkPrefixedAttrsOfParam (mkOptionalStrParam "") '' + PPK identity the PPK belongs to. Multiple unique identities may be + specified, each having an id prefix, if a secret is + shared between multiple peers. + ''; + } '' + Postquantum Preshared Key (PPK) section for a specific secret. Each PPK is + defined in a unique section having the ppk prefix. + ''; + private = mkPrefixedAttrsOfParams { file = mkOptionalStrParam '' File name in the private folder for which this passphrase should be used. diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 508398f03ace..6c733f093ba8 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -46,7 +46,7 @@ let configFile = pkgs.writeText "nginx.conf" '' user ${cfg.user} ${cfg.group}; - error_log stderr; + error_log ${cfg.logError}; daemon off; ${cfg.config} @@ -341,6 +341,35 @@ in "; }; + logError = mkOption { + default = "stderr"; + description = " + Configures logging. + The first parameter defines a file that will store the log. The + special value stderr selects the standard error file. Logging to + syslog can be configured by specifying the “syslog:” prefix. + The second parameter determines the level of logging, and can be + one of the following: debug, info, notice, warn, error, crit, + alert, or emerg. Log levels above are listed in the order of + increasing severity. Setting a certain log level will cause all + messages of the specified and more severe log levels to be logged. + If this parameter is omitted then error is used. + "; + }; + + preStart = mkOption { + type = types.lines; + default = '' + test -d ${cfg.stateDir}/logs || mkdir -m 750 -p ${cfg.stateDir}/logs + test `stat -c %a ${cfg.stateDir}` = "750" || chmod 750 ${cfg.stateDir} + test `stat -c %a ${cfg.stateDir}/logs` = "750" || chmod 750 ${cfg.stateDir}/logs + chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir} + ''; + description = " + Shell commands executed before the service's nginx is started. + "; + }; + config = mkOption { default = ""; description = " @@ -608,9 +637,7 @@ in stopIfChanged = false; preStart = '' - mkdir -p ${cfg.stateDir}/logs - chmod 700 ${cfg.stateDir} - chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir} + ${cfg.preStart} ${cfg.package}/bin/nginx -c ${configFile} -p ${cfg.stateDir} -t ''; serviceConfig = { diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index a1412bc32904..89f8e8153550 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -387,7 +387,7 @@ let logindHandlerType = types.enum [ "ignore" "poweroff" "reboot" "halt" "kexec" "suspend" - "hibernate" "hybrid-sleep" "lock" + "hibernate" "hybrid-sleep" "suspend-then-hibernate" "lock" ]; in @@ -587,6 +587,15 @@ in ''; }; + services.journald.forwardToSyslog = mkOption { + default = config.services.rsyslogd.enable || config.services.syslog-ng.enable; + defaultText = "config.services.rsyslogd.enable || config.services.syslog-ng.enable"; + type = types.bool; + description = '' + Whether to forward log messages to syslog. + ''; + }; + services.logind.extraConfig = mkOption { default = ""; type = types.lines; @@ -754,6 +763,9 @@ in ForwardToConsole=yes TTYPath=${config.services.journald.console} ''} + ${optionalString (config.services.journald.forwardToSyslog) '' + ForwardToSyslog=yes + ''} ${config.services.journald.extraConfig} ''; diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 8fe59badd335..572092a2ba94 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -606,7 +606,7 @@ in { config = { config, pkgs, ... }: { services.postgresql.enable = true; - services.postgresql.package = pkgs.postgresql96; + services.postgresql.package = pkgs.postgresql_9_6; system.stateVersion = "17.03"; }; diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index 60048911658c..037c0d2f0d82 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -12,7 +12,7 @@ in { virtualbox = { baseImageSize = mkOption { type = types.int; - default = 10 * 1024; + default = 50 * 1024; description = '' The size of the VirtualBox base image in MiB. ''; @@ -61,7 +61,7 @@ in { export HOME=$PWD export PATH=${pkgs.virtualbox}/bin:$PATH - echo "creating VirtualBox pass-through disk wrapper (no copying invovled)..." + echo "creating VirtualBox pass-through disk wrapper (no copying involved)..." VBoxManage internalcommands createrawvmdk -filename disk.vmdk -rawdisk $diskImage echo "creating VirtualBox VM..." @@ -72,9 +72,9 @@ in { --memory ${toString cfg.memorySize} --acpi on --vram 32 \ ${optionalString (pkgs.stdenv.hostPlatform.system == "i686-linux") "--pae on"} \ --nictype1 virtio --nic1 nat \ - --audiocontroller ac97 --audio alsa \ + --audiocontroller ac97 --audio alsa --audioout on \ --rtcuseutc on \ - --usb on --mouse usbtablet + --usb on --usbehci on --mouse usbtablet VBoxManage storagectl "$vmName" --name SATA --add sata --portcount 4 --bootable on --hostiocache on VBoxManage storageattach "$vmName" --storagectl SATA --port 0 --device 0 --type hdd \ --medium disk.vmdk @@ -82,7 +82,7 @@ in { echo "exporting VirtualBox VM..." mkdir -p $out fn="$out/${cfg.vmFileName}" - VBoxManage export "$vmName" --output "$fn" + VBoxManage export "$vmName" --output "$fn" --options manifest rm -v $diskImage diff --git a/nixos/release.nix b/nixos/release.nix index 5412080cca18..51505d6aab9d 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -399,6 +399,7 @@ in rec { tests.radicale = callTest tests/radicale.nix {}; tests.redmine = callTest tests/redmine.nix {}; tests.rspamd = callSubTests tests/rspamd.nix {}; + tests.rsyslogd = callSubTests tests/rsyslogd.nix {}; tests.runInMachine = callTest tests/run-in-machine.nix {}; tests.rxe = callTest tests/rxe.nix {}; tests.samba = callTest tests/samba.nix {}; @@ -467,7 +468,7 @@ in rec { { services.httpd.enable = true; services.httpd.adminAddr = "foo@example.org"; services.postgresql.enable = true; - services.postgresql.package = pkgs.postgresql93; + services.postgresql.package = pkgs.postgresql_9_3; environment.systemPackages = [ pkgs.php ]; }); }; diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index 2d74b59bca46..0b3da0d59c68 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -74,7 +74,6 @@ in { print "$log\n"; # Check that no errors were logged - # The timer can get out of sync due to Hydra's load, so this error is ignored - $hass->fail("cat ${configDir}/home-assistant.log | grep -vF 'Timer got out of sync' | grep -qF ERROR"); + $hass->fail("cat ${configDir}/home-assistant.log | grep -qF ERROR"); ''; }) diff --git a/nixos/tests/opensmtpd.nix b/nixos/tests/opensmtpd.nix index 4c0cbca21010..4d3479168f70 100644 --- a/nixos/tests/opensmtpd.nix +++ b/nixos/tests/opensmtpd.nix @@ -17,11 +17,12 @@ import ./make-test.nix { extraServerArgs = [ "-v" ]; serverConfiguration = '' listen on 0.0.0.0 + action do_relay relay # DO NOT DO THIS IN PRODUCTION! # Setting up authentication requires a certificate which is painful in # a test environment, but THIS WOULD BE DANGEROUS OUTSIDE OF A # WELL-CONTROLLED ENVIRONMENT! - accept from any for any relay + match from any for any action do_relay ''; }; }; @@ -41,8 +42,9 @@ import ./make-test.nix { extraServerArgs = [ "-v" ]; serverConfiguration = '' listen on 0.0.0.0 - accept from any for local deliver to mda \ + action dovecot_deliver mda \ "${pkgs.dovecot}/libexec/dovecot/deliver -d %{user.username}" + match from any for local action dovecot_deliver ''; }; services.dovecot2 = { diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix index eb705536827e..788c8719c8d2 100644 --- a/nixos/tests/plasma5.nix +++ b/nixos/tests/plasma5.nix @@ -26,31 +26,20 @@ import ./make-test.nix ({ pkgs, ...} : services.xserver.displayManager.sddm.theme = "breeze-ocr-theme"; services.xserver.desktopManager.plasma5.enable = true; services.xserver.desktopManager.default = "plasma5"; + services.xserver.displayManager.sddm.autoLogin = { + enable = true; + user = "alice"; + }; virtualisation.memorySize = 1024; environment.systemPackages = [ sddm_theme ]; - - # fontconfig-penultimate-0.3.3 -> 0.3.4 broke OCR apparently, but no idea why. - nixpkgs.config.packageOverrides = superPkgs: { - fontconfig-penultimate = superPkgs.fontconfig-penultimate.override { - version = "0.3.3"; - sha256 = "1z76jbkb0nhf4w7fy647yyayqr4q02fgk6w58k0yi700p0m3h4c9"; - }; - }; }; - enableOCR = true; - testScript = { nodes, ... }: let user = nodes.machine.config.users.users.alice; xdo = "${pkgs.xdotool}/bin/xdotool"; in '' startAll; - # Wait for display manager to start - $machine->waitForText(qr/${user.description}/); - $machine->screenshot("sddm"); - - # Log in - $machine->sendChars("${user.password}\n"); + # wait for log in $machine->waitForFile("/home/alice/.Xauthority"); $machine->succeed("xauth merge ~alice/.Xauthority"); diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix index f8b63c5b6a27..49be0672a8e5 100644 --- a/nixos/tests/postgis.nix +++ b/nixos/tests/postgis.nix @@ -9,7 +9,7 @@ import ./make-test.nix ({ pkgs, ...} : { { pkgs, ... }: { - services.postgresql = let mypg = pkgs.postgresql100; in { + services.postgresql = let mypg = pkgs.postgresql_11; in { enable = true; package = mypg; extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }) ]; diff --git a/nixos/tests/rsyslogd.nix b/nixos/tests/rsyslogd.nix new file mode 100644 index 000000000000..969d59e0f2c2 --- /dev/null +++ b/nixos/tests/rsyslogd.nix @@ -0,0 +1,38 @@ +{ system ? builtins.currentSystem }: + +with import ../lib/testing.nix { inherit system; }; +with pkgs.lib; +{ + test1 = makeTest { + name = "rsyslogd-test1"; + meta.maintainers = [ maintainers.aanderse ]; + + machine = + { config, pkgs, ... }: + { services.rsyslogd.enable = true; + services.journald.forwardToSyslog = false; + }; + + # ensure rsyslogd isn't receiving messages from journald if explicitly disabled + testScript = '' + $machine->waitForUnit("default.target"); + $machine->fail("test -f /var/log/messages"); + ''; + }; + + test2 = makeTest { + name = "rsyslogd-test2"; + meta.maintainers = [ maintainers.aanderse ]; + + machine = + { config, pkgs, ... }: + { services.rsyslogd.enable = true; + }; + + # ensure rsyslogd is receiving messages from journald + testScript = '' + $machine->waitForUnit("default.target"); + $machine->succeed("test -f /var/log/messages"); + ''; + }; +} diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 87f5d0be68a3..b24dbb8f90a5 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -90,5 +90,5 @@ rec { parity-beta = callPackage ./parity/beta.nix { }; parity-ui = callPackage ./parity-ui { }; - particl-core = callPackage ./particl/particl-core.nix { boost = boost165; miniupnpc = miniupnpc_2; }; + particl-core = callPackage ./particl/particl-core.nix { miniupnpc = miniupnpc_2; }; } diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix index b23f3ad42434..33ac2be18322 100644 --- a/pkgs/applications/altcoins/litecoin.nix +++ b/pkgs/applications/altcoins/litecoin.nix @@ -11,13 +11,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.16.2"; + version = "0.16.3"; src = fetchFromGitHub { owner = "litecoin-project"; repo = "litecoin"; rev = "v${version}"; - sha256 = "0xfwh7cxxz6w8kgr4kl48w3zm81n1hv8fxb5l9zx3460im1ffgy6"; + sha256 = "0vc184qfdkjky1qffa7309k6973k4197bkzwcmffc9r5sdfhrhkp"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix index a06f373683a9..d3b20ef2ea36 100644 --- a/pkgs/applications/altcoins/particl/particl-core.nix +++ b/pkgs/applications/altcoins/particl/particl-core.nix @@ -10,31 +10,40 @@ , zeromq , zlib , unixtools +, python3 }: with stdenv.lib; stdenv.mkDerivation rec { name = "particl-core-${version}"; - version = "0.16.2.0"; + version = "0.17.0.2"; src = fetchurl { url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz"; - sha256 = "1d2vvg7avlhsg0rcpd5pbzafnk1w51a2y29xjjkpafi6iqs2l617"; + sha256 = "0bkxdayl0jrfhgz8qzqqpwzv0yavz3nwsn6c8k003jnbcw65fkhx"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ - openssl db48 boost zlib miniupnpc libevent zeromq - unixtools.hexdump + buildInputs = [ openssl db48 boost zlib miniupnpc libevent zeromq unixtools.hexdump python3 ]; + + configureFlags = [ + "--disable-bench" + "--with-boost-libdir=${boost.out}/lib" + ] ++ optionals (!doCheck) [ + "--enable-tests=no" ]; - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; + # Always check during Hydra builds + doCheck = true; + preCheck = "patchShebangs test"; + enableParallelBuilding = true; meta = { description = "Privacy-Focused Marketplace & Decentralized Application Platform"; longDescription= '' An open source, decentralized privacy platform built for global person to person eCommerce. + RPC daemon and CLI client only. ''; homepage = https://particl.io/; maintainers = with maintainers; [ demyanrogozhin ]; diff --git a/pkgs/applications/audio/axoloti/default.nix b/pkgs/applications/audio/axoloti/default.nix index 274233167bd8..3c3198e17348 100644 --- a/pkgs/applications/audio/axoloti/default.nix +++ b/pkgs/applications/audio/axoloti/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, fetchurl, makeWrapper, unzip -, gnumake, gcc-arm-embedded, dfu-util-axoloti, jdk, ant, libfaketime }: +, gnumake, gcc-arm-embedded, binutils-arm-embedded +, dfu-util-axoloti, jdk, ant, libfaketime }: stdenv.mkDerivation rec { version = "1.0.12-2"; @@ -20,7 +21,15 @@ stdenv.mkDerivation rec { sha256 = "0lb5s8pkj80mqhsy47mmq0lqk34s2a2m3xagzihalvabwd0frhlj"; }; - buildInputs = [ makeWrapper unzip gcc-arm-embedded dfu-util-axoloti jdk ant libfaketime ]; + nativeBuildInputs = [ + makeWrapper + unzip + gcc-arm-embedded + binutils-arm-embedded + dfu-util-axoloti + ant + ]; + buildInputs = [jdk libfaketime ]; patchPhase = '' unzip ${chibios} diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index b6a6acf8ab7f..bf9c7b7e129b 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "0bg1h0msd6mpkvirkg4pssa1ak32smv2rlxxsjdm3p29p8gg59px"; }; latestVersion = { # canary & dev - version = "3.4.0.0"; # "Android Studio 3.4 Canary 1" - build = "182.5070326"; - sha256Hash = "03h2yns8s9dqbbc9agxhidpmziy9g3z89nm3byydw43hdz54hxab"; + version = "3.4.0.1"; # "Android Studio 3.4 Canary 2" + build = "183.5081642"; + sha256Hash = "0ck6habkgnwbr10pr3bfy8ywm3dsm21k9jdj7g685v22sw0zy3yk"; }; in rec { # Old alias diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 23ecfb0c19d3..f5fbf1b5f03d 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -289,12 +289,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2018.2.4"; /* updated by script */ + version = "2018.2.5"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1syrxkp4pk95bvx02g2hg0mvn36w098h82k0qv0j6aqv0sidfzjy"; /* updated by script */ + sha256 = "0jnnmhn1gba670q2yprlh3ypa6k21pbg91pshz9aqkdhhmzk4759"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA Release"; @@ -302,12 +302,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2018.2.4"; /* updated by script */ + version = "2018.2.5"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "0z1ga6lzmkn7y7y24984vmp3ilrfc1ak1ddcgsdkwkiq5bx67ck8"; /* updated by script */ + sha256 = "105mzbqm3bx05bmkwyfykz76bzgzzgb9hb6wcagb9fv7dvqyggg6"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA Release"; diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 1a5c9d65583f..9d8c430630e5 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -6,7 +6,7 @@ let verMajor = "1"; verMinor = "1"; - verPatch = "456"; + verPatch = "463"; version = "${verMajor}.${verMinor}.${verPatch}"; ginVer = "1.5"; gwtVer = "2.7.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "rstudio"; repo = "rstudio"; rev = "v${version}"; - sha256 = "0hv07qrbjwapbjrkddasglsgk0x5j7qal468i5rv77krsp09s4fz"; + sha256 = "014g984znsczzy1fyn9y1ly3rbsngryfs674lfgciz60mqnl8im6"; }; # Hack RStudio to only use the input R. diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix index cccf59f3e7bb..ba68a5420a88 100644 --- a/pkgs/applications/editors/thonny/default.nix +++ b/pkgs/applications/editors/thonny/default.nix @@ -4,13 +4,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "thonny"; - version = "3.0.1"; + version = "3.0.5"; src = fetchFromBitbucket { owner = "plas"; repo = pname; - rev = "f66bd266deda11534561a01ede53cf1b71d2c3c0"; - sha256 = "0mjskb0gyddybvlbhm10ch1rwzvmci95b018x67bh67bybdl4hm7"; + rev = "e5a1ad4ae9d24066a769489b1e168b4bd6e00b03"; + sha256 = "1lrl5pj9dpw9i5ij863hd47gfd15nmvglqkl2ldwgfn7kgpsdkz5"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index 6ed6326f16e5..3517351090d7 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "OpenOrienteering-Mapper-${version}"; - version = "0.8.2"; + version = "0.8.3"; buildInputs = [ gdal qtbase qttools qtlocation qtimageformats qtsensors clipper zlib proj doxygen cups]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "OpenOrienteering"; repo = "mapper"; rev = "v${version}"; - sha256 = "02lga6nlal4c7898zc3lv1pcwyv1wpkn7v2xji2kgq68r6aw6j59"; + sha256 = "0pnqwvmg97mgc2ci3abmx07l0njxcrbljh75w8ym31g0jq76pgr9"; }; cmakeFlags = diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index e164a789459b..8fb21e65c951 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -13,8 +13,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.8-12"; - sha256 = "0rq7qhbfsxvclazi1l6kqi4wqsph7hmzcjbh2pmf0276mrkgm7cd"; + version = "7.0.8-14"; + sha256 = "0pbrmzsjc8l4klfsz739rnmw61m712r82ryjl8ycvbxdzxwnwm9v"; patches = []; }; in diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index 532645803808..52df41c683cd 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -8,13 +8,13 @@ assert useUnrar -> unrar != null; stdenv.mkDerivation rec { name = "ahoviewer-${version}"; - version = "1.5.0"; + version = "1.6.4"; src = fetchFromGitHub { owner = "ahodesuka"; repo = "ahoviewer"; rev = version; - sha256 = "1adzxp30fwh41y339ha8i5qp89zf21dw18vcicqqnzvyxbk5r3ig"; + sha256 = "144jmk8w7dnmqy4w81b3kzama7i97chx16pgax2facn72a92921q"; }; enableParallelBuilding = true; @@ -29,11 +29,6 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-base ] ++ stdenv.lib.optional useUnrar unrar; - # https://github.com/ahodesuka/ahoviewer/issues/60 - # Already fixed in the master branch - # TODO: remove this next release - makeFlags = [ ''LIBS=-lssl -lcrypto'' ]; - postPatch = ''patchShebangs version.sh''; postInstall = '' diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index e0aea87c90c3..7777be918975 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -1,23 +1,24 @@ { stdenv, makeDesktopItem, fetchurl, unzip -, gdk_pixbuf, glib, gtk2, atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome2 -, xorg, mozjpeg +, gdk_pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3 +, xorg, mozjpeg, makeWrapper, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "avocode-${version}"; - version = "3.4.0"; + version = "3.6.2"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "1dk4vgam9r5nl8dvpfwrn52gq6r4zxs4zz63p3c4gk73d8qnh4dl"; + sha256 = "1slxxr3j0djqdnbk645sriwl99jp9imndyxiwd8aqggmmlp145a2"; }; - libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome2; [ + libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome3; [ stdenv.cc.cc.lib gdk_pixbuf glib - gtk2 + gtk3 atk + at-spi2-atk pango cairo freetype @@ -29,7 +30,6 @@ stdenv.mkDerivation rec { cups expat udev - GConf libX11 libxcb libXi @@ -54,7 +54,8 @@ stdenv.mkDerivation rec { comment = "The bridge between designers and developers"; }; - buildInputs = [ unzip ]; + nativeBuildInputs = [makeWrapper]; + buildInputs = [ unzip gtk3 gsettings-desktop-schemas]; # src is producing multiple folder on unzip so we must # override unpackCmd to extract it into newly created folder @@ -85,6 +86,10 @@ stdenv.mkDerivation rec { for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do patchelf --set-rpath ${libPath}:$out/ $file done + for file in $out/bin/*; do + wrapProgram $file \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + done ''; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 9aa80fc789c9..ce2bdcbd298c 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -10,11 +10,11 @@ mkDerivation rec { name = "krita-${version}"; - version = "4.1.3"; + version = "4.1.5"; src = fetchurl { url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz"; - sha256 = "0d546dxs552z0pxnaka1jm7ksravw17f777wf593z0pl4ds8dgdx"; + sha256 = "1by8p8ifdp03f05bhg8ygdd1j036anfpjjnzbx63l2fbmy9k6q10"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index c803eb37ad6f..1144d5152847 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, mono, avrbinutils, avrgcc, avrdude, gtk2, xdg_utils }: +{ stdenv, fetchurl, unzip, mono, avrdude, gtk2, xdg_utils }: stdenv.mkDerivation rec { name = "avrdudess-2.2.20140102"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk2 mono]}" # We need PATH from user env for xdg-open to find its tools, which # typically depend on the currently running desktop environment. - export PATH="${stdenv.lib.makeBinPath [ avrgcc avrbinutils avrdude xdg_utils ]}:\$PATH" + export PATH="${stdenv.lib.makeBinPath [ avrdude xdg_utils ]}:\$PATH" # avrdudess must have its resource files in its current working directory cd $out/avrdudess && exec ${mono}/bin/mono "$out/avrdudess/avrdudess.exe" "\$@" diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/applications/misc/bb/default.nix index 0689843af612..f085e4bd7dd5 100644 --- a/pkgs/applications/misc/bb/default.nix +++ b/pkgs/applications/misc/bb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, aalib, ncurses, xorg, libmikmod }: +{ stdenv, lib, fetchurl, darwin, aalib, ncurses, xorg, libmikmod }: stdenv.mkDerivation rec { name = "bb-${version}"; @@ -12,13 +12,17 @@ stdenv.mkDerivation rec { buildInputs = [ aalib ncurses libmikmod xorg.libXau xorg.libXdmcp xorg.libX11 - ]; + ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudio; - meta = with stdenv.lib; { + postPatch = lib.optionalString stdenv.isDarwin '' + sed -i -e '/^#include $/d' *.c + ''; + + meta = with lib; { homepage = http://aa-project.sourceforge.net/bb; description = "AA-lib demo"; license = licenses.gpl2; maintainers = [ maintainers.rnhmjoj ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/dmrconfig/default.nix b/pkgs/applications/misc/dmrconfig/default.nix index 20c6ff57b241..9edf5e4f88c2 100644 --- a/pkgs/applications/misc/dmrconfig/default.nix +++ b/pkgs/applications/misc/dmrconfig/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "dmrconfig-${version}"; - version = "2018-10-20"; + version = "2018-10-29"; src = fetchFromGitHub { owner = "sergev"; repo = "dmrconfig"; - rev = "a4c5f893d2749727493427320c7f01768966ba51"; - sha256 = "0h7hv6fv6v5g922nvgrb0w7hsqbhaw7xmdc6vydh2p3l7sp31vg2"; + rev = "4924d00283c3c81a4b8251669e42aecd96b6145a"; + sha256 = "00a4hmbr71g0d4faskb8q96y6z212g2r4n533yvp88z8rq8vbxxn"; }; buildInputs = [ diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 537627a10d2d..843257a74e55 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "022iw4cq0c009wvqn7wd815jc0nv8198lq3cawn8h6c28hw2mhs1"; + sha256 = "139kzapas1l61w1in9f7c6ybricid4fzryfnvsrfhpaqh83ydn2c"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index c353a779b646..29b6e41a90df 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.47.1"; + version = "0.49.2"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "0n27vyg66jfx4lwswsmdlybly8c9gy5rk7yhy7wzs3rwzlqv1jzj"; + sha256 = "0a320mv6x770vppbz0aw5ikywmy0mxqq1lhc0syp48hgg42d46is"; }; patches = [ diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index 47487029ea01..002fb6351b8b 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -1,488 +1,721 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 [ + { goPackagePath = "github.com/BurntSushi/locker"; fetch = { type = "git"; url = "https://github.com/BurntSushi/locker"; - rev = "a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a"; + rev = "a6e239ea1c69"; sha256 = "1xak4aync4klswq5217qvw191asgla51jr42y94vp109lirm5dzg"; }; } + { goPackagePath = "github.com/BurntSushi/toml"; fetch = { type = "git"; url = "https://github.com/BurntSushi/toml"; - rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + rev = "a368813c5e64"; + sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5"; }; } + { goPackagePath = "github.com/PuerkitoBio/purell"; fetch = { type = "git"; url = "https://github.com/PuerkitoBio/purell"; - rev = "975f53781597ed779763b7b65566e74c4004d8de"; - sha256 = "1j5l793zxrjv09z3cdgs05qn45sbhbm9njsw5cfv168x8z88pd3l"; + rev = "v1.1.0"; + sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91"; }; } + { goPackagePath = "github.com/PuerkitoBio/urlesc"; fetch = { type = "git"; url = "https://github.com/PuerkitoBio/urlesc"; - rev = "de5bf2ad457846296e2031421a34e2568e304e35"; + rev = "de5bf2ad4578"; sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"; }; } + + { + goPackagePath = "github.com/alecthomas/assert"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/assert"; + rev = "405dbfeb8e38"; + sha256 = "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l"; + }; + } + { goPackagePath = "github.com/alecthomas/chroma"; fetch = { type = "git"; url = "https://github.com/alecthomas/chroma"; - rev = "5d7fef2ae60b501bbf28d476c3f273b8017d8261"; + rev = "v0.5.0"; sha256 = "150jv4vhsdi1gj3liwkgicdrwnzgv5qkq2fwznlnzf64vmfb0b9f"; }; } + + { + goPackagePath = "github.com/alecthomas/colour"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/colour"; + rev = "60882d9e2721"; + sha256 = "0iq566534gbzkd16ixg7fk298wd766821vvs80838yifx9yml5vs"; + }; + } + + { + goPackagePath = "github.com/alecthomas/repr"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/repr"; + rev = "117648cd9897"; + sha256 = "05v1rgzdqc8razf702laagrvhvx68xd9yxxmzd3dyz0d6425pdrp"; + }; + } + { goPackagePath = "github.com/bep/debounce"; fetch = { type = "git"; url = "https://github.com/bep/debounce"; - rev = "844797fa1dd9ba969d71b62797ff19d1e49d4eac"; + rev = "v1.1.0"; sha256 = "1sh4zv0hv7f454mhzpl2mbv7ar5rm00wyy5qr78x1h84bgph87wy"; }; } + { goPackagePath = "github.com/bep/gitmap"; fetch = { type = "git"; url = "https://github.com/bep/gitmap"; - rev = "ecb6fe06dbfd6bb4225e7fda7dc15612ecc8d960"; + rev = "v1.0.0"; sha256 = "0zqdl5h4ayi2gi5aqf35f1sjszhbcriksm2bf84fkrg7ngr48jn6"; }; } + { goPackagePath = "github.com/bep/go-tocss"; fetch = { type = "git"; url = "https://github.com/bep/go-tocss"; - rev = "2abb118dc8688b6c7df44e12f4152c2bded9b19c"; + rev = "v0.5.0"; sha256 = "12q7h6nydklq4kg65kcgd85209rx7zf64ba6nf3k7y16knj4233q"; }; } + { goPackagePath = "github.com/chaseadamsio/goorgeous"; fetch = { type = "git"; url = "https://github.com/chaseadamsio/goorgeous"; - rev = "dcf1ef873b8987bf12596fe6951c48347986eb2f"; + rev = "v1.1.0"; sha256 = "07qdqi46klizq3wigxqbiksnlgbrdc8hvmizgzg0aas5iqy88dcb"; }; } + { goPackagePath = "github.com/cpuguy83/go-md2man"; fetch = { type = "git"; url = "https://github.com/cpuguy83/go-md2man"; - rev = "691ee98543af2f262f35fbb54bdd42f00b9b9cc5"; - sha256 = "1864g10y9n6ni0p1yqjhvwyjdh0lgxnf7dlb0c4njazdg5rppww9"; + rev = "v1.0.8"; + sha256 = "1w22dfdamsq63b5rvalh9k2y7rbwfkkjs7vm9vd4a13h2ql70lg2"; }; } + { goPackagePath = "github.com/danwakefield/fnmatch"; fetch = { type = "git"; url = "https://github.com/danwakefield/fnmatch"; - rev = "cbb64ac3d964b81592e64f957ad53df015803288"; + rev = "cbb64ac3d964"; sha256 = "0cbf511ppsa6hf59mdl7nbyn2b2n71y0bpkzbmfkdqjhanqh1lqz"; }; } + + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { goPackagePath = "github.com/disintegration/imaging"; fetch = { type = "git"; url = "https://github.com/disintegration/imaging"; - rev = "0bd5694c78c9c3d9a3cd06a706a8f3c59296a9ac"; + rev = "v1.5.0"; sha256 = "1laxccmzi7q51zxn81ringmdwp8iaipivrl375yc3gq56d70sp0r"; }; } + { goPackagePath = "github.com/dlclark/regexp2"; fetch = { type = "git"; url = "https://github.com/dlclark/regexp2"; - rev = "7632a260cbaf5e7594fc1544a503456ecd0827f1"; - sha256 = "0vhp5r0ywv9p1c74fm8xzclnwx2mg9f0764b3id7a9nwh0plisx2"; + rev = "v1.1.6"; + sha256 = "144s81ndviwhyy20ipxvvfvap8phv5p762glxrz6aqxprkxfarj5"; }; } + { goPackagePath = "github.com/eknkc/amber"; fetch = { type = "git"; url = "https://github.com/eknkc/amber"; - rev = "cdade1c073850f4ffc70a829e31235ea6892853b"; + rev = "cdade1c07385"; sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9"; }; } + + { + goPackagePath = "github.com/fortytw2/leaktest"; + fetch = { + type = "git"; + url = "https://github.com/fortytw2/leaktest"; + rev = "v1.2.0"; + sha256 = "1lf9l6zgzjbcc7hmcjhhg3blx0y8icyxvjmjqqwfbwdk502803ra"; + }; + } + { goPackagePath = "github.com/fsnotify/fsnotify"; fetch = { type = "git"; url = "https://github.com/fsnotify/fsnotify"; - rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; + rev = "v1.4.7"; sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; }; } - { - goPackagePath = "github.com/gobuffalo/envy"; - fetch = { - type = "git"; - url = "https://github.com/gobuffalo/envy"; - rev = "3c96536452167a705ca5a70b831d3810e1e10452"; - sha256 = "0ixqpdmb7kjlarkv0qlbwnbr194sajx9flysnhcldzmciqgk5bqs"; - }; - } + { goPackagePath = "github.com/gobwas/glob"; fetch = { type = "git"; url = "https://github.com/gobwas/glob"; - rev = "f756513aec94125582ee6c0dc94179251ef87370"; - sha256 = "1pyzlvb950864syf2safazv39s7rpi08r7x2vby82kj9ykqgvhc4"; + rev = "v0.2.3"; + sha256 = "0jxk1x806zn5x86342s72dq2qy64ksb3zrvrlgir2avjhwb18n6z"; }; } + { goPackagePath = "github.com/gorilla/websocket"; fetch = { type = "git"; url = "https://github.com/gorilla/websocket"; - rev = "3ff3320c2a1756a3691521efc290b4701575147c"; - sha256 = "1b0kpix2qxv3qiiq739nk9fjh453if0mcpr9gmlizicdpjp5alw2"; + rev = "v1.4.0"; + sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; }; } + { goPackagePath = "github.com/hashicorp/go-immutable-radix"; fetch = { type = "git"; url = "https://github.com/hashicorp/go-immutable-radix"; - rev = "7f3cd4390caab3250a57f30efdb2a65dd7649ecf"; - sha256 = "13nv1dac6i2mjdy8vsd4vwawwja78vggdjcnj1xfykg2k8jbkphv"; + rev = "v1.0.0"; + sha256 = "1v3nmsnk1s8bzpclrhirz7iq0g5xxbw9q5gvrg9ss6w9crs72qr6"; }; } + + { + goPackagePath = "github.com/hashicorp/go-uuid"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-uuid"; + rev = "v1.0.0"; + sha256 = "1jflywlani7583qm4ysph40hsgx3n66n5zr2k84i057fmwa1ypfy"; + }; + } + { goPackagePath = "github.com/hashicorp/golang-lru"; fetch = { type = "git"; url = "https://github.com/hashicorp/golang-lru"; - rev = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3"; - sha256 = "0vg4yn3088ym4sj1d34kr13lp4v5gya7r2nxshp2bz70n46fsqn2"; + rev = "v0.5.0"; + sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f"; }; } + { goPackagePath = "github.com/hashicorp/hcl"; fetch = { type = "git"; url = "https://github.com/hashicorp/hcl"; - rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"; - sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr"; + rev = "v1.0.0"; + sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; }; } + + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "v1.0.0"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { goPackagePath = "github.com/jdkato/prose"; fetch = { type = "git"; url = "https://github.com/jdkato/prose"; - rev = "99216ea17cba4e2f2a4e8bca778643e5a529b7aa"; - sha256 = "1mdh276lmj21jbi22ky8ngdsl9hfcdv6czshycbaiwjr5y9cv7bn"; + rev = "v1.1.0"; + sha256 = "1gjqgrpc7wbqvnhgwyfhxng24qvx37qjy0x2mbikiw1vaygxqsmy"; }; } + { - goPackagePath = "github.com/joho/godotenv"; + goPackagePath = "github.com/kr/pretty"; fetch = { type = "git"; - url = "https://github.com/joho/godotenv"; - rev = "1709ab122c988931ad53508747b3c061400c2984"; - sha256 = "1pym5lydb28ggxrz80q9s26bj2bd80ax1igm1zfhyhx9i3060kif"; + url = "https://github.com/kr/pretty"; + rev = "v0.1.0"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; }; } + + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + }; + } + + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { goPackagePath = "github.com/kyokomi/emoji"; fetch = { type = "git"; url = "https://github.com/kyokomi/emoji"; - rev = "2e9a9507333f3ee28f3fab88c2c3aba34455d734"; + rev = "v1.5.1"; sha256 = "005rxyxlqcd2sfjn686xb52l11wn2w0g5jv042ka6pnsx24r812a"; }; } + + { + goPackagePath = "github.com/magefile/mage"; + fetch = { + type = "git"; + url = "https://github.com/magefile/mage"; + rev = "v1.4.0"; + sha256 = "177hzmmzhk7bcm3jj2cj6d5l9h5ql3cikvndhk4agkslrhwr3xka"; + }; + } + { goPackagePath = "github.com/magiconair/properties"; fetch = { type = "git"; url = "https://github.com/magiconair/properties"; - rev = "c2353362d570a7bfa228149c62842019201cfb71"; + rev = "v1.8.0"; sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; }; } + { goPackagePath = "github.com/markbates/inflect"; fetch = { type = "git"; url = "https://github.com/markbates/inflect"; - rev = "84854b5b4c0dbb0c107480d480a71f7db1fc7dae"; - sha256 = "0b7shs0mxhkl7v7mwp799n7jgjsdbgi81f5hbaz2b936gbxksw7d"; + rev = "a12c3aec81a6"; + sha256 = "0mawr6z9nav4f5j0nmjdxg9lbfhr7wz8zi34g7b6wndmzyf8jbsd"; }; } + + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.4"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + }; + } + { goPackagePath = "github.com/mattn/go-runewidth"; fetch = { type = "git"; url = "https://github.com/mattn/go-runewidth"; - rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"; + rev = "v0.0.3"; sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; }; } + { goPackagePath = "github.com/miekg/mmark"; fetch = { type = "git"; url = "https://github.com/miekg/mmark"; - rev = "057eb9e3ae87944c038036d046101dec0c56e21f"; - sha256 = "0hlqcwx6qqgy3vs13r10wn0d9x0xmww1v9jm09y2dp1ykgbampnk"; + rev = "v1.3.6"; + sha256 = "0q2zrwa2vwk7a0zhmi000zpqrc01zssrj9c5n3573rg68fksg77m"; }; } + { goPackagePath = "github.com/mitchellh/hashstructure"; fetch = { type = "git"; url = "https://github.com/mitchellh/hashstructure"; - rev = "2bca23e0e452137f789efbc8610126fd8b94f73b"; - sha256 = "0vpacsls26474wya360fjhzi6l4y8s8s251c4szvqxh17n5f5gk1"; + rev = "v1.0.0"; + sha256 = "0zgl5c03ip2yzkb9b7fq9ml08i7j8prgd46ha1fcg8c6r7k9xl3i"; }; } + { goPackagePath = "github.com/mitchellh/mapstructure"; fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "f15292f7a699fcc1a38a80977f80a046874ba8ac"; - sha256 = "0zm3nhdvmj3f8q0vg2sjfw1sm3pwsw0ggz501awz95w99664a8al"; + rev = "v1.0.0"; + sha256 = "0f06q4fpzg0c370cvmpsl0iq2apl5nkbz5cd3nba5x5ysmshv1lm"; }; } + { goPackagePath = "github.com/muesli/smartcrop"; fetch = { type = "git"; url = "https://github.com/muesli/smartcrop"; - rev = "f6ebaa786a12a0fdb2d7c6dee72808e68c296464"; + rev = "f6ebaa786a12"; sha256 = "0xbv5wbn0z36nkw9ay3ly6z23lpsrs0khryl1w54fz85lvwh66gp"; }; } + + { + goPackagePath = "github.com/nfnt/resize"; + fetch = { + type = "git"; + url = "https://github.com/nfnt/resize"; + rev = "83c6a9932646"; + sha256 = "005cpiwq28krbjf0zjwpfh63rp4s4is58700idn24fs3g7wdbwya"; + }; + } + { goPackagePath = "github.com/nicksnyder/go-i18n"; fetch = { type = "git"; url = "https://github.com/nicksnyder/go-i18n"; - rev = "04f547cc50da4c144c5fdfd4495aef143637a236"; - sha256 = "1h4ndn822k7i04h9k5dxm6c29mhhhqhl63vzpmz2l1k0zpj7xyd1"; + rev = "v1.10.0"; + sha256 = "1nlvq85c232z5yjs86pxpmkv7hk6gb5pa6j4hhzgdz85adk2ma04"; }; } + { goPackagePath = "github.com/olekukonko/tablewriter"; fetch = { type = "git"; url = "https://github.com/olekukonko/tablewriter"; - rev = "d4647c9c7a84d847478d890b816b7d8b62b0b279"; + rev = "d4647c9c7a84"; sha256 = "1274k5r9ardh1f6gsmadxmdds7zy8rkr55fb9swvnm0vazr3y01l"; }; } + { goPackagePath = "github.com/pelletier/go-toml"; fetch = { type = "git"; url = "https://github.com/pelletier/go-toml"; - rev = "c2dbbc24a97911339e01bda0b8cabdbd8f13b602"; - sha256 = "0v1dsqnk5zmn6ir8jgxijx14s47jvijlqfz3aq435snfrgybd5rz"; + rev = "v1.2.0"; + sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; }; } + + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.0"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { goPackagePath = "github.com/russross/blackfriday"; fetch = { type = "git"; url = "https://github.com/russross/blackfriday"; - rev = "46c73eb196baff5bb07288f245b223bd1a30fba6"; + rev = "46c73eb196ba"; sha256 = "01z1jsdkac09cw95lqq4pahkw9xnini2mb956lvb772bby2x3dmj"; }; } + + { + goPackagePath = "github.com/sanity-io/litter"; + fetch = { + type = "git"; + url = "https://github.com/sanity-io/litter"; + rev = "v1.1.0"; + sha256 = "09nywwxxd6rmhxc7rsvs96ynjszmnvmhwr7dvh1n35hb6h9y7s2r"; + }; + } + + { + goPackagePath = "github.com/sergi/go-diff"; + fetch = { + type = "git"; + url = "https://github.com/sergi/go-diff"; + rev = "v1.0.0"; + sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; + }; + } + { goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; fetch = { type = "git"; url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "86672fcb3f950f35f2e675df2240550f2a50762f"; + rev = "86672fcb3f95"; sha256 = "142m507s9971cl8qdmbcw7sqxnkgi3xqd8wzvfq15p0w7w8i4a3h"; }; } + { goPackagePath = "github.com/spf13/afero"; fetch = { type = "git"; url = "https://github.com/spf13/afero"; - rev = "787d034dfe70e44075ccc060d346146ef53270ad"; - sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1"; + rev = "v1.1.2"; + sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; }; } + { goPackagePath = "github.com/spf13/cast"; fetch = { type = "git"; url = "https://github.com/spf13/cast"; - rev = "8965335b8c7107321228e3e3702cab9832751bac"; - sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; + rev = "v1.3.0"; + sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; }; } + { goPackagePath = "github.com/spf13/cobra"; fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "ff0d02e8555041edecbd0ce27f32c6ea4b214483"; - sha256 = "1ilw6b2nir1bg7hmx8hrn60za37qqm18xvamv90fx5vxq85fsml9"; + rev = "v0.0.3"; + sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; }; } + { goPackagePath = "github.com/spf13/fsync"; fetch = { type = "git"; url = "https://github.com/spf13/fsync"; - rev = "12a01e648f05a938100a26858d2d59a120307a18"; + rev = "12a01e648f05"; sha256 = "1vvbgxbbsc4mvi1axgqgn9pzjz1p495dsmwpc7mr8qxh8f6s0nhv"; }; } + { goPackagePath = "github.com/spf13/jwalterweatherman"; fetch = { type = "git"; url = "https://github.com/spf13/jwalterweatherman"; - rev = "14d3d4c518341bea657dd8a226f5121c0ff8c9f2"; - sha256 = "1f9154lijbz0kkgqwmbphykwl4adv4fvkx6n1p7fdq3x5j9g8i17"; + rev = "4a4406e478ca"; + sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; }; } + { goPackagePath = "github.com/spf13/nitro"; fetch = { type = "git"; url = "https://github.com/spf13/nitro"; - rev = "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8"; + rev = "24d7ef30a12d"; sha256 = "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib"; }; } + { goPackagePath = "github.com/spf13/pflag"; fetch = { type = "git"; url = "https://github.com/spf13/pflag"; - rev = "947b89bd1b7dabfed991ac30e1a56f5193f0c88b"; - sha256 = "0n4h5cb07n96fcw9k8dwnj6yisf2x357lsiwjmrq6xr1vkzdlk8c"; + rev = "v1.0.2"; + sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2"; }; } + { goPackagePath = "github.com/spf13/viper"; fetch = { type = "git"; url = "https://github.com/spf13/viper"; - rev = "907c19d40d9a6c9bb55f040ff4ae45271a4754b9"; - sha256 = "177ziws6mwxdlvicmgpv7w7zy5ri2wgnw2f2v3789b5skv9d6a6b"; + rev = "v1.2.0"; + sha256 = "0klv7dyllvv9jkyspy4ww5nrz24ngb3adlh884cbdjn7562bhi47"; }; } + + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "f2347ac6c9c9"; + sha256 = "0ns8zc2n8gpcsd1fdaqbq7a8d939lnaxraqx5nr2fi2zdxqyh7hm"; + }; + } + { goPackagePath = "github.com/tdewolff/minify"; fetch = { type = "git"; url = "https://github.com/tdewolff/minify"; - rev = "948b6490cf3cacab5f4d7474104c3d21bf6eda46"; - sha256 = "1js5l0405kbic53qgim0lj3crw7cc2a2sbga35h9qcnm8l3cx22f"; + rev = "v2.3.5"; + sha256 = "0x67kgjhc6mfzjhr4xmw0j3qapzhkgwwahvv5b44rb449ml2qx5m"; }; } + { goPackagePath = "github.com/tdewolff/parse"; fetch = { type = "git"; url = "https://github.com/tdewolff/parse"; - rev = "dd9676af8dd934a61082c5b3038e79626847fa32"; - sha256 = "1hp9qh8knx3q57aw5qavsf7ia3mxm8ka0bk6kjkqkqq8k9jq97qk"; + rev = "v2.3.3"; + sha256 = "190y2jykp8qyp6y58ky1v1fvmaqjnrsr1ksbqrrspf1gpjy69i94"; }; } + + { + goPackagePath = "github.com/tdewolff/test"; + fetch = { + type = "git"; + url = "https://github.com/tdewolff/test"; + rev = "265427085153"; + sha256 = "1h0cmsjjia92w50dzr06c5h10zd5c7snhpixqjv94wbl7dv80yp0"; + }; + } + { goPackagePath = "github.com/wellington/go-libsass"; fetch = { type = "git"; url = "https://github.com/wellington/go-libsass"; - rev = "615eaa47ef794d037c1906a0eb7bf85375a5decf"; + rev = "615eaa47ef79"; sha256 = "0imjiskn4vq7nml5jwb1scgl61jg53cfpkjnb9rsc6m8gsd8s16s"; }; } + { goPackagePath = "github.com/yosssi/ace"; fetch = { type = "git"; url = "https://github.com/yosssi/ace"; - rev = "2b21b56204aee785bf8d500c3f9dcbe3ed7d4515"; - sha256 = "0cgpq1zdnh8l8zsn9w63asc9k7cm6k4qvjgrb4hr1106h8fjwfma"; + rev = "v0.0.5"; + sha256 = "1kbvbc56grrpnl65grygd23gyn3nkkhxdg8awhzkjmd0cvki8w1f"; }; } + { goPackagePath = "golang.org/x/image"; fetch = { type = "git"; url = "https://go.googlesource.com/image"; - rev = "c73c2afc3b812cdd6385de5a50616511c4a3d458"; + rev = "c73c2afc3b81"; sha256 = "1kkafy29vz5xf6r29ghbvvbwrgjxwxvzk6dsa2qhyp1ddk6l2vkz"; }; } + { goPackagePath = "golang.org/x/net"; fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "922f4815f713f213882e8ef45e0d315b164d705c"; - sha256 = "1ci1rxk2d6hmfsjjc19n2sxhyn4jqr5ia3ykyah1h08p0pn7k52w"; + rev = "161cd47e91fd"; + sha256 = "0254ld010iijygbzykib2vags1dc0wlmcmhgh4jl8iny159lhbcv"; }; } + { goPackagePath = "golang.org/x/sync"; fetch = { type = "git"; url = "https://go.googlesource.com/sync"; - rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca"; + rev = "1d60e4601c6f"; sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; }; } + { goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "4ea2f632f6e912459fe60b26b1749377f0d889d5"; - sha256 = "16pdi4mmjlcrjdcz7k559jqnsvkhdmff68bbqq7ii1lp8vrpqqmy"; + rev = "d0be0721c37e"; + sha256 = "081wyvfnlf842dqg03raxfz6lldlxpmyh1prix9lmrrm65arxb12"; }; } + { goPackagePath = "golang.org/x/text"; fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "6e3c4e7365ddcc329f090f96e4348398f6310088"; - sha256 = "1r511ncipn7sdlssn06fpzcpy4mp4spagni4ryxq86p2b0bi8pn4"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; }; } + + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + }; + } + { goPackagePath = "gopkg.in/yaml.v2"; fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + rev = "v2.2.1"; sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; }; } diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index b94d067dd18d..bc2c8978a67e 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -1,22 +1,6 @@ { stdenv, pkgs, python3 }: -let - python = python3.override { - packageOverrides = self: super: { - - # https://github.com/pimutils/khal/issues/780 - python-dateutil = super.python-dateutil.overridePythonAttrs (oldAttrs: rec { - version = "2.6.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "891c38b2a02f5bb1be3e4793866c8df49c7d19baabf9c1bad62547e0b4866aca"; - }; - }); - - }; - }; - -in with python.pkgs; buildPythonApplication rec { +with python3.pkgs; buildPythonApplication rec { pname = "khal"; version = "0.9.10"; @@ -50,6 +34,9 @@ in with python.pkgs; buildPythonApplication rec { install -D misc/__khal $out/share/zsh/site-functions/__khal ''; + # One test fails as of 0.9.10 due to the upgrade to icalendar 4.0.3 + doCheck = false; + checkPhase = '' py.test ''; @@ -58,6 +45,6 @@ in with python.pkgs; buildPythonApplication rec { homepage = http://lostpackets.de/khal/; description = "CLI calendar application"; license = licenses.mit; - maintainers = with maintainers; [ jgeerds ]; + maintainers = with maintainers; [ jgeerds gebner ]; }; } diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 7068d8aedd37..daeb8b159f7a 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -13,12 +13,12 @@ let inherit (python2.pkgs) paramiko pycairo pyodbc; in stdenv.mkDerivation rec { pname = "mysql-workbench"; - version = "8.0.12"; + version = "8.0.13"; name = "${pname}-${version}"; src = fetchurl { url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; - sha256 = "0d6k1kw0bi3q5dlilzlgds1gcrlf7pis4asm3d6pssh2jmn5hh82"; + sha256 = "1p4xy2a5cin1l06j4ixpgp1ynhjdj5gax4fjhznspch3c63jp9hj"; }; patches = [ diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index d97f2d2c0489..051e7139a23d 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "nnn-${version}"; - version = "1.9"; + version = "2.0"; src = fetchFromGitHub { owner = "jarun"; repo = "nnn"; rev = "v${version}"; - sha256 = "0z7mr9lql5hz0518wzkj8fdsdp8yh17fr418arjxjn66md4kwgpg"; + sha256 = "16c6fimr1ayb2x3mvli70x2va3nz106jdfyqn53bhss7zjqvszxl"; }; configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf); diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index 8a941a719f29..0aecc43d1e53 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/applications/misc/opentx/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, cmake, gcc-arm-embedded, python +, cmake, gcc-arm-embedded, binutils-arm-embedded, python , qt5, SDL, gmock , dfu-util, avrdude }: @@ -21,10 +21,12 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + gcc-arm-embedded binutils-arm-embedded + ]; buildInputs = with qt5; [ - gcc-arm-embedded python python.pkgs.pyqt4 qtbase qtmultimedia qttranslations SDL gmock diff --git a/pkgs/applications/misc/pbpst/default.nix b/pkgs/applications/misc/pbpst/default.nix new file mode 100644 index 000000000000..fcf88200133c --- /dev/null +++ b/pkgs/applications/misc/pbpst/default.nix @@ -0,0 +1,49 @@ +{ llvmPackages, stdenv, fetchFromGitHub +, python36Packages, which, pkgconfig, curl, git, gettext, jansson + +# Optional overrides +, maxFileSize ? 64 # in MB +, provider ? "https://ptpb.pw/" +}: + +llvmPackages.stdenv.mkDerivation rec { + version = "unstable-2018-01-11"; + name = "pbpst-${version}"; + + src = fetchFromGitHub { + owner = "HalosGhost"; + repo = "pbpst"; + rev = "ecbe08a0b72a6e4212f09fc6cf52a73506992346"; + sha256 = "0dwhmw1dg4hg75nlvk5kmvv3slz2n3b9x65q4ig16agwqfsp4mdm"; + }; + + nativeBuildInputs = [ + python36Packages.sphinx + which + pkgconfig + curl + git + gettext + ]; + buildInputs = [ curl jansson ]; + + patchPhase = '' + patchShebangs ./configure + + # Remove hardcoded check for libs in /usr/lib/ + sed -e '64,67d' -i ./configure + ''; + + configureFlags = [ + "--file-max=${toString (maxFileSize * 1024 * 1024)}" # convert to bytes + "--provider=${provider}" + ]; + + meta = with stdenv.lib; { + description = "A command-line libcurl C client for pb deployments"; + inherit (src.meta) homepage; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ tmplt ]; + }; +} diff --git a/pkgs/applications/misc/tabula/default.nix b/pkgs/applications/misc/tabula/default.nix new file mode 100644 index 000000000000..52e39b98a3b6 --- /dev/null +++ b/pkgs/applications/misc/tabula/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchzip, jre, makeWrapper }: + + +stdenv.mkDerivation rec { + name = "tabula-${version}"; + version = "1.2.1"; + + + src = fetchzip { + url = "https://github.com/tabulapdf/tabula/releases/download/v${version}/tabula-jar-${version}.zip"; + sha256 = "0lkpv8hkji81fanyxm7ph8421fr9a6phqc3pbhw2bc4gljg7sgxi"; + }; + + + buildInputs = [ makeWrapper ]; + + + installPhase = '' + mkdir -pv $out/share/tabula + cp -v * $out/share/tabula + + makeWrapper ${jre}/bin/java $out/bin/tabula --add-flags "-jar $out/share/tabula/tabula.jar" + ''; + + + meta = with stdenv.lib; { + description = "A tool for liberating data tables locked inside PDF files"; + longDescription = '' + If you’ve ever tried to do anything with data provided to you in PDFs, you + know how painful it is — there's no easy way to copy-and-paste rows of data + out of PDF files. Tabula allows you to extract that data into a CSV or + Microsoft Excel spreadsheet using a simple, easy-to-use interface. + ''; + homepage = https://tabula.technology/; + license = licenses.mit; + maintainers = [ maintainers.dpaetzel ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/truecrypt/default.nix b/pkgs/applications/misc/truecrypt/default.nix deleted file mode 100644 index 5bb614ac68b1..000000000000 --- a/pkgs/applications/misc/truecrypt/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -/* -Requirements for Building TrueCrypt for Linux and macOS: ------------------------------------------------------------ - -- GNU Make -- GNU C++ Compiler 4.0 or compatible -- Apple XCode (macOS only) -- pkg-config -- wxWidgets 2.8 library source code (available at http://www.wxwidgets.org) -- FUSE library (available at http://fuse.sourceforge.net and - http://code.google.com/p/macfuse) - - -Instructions for Building TrueCrypt for Linux and macOS: ------------------------------------------------------------ - -1) Change the current directory to the root of the TrueCrypt source code. - -2) Run the following command to configure the wxWidgets library for TrueCrypt - and to build it: - - $ make WX_ROOT=/usr/src/wxWidgets wxbuild - - The variable WX_ROOT must point to the location of the source code of the - wxWidgets library. Output files will be placed in the './wxrelease/' - directory. - -3) To build TrueCrypt, run the following command: - - $ make - -4) If successful, the TrueCrypt executable should be located in the directory - 'Main'. - -By default, a universal executable supporting both graphical and text user -interface is built. To build a console-only executable, which requires no GUI -library, use the 'NOGUI' parameter: - - $ make NOGUI=1 WX_ROOT=/usr/src/wxWidgets wxbuild - $ make NOGUI=1 -*/ - -{ fetchurl, stdenv, pkgconfig, nasm, fuse, wxGTK, lvm2, - wxGUI ? true -}: - -stdenv.mkDerivation { - name = "truecrypt-7.1a"; - - patchPhase = "patch -p0 < ${./gcc6.patch}"; - - preBuild = '' - cp $pkcs11h pkcs11.h - cp $pkcs11th pkcs11t.h - cp $pkcs11fh pkcs11f.h - ''; - - makeFlags = [ - ''PKCS11_INC="`pwd`"'' - (if wxGUI then "" else "NOGUI=1") - ]; - - installPhase = '' - install -D -t $out/bin Main/truecrypt - install -D License.txt $out/share/$name/LICENSE - ''; - - src = fetchurl { - url = https://fossies.org/linux/misc/old/TrueCrypt-7.1a-Source.tar.gz; - sha256 = "e6214e911d0bbededba274a2f8f8d7b3f6f6951e20f1c3a598fc7a23af81c8dc"; - }; - - pkcs11h = fetchurl { - url = ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/pkcs11.h; - sha256 = "1563d877b6f8868b8eb8687358162bfb7f868104ed694beb35ae1c5cf1a58b9b"; - }; - - pkcs11th = fetchurl { - url = ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/pkcs11t.h; - sha256 = "8ce68616304684f92a7e267bcc8f486441e92a5cbdfcfd97e69ac9a0b436fb7b"; - }; - - pkcs11fh = fetchurl { - url = ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-11/v2-20/pkcs11f.h; - sha256 = "5ae6a4f32ca737e02def3bf314c9842fb89be82bf00b6f4022a97d8d565522b8"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fuse lvm2 wxGTK nasm ]; - - meta = { - description = "Free Open-Source filesystem on-the-fly encryption"; - homepage = http://www.truecrypt.org/; - license = "TrueCrypt License Version 2.6"; - maintainers = with stdenv.lib.maintainers; [ ryantm ]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/applications/misc/truecrypt/gcc6.patch b/pkgs/applications/misc/truecrypt/gcc6.patch deleted file mode 100644 index 6e8c7da69e87..000000000000 --- a/pkgs/applications/misc/truecrypt/gcc6.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- Main/Resources.cpp 2016-05-16 16:47:35.846462041 +0200 -+++ Main/Resources.cpp 2016-05-16 17:12:21.838202520 +0200 -@@ -45,13 +45,13 @@ - strBuf.CopyFrom (res); - return string (reinterpret_cast (strBuf.Ptr())); - #else -- static const char LanguageXml[] = -+ static byte LanguageXml[] = - { - # include "Common/Language.xml.h" - , 0 - }; - -- return string (LanguageXml); -+ return string ((const char*) LanguageXml); - #endif - } - -@@ -64,13 +64,13 @@ - strBuf.CopyFrom (res); - return string (reinterpret_cast (strBuf.Ptr())); - #else -- static const char License[] = -+ static byte License[] = - { - # include "License.txt.h" - , 0 - }; - -- return string (License); -+ return string ((const char*) License); - #endif - } - ---- Main/Forms/PreferencesDialog.cpp 2016-05-16 17:14:47.704707908 +0200 -+++ Main/Forms/PreferencesDialog.cpp 2016-05-16 17:15:56.927964437 +0200 -@@ -414,11 +414,11 @@ - libExtension = wxDynamicLibrary::CanonicalizeName (L"x"); - - #ifdef TC_MACOSX -- extensions.push_back (make_pair (L"dylib", LangString["DLL_FILES"])); -+ extensions.push_back (make_pair (L"dylib", static_cast(LangString["DLL_FILES"].wc_str()))); - #endif - if (!libExtension.empty()) - { -- extensions.push_back (make_pair (libExtension.Mid (libExtension.find (L'.') + 1), LangString["DLL_FILES"])); -+ extensions.push_back (make_pair (static_cast(libExtension.Mid (libExtension.find (L'.') + 1).wc_str()), static_cast(LangString["DLL_FILES"].wc_str()))); - extensions.push_back (make_pair (L"*", L"")); - } - ---- Main/GraphicUserInterface.cpp 2016-05-16 17:16:38.724591342 +0200 -+++ Main/GraphicUserInterface.cpp 2016-05-16 17:17:09.854562653 +0200 -@@ -1445,7 +1445,7 @@ - FilePath GraphicUserInterface::SelectVolumeFile (wxWindow *parent, bool saveMode, const DirectoryPath &directory) const - { - list < pair > extensions; -- extensions.push_back (make_pair (L"tc", LangString["TC_VOLUMES"])); -+ extensions.push_back (make_pair (L"tc", static_cast(LangString["TC_VOLUMES"].wc_str()))); - - FilePathList selFiles = Gui->SelectFiles (parent, LangString[saveMode ? "OPEN_NEW_VOLUME" : "OPEN_VOL_TITLE"], saveMode, false, extensions, directory); - diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix index bc5b19e77370..8b64bcca667d 100644 --- a/pkgs/applications/misc/veracrypt/default.nix +++ b/pkgs/applications/misc/veracrypt/default.nix @@ -1,43 +1,38 @@ -{ fetchurl, stdenv, pkgconfig, yasm, fuse, wxGTK30, lvm2, makeself, - wxGUI ? true -}: +{ stdenv, fetchurl, pkgconfig, makeself, yasm, fuse, wxGTK, lvm2 }: with stdenv.lib; stdenv.mkDerivation rec { - name = "veracrypt-${version}"; - version = "1.22"; + pname = "veracrypt"; + name = "${pname}-${version}"; + version = "1.23"; src = fetchurl { - url = "https://launchpad.net/veracrypt/trunk/${version}/+download/VeraCrypt_${version}_Source.tar.bz2"; - sha256 = "0w5qyxnx03vn93ach1kb995w2mdg43s82gf1isbk206sxp00qk4y"; + url = "https://launchpad.net/${pname}/trunk/${version}/+download/VeraCrypt_${version}_Source.tar.bz2"; + sha256 = "009lqi43n2w272sxv7y7dz9sqx15qkx6lszkswr8mwmkpgkm0px1"; }; - unpackPhase = - '' - tar xjf $src - cd src - ''; + sourceRoot = "src"; - nativeBuildInputs = [ makeself yasm pkgconfig ]; - buildInputs = [ fuse lvm2 ] - ++ optional wxGUI wxGTK30; - makeFlags = optionalString (!wxGUI) "NOGUI=1"; + nativeBuildInputs = [ makeself pkgconfig yasm ]; + buildInputs = [ fuse lvm2 wxGTK ]; - installPhase = - '' - mkdir -p $out/bin - cp Main/veracrypt $out/bin - mkdir -p $out/share/$name - cp License.txt $out/share/$name/LICENSE - mkdir -p $out/share/applications - sed "s,Exec=.*,Exec=$out/bin/veracrypt," Setup/Linux/veracrypt.desktop > $out/share/applications/veracrypt.desktop - ''; + enableParallelBuilding = true; + + installPhase = '' + install -Dm 755 Main/${pname} "$out/bin/${pname}" + install -Dm 444 Resources/Icons/VeraCrypt-256x256.xpm "$out/share/pixmaps/${pname}.xpm" + install -Dm 444 License.txt -t "$out/share/doc/${pname}/" + install -d $out/share/applications + substitute Setup/Linux/${pname}.desktop $out/share/applications/${pname}.desktop \ + --replace "Exec=/usr/bin/veracrypt" "Exec=$out/bin/veracrypt" \ + --replace "Icon=veracrypt" "Icon=veracrypt.xpm" + ''; meta = { description = "Free Open-Source filesystem on-the-fly encryption"; homepage = https://www.veracrypt.fr/; - license = "VeraCrypt License"; + license = [ licenses.asl20 /* or */ "TrueCrypt License version 3.0" ]; maintainers = with maintainers; [ dsferruzza ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 4cbd44c100d6..a011d0a892e9 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,4 +1,4 @@ -{ stdenv, gn, ninja, which, nodejs, fetchurl, fetchpatch, gnutar +{ stdenv, llvmPackages, gn, ninja, which, nodejs, fetchurl, fetchpatch, gnutar # default dependencies , bzip2, flac, speex, libopus @@ -130,14 +130,16 @@ let patches = optional enableWideVine ./patches/widevine.patch ++ [ ./patches/nix_plugin_paths_68.patch ./patches/remove-webp-include-69.patch + # Unfortunately, chromium regularly breaks on major updates and - # then needs various patches backported. Good sources for such patches and other hints: + # then needs various patches backported in order to be compiled with GCC. + # Good sources for such patches and other hints: # - https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/ # - https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium # - https://github.com/chromium/chromium/search?q=GCC&s=committer-date&type=Commits # # ++ optional (versionRange "68" "72") ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) - ] ++ optionals (versionOlder version "71") [ + ] ++ optionals (!stdenv.cc.isClang && (versionRange "70" "71")) [ ( githubPatch "cbdb8bd6567c8143dc8c1e5e86a21a8ea064eea4" "0258qlffp6f6izswczb11p8zdpn550z5yqa9z7gdg2rg5171n5i8" ) ( githubPatch "e98f8ef8b2f236ecbb01df8c39e6ee1c8fbe8d7d" "1ky5xrzch6aya87kn0bgb31lksl3g8kh2v8k676ks7pdl2v132p9" ) ( githubPatch "a4de8da116585357c123d71e5f54d1103824c6df" "1y7afnjrsz6j2l3vy1ms8mrkbb51xhcafw9r371algi48il7rajm" ) @@ -159,7 +161,7 @@ let sha256 = "018fbdzyw9rvia8m0qkk5gv8q8gl7x34rrjbn7mi1fgxdsayn22s"; } ); - + postPatch = '' # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ @@ -207,10 +209,16 @@ let '' + optionalString stdenv.isAarch64 '' substituteInPlace build/toolchain/linux/BUILD.gn \ --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' + '' + optionalString stdenv.cc.isClang '' + mkdir -p third_party/llvm-build/Release+Asserts/bin + ln -s ${stdenv.cc}/bin/clang third_party/llvm-build/Release+Asserts/bin/clang + ln -s ${stdenv.cc}/bin/clang++ third_party/llvm-build/Release+Asserts/bin/clang++ + ln -s ${llvmPackages.llvm}/bin/llvm-ar third_party/llvm-build/Release+Asserts/bin/llvm-ar ''; gnFlags = mkGnFlags ({ linux_use_bundled_binutils = false; + use_lld = false; use_gold = true; gold_path = "${stdenv.cc}/bin"; is_debug = false; @@ -224,7 +232,7 @@ let use_cups = cupsSupport; treat_warnings_as_errors = false; - is_clang = false; + is_clang = stdenv.cc.isClang; clang_use_chrome_plugins = false; remove_webcore_debug_symbols = true; enable_swiftshader = false; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 686e8fadec34..88b0a89db4b1 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,4 +1,4 @@ -{ newScope, stdenv, makeWrapper, makeDesktopItem, ed +{ newScope, stdenv, llvmPackages, makeWrapper, makeDesktopItem, ed , glib, gtk3, gnome3, gsettings-desktop-schemas # package customization @@ -14,12 +14,13 @@ , commandLineArgs ? "" }: +assert stdenv.cc.isClang -> (stdenv == llvmPackages.stdenv); let callPackage = newScope chromium; chromium = { - inherit stdenv; - + inherit stdenv llvmPackages; + upstream-info = (callPackage ./update.nix {}).getChannel channel; mkChromiumDerivation = callPackage ./common.nix { diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index c5622f0c63cb..ed3a58f62dbd 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -1,4 +1,4 @@ -{ stdenv +{ stdenv, gcc , jshon , glib , nspr @@ -69,7 +69,7 @@ let ! find -iname '*.so' -exec ldd {} + | grep 'not found' ''; - PATCH_RPATH = mkrpath [ stdenv.cc.cc glib nspr nss ]; + PATCH_RPATH = mkrpath [ gcc.cc glib nspr nss ]; patchPhase = '' chmod +x libwidevinecdm.so libwidevinecdmadapter.so @@ -110,7 +110,7 @@ let patchPhase = '' chmod +x libpepflashplayer.so - patchelf --set-rpath "${mkrpath [ stdenv.cc.cc ]}" libpepflashplayer.so + patchelf --set-rpath "${mkrpath [ gcc.cc ]}" libpepflashplayer.so ''; doCheck = true; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index bca9231e8662..8162f43776da 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0dqfwghl73gcmbnl9wb3i5wz8q65y1vhg7n0m2nh0hv33w1w4mp9"; - sha256bin64 = "0x7npns1ng7p4w1qswcj889v9lplvy2wv1ccxrk4ilyqiwzvwy1z"; - version = "70.0.3538.67"; + sha256 = "0kkdfp5f3gmzngfj1nfw023bpyvm47h94k9rpwml2kxlijswd1gl"; + sha256bin64 = "13ghx5ysl8f2iphdvjh698q4jksh765ljjrd74m6x0ih6qm0ksaq"; + version = "71.0.3578.20"; }; dev = { - sha256 = "1kw0rn58s4nd43z2qkjph7aid0s3jnmm650d7k1yxppgmfsal246"; - sha256bin64 = "0518qrghjk5jlzhmynk6nngp5i81bpxi3880gimpbd7bblj6dg7y"; - version = "71.0.3578.10"; + sha256 = "1d7q8hbqbxy2izdvv4d9126ljiglsfc3w7wns3zbbbiyqa2rj00y"; + sha256bin64 = "0v6yahsvsgxcqg6k84lgr589rnx9af1r2axn7cggyn1a2lk63jck"; + version = "72.0.3590.0"; }; stable = { - sha256 = "0dqfwghl73gcmbnl9wb3i5wz8q65y1vhg7n0m2nh0hv33w1w4mp9"; - sha256bin64 = "0ihs2xfb2zn8aq11kg7miw9rnjwc6l4k5jgf24dm661463xmd3ha"; - version = "70.0.3538.67"; + sha256 = "0j84556r3m4igigqsx9zvw4kvbn4psfsi7m8xhcvfxc39ingh569"; + sha256bin64 = "082cf9d1wm36w4i09ai4xnprvxfqdar6cbgsxz5q5srd41mqdy6p"; + version = "70.0.3538.77"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 8c3d7dc7a4a3..2089b1c5e22f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,995 +1,995 @@ { - version = "64.0b3"; + version = "64.0b5"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ach/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ach/firefox-64.0b5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "6780c222879e7199a430102865afeb7959a98ff05d5dd0b153fb545d0870bbc3fbd51fb51d6a88e18d57ab71e157dc15d2631754437dc8b4d4826d4c57b5ac6a"; + sha512 = "d57da255abe658e1b5fdb2156fe737d3ecd996320a554d67dc9de038cc6065a9798009de94c0d3530f6cadda044578772d13a6a2647d71e4e52507d4b4ff0b8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/af/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/af/firefox-64.0b5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "e209850c490e90d64e715b0725bee788d3e10a727253dfdd344ff100893f3e407b10c684a4783be369f35d96c632d0f4809c353370d093daf855dbf7b0486fc6"; + sha512 = "09f84b78c77d888724c5b66c69d4ca266568b70f861e858a978ebadf592c0fd341f338792ec13a95ac0a8518442ef8db6eb1e3cf34154c9473c739367c2b3c83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/an/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/an/firefox-64.0b5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "b79953646a31876e4db9636ff5a87eef3e84722b33bab3c146a68b64c4e04f02d2b0b58b4c51f5480573d77cfa859415e1b8257d5082c7c01ca8380715a44bec"; + sha512 = "809d1de6ad2e9b488b8e327ec0e76ba412f63a52c7959ed6770b724cfd295f1d2abb0f2e3a30ad688b3c35b7c67aa7b3bb17c22c55219c136172fdac46bb0a88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ar/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ar/firefox-64.0b5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "fa511dec672dd61a10d57963da29b83847a5b791b37f386675ef6e7bf86ac7c57aa74114c8b67421650f743d4b0bd44cc9be9ab5bd0cb5fa90403c60eeac00db"; + sha512 = "2d712f71aa187e378ebe7a19288e9ace821485e49787c5c52c9e7bba5d363f026625762e3a3cefea3edee519afb8854068ada726961f1c3722f2dc8dc1fb4a28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/as/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/as/firefox-64.0b5.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "f42e5366a7dedf5a113911f1dcfcf8736ff1a0b037059b47f4b0e6021e4a3dd3dfbf1f3afd9873382bdaa1cd8cc535b07a97d5e34eaa3838a98a8bb57f8e8279"; + sha512 = "fa664a245fa86dff7a49bd03514568373b571681efa6a04a6c45d2168aa50700f0c9a5c0616ac05063cdfc015326d88c703799e2f267db0d62a565a4c6963630"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ast/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ast/firefox-64.0b5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "0bf6c6fc480a1d7bf71f2eefeddcfe1fd8ae2c6b40b369e42e18487075f3744b98dadf61a94a10989b9b606256292bf4d016acc2089014ac71ae160028351df0"; + sha512 = "922e914bf58ee148e7c2abe9390389306b8ca9414f1dd6eed1615b4ef76cb2e872432a81103b3f4ae9a89dae5341d079c7d7ab511af0377a5bfd62405a379957"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/az/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/az/firefox-64.0b5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "a287d058701dad9c8f9dcd7b2e9a473471126fab1e1cc0c64eab5dd34025a4d10d74c63d1894f04ce55513c26c1effc3b8078b3d59fd85cb3be9a2b78fe76ae7"; + sha512 = "fd7a9089521c2fc3a94b026e7ddf795b48020b97acc5b2b0e3a20c0cdacabb51b5711a9ac784a43c506c477ae6fd0e2628774f4239dc8d190cf6f4f555f08076"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/be/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/be/firefox-64.0b5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "84c511d0fb20709cbb32a51c2e488102899a73f6c7bf17a8367ceda6dcb838a3052c3e6c92f6cb86b5f881c83398e23ff21aeb4abc6e658ad855809dde1fd5e1"; + sha512 = "d199ed2918061c39a2cbbd18277812b15b08090aea8e87d740617b46fbd5dcae172bf8fd4b1ef71695171f530db73df05c8eab0f9c60691318d10217dafd8d4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/bg/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/bg/firefox-64.0b5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "2905bfc56034a2f6329e8247cdaebe212cec97be86806d95f22eb0fa07e4a3ac94652b52a1e0dae4e725d9941a008f7f923dffd5679bf747ddbd645724100286"; + sha512 = "c5c36e85090df048fdf18dec0374371139b1948a532c9b5e71109d517ad44bd91c150efcbd9e8a7588a8e4cbcff38f9e67640d4f812aae694720510aad19397e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/bn-BD/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/bn-BD/firefox-64.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "917f7821a7ba71a8dde46e53468b4e3a9d4a5315c9b4ae9af2ae0bdce56b5a0333c12ba44604dd7159c4ecb61a7d5087fe60d83a3c8e7734cd1a90c4aa29b259"; + sha512 = "6fa41190dcd2fe25c494e7b259aeca89d9482162221d2244883c945a95a035872810deb0b14acc3fe0f0b29ec1eb6d809e2bf58bec72787d67cfa2722ea6916a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/bn-IN/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/bn-IN/firefox-64.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "12b515b616cb55dae73bbda075a141dbc96a38a1b2d2ad50b56a48fa58bc3c802251098c61a08105f00affcfc79b71615f18c11d57da92d78d66eb737f8a3c46"; + sha512 = "3c32deb94bab358c04f09106410c7191f42727fb7414ed64f835c28ad69f7f09cbdb2c040f1cd2c5cd15ed3ba704d1454ae11947bc1e6bff5f6123ed7b0783a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/br/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/br/firefox-64.0b5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "c6fadf68795b0ceaa5e162ab145da5eb26006e481a9e85923bcb37ef3ea6e6d83a0333d76954f4865c4900b015806a3a3c350839eaca5d6ce56ebb3f5170d97b"; + sha512 = "d8c21bd0b7c6317dd565f0015e5749cfe668b586b0b05ae8a9e7cec9a9dd8ca0396c610ac4ae864d1e5a06d92c313bdd6b538eb1d8665a5e2982259b62f8ac29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/bs/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/bs/firefox-64.0b5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "05f3ec07875e53afae59ca9ddbf9873529f2350f1a19a2adf29f205c165afcf13a54a54f2420944665a702aa9d8f738c22519ff9172720d09de6e720dd2db0e7"; + sha512 = "a09f1a588086f043e3cf2efc3fdcd871e4423602138b7dc5340e02fc628c5b6cefa914d5b892712687b406a8590590dd9c74b3eb3509f2b228b2ca6e5dc7cadd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ca/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ca/firefox-64.0b5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "696d279a802ee758eda15bda7b0b10b11a6f65f5ab5b8068df294a986552211c27437ee825ba7533650b5174a4525510b96cdc39fe244008de0c8c757a95744e"; + sha512 = "ecd98bae1ef23c69055c8bad7bd4dba9d495679417f260dcf57e201341f418e1596927a9ea0f80ee04c4148442d911c4602769a5fd15e36f17497954c4610f29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/cak/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/cak/firefox-64.0b5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "828f577737e9c767b349c0413e9fb9db6a271a97121fa1960da885592c29bed060e15cf53ab29f9c181b220a4682814879b2848ff6ccae7d5ecad5626884475b"; + sha512 = "2843e23ab8023a3d407de510f47f8c4ee2d1b0450672c81ebd01b262965bd26d9deb0b108762d5057ce4519d3f18af82b7b3f9184cad57a94c37134848d04963"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/cs/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/cs/firefox-64.0b5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "61503f4dc11c4d8026939cb5808a2a9ff6d74e2aa8cc474425f6704608dfcf5f8794885bfab2bb9e4aa589ca8c7ba327040f0668ec3436a0be39cee60db9cc71"; + sha512 = "e1df39ee230751c1cea28a9bd0935ac5c0ae5517774db76a9ad338f79fd5edecc20fdcfd868e90644af898d5a008ced4b4a63367966ae11280b891d50d3c4d6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/cy/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/cy/firefox-64.0b5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "45cb13ac3ecd45144d898d501a3bd29dd3bbe2de22edc9bc15453321a787b594b1b3a10bd5c4c1586998dbb0b6dbb60916673c062eaefd2224c035ff23f8c9c4"; + sha512 = "d16f5d66184ae187e146f79771275b143c783d01e89b0ff12253dd4820f740c76e0310941d7fb3c3a54b3be70dedb67f627b17cb569c23560edef2cd05186d8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/da/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/da/firefox-64.0b5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "0e5ab638cea0ee3203215777c92c519f04290a29a9b893c527ba5b8562776f252cca57ae6618267427a70e08c832ce017f2c2f25cfbac2575779fa1a946e4c5e"; + sha512 = "81b9ab64c69aed8d7a28c37e02064ec274d8e11228d950ab82f53add745ec8bd628e1c9ee18157399460a93e737f4c96fb2552fffa24517e58221c9d0d13d0dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/de/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/de/firefox-64.0b5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "eacbbd4eb3c962c54eb892b156d60cd4911367788c3ef8d142037ba1c9603f3f2dce63482c614a1547414fb5a2b19fbc0027c64ecd78f4661c52096a033d1b23"; + sha512 = "34352a5aec883dde7f263778722f59bb72c28b2381f3b81a68bd0e1062e8cc4a595a890085358b48a56ed76c38cd3b12c2f76c01a00c23cd0b98afc9f00a259e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/dsb/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/dsb/firefox-64.0b5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "36aa46f73092120b7581b894bcfec8f5ebb53a0169a5136e6758db452f5be174056a61c0c367e9701575c63477249dcb65c0666ce9b97b86d36b2287220cdf05"; + sha512 = "edcc41a36f620a631ddf6c2aa926b85e1b977994f60883495089155e987288ef9d861634b7d559b304f38f7dd624e9557c6c998152062b4b2e671b4bafad5103"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/el/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/el/firefox-64.0b5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "b9ed6e9f45f97df8347b708ec0ddc41fdf684da431b7d97956aa8464010ea9d4cb83ed81f2f97b71d32224bd0b8f2d6dd02bee0b74fe6c7251b8c6749f852299"; + sha512 = "10c06c9b11753787f6433c736fd68280892ff038154e0a62b4bc409dd5d35eba2fc0fd02c8ead4214d668bf30b3507b3fcae498d5f56d24941177b743fdaa156"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/en-CA/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/en-CA/firefox-64.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "4a608528c847cb4a9e37cece45fca3f88b4367a835c49bacc646b06ab89f13498f7f5d8eed2d1bab12da7e9dd416e231aa664c44ef85c0519028283a7c8d1908"; + sha512 = "60755157a2726db341fc0c2daa9babea85507e0744845c1b0d6457b8b6fca7343ad68e8240d46a17c2292d0041e0054a1a404713902207f5dbe6ca7341d521d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/en-GB/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/en-GB/firefox-64.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "bbd2b19f8b9a1df28af1afccb1e115e89be0d8bc3686c23dad6c0792c647de93f896e13e87110c91006aa6dc5fd84ffd4583d3fbdd4a4abb1bb13220ab6f14b7"; + sha512 = "ad87069011210e8362b36451666a69df663b565ae6bd7382fab6e84b25e924965d1fbbc1187b0456fe79ec096df65c12b147a2eb80fcf5f3d192b5df738ae53e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/en-US/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/en-US/firefox-64.0b5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "77f3ed6ba0b07b38fb46b79913040cc37225d56909afbdda49e227fefffad70a783db16dd4f23d89f68d4c7ddb7531298e36f97d18cbbeb5288497d054409ebc"; + sha512 = "4244650468d15ae708ad32b5a6f2165ebb29879207e3689404194be772ba0eb93354a48938d39017db873e902aa4ff30f6f39d4224e8e4423035c7d938b18df0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/en-ZA/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/en-ZA/firefox-64.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "df6ded2a54a5df53df36fe1e81289d26ddc958ecf6a8a40a14b00d5a4c1383e7bdc77658a410eb4d906a69b926d2f30be4e60b30eee384194c5641b37d29ba89"; + sha512 = "91525be6b8f404a8a062c2dc8ed63f89e29b44bbf5d899e5b3d5f71f912f98f3df504b48c1a932e6e140a36dbef9fc00d28b7a229e3f833699e5af1c08a62732"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/eo/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/eo/firefox-64.0b5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "cf2c73fd2dc14e38ea9add2f5438fb03bf5380bd8fd49ed0ac9dbd50855bf01579e9473d4ae1b116b7069d7d58e67c61bec2b4eed53f583ba9557b318f3ca126"; + sha512 = "1bf1eebd0e31587ab0675f11cdd1e4b36995e4adc7bb5c53c7a45e76453fef4b89b03a00c48c00f896c6fdfed54fa8f3f9ad06843ede961130c8667fd4fa2e2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/es-AR/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/es-AR/firefox-64.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "f9e6cf029b1d883aab0c3550dad4f94b63afc35eafa68e0f426fba1a7e555ee4419845e7c1f1d6811586201d13c81c51a9f1dc79ff33aba41660229497abe9d3"; + sha512 = "74d99d3c19cca9bf6b4e3dd3cbd7d95d04519e4493fd17a0c29dd9fc38f110f05dfdd33a266cd5803095461103bbf026e88b2ee2fe734442ed41a3da61562798"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/es-CL/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/es-CL/firefox-64.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "49674a7c3aff83eb3b667ccfd9d0e58522d9732534cec334db7595a58c44dd916127e36fce51d356e12c2ecec4dd635bafa1b3b015f6f21569d0041556ce7289"; + sha512 = "809eb23b5a1ba49fc7c646daf3775072303be1d9f184845b424a63e3a13425df395afbbe44b00e808837581e7fb5e81a557b6e0589339e776de009add9c0b578"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/es-ES/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/es-ES/firefox-64.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "1cc2f6e9c0cd7b4a4f5df8ee18b4b7e70875d3ee39e8c865f445fbbf085e63111239f56dee645f03fa0c26dc096c0cd2d955aa2c2b7fcb0f7be4c3a20863b5c2"; + sha512 = "05dca4924b2c2f546b550a74b9c70d9b6fa38970f26bc4bb19ee498bff1355d323584f8b1fa3f240aba857a3568fb951978e706fe501a45c2d9289b85b3354ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/es-MX/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/es-MX/firefox-64.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "621dc1088af68c755bec9bedbc9ca8bc31fb8bc3278faf082389e3eb367461d02619ac78900eaf9809c1025b6fb9316d2b65f3d789789c6862fc6d5a7c91680e"; + sha512 = "fb0cd125bfb46aa056e37a7930d8a75b92f94a3359033d126c475ae1c62dbf0263b46de19dc2dc37c710e2d8bb40d990b9c0b9682721ca88c5383722618a16f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/et/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/et/firefox-64.0b5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "dc7f53c0344dcd02736555447750e31fd95c89142e3a2f0ee9c462adc417a2578d22bca743ed4ef73f2f1432c3a7a4c42a6e3d22fe815b05a6bf1f2005de8ff1"; + sha512 = "a96f9d351e82e4b418ae0e05ec983eb81fc405238ecc5605d771333dbcb6a2f067c8b37953fced024abf9605457217a5726766e7a23e05d0f24dda8fa6fbb9ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/eu/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/eu/firefox-64.0b5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "da7da58bd15cb3ea17c972977c609fcdcd959fd33d28fce3bb1d78e1510ba613203b48cb549532aceee6b3c2a7e2724be355e9347801e32e789ce27c544bf2b0"; + sha512 = "74e40c64a7105a373194905ff6610396258f49ecb6a7785d4f166181e6230632bf1afa441a59e2491cb30cf289237f1c6d5f13c6e6780a0d0e74e165729f6bcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/fa/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/fa/firefox-64.0b5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "28e7343dca8bdfe8b6e91095eb3de6efa6a8c573a2482e2ecc60e2ddecafe1a96bc0aac555bb7b7eaca681bdc28a24a04ffe6033b99910ff4169811338d87bd6"; + sha512 = "1a4276b4154ef450aaf751bf37421a7504b8ff5f62e0f6f93bb550936c0833e4f271c8fd288ab8dbc5a6e0f07de36baeb86ce2531bde0d3202414efd73907610"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ff/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ff/firefox-64.0b5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "cf7ff3db94d78802ac6dfee4ab9fc07283d7da3a87ff46d14aec26c4a50ab66ad6fda68a867c17c23094396aaa302a3736ac416de5418c139a69422f03abe3a5"; + sha512 = "c9f55ea688d3ab90b29d9b4b4cca07d9b9f01afdc69c2be3c88f8bcc98928a9696d956a560d1df2f7dbd834814a75b254e6e1927e28d97c465956be6f6cb43fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/fi/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/fi/firefox-64.0b5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "68806d9504c1abf1174dce455910d9e7b06cba0b9531bbe703faa38334531a1194447cb57254e71008696a3a056d575a3280752d3317cf99ab620e8bbb9de976"; + sha512 = "8f798f71a5914ae5db3f3e1fde8025f09a08f6f77548f8d40bc05591ec3ae890cb7a61f6ba53c6e29af945aca178ace8e51079c5c47ae520935157f02e2043b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/fr/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/fr/firefox-64.0b5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "6d08c8b11f7baee9895b81fc44fcce77f9ad71f45b96e268dd112735a267ee0ba2cc3a3624e66c95fc675aa01e4fb1b0b6cdfc6e67956206d14168c67adf9a9e"; + sha512 = "802d7fd021acf040e85ea4e54b7bbd907c3b9c42b98fa026034430344b521fee7e20f8f7d3aff87d2b28d8b2df811ee29fdae323df8cea2c672dfb8a03217c05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/fy-NL/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/fy-NL/firefox-64.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "25d5e8f252c3c8d4068f6bf73a083ca19679debb1019c797c075f0a7d56ed50056a66c6da23a2ffa164b13043c1e8ea4fe8c569968f2d4b1dd471d6b8710d158"; + sha512 = "6b9345cb60dc071071a7ec6b16d09938456d4838f7a274e3de7a3a4fde868a5594e4801e10ce2f534f4977af63db8d05f932dea978d2ba88282a18fc5cc1c618"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ga-IE/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ga-IE/firefox-64.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "f3d93d6606404befcdd8cda5c979c9ec22a0de3ed089574f902ef906622e19a88fd27200c8a2e8574336fefed1df6c656c557a29d81f9c4a25b88f3765a18f77"; + sha512 = "a85726d6d2bfd4088de935151b7e27763b6146c9c437ba357aebd1f4c199ff353c777e24ed4fa2515715b707904cb745eceeff2fc4e24064b7b01b5be68ad269"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/gd/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/gd/firefox-64.0b5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "a781c22454cc205e33c4b3632cbcac4494676b92676889dec2cfb4b3f9a39f7d805694ed4fabde77b20d1851f6931c4fcae145941fa0a433d1d373ae264ee501"; + sha512 = "84c7b922984470ea266bbea749887228d0056bc16bc48aac6061c0d129a0928e71bfd01d2618f9484950197d8603cfb5fff3652eca53d5dcaeed9d7bbbbe7c87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/gl/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/gl/firefox-64.0b5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "ec991b1c98d6250635440c659ffffa04365cae760576b60d7bd8600915fdce8ecb58598edf676f4736e55c0025e236121f9e8f0e9d02b2051cc636555bcb9d49"; + sha512 = "04ed397b017446b58ebabe5fe93dc9eedcebde75076cbe3c379383495124338567715190d781646338ddffadf00799f82cff8db2d211e17387a6eadfcfea7f32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/gn/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/gn/firefox-64.0b5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "a86ce563657c7870df74aa8ab176f6bc0526355f1fd3237126cd5444edc934524b008052f5df78a24f35a4220ac074a425effb586b29a00fb25989c145677191"; + sha512 = "6d99ce21e7bb661490d4fe9b4bce4efc4af4021878935c4b7459e03984cda148c60ae74ec8bd9e509997b4ce85941a99cd99f11112eec5c6957efd4fb50e5ed1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/gu-IN/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/gu-IN/firefox-64.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "6b30fa7cb8d6cc5e91ff936aa323874551fc5736f991d49d790e2934d9c75d2edd91a427abf269878f6d9aa1153215195ba30442bb9f19030f22ddb669cb1a88"; + sha512 = "4898d1c4d84c7e04c54ba5417eca8e15053ec6e8fcde8239d4bc1e720a0b1a4ff2e6cc72e2036e44d1e4309110ebf9415650d6218944ad3cda8b02829c173519"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/he/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/he/firefox-64.0b5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "eea36cec7a878a26fef05de7d8a8e45836478d889da001f3393b8a6c1f9e6a961a980c4f6794eaf190a89d28b56a8fb7ccfa76f810e8526cb8ff2b70d07a2aa6"; + sha512 = "71b93f0a720444220a10c57219957f465d85be5f9dfccba5b7f00a33f2068ad40e5176dcb46b54f77bf3b20db3b013814f0c030730d5f3c35626c8d83d455bbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/hi-IN/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/hi-IN/firefox-64.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "732f1317aa98ce67a809952071d0a03b7c195aa327072a33a5976b64b2d6ba1695b1ae5a6ec9d7def16402f8f198c12a8cc313c99455a1c23c019dc492c776d6"; + sha512 = "fe603ff5cf3c7a5d666b85ec1610c6485194c5a79d4bb17cc79bebbf1d9c9642b0d677431b32d9514db261e08228b0d81c01ecc4dcbc6fb652f243c8ff7625cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/hr/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/hr/firefox-64.0b5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "ed11cec198299d11af3d58209cb43eea08c4d16ccce56a6e938f57a998ddedbf37267251b05e983bd929cb72649d60f724c60c1c1eef45d993ddd41c57e49886"; + sha512 = "6f1504c49cf285b4897935a506b0db89c0339cc0f422abf514b7c16eba4c26a606726603437b5eadcff18a7e4678882206376055fad295dca22daf6c0453965b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/hsb/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/hsb/firefox-64.0b5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "1ee3ad7982470d337865782a00528f2edde41c62f693ca667cc6ff0a1bc72601b4a4e289398c2235ac14d1ed3a82bf2ed2ee0d532a0415c2bb76a1419a0159d2"; + sha512 = "009df3d9e38256939448299175ef805f34c81d1a4c21cf5c0a8b7652487fa5fd0c8b58cfb5810eebfaceca6cb9dfb2eef5dc74c828d109834d194e7bd8993379"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/hu/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/hu/firefox-64.0b5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "9b159bb5b48838baeef8fd623e19eb2e801c952dd825f838e2e9c70aa9045c69bc7814763127380d77535e9dfb2256a3f0aac5f8d34b287bc90ecb9aa258a91f"; + sha512 = "2fb92d1e50edf38c2f75d3b799c29b198ff04016b2d1118db8a32aca95e4f96d8445f6b8e0de745c225d6e6cbc724b1e11da000a7e37c71a6a8f79e38d2460f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/hy-AM/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/hy-AM/firefox-64.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "c2e76476e2e5e555f706f9fafbcc034675754eb2c46da5243ad142bac1f71b3e0a116c74aa8582f7c3ee346ce936fda5d6e0f274acb485736bbec1b7e00b9e2b"; + sha512 = "dafaaf7b86b5e851b25fdc350f2fe2841782f79161a4a53f347df8daf70977a4a61768c749df90ee11d2d140e00ce347b9c5e16ad007538ee2709dfd67bb5263"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ia/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ia/firefox-64.0b5.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "06c5903dde7b5a2c0290002fab190654d262f3d6c582cd60834b767dfd5987ab7c3f74c07b4b0527615cd689692b0c1e33ac4e726e6f5512c318ac229cc8dce1"; + sha512 = "ab86f804a8115c01163b04e70ec284a97250982d868515c574e20133897077b2f8d9f0c5302f0da7907d4fa9db923519a1331581ff0dae9455c4a0d6c3ff4a6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/id/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/id/firefox-64.0b5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "31579b18b37b183f5f26e60e391b9255bd4a2d7c573351a54e07aac89f91d81aed13f9998332ecbc746bd2abf40ca98e10c28845b0b9ede004ec24d488f48505"; + sha512 = "d67a83b733c62d9666d2ef75088ea8cba79a4be1de9dd05fe2a846aa832970c0cae4695563ba79d221741edd9a8cf50ada41b5435c41545a41c712190ab910e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/is/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/is/firefox-64.0b5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "f22dc2c3fd59768eeb538b85f0a7843a1dfc974cff5f31d0589a0ffacedd227da6c249507de38c41ab9c51a3b03c37ec110344e5423c7e5b7e4709916558def3"; + sha512 = "e5d7fbdd9934e958c9a3f5c2a19e8fff875ce5267520511ff806522976fe5fd727a58bebfaae3bdba0acbd365f65eecc55b7a23898b7b5e8217a92eddf30d160"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/it/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/it/firefox-64.0b5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "35aef32e732264f1489db1cd031f672b91aff12c02ac7ea4ecd5c8583a27c8e30b6a18a572177dbef466b7c2b6fefbaaa064b8b3206d5d6df25d54391544a7e1"; + sha512 = "b34640443cc069a0d37038a93d8badfca4107a6261e39829430be3c8e52fdfd34f2e9d3229432aa51a120dcfbf3c184bc439f88e58002a6cf10acfb49dcfeb06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ja/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ja/firefox-64.0b5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "d00a6a1dfe229e137e84a7becb1743e2189319052867fadbc62ab5808c8873dc3a72fbcef47f236929a6e1a2c131332dae206dff006ceb7f502073a209a09ae9"; + sha512 = "b53fe7353a363283b043d4c55be0c9ad61d8ff988d931ab366219fc7b375ac23bd7acd13395f127246f54c1eea208d8588d0d4b8d3cdf653cba1415ea96297a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ka/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ka/firefox-64.0b5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "8c4f89cbb4a5cb026c633da5f2a562b5f43bb9e0e3144d22cc56d7828fcd186031566bf7f0bb48f233c34dd92296f9059731cc92373c0d42fa296ea2294b672f"; + sha512 = "33c8a35c0f1b61a3079df8d0fea33b2d294bf43348eb00c085aa79e0ba65e24ac0e6ae615fc07de75f77dfd3dbb83f66e11f343026c114f9e82d19c68883d89e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/kab/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/kab/firefox-64.0b5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "1de0080e0cdbd54f066d213d6a09bf1e727b410b71bcd789bd192815f88d0749e1abae41e82b6bba65759004d5f30a8c34da96d1b54a6878fedd7abb098cd703"; + sha512 = "be47c88150653b5f28d4c5f5a5d8c9eb76f768e860376b31323b789d7a6d20a34f375bebb5561174f06ba56c5697dd23e204cc5f93a50a3249de5a08a24c718d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/kk/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/kk/firefox-64.0b5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "2936b54d148ab79f45ba11606632c607ee0d0a9dedc4b48d4ae0db97cb88f6c6167e0547fdb4f67dfc89894c4d4ec4cf53d3b71176dac7e48793e762d4f7aef7"; + sha512 = "7e26b2625447956ef54aad34f0708d537e0c8d42e1875e4a01547b3ff1cb646effeb5090421204a7eca0b228ba04ee41cca43888b8a9df8f8461066c7266ecaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/km/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/km/firefox-64.0b5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "71d3e28b8698debb941ccfa4e046124c2d80fa8e0b8293b3a710bc35612fd1cd49c5b63ea656421901bad7875c7bfc980a9a9b9f0b0e4f1d6c9277d4bb60768f"; + sha512 = "9dc85b4151744f1e086274cd0fbd41fa7425365c3df2659f5ccc3e18ae0a6c70c2680a0e52a56ffc6d7e7b129ed3e83e0df47a6282cf043bbb75cdc07d823068"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/kn/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/kn/firefox-64.0b5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "43e5d3080e96fd95823400c8ae274a168c3b4e5103bedbe2359264f22ec2308ddbced05fa91ae2fdfd68c22ea0c1fa0cb7e5d4cc39d38f47d3834e4e024bb414"; + sha512 = "d2758645fbb9f5029465c90e86453956f2069f19050a14695ee46a0686ccb0ed2e1cf935c0f009a14ece4f9f78aeed9dd73ace4997afa6702182c23fb746ebb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ko/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ko/firefox-64.0b5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "3b824a6b06b1ca896ddbe640b7664beaa5ec1a2eeaa17d34e0f516a1b5aaaaf6f633c34f563eebd9065ebcb0d740dc58dc262217472b8b0c91b113ab55dd6983"; + sha512 = "5c60753d92d0748f47a7b1a88f863735912bbc9a25a424cf79d756ccb31c0172bcaedee99d59dc5fa40d6575b8225c623722ff3c7409e685cfe04e4f88846c9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/lij/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/lij/firefox-64.0b5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "c311738217edd99ffb79ddf7a75c6295972116d7e7feba29a221c256705cb9e280c7d590fb1bad0ff0b9dc8fe098b1bb8c4ce653e70d170d90cc350bc83c3378"; + sha512 = "c4863cf712f4ed5753365f272cc37c92bade71b5bdbbd5de50c1ed68a56c8ba908034f506c571e76ff70b3b32ffa64624104f96e2555c5401baf5ed8b2a58719"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/lt/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/lt/firefox-64.0b5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "ff7823346bd78ef5ca874c43d62c19ab1fb99398507ab9784f7bf6485acaf90e794bb878ea2801de2a5b07806bb8b4b3e96fc4acb2e73f9d99607f43ada1d987"; + sha512 = "c4a28cfa188d07fac8ef2d0573f7c205a51578e520196b7625ef80e67c33570b3d545bcd7926d5f5edf10944cd33fa3a0cd64362002b7772f2a1e63b7ed0a5cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/lv/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/lv/firefox-64.0b5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "652ccc4cffdfa2f9e3dc13162647c96aed6af18d40380e8f9fd484ef80244716d5052718d49f4e0b806d8f953d30f7732b06cdf4055ec2c37d1a99e9c68cf3f9"; + sha512 = "9a3f4142dd48c6fbc7bf7e8e3a617e3cf7d48cf7d72dcf1661af4c91934a8b8a1de3b0306405ed6cd3d4f479d51c960faf8725a7bd345a6573e2d8338ac1a8c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/mai/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/mai/firefox-64.0b5.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "673b77ffc28ec487aa87ac8c6d1940d0804ad47d8cb9a74e32b0068304456dad2c0ed814d126fdfd8433090c843e901de5e0ed0dcdd8161644a3802c4f9576f5"; + sha512 = "fac26f3a82c6f246d9de452d789ae51ced2d94aaecd130a43daedabe2c599c8a083753955eed7855d2215eff2a131ad89e0ef9e9c089900bd2ad39ca3c93ac1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/mk/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/mk/firefox-64.0b5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "52fcafde72f01cc41bbc1de6985b044dfc66a421aef6c2fe09f89c10d8d1472b69208c2a7b9c4b9dc8fe091dd337bca89577d5bd32198d1867d794985c952340"; + sha512 = "806f287f3f833560bde872e5e2dc6d1efa3d2c58086c514f20700bd71a0d1c374b621906f16404de4c0cb9e25f35b7c499f432f605c9bf27a3b932e4f71f2eab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ml/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ml/firefox-64.0b5.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "b8592d02931efc5c1a2e1a8c0df73353051a69e94b5205c620893b9ceace0730f63466d9cacae9e8b451e79ae2f7e73334fc5ae35133e2df99d7ff3f227fadbc"; + sha512 = "30df070ac612ea6f20cc6a0ea377e6ba7285400fc4b6929ae6ea053eecdb536ed2ecd40c0b7ec734499704509eb4428505e9ac3652d6f1721c268b2c82b693ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/mr/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/mr/firefox-64.0b5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "d4a831c25b20d6ea93938003d68366e34e52b01b87d5e740f89a20ec70b142be52d624345e1779244c9c254d66557b7299edcb3ea24867b12e6fd8d47eb90138"; + sha512 = "21c8502322dd6b4deea09bef88d24463d72cc039d1e52fe80994f117839e6a6c789c75b98f5b1fe72822aabd00e0d722c27b58214d527a207e6a37c6a8fbef52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ms/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ms/firefox-64.0b5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "a71249aa2fdc1d22a1e223f58d004fd18e0436e7578d2d01a82480b53212059653babeee0fe1620c2a455d854ca3e68a98e8e9a211862f599d1b3f50323ca230"; + sha512 = "d98695178522e2b33117405d98a4c2a9bf3dfeeb51cf57f86cf44e95329a31c51e79b409514f8fda2c0ca1bb45f3b3761b857f656e737633d84b9d967e0b8d94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/my/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/my/firefox-64.0b5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "175f5dcbf66405e9f80c9f62de3e2b972ac9ecacafc82fbbc1409e0bc26e87838ab8a193f6c50a497742ce2c334be24f200a6085e8a256838920087ef2ba873a"; + sha512 = "c828786fb800dfc9ea0eb1ca45c051a193f0581da8e5b4ea99f8f1108c022b58dfeae8aff1f6defd3ad5eb9e3268c3a5a4322b928d6186006fc6f0856a20d69a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/nb-NO/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/nb-NO/firefox-64.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "e2e16db2580e030239018fa34a3c50695fe8f6c94e8017193d6a9e2127567ecbcfa1d87040550619e894edf3ed698e9789fd506a0f386352fddcd31314b0a9f9"; + sha512 = "ac59dcd1cd8ce4f4586325a41c646f81189a3b57c96c2171cecbbb8828de36a8c8afcd3de2ac20f174ff5fccb806e8026574726b71b1405abd42c5639936f09f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ne-NP/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ne-NP/firefox-64.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "e659cdbd3a9cc2f9bf8ee18a5a952e30cf1216097d4f016d86d3dc1a0adae29189d52ecc3acad78333ae213216f5b6a4f76dc407ab53364271e3e7b570050da2"; + sha512 = "ddc92703adc687aefc2517911a8a86dd68cc14f05095ec7335c127fb3a2b2d9ef4ae9e043730b797e802e2a4ec840376578b68c5f37af367a78d59304f434e88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/nl/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/nl/firefox-64.0b5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "bc58308f98f8bd3290103db79bb37f3a15ed9c1133c6da59648ea6fb587235d2b79ee7374968064dfabb1dc88827e27fa7a8cae39e43c5429bf43c096f0e081f"; + sha512 = "0c9b9d5defc6ad1641a155ff9ac5ca632ca2c3ef8b63f5fa34ba9315eab827b806c42d51f0349827a20c02d554ff6dbd615293ff4eb3a990ee75813cca2caf14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/nn-NO/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/nn-NO/firefox-64.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "c3fe7d0ea818c1dae682fa9c35899ddcc7b878e2b12625cabb76a001ac0808875315752fa8bae0a83d455c902a88a86e44acafea26cd4d85cb531a5cc8aad8f3"; + sha512 = "e8136709280a870f2417400696683171cff81df1d67861aa0c7d5cf454415e84939e73ccf056f7154a786e1ce8cc45e9d996f2bc082e80113fb9168c1b2246df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/oc/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/oc/firefox-64.0b5.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "35bb0b6f5a5a3f6d217dc215cfb737eb2366b12399884d1f1998e4418ea951ffd7d39d5fc6970dbee883b8440c4b965e013e361fefef3b298bbba303c1ee3481"; + sha512 = "52c4cdc1eeaf28bd7f6e77d88c18aaa4797f3e6764378d4d4fd91655609f868ca6c01a535cb4103a7cf1e00b785d46eca279f3ad41247c2aec40b912b5684781"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/or/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/or/firefox-64.0b5.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "f0e4befffe8ca8ea9a420d891d9dbbab4ebc8eb538158d621576e46e6b05a47c2aca815af06c2b44036fdb2f5db3d0cb0d8afad964a8beb809ff1d9c1b6d5c05"; + sha512 = "0f898ed4c94cb7c1e52704a6c5c4afbc3c8c8699213120125da8bc191936eee7582bb8362bc257fa6738c18f1dca0acdbb6c8a098c8f0d2001afb820c133797c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/pa-IN/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/pa-IN/firefox-64.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "bac1a1d713f34aecf4565c937ebb90a8f226aaf6cd12c1682560634ea6bbc53462832ffb08fa5fe65215014b9efd52eaf5608dd47f30dd13e5bf56beb00a51c1"; + sha512 = "c92975d160b4c8baa3537e4b19f4369bd8bf4376824f33b4495fbc6f1b226b99419f9c1c389e43b72dd82176ea994c13b764f45e0b9ab848ce347f10f897f39f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/pl/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/pl/firefox-64.0b5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "5b08de1128c10a5408d699d68512f72e54124ccb6b43b3e6ffa49bab90e47c823fe6044b85b58c7880c942b23bdab1ee24d8219ca54d9fdeee6772b546a825c9"; + sha512 = "96bae56aca7aa199b18eb85fdb9ba0fc9ebd67b673b23df8e2a44a2c59671d90b53a6d54a66a504ab0f85cf94cecf981d7dc4b6aab12ac480b50edeba9e5c287"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/pt-BR/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/pt-BR/firefox-64.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "f4cfd768a38c12e3ed45a36835ec2ea9674b726553cae8755e45e8a0ad20d46b55463de8fdff493068895983b7a816b5213977638d61bb5e57f4acddbf1c2ee7"; + sha512 = "74bde3c282ffd1d3c72b8515b2b30fd8646d384127df7dfa5b3130f4521731b201e297a03e328418b11d697243c59e9e53ab184c546b1afd7479ed21fd3e723a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/pt-PT/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/pt-PT/firefox-64.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "3dad284cba4bd414c88d96e1ad5e8a62ff985f1a5dd4408462fef3c9f08fe5855c85298dfe1105d99fd812b6193200444f15dc217d62b300e052018cdae213fc"; + sha512 = "4b28d362b63176ee1b848e3d7c46405bba1aa6c1eb1c92097bc5c88b1d1c9cdef21d288a79eeb4141d6b25146509995dc5dd439f851af3a0048b80526422c66f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/rm/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/rm/firefox-64.0b5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "c2c783cb59688602c7788cd17dd5b04901806bf341280f7368aff672005f1bf1e2cbdb81f22fdc02f4eb41cbe9d4b76c47bbdc5585fc97caee4b5119ca5c0dfc"; + sha512 = "a372bc9f43aa1aebba674f561ac2f1c4cf7037ce14ae0d3d607e762589a473169d2e3c9b134c4b9152022d29c01a100ccc019d78417ce39d971070f582debbad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ro/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ro/firefox-64.0b5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "68d8225e5873d7328c0d368c0d03a8b3a219ba40c80d74f724e50ac3a1f513842576d14a2af44f10cfc209d782aca94ed17114f97e9c7c495b61a2d239a6ab93"; + sha512 = "8be0dce6982e28bcf095dbeeaaaa45e248fb8a3f9fce583893aa93e454a62f88a1b86afa74aa4619c2294eeeffef6525fd9d534dca7f9d42f48b601b29f229c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ru/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ru/firefox-64.0b5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "91119b5aa441e79969eea5438295e2c9565f96512c834787976d29a2bd8c619d243a500ac065ea64073bfda845382e20e8fb117972ffb9167c927db232343849"; + sha512 = "3eac71492680bb6f1ded25df753052eabd7829f18b1e1174011211e20a9886c6f8dce71e546a8c1b728469c97f602a0545d900ebb309207f6eea1da1dc53f765"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/si/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/si/firefox-64.0b5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "5c4404793e0df7286eb529f6a1e110708dfd2eaa0cdc08bd0166dbc8b7cd467e708a6fe4c2ebca03facf5d18f4d6ecf0d0113e7f9745a77b46cb8cebed4aa5aa"; + sha512 = "4f87f0e20af18718d2e9eb28e3a619bf8954ae76f88109f3a55e8b45effeea53e697aa236c5f5d987a34abf8b4ef3ba63ccf6cd04a3757ce52e225892ebaaecb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/sk/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/sk/firefox-64.0b5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "c4b3f9ace0755c3b19edabfce85a2bc281797cba9d00d5bea3151f40d196615b2d6e978b77071fbccbca1841632d149f946a486e02b8552811fa339375ee1ea2"; + sha512 = "eb274af0f67456af13ac7ad51c7b927488e4c2e79d4227520d3077b5a07e2590e49e0266f91930b0fa17011506fbbd4af8ca5d4f264d6d2a4ec480d2d5dd3883"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/sl/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/sl/firefox-64.0b5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "2a1b4dc094025c95ac5f817f7915b5bde481e7d0d98a68af7a232725ffd0cdfe6f999b601d94d09ce85de3f0c60f9f9282fd9ecbd873996dfe77801ae3b5decd"; + sha512 = "150e3506c32d076791495d5eea723321ceed71b0bbaccbb69521dd7357602e1c07abe6573d969fcaf22b2513b12d8382347e31d3ed0830f301c53fab442ae217"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/son/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/son/firefox-64.0b5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "24b5fd14fdcfcd1ef1388d9630985c09b42e633eff9a2201e5b07f8d5d95a0845d09323d52d9596d23a3e3f54696a1c33a038445522a3c96d333df7c57a0eb9c"; + sha512 = "0c49ee53876fd170bafe3ed9b301abbaaf09e8848e7eae3be7b46a009773aab80ac559d66211dea09e9c74fb988d64124b51838b44d594cac8a9d50938c9bbeb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/sq/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/sq/firefox-64.0b5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "260978083ead7ce3e07ab02b324ff1437850a327ad0a270b3f905c975516e676e949f616fe3ea4ce324de2d33e14b6cf442bf7d22611ca4e29cf1226f5c2bbeb"; + sha512 = "3902c30bbdc02c2a9c6ddb60e5dfaae52c74f8218cbfe3410b929f1ee9ddc5309888a8a8bb2aee172c4101eb4b700f395df00a98cc1a1d32c0efc1f73a0a1f66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/sr/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/sr/firefox-64.0b5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "bbaa90b245f24cba9a829adec7e057458cf830fe29879ef5be31b44be602eb4899eccae2b8b7fd32ed58bbef371440747ac9777803c806ddcaa1723c314882ad"; + sha512 = "42af1d5ab70d574eb6b9ebd175e9fec08474a82e300cf2a01ab14b5e07d1491241b973f749992fcf01a1d7c7718da0c0bb4cdb0728c937f2a0a73ed70202e8ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/sv-SE/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/sv-SE/firefox-64.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "8a143bc41243c7a79c6001d1f9fed8890226ee111433a6fbd1d96170b8e31ee09b589eb36e6eb4a2895b94b020fbbedce01fdde68a1cdcd849911fe5b176423e"; + sha512 = "801a919a8d1ff558df160caba43606d96ebfcf32f7af1d5a2b5d456565d1b0b31495795d0e7ad3c048cbfbf6f6a4ab76b6546cf4c8912e05851374ea48c0fd14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ta/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ta/firefox-64.0b5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "aaaab23021c7ceedcd6aa5b2f8ff43c0ba1ac8bc998c632554de0022536d42ed6c99759706ecdcb0660657a79c1f640e9474da4fadb74735c7af09da8eb9b8dc"; + sha512 = "9a241eb75506db710d7a4869fb110a33063a8f37e583812b34ba51368e3b59e68602c017e364331eccb5366b652e204af4b98e1b3bd4f66ef60004e64cce1549"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/te/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/te/firefox-64.0b5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "4ae162266445d1a7d573368ef4f4bbd8ad87487ad1c0a94ed22430b5eee6a9e190b93ee9789fad6b91470fa575e248a9f4da2152a80145c4c1810a36a588f473"; + sha512 = "014afc1ad2111451a775864be7ebad47efa48241cf9709689ba5ed275bb7099b173c421bf606031fac4d9a350f0d868f5d0d27c9ef964bb1bbaf3867f69c2e05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/th/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/th/firefox-64.0b5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "3c4cbaf05a942e8afe7b1c95cb0a049f6aed502cbe6e1fa537aeb4835ec9d06032f9e473a15af83dead5a6a143686796f6d98c1458d33f227eac8feda696e011"; + sha512 = "7eca51ff64032688e11e7917ff6d672bd220f961b891354d0fd13c9a88872a183e8558beab2ffcc98f8ff58ef5a38474abf3846b7b8239cda93816933faf541a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/tr/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/tr/firefox-64.0b5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "10d0437d731eb6afcc857a957c194e74b892bfca0502527b19fbf7eeec4ee34d45024eba3911ef1ff66575d6c48bba00e42e057558a1e085385e574d37e9ab3c"; + sha512 = "66ae7cc41c2c9a8d0386a702c6954ab7dd31ff5d7cc77416a62e0d9d48d658586c63125241f8d92aea9e0975ab7f5e12cfd6caafe732aef781de3abd3efd1f4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/uk/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/uk/firefox-64.0b5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "49f10d817d5bbcbcafde66b341bffd230d4dc63e1a0addbf12785e1a0526880fba6d371247eb51e224cb58039276c05a698a8b348ceea2cd5be4c63e9ae29931"; + sha512 = "93c1662dcac61e23f8773a03d6f5e6918ead687d40a8aba509657284e543205e6971f88333a093e18549c95fedea0468b3f1bd8fcea80104f778b23eae0a1910"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/ur/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/ur/firefox-64.0b5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "4c2b3ecfc85526a754cfc8ea3be9efd13b4cac14e4ed66c3b35c353862c2f2b4df17c9c2a00d1f670d0aec382e4132dcfdbe71d65734f2b34ec964f8d5623ee6"; + sha512 = "5ce6575434ba4b54278c1363cca97f9dfa82382604d462e554a0139a108cf2b685436ac140f79253fc4f8c9947e662a077edab7de681060c4374b4994d26cdc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/uz/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/uz/firefox-64.0b5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "7546c56c5e1a20c2e0b9d615cb8a8b084036a6522510a97882c2e6464b7265c4852f813961a821a6fa5eff244db7cdbda8ff49fbdc91c7a8928e20f969b7f351"; + sha512 = "6c61ea82705d13b8c8aafdbf5c14c8eba79dc73425678a6b8f87c9f6f1868a7d38107d4cdd54f94c8131e395e591c0a2f6eceff9a66c938c4929fc6524428a63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/vi/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/vi/firefox-64.0b5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "a0a4fa36cc1804f786463e681bb1474f94921611d277d8f24cc2cf20e98b24244d897f7db59e81e645ea35c7dcdbc57efe12c78ef14242c99b9fb5cde0b05989"; + sha512 = "338f7bb15004c4f820aeb0cacf8cd3cf7155f787c2546f9d95203035603d001b4c85a60f61415926f0b9a5342bfd41db9b9b865cde343130165ee1ab36d7dc5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/xh/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/xh/firefox-64.0b5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "eff49b74691e348768d489e5913adb8916bec7533d28623181983972f77844384819eacaa4d8e6083001c693b180a95957854a0a547d5b41517c4fd392bec9e2"; + sha512 = "e9b9924c45ca63b749c13a7aba4786c9f5eb75f0a2dabdc040fabdbde53bdef75fa5d93cc10130473e2d11c884ec7b5a643de9cf38ca1860e2769ef8af1eef05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/zh-CN/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/zh-CN/firefox-64.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "64acdd41eb15cf6d25f09c21f1059ce42effed27e09907439397e8da27c9ef123901c9185651f2ac89e6b4c026e6a7ac08c4a8c363766b49a5a44132275b975b"; + sha512 = "a19374823fdc429971d35c2fb3828304d0dd46a15dd87d866c524526fe6f17a0bea65ebfa87f0c90eb2d9cca3e0acf1d54ad2fc99dca3a48c112b7a19708c167"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-x86_64/zh-TW/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-x86_64/zh-TW/firefox-64.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "e0181679697f610f5af5f096e6872b9ca4c4f814e1dac6f045913a83be681376d5019988c721ca0bb57b86d288cf7bf1e19847b4179a1781f957891ce452ae49"; + sha512 = "e8f73af598dd5ece70c1576d4a8ebde107f2eb00f4d24800698fa2f4ad81c2cfc2db07874cd412482369ad50029837f43e9a91f9c39a75a1214a7068227770cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ach/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ach/firefox-64.0b5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "f64e8886f5adc2e40d0325bc45f86b81b475cc29fcde180e07bd0343ce88e199adcce00bfdc661f185afbc3f3b40d4518abc0f6787a446fd189abc27991728ba"; + sha512 = "bd145ee016bfaaf90679c0e2fda92746b05f106055c0792b3f2ecbc00177815e5f13285db7c2ca218d9d5e396c6626d46f30f5c3356ab345fc5c2819d1c11b73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/af/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/af/firefox-64.0b5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "1f260f205c63558d31a4de81e51428b93c389d374d8591f2152c301bac623d27fa1fa56a10754e54b372b6d389c24c04805dafd99f1508210662b71024349d8c"; + sha512 = "7e64a10c565f9f29385cebfd6cd182cfde4ed4d6c7c13794ed2c43468f9d0de640035769184f69e7e3da864955188d825c3bdeb2ceacb7b7dc75b25288edff71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/an/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/an/firefox-64.0b5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "58d824350995bfdd4152d5f1080f4d0fb99b0976c717dde29cce6b3830f1ad1a1ff7631946febd7ab56ece00dbb4b6e6f73751503d64e7c600b63fe6ecc85d1b"; + sha512 = "23bac5ad0c847580e48c2dda4beb71597d7601ce9e4931084dd7bd5f68ede83ac0e80876733e4178a4a53a6cdc2bb7782e9324c6efcdef76ab80cc50327696f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ar/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ar/firefox-64.0b5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "9e27cc3e2a55c1f03e019f26f8dac0400a86b81993260fedcf612d0e731d721c3d4b0a152d81e0499efa14007fd6b6823f3c28fc97aaa07c3a7db11dbeed2c45"; + sha512 = "1984c8e75011137af33f914327581c81454cb8e251895d6dae8682b191490e2c663e5f397e80bf046f430ad62222ea7b0bd9eb971a222b465cf35fa17274eb07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/as/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/as/firefox-64.0b5.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "ffbe4274423cfbd1fc4bcd44548d83c92556fc358475c1057fd16ac2e693a344f910aa4190eb8edceb05768fb634e3ed3838be40745100a66bfc8ed0322b9046"; + sha512 = "ec3b21771ae42ed00fd0d514d12ecada5d777e561db150ee72264f0e4e6a4a0c4730f1103efb93782575c5221d4de36e6a00c467ad5f5efe8538059d90950665"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ast/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ast/firefox-64.0b5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "af21bba6a92856bc028cdfc4c2ea8e6225e73f5c3311bc4c20db8f0a84f93e84dfa6b4c24d5155d0e43dd664241047654353761e7c46cb659315b63c60ae43e1"; + sha512 = "03fbfd04e90ed448fc7660f74ff525ddf8a70f1c575fcab9d5a17c84fbd709d14a7ad6c255b70a4988a4357e9139f29ee6cb9cc0fd4f2e4d08d7acf60d850018"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/az/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/az/firefox-64.0b5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "01a2c32b5fe56d81157020fb1c48808f29bab23a8782f69e5f06e530f92b2a33d3ec1e4130df9ba8ab0fe61ef9f13f6d6cf30540af40b5ce104fa488168afb1d"; + sha512 = "cc1d86f175a7faf7643d46ac348b23ca7f83027c2ba6f7b8355333914fe60f324f0b458b69df1f950aee3bde31c6f2acbf5d72461be2502d4011494906b02517"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/be/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/be/firefox-64.0b5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "c921b35e3f6c6419dc1b8a1168caef3e466e7f5937c10ba8c3eb2568423b6bf358c61b97b9500fc9422e566404bfa9d4897b8dfd040a081b2e2921aef468036a"; + sha512 = "2e3fddf652a879f2c379fd59e31070cd5845555fcec8742df886383bf669d9d0656c535332aee097f64a8fac30a9421ece567f91327aa494dea4fbb34df62631"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/bg/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/bg/firefox-64.0b5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "89bac25afc4458983ccbdf3fd13052fc014be74815e943d1c5c3b30bcdd30cf81acaf63025a6dd8ec0daa9bcb5009826df516fbf65a4245e94b4bb746f1dc10c"; + sha512 = "38918ec4067e0ac6511b57c787765aaaa31b5e26a9f1d406c2eb6f6f7ea67aba79780bef67fdcc995659703d17509d95aef7c4d86795fd1aa6e18833e7f3345a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/bn-BD/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/bn-BD/firefox-64.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "79a8dc595dfa333f98e3fb33b1a1534f535876808469ce4534b27a68a804e61e120afb40e171c6a5874f3aa46abbb38278008eb453daee0fd1d1d8f17d076b44"; + sha512 = "dd4cfce4d9454ef2f679970ff9146978c99672f8afddd81e5f854225c1347dc28180f850b30bb4bfb6425e333bc29a42efa7213f6aeec2da306e259e416cd33c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/bn-IN/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/bn-IN/firefox-64.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "4e20c698168c888863445abb7f3cbc1b57b69a1a80b5fcafcc5cb8efa2a7a3dcdfad6dce2969ddc1ba62beec2ad3aeb784132ab8ef79e41505af733615a8a19c"; + sha512 = "d7de9b468c03310cd5083ce097b2f45b9d5aff2dbc8938f6c549eb86ecbdfac585cd4c52ca45b83809be1a6113a8dca2b7875a4f3639c63b748680629f8ca45d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/br/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/br/firefox-64.0b5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "8e973f0694a10f1330d2652339d1acf1e6853939596eca8ba87f337f9ae3bcc1bf34f24771b73cef634eb3ad62e68471d818c55140fcfa90be61ec445df735db"; + sha512 = "d7290566ee3014debda6df43688df7d5fbab4d9988901cdea0be89c83abc2f2967742e8641992262794372f2da6bd4c67dbcfb147fe55a4ce27a481b36de403e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/bs/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/bs/firefox-64.0b5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "ac017ee280d1167771878aabed612a42a58390339f954351d9972594203a966eedd10a17699b0f04a6651a0ff3996f5407a341f3643d99dca8cdfbf9f47781c3"; + sha512 = "38978da54270aed6230529cd054846479d4e6bad90edeefb93632702660a6dcdf486a1ab530f803d1421a32244a97d8df093a9f216caf98698ece7b78bf15cea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ca/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ca/firefox-64.0b5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "03ee3a07f0efb6c6adbc1224c9b1872f68b2099e51852028302f5a6904c264033cb0642d530fa6368e15b8b108af49346ea82a46b4376c7adffb2890a353cddb"; + sha512 = "dbbbcf8704be715d04780a0c8c75c0efdcd587d5c2554e1bafbd45c6a9775d2884fbe9df3c8d3c2a70cb8fffa1a20459b3df10710ac203b0456f3ada3a1b04b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/cak/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/cak/firefox-64.0b5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "ad7a6cd81affa6d5009468ca1e301b05396b335346833225948e2f64a32993f7360f190a13aca4bcea8889658c56ce7fe1f84d9b9af7eebb7c2b79769a159742"; + sha512 = "95e0cc1ec760dd5cdc6a0cb0d5fa796d109e1a449585b52b1bab153ff8a6177b3c87bd1408dad15b6e193beceac6b7ee05366c48cae63eb73d361616434a45d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/cs/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/cs/firefox-64.0b5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "14780191d373277f51e6ce9c06327df17c4bd324e5c12b4760a43de38bb3d36f733d92b5f83f01bc4633f11ce7a51b0bc8babb1214fe36d61c7611ea7b50d516"; + sha512 = "3e7aa8df3f4d03a941e275ec317f8a60620f4b5d2e85800800f1b9449cd4ef268654f036e1a5fa4e9200e876877b25d39028268e0a2eaa41af79b9625584fa11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/cy/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/cy/firefox-64.0b5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "8bf6c014c6710e3a096238bb76eb862b579dff7a798c2a4aa8a3232a93efe92741330580769bd16e17366746fc1dfafd24152260f996851a45f9cd684c848d93"; + sha512 = "5ae01651524bf28fdf9fb8117aad4a1eafcd20ab39f16428052f09db09e7023b7558145cb866bde022daf61d021963b043d972cf031c648ccd88bec19176561b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/da/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/da/firefox-64.0b5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "e1719cbcf4c532ab484c5aaf3a766d27e4a409aa38d9ceaf2dd52bd183beaca2954e392e8faa66a747e02e21813a4b8e3f9a5c6d7bd81ce321df7811fd529842"; + sha512 = "59d2ecdfbcf4ef0c8c87e919585e989b4283917d002ccb6d4b31044e45c0fa54a508b4ca99baec1daf74dea5c068d2784014b51f10588b84024a41855ab24fb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/de/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/de/firefox-64.0b5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "1f9ef9906988924c254a44c796a935ce5ea8cc40dc033bcaf28b50dcec8e90451ae09f039586d1ecc72b5e839f1cf42517a01d0c9e8e9b7c81f365597a8d6dce"; + sha512 = "d328908f23da7d14588fa3b95c5aad10fa897031b115df309d9f441ff9d560c39c4bfbca7772d7e65b8167bc41aeee0df5e930918a17b089427017a5f1cd7ea6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/dsb/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/dsb/firefox-64.0b5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "946334d8ddd8f7c82226db0d7cf838e2b6208cdcceba251beebcb9b625b6f3f684c6b9479c23e743a7a1eafefbb54eb4e63685256f0ef5d482e76fff55691e32"; + sha512 = "72f63d66e3215bdb224f21671f4ce6dd14742a5e84be35e889e30251cdc13d05a9aa2c4a8081eb4a7bcc231e6a62e5228d17e261d33dab0897391c90aac2d4a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/el/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/el/firefox-64.0b5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "f8664b184607f5a655a96b60bc2a97f641c15dd299448d94cc8b630ccec7009d7c51b5e0d4245b1c0eec4477f2217ad54c1453ed516dfdf9fb1b519169c313a8"; + sha512 = "6b7ae7e07540e3ca2a394043b95c75b34a87d15b1f584fa17ab63d81372ff49a4a490029cf3a393ec001864d6dd9263b09c953857f83680e65d133aa3d5c3d87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/en-CA/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/en-CA/firefox-64.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "67339f09f046a4f72bd5a2e79dd5b53876521f5761eb7e9963a1af0acdda507ecc372fdf8e7ccfea96c3ef5324fc06faeb5510060d3840467db03d1f229c07ff"; + sha512 = "036e90d7673b745a68b94881da966f0f1b076eb9dc50cd17c0b47dd130467e27f68a7f1e5b15b960a1776c97e4d7ecd2424a96a5c5cc7ac7d6ebfb4ba6e09445"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/en-GB/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/en-GB/firefox-64.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "1138722e998c0d09b5e6bc404833e652302e7f4774ae024238679f22fcfc4a7acaf6e3bb88c5b04f331c457ef18b70451e485eda79377acab668ad2369ec0e76"; + sha512 = "28fd4cf0573d0038cc3721f65588a4ed397b5c76006e822d4e7d49f2ed4295f8ebef912bf47a8e511f394fc05514c9e14f39b17497a1c2d942592075b072b020"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/en-US/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/en-US/firefox-64.0b5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "eda0706887013a73e7e310268cfc327be64efab22764357dde8ca8c7ccb26c388a20cc18fcd4f5de284f76541894f2b67454e188d30958fa7f2cc541af14917d"; + sha512 = "452a7447c706dcaecb3149b4e7f93de8b01ea378e55d21975bf3d630102b5b67d39d8ab9aac4eb650e369599b95e5e10e028c0ad8120e5e2934c6fcb0f8e411c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/en-ZA/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/en-ZA/firefox-64.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "8da5ef93bbf2f7d51b11276b8d3fbde8cbe4b02e9db5f95d5158c0aee0a20438dfcc3e36485c61410011eab6ad119729c6ec4e4aa3565176255d39e71434741d"; + sha512 = "2c105a1537ada5586bb30daf464001093b631925c09b7023638b8426d5f65a1e39bcf67d15c1c0d03860b39a924a42bbfa0a5e7c102f1552d4e24e7046e24d7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/eo/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/eo/firefox-64.0b5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "b375d409c35829aada3e66b6e610f4bc2fa0e3907416dbb18f924dab4eeaf40db65d9d5c470cc63c84b9e73f901e15fea0160f0e63b6b2cb469152519e50e863"; + sha512 = "382bfcad799aafe18d295a0753e8958b2820a38387925702aa948125d71ff0bed8c87893060726c4650c2b4b4888da6f4fa248c1ad93db6f601c5b888128c8d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/es-AR/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/es-AR/firefox-64.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "68bd243d3bd388f4556bb66595a2323d5ca1b4c8045121734d40bac6250dc3e83c40cffbcf28f3af439c0b43d082a8e90ff3b680dff4bee1f3ddf6e3bd59ffb7"; + sha512 = "5219f022880ab50e3ea6c80cb987486e08842c00a80cf3d4454328628264be4acf71673b0116a845ef1573a908001de4e8ca4d99e9f68407fbccce010eeea483"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/es-CL/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/es-CL/firefox-64.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "7b8c047120da9174585d8ecacebf155d02a3e6bf560b3ff87ed32e718f253a566bcc73439560ed3d922e410fcbb094e5c34d766d8a665ac1da8251a2e836c83c"; + sha512 = "c0c1c23f182ecbabc8eea283a28ac563814be8cc3dd27d06bc852c2cac93594aa40574e3cd56227d626430d3593a555affd033d148501054bf60c7ced2c45a53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/es-ES/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/es-ES/firefox-64.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "c2d1f066d5b65049961d8c9ee9e12b8f0ddad1e76f83b2a13f670c56763db4b7e06a5dc7712e457e5c08d135113a3ef97b90efa8ca377a66eb9ddd2c3515a670"; + sha512 = "a53fdde333e885574e4998f64b3cff4c436c86683cfbb918e9d50d3b093c8278d7b509cfdbcb0db4bb1c515fc5aa90432ee0beaef4f3d6dc660f275ae218ce44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/es-MX/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/es-MX/firefox-64.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "fc54a4647c81fab54f6c28d59d51b9303eeec2cc7c78bb20a76f1b9fbdfcca10a51a42735a93600b390dfd5592121edb8a10bf359fcf90190c93470f5393bd6e"; + sha512 = "91407fe8eba1299c6d0e9c2296b8f5cfd357a87064ba5507f1eb03665d7e6f98b5a23a2cde806863eaa0a23fa856b8e11010771d946e49dc5b38535881fd2029"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/et/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/et/firefox-64.0b5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "45dc3b8b87cc6b2fbeca18a685e3e07d676af25d2d9e2987b92040b0f055bb29388fec3689e670b6764e7df0c6945f331af9555898179119f4b3c0516f0fd773"; + sha512 = "ae9ccc474b949d47b6c7f72f7b7ebafcc9501539af7515e9cc974b89bedf868e3adf86148863ea8cd6d363596adb9a7e696ff4ce8d94b25518d89720f2812edc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/eu/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/eu/firefox-64.0b5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "e7b955cd2b6cfb30aad321af5d0bfad7740abfc0f7935800f3fcb780d107c15976526a25cf3e1a6d567b18dd360af09362f89e87cbcc94982c3b46a93e57291c"; + sha512 = "2884ff249b65f92c98cf9776f218ba8d0b20129cf449af7e73db7612e98f74b147145a0aa47cded112c8ba45693e99d037d127fd6dc7de452bd1ac283be79d3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/fa/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/fa/firefox-64.0b5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "d302e756531cb2cb9116d3266c4a7ddca9875c7d8e92f10d94046059805f8babc18e50d68156f4a4a9b637af4a06ef80d351a70e46781fea7eac3cecec537d34"; + sha512 = "9d3ac6f5db153d1b22e1731fe4c73cb0eb3a2a83451832f923041ce2a531996b92af866cbe098e46561b4b755758179b6984df90c21b94ec3ec194e321135672"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ff/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ff/firefox-64.0b5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "354f803dce5f9565c582f11357c2436b4ad2fc795ede74aea5d38c9f7a3d446876b4a71467fcabf1808fef488ad391cc3b063506cc696539c4af61aa70b00dff"; + sha512 = "f190b04223a2ba85293239dcf375bb9cc2238b7f2ddab612502cfe6f3f040d33e83fa7f0d73b588c222d80b765cab28a8f8d4f52bf602e1421268e941a8f3c67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/fi/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/fi/firefox-64.0b5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "4f18d88beab0208a85da71d4812fdd01bb3006d9230c1dbceca2756ea0b27242ea97a76f12b3c99daa51af03b1fd3866351b0cab621a4bec369c16ee8bb87ecb"; + sha512 = "d91ba417ca86f04dbbfd1eb4ab953ec36d4d8ecfea8e55e514e5fedc4b08b1f634b1e426d61e5a0f92665113923358019f5b8babfe24b0a1796f36cab0ac532c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/fr/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/fr/firefox-64.0b5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "04268d69d544b5bb4d5ec48b8debfd09a83f3a0faab08da16b6b1c643c1451c89e8c67c3f02a05100d21319cbc27feb09531dc87ec3a1e5cc7ed2a7ec8e77aa1"; + sha512 = "122be20f884eaf3d5074918adf69b26486189d458a6eb57c9d3e53757bf41e5142afefd7c18d6c6a9652f417fa6d649e2c02f7eaab3aecf2831c3c145518fee2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/fy-NL/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/fy-NL/firefox-64.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "76dd116eabbe4aa6c7d0b4e0dfbc45f4b057f86a06d95e56cfb9000ea38fe1d88b55d2b2fd885a88027083d930195fd8917fd20da2f54d7461dae707ddcae6bf"; + sha512 = "fbc0870001eebcac762354d70c1645e2115b01f74792ba877b4206ea803ba33319d1625f210e19e89271291ff582e025ad732ba8e52d431e443ecec6be4f5527"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ga-IE/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ga-IE/firefox-64.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "6a9e40802e1574175fe1b062205bacdd0e3ebddd04987ff690d8991178911d74ac7d638f19857bb2180545689d8ca641f073458df7dc83311499c176b1102f7e"; + sha512 = "c701506d4e54123e979ee202f56d55f4a7498e15b26e2240c3e95e56e30322c27fe46c52f4034220cde80f8454c4361341c7ef61a6be8041b7f917da367f6d93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/gd/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/gd/firefox-64.0b5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "58fd25bf8319cd2ca6b46ccb3f6aa8e5e9416a6cb229755f111a8e7304a806aa2aac3789bb666ab4ea2d63658eab79a50c3c11431e87f2e105ea3de584de9fcb"; + sha512 = "89cb078ea4355a43f16049a322b13dfb6ca0e8ca469af76dbea2099bb77b0ae861f587f8b6e8ae64d3b478d22157e164ab1b38a8a3cf318abc232d747571f993"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/gl/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/gl/firefox-64.0b5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "781d7c01208190351350fa601424132eac394c6e6ba0f0a55e799b59a91d4e743dec4bae8a973e384977b76d3e064b62a2162b6b0a025b05b7635cbd424b18a2"; + sha512 = "6f7bc8f489fcfa7405677a31819c3f37e75c663204e1e99cc09d5fbbc1e5eca95013985f6eaa2af5d749868b7d371e71e16b310c19457c02eafc830017c1172a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/gn/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/gn/firefox-64.0b5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "a3287a85a1549015c8f1c5c125bb3296da2da07505a961425ea0b5c755f6c6709c26a384109f700992f4d50746b441d4470c39dee9c78be1255f031d63dd73f1"; + sha512 = "efdc85111d772d9440d0fc8e7a875ded44af7558c55e39e1c7feed7dec7d81947a0cd16f2b783dc53ed988acc5ee34f0649c7d73575e96ce1a86d904a1a601c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/gu-IN/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/gu-IN/firefox-64.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "033e88246db1c1f1768e032d58c8b24f30ffa541a86e1922e9cfe0cac8706da67da3951d596844f1ae6eb9d0ba8de4e6d787c1d1e918c38a0c57989c48327d48"; + sha512 = "624196eb8805d240194358eb5c3fbee121399edde5382305aefba0c09cd1c8a9828d24b738f2ca75cfda1e19efdb021e10e8fcf6fac580c6df236eb02f033c3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/he/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/he/firefox-64.0b5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "436cdbe1d1da1f54e3e48b5f439b73014aca425984e4ceac7834ec22754d07b3d3f1449df640cfaad75c09d658df5b209e77fe830411c0be560abe74e00b6148"; + sha512 = "6bdab654255347b3ac854654f61388ccb9a4ca33c7b284023cea92442ecce0bce5bfb0cd9b10fee55ee874514dc0a503a55ef5316bffb00367c7ac222ef0cf04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/hi-IN/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/hi-IN/firefox-64.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "f6a50c0b04f7ecaec138947a2cc6f942230482ed7f3ffe353cb4a5298f4161042aa0a99b1445ae7dffcaea1807d0705f93949748ffa8342778d8a8bba8319b48"; + sha512 = "7a328b816bb746ed737680d99ccf5a6d1e961e6787b12eba6401b8a1b11735878839434a63a3e4bcc314ffa2722c7b42cba598f88f4b9a490a7fdd74ce1e81d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/hr/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/hr/firefox-64.0b5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "bcc4d9fb87d255aab901d322ef3f05242d3899c7146a34cb36e9f7e49091ed48cf81f7a1388ffe2a3ff55465121932b9bd3fbecc9eb1a032c9dbf535b95ed236"; + sha512 = "f2f4bda42831825281652422cd557b9d60781b0eb3056827a71a5d71636df8640f2e4a84297e711f4cb52e82a006f0db5d195f6005600a50c21efd7b82595868"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/hsb/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/hsb/firefox-64.0b5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "7e3ac04497b122a18e78f144423bb7244c91cfe3cb0c1bfef98885f779d6032e1f71ac9a36eaff66889e043c8b28e51c2a47117ca573e426abe15815b3e068e9"; + sha512 = "3abb7347382ff3b8bf4b137696e14e1524cc4a97aa1e3547178459ef48505587c98be5301cf758db1cfaba23ddd6ed095ced6e53a0896cc899aff53e9799f128"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/hu/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/hu/firefox-64.0b5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "383e4442f5f78e8e5e0d4d4dcdc302d92dc8e95957393ae77eb88a93278cd68c0df61fefa1255f75bbaa53ac47fbb336dcce6aea455750b50c210b8919c24686"; + sha512 = "1dd180859c257d0b53a48e024f9092480b821cf8a518665ab88407c3332b95699dc26ba8aad9370aa7bf9324b2ff31dd61ace472be6c753c9779410568612af4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/hy-AM/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/hy-AM/firefox-64.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "50e3b0c10c6b9c02e58649c29844f78c202de2de0bbbaa8ec3d7df9a802f365fa01d9ff99c3baf5ad58f64f0388ca9cbe8c49d4443f2971697e6eda10bdd054e"; + sha512 = "075a16457c3da3b567554707f925b6705934538c6dba870d3a9557a8a729540ae4358ec21cf1e56b33f89d24c4e37315c926b48caeb99f74247f2598f5fc7ac7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ia/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ia/firefox-64.0b5.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "6b213d33cc2f66f6e40dc12aeedaf5fc2b102a810324abb0053dbef3af230b5241ac76edc0048b01b29f108bfc7c40e77f6317b0b3dcbadf6eb3cacfdb7d9709"; + sha512 = "f27afaea7a1862620f6660446f6d633756bdfb309294532ed9a7c482f52a004e87a0aca5267174210dd34c10337b76162cf9febda409d09568ff8834a1df71ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/id/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/id/firefox-64.0b5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "f4111d085f8fd354e8c85b6e92987bfdcd71f778282b7bfa8c6d74f59786a3f2bd7a9bcb9c358c5fc905702d94800ace03d2126c964b8cd2fd2f421713935c93"; + sha512 = "67e16e18912fe5267a5a20490efd95e5cd3dddc3c2e6e408d274b545e091b8b40aae9dceb117bbb6ce76a7cec6325dd573f1a1fb4dfcf52032b3e7f6c5e59de0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/is/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/is/firefox-64.0b5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "0af27d25809a5e28100d0b65b66964edda6fbb7799b7d7c5954b513d0ef58d4800965459a8740908c6b184a6c70493f8adbc8f258e9c5a1b5ae6c38c0d56d71a"; + sha512 = "cf310a886f9195094ac5b0ad8b67efc8e56e2bdd0463f31d718a194a1b34551290e2fdc18670978309b38961f3be3ce68130b67ddea803e8463a2c9232863290"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/it/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/it/firefox-64.0b5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "1ecf18b33ed2ea28828882a0a6a876c0489555e1f6430625a56a81f76a81be96c1b3ace5f3c4a55cf1555e9d3e0c3a0e76f680f0f08605302c9a4125401eeea5"; + sha512 = "b02edafa763f97cfa299e0be00212c68862ba9877f62eeb175772b6ef66cfc97ebf2e0fec67e364ecbf577b560b5592b7e3a578dfa30e01e4e144a279ad7d7ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ja/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ja/firefox-64.0b5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "1eac9b077a7f121631d4378cf00fe9c131ace2fe7eee7b864c32bda99ccd07b415401a14470cc00d466f5c280ebe430ed1d3bc46fe2130ff4d5819124855d137"; + sha512 = "2a95d7f61f9a00a7f5118caeb30e0ff301604d144cb13e36dfc67eeb69e307477c51398d066413830fc4c3e9c0b2a504a2934d8acd1ce9ee1edf3ec5511efe61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ka/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ka/firefox-64.0b5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "c5386dc11f5e5fa756e0b13d5e2dbcbb2dc8d99494586494932c3b6ed8ab920cf56ddc1062b18106e58a83013108851b64704756b8c3a5d9f4a04ba1fa279a4f"; + sha512 = "33bc459e16ab626ffaeea3b8c82982d5c72fa712b6e37053a3c75470fecd3886b314d67f6473f64c3e64842c02f4907dab1b88fc665bfc42c3b55f1bed93c8ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/kab/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/kab/firefox-64.0b5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "0c77ff888ce71d4da366f552d5e6a586e73a31eee53054b9c25663c8602c353cdbfc09f0b4a0c0b9a91b042eae5a31a8bbae0227efd5d6b1bffa200c515ff6f0"; + sha512 = "64c7caa01480359e84e8fa2f45820afe4848186b09ccbdae837d535592c07e719136c39c62b34f14a3f9e280f1321de76d18423f2e7b8842029d36b723b1fbc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/kk/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/kk/firefox-64.0b5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "52ce683a996853aca8d0a503b1407b88daaeee86fdff15da2f67bf0b7040768916f92eec1afcbe306ad1966e1a0f126207a5db9a0fbef2b3883c5d809cf105f1"; + sha512 = "71a3a7ef3b709d56e0e7113be2a56431b479bf33eea3ed82dbc6988eea34d9e7089e2e26a942f1a768776cdf5f887341abdb6d08da459de70635d7850c621cf5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/km/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/km/firefox-64.0b5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "d1055d1018ee47db02d85eaa72c1106d2d87bfa05f424b1ce01b9d59b30705835eb41a256548039728063427ddfaf7afbc82bc0b6881d1c4b594ecf03b79568f"; + sha512 = "289314e3af8d59cbd06321e3d4ff2059809bdd3b8612d857b46ffbed9ef4130acfa6efa5c64fae362b81853502312cb2825fe7a68941d14fe80d586351e950fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/kn/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/kn/firefox-64.0b5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "893a073304d6efbd5c1827a95f64e8b2f55987ea22c598c68f75dc4d30ba71d056270cd83cb35545994c084d6766f9fd6b02bf5c377e7aaa4f8eb14a08e3bfb2"; + sha512 = "b1b6a68d8928535dc2108a8fc8d695f719c000800961525b7e95e26a0e17618c79595459fa3c841776bd004209272a928907b646ea09a004d2594d7786d39ec3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ko/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ko/firefox-64.0b5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "0d17f3d3c482f434f848e91dd0e0fca1073245187ce736d6518c709ff9193f37a9c8febc3d03ae770775d3f39838d25d6ac8070cb3421c86b42a280b0c650276"; + sha512 = "d9062cb3dcf8189359774ffabdb36244790a27e9bf17cffb7dfd35552c79c75a1e583aa054a77809e519befb4190475130a7dcc13f1fc996cce67775d204717e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/lij/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/lij/firefox-64.0b5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "b19010fcb1f5c0bc078e662299a06a75c7a99076cd7d4100bb3c313a452e4b96ed3c795dfb46bf33182c59030c28d9f3eb75c031f0349431d559e7720da9904e"; + sha512 = "fe22b18e8d7a2e795ebbda404980a920aff14f8262c2d8af61948ed032950b8e204fd817845b6a732a7d2cd98fb77871c4945d0dc9cd15048287b248fcb6daac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/lt/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/lt/firefox-64.0b5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "35e3599b5264895d470c546a3a91dc416bf1707dbb6f7d4b1b1c13ce98864ab432136b768eb273edf606085e026f3de1bb7b2348c1c908a197febaee8a9d2682"; + sha512 = "63840ea6a185ddc9764bd014e6566895639ec5cba587c77e8053b9da840be82a90deecf94661ca18bf651a20a9134f1a431b0a4d0f0cf3fa5390a8bb8ecaaacc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/lv/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/lv/firefox-64.0b5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "b67447ee34562d2f0b6d1c6b5f5eaa10b22797acf29ac0c5d55799511db34a2d1ef24130c7a0ab7dd846cf0eabc2cf5838b21afbdf5ca0689ad012e52e97a4cd"; + sha512 = "916feac0fef268f00917160aae79384b171581135858ea223b95d589bfec75ca7db5480a4fae9badd97dd224f2e7d973094c755c759bbf9e94dc78826729b16c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/mai/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/mai/firefox-64.0b5.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "10c8c19b45550d2c6b7129afc72988cd803308433fdeb6f97d36cafe31cdbd69989caae92f14353de6dedb56ac0b78529c8859cfe12651677213ca9fa5780ad7"; + sha512 = "7db5b29729632bfafc1a7709965b3decc8675e5b8aed5a0d24bc60c857ef8f6a6040363a697c66bb1503e8f5cea3b3a86e039a2ac0818d4f4381a11db53730f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/mk/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/mk/firefox-64.0b5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "7da68387e0b8451dd97c8565b9728249bd05ca162bc8da52f3ba8cc7d5bff944b7da7ea2fe5a15d13a38180708a510d3f8011ece96bdcbeafbd14713953de437"; + sha512 = "67b4fabf8237910a12d9aa23579584abd9a521259933ff4e6888176cce2cffb723298e2e7bdf6d8697f527fa3af522b4bf26e7dcd105aeebee9d3e211639dca7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ml/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ml/firefox-64.0b5.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "0fcd853afefceb8cc81f32187f8bcc81e499ffca12b33eaf5f6dacc1c4f3e1af7ade7880431da60606eb382f7ba85a6721e1f29691d77c3880fd216d8f2cf545"; + sha512 = "2ab762d30b3552dbdc04826517d2d819e65b4e3b8f312c6167a267afa4b7724ce107e13eecf1e99faf42bf14a7a0986d8bffab3aedeca8b441f0c5141f3c283e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/mr/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/mr/firefox-64.0b5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "27ae7b43d97ae119ab383e85d95b325897542dfc207b868fad098cd98a0a61cf55020801f6a64bc72086ad685a204dc058f77bbcdc821cdb823552beecd30474"; + sha512 = "6342afca1160a2180bc40ffa85edca960634baae4aeb219b68cceaf73e509809ae0bacfc9902727da0805f26ade9e59a4a206a70109c5a48c6807e5be3c2e59d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ms/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ms/firefox-64.0b5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "690e5c12da34c29a39289f2c863d0f1e36da16f730c832f09d7b52fabcbb940077f906981d2ee1ce854fccba708e23badc13ccebcecf36fa72ab17c56cbc011a"; + sha512 = "51748833b7fd69ed1e09afd3341218d190f9ec0752b74475e17c205085733cbc77f95326ec0d401f66bc83a14f40e8b9fe7f351796f83639ffb0cce86cb7f289"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/my/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/my/firefox-64.0b5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "60bd5d1489326bc6cee765a34acce16206b111abc400677d8cc25a5000422fead636ec71f4848752713e861726ab80a53f9310b8148f834b6c2a839fcd48eb8c"; + sha512 = "992b5e33e02eb32f08a00e7f3ee451aecf489cb55651ec9e60672e7a63cb6da6c511e08245c1f8a070bd29f40a510cebbfe9f5d869c6a7217ecf0d859cca8a67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/nb-NO/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/nb-NO/firefox-64.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "4168ce2d6dc32fb8f013a4fde2924dcf26ea7aa3c06ba40a90356715f55d2201e78a7b04295c328972070af26d2f2fac856de5b8f613f483d0ac4cbb86e9849b"; + sha512 = "7d4a491c7c91a48bc19de9402eed14322136639a9a3c47322bc9b601d09e6c254b5a5ca674c46ce65f8fa2aeba55fe8cdb6427da84dedb14c6003fb49e060547"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ne-NP/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ne-NP/firefox-64.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "00ac6ab02669dbe2792fd8b75756b1a1436b8282fd7c0b5ff8ad4d64108b516003bfe893033e4c862c5f2071f9a580abd18b17fe9f100ab8b75d3829880d860c"; + sha512 = "3713e66cda2fc45544da1f8224722069814d2149d83eeb6091ea4d5373ee06e5cfb1d4f8965bdf001b297a9e112c3b94a31d64afa68b0c1194d85a6f7c5ae998"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/nl/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/nl/firefox-64.0b5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "ed7299ad0b5717aa4cc1c3e615ef66bfcfa20a2c5e840b1055ca40b39643a37aef624f68c3cfcde2d3fb8ceacbfb18be771970e669dddd755a877a16bd09bbc4"; + sha512 = "610374a1c75e8124edf7bb9564543f791018ea42d565832e1362654d3e7648db6f0b635bbe5d9acc16fab0604facbf3beb2c4c47f07ab848d0ec24832648f78b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/nn-NO/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/nn-NO/firefox-64.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "34438a89adb22ad924771fff06bd4440f7ea35d7c34bca1366104739d8fff1f1c00e5de2b4ba29004b3ef946a747a2a60787e8af2b35c20c5cef36c908a45136"; + sha512 = "f8dd4ab9b08f5581572f8a67e8f421e0949aff84f74e7cd4455631f09d42f725ba53b2cceb883f51e5849d66d564b565da4611ed889301495bdd76eabd7bc4a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/oc/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/oc/firefox-64.0b5.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "c7aaf7265f7322d5648eeaea7a58bb6dc89f09b2b0fce5d03f3996c01792642941e6b3116f1deba5d300874a44af06a3b1eb062857ffc85f5a6d87a983cbee74"; + sha512 = "7b30a8ed226d8944b78bf6fcc034c16a3bee70d32d8bc8282bee5f64208eee64263575da6dbcaa22f543a19b5eb53ae5e7d6c5acc213465a27630f355cef4b09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/or/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/or/firefox-64.0b5.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "d1024ae51c997c8da657a94556e130955e0a133f41ae6d81b34626646781134c9024d03f6be5ef6d53233c0fbfd00fe9fb3aba25b7aee0edf7f583a8f01a66fd"; + sha512 = "36fca8e986e42a9507c9b7637761d8b06dcb4a79c09eed04441ad82585e893e531623b61cbd46cd37f8a6d6911d87336ca7ce8a8f758637102d8b263eacd9f65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/pa-IN/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/pa-IN/firefox-64.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "44b00d71bc8330cdb028cd00c8bf33957353e4f728fb7d36d27bc7685f963a047d39c2fe42d2817fc8094e00696cfdf65140324a53a7b867a11bcf4ceeebdba5"; + sha512 = "0482145dbe53eb5550cef1d9edcfc17caa0160555e2e72203161eccb84a924bb8dfcfd0fe0433ce29f29621a54054a290d908c533b9e814e60545468f14515b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/pl/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/pl/firefox-64.0b5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "39406db62c4c94bb2f4b9a5ce594c93846aaf3110af3ed754a2b90d4f357444235686560e6bf413edb5c7c65d008d66a00c4f8d03f8477014899bc25f1c28176"; + sha512 = "1854eefdd42fe0de827627063e0f05499b1d0d7efe2a6de3880dd25ca7a665abc45f25db34c3e27f52839bc8bd9702cae38c49c7c2e7f1aa2dc5dc35258d5c1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/pt-BR/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/pt-BR/firefox-64.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "ff4b51f5213ae9f861602536db0118bea6ae7f2a7bd9ffb997e22993b09420ef3c1598f489eac28f126d3c270bbf1b7af62f30dec9b30ac93d889e887ea15fad"; + sha512 = "c2b9a6be638e77a691f583f513800d4363921516f30f5fcaff71524e06429501d5d9a076fe77acc1bed3d51628e9dc91425667b1a754a846e56ffc1c26d3356d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/pt-PT/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/pt-PT/firefox-64.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "2a90179db419253b37c1d46c65f86dfe06ff2c226daf7f1a889e9b8de705d705de18fa63966305841ecd28b81c1a5b7d39a7a7451c325e3b79f0e376fe5a0664"; + sha512 = "d1af23df24607dbb394ca3e606b512195d049cfe73aab57f694198fc72b088dc8cdff671be218b5f2254c2427f36020a2c2ca69afd8f6fcdf5293de769de7579"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/rm/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/rm/firefox-64.0b5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "5822fe796a8f790919ef2d7435426b75e755989ae5f99dc765ce018898fb7f3ce3ab8c26b76db8d6eca5358936748dd46c1d74073246389c9b3101f03d5f9c61"; + sha512 = "f555ddf60b72835b34eb0628b723c8570a671f39a335c02130238922f908e013c04c54fa9edab94aaea81df4e62b38cbd9d0f487cd2eebdc32f465bf332db340"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ro/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ro/firefox-64.0b5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "f58ddfec45aeca8af38f539e3a5dce572b3fd7347d7221b964cdc15882ee8a6d2df17d4673639c126b9b7d4db823e5f8e2c12ddd3bdb5f1ad07de37e407e738a"; + sha512 = "8e3192d2460671337f3b790b42d5e81cd223214915e6d357a0b3054a241d08c7d0d55346f72b2a314ae724f491cf1aba72e4398a316ca576956eee684c075439"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ru/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ru/firefox-64.0b5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "87a098da5a149af265424a6f43d8f992269c92caf2beec002077c0a0a51487ef7cfc1e766b0f4b50c3955d9a47530df51dbf7fca6983c103092e58c035a2f97d"; + sha512 = "f9d7ef1de1d7f83102d69c1d86945389dff84bda2d956b9493e13b33e33f359d5aa058cbb162e8d636da77358da5d3ccc5a401e1eb4ba60b7f77595feb6d9405"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/si/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/si/firefox-64.0b5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "b9f742a394ccdee8c5bd1c4e9ad9e78719a27a4296f7ce8e634e9a8d2123a6d8f36b4aba3b4a1d812740bdf19cc93d08b89623e3566543f8da392b124a53ee89"; + sha512 = "31c792bdb9a2ac4887313108bd9c1f58dd98841842e991e682168062a6b497d91cfe5079a26e9b2cda520a8a20659320f0e1a93c29b90cb5c7d5ca47fb4e8953"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/sk/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/sk/firefox-64.0b5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "1f6a53e855aaae8eba829915de95aac53fa43d5ad3058c41e099a87c233dceee3ec8f730ae0b7fd0d8c06ef6539cd7bb82890e202c6a5a13a46da3d95f3f361a"; + sha512 = "247b35c137ef636ad44198c3be9cefc0669a35303d338c7a99eab68dd4e45ca7701c614dcf91fe7ae3aa915deae880dc32c459740ecd4d8faa91ee360794d7ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/sl/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/sl/firefox-64.0b5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "08113daa78aab30e470a3b388a9756e794277aa10d5ff8b91842122b76506d2b5a72e87b32462ac84c7286723dfc997b9768eeea3395ee38db7afc9c99a66795"; + sha512 = "46e44ffe2408ebfef01a5a09a15ec03645f1110363c9c155e8ae36e68c3859bc1caaf5ae38b55ed9d2c0931bc03dd285d07b5203693ef5aacc5089ca4cf5322b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/son/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/son/firefox-64.0b5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "834f193d8fb2a4552bb95e8d2e6aa0e6713f2f5450f19f28a247c544cf86e7d3490b405e1355a956d33611e2d387020a16d040f127e401f57b5cefcafec054c6"; + sha512 = "284dd43ed39ff77a1acc08e68036a61c966ff8bad1d8911eb2348b7db190b32f07e7252152d2e063045a181eb3d3951d2108646502118292cf077a45d60290e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/sq/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/sq/firefox-64.0b5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "313fe1fa9118476fcc417da6191706657c4aa1c2bd8a9058c0b8a908dd99093bd340516aecc400a485abc098ef8b6af4768875bf2901ac7d7c56cd140bc023db"; + sha512 = "fe47640bce1457f417c8c90070a608a6c480c247e172b496b6d1e614927cbd9bffebf149588db273e906dca1cb7c1c0ca3a5c61e4c91e549177902184ed27832"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/sr/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/sr/firefox-64.0b5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "297b6f0c048c3c7c5754ce0be1f2e166818480b3d3c3c50f568f18e1416b7df5039b726060a11973adfd21c7fb1402dbc82599c2daa177207982e5529ce4031e"; + sha512 = "eddde48d778a97a5a9b566badbe3e1a8affbced8b8d2c498328bf0f0692ebb878ab80f6be0b6aace380c477ccd928f84a10a0620caabe18341d4fb44b4af73f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/sv-SE/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/sv-SE/firefox-64.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "08855eb50d2db6753b42085fa948cc146df27404ce98b33d529066d37c7f6e74e14deaf05a654360d0e47bf78927d3a40df57b8839f0503c18ee93d71d45e971"; + sha512 = "16afea960446a746ca9d68749b2b474eca804912f238aec81a271705b3374e06165bda0f5ff60cb48ff5533263042b97770caa58b46c01f28ec6c544c7a99cd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ta/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ta/firefox-64.0b5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "bb8a13b790d97c321a1d8ba17e89ecba580c0a170226ee1c3a9181ede94ab9b974fd4b10f63627c4a0cea854aefa99d6288678a2d0685e39d806bc3ac4d11e69"; + sha512 = "bdc9325d3e374a26a95ae4cdad850ee21232fe750f20caa435bf5a05aa55db84e75efc5992ba417088f2f89265b04a84dce83c8f1a7f4d4b8c37b8025ab7a601"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/te/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/te/firefox-64.0b5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "ae66f62349163cd5a506117e6e823b75ccc55d80cb3227284d5d42a76e7b190b6057a693b98751f5ec7897afca220795e4a74711363173b92c389ca7f4132dd8"; + sha512 = "00a0714da1b005bc731315b1a66dfd73be3b8bb17b2c02916ee2ab74d5b16ba93c37f95c79626f7bdb254dc9510786463d38264a37fd1e5ecefa01f1daf09d7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/th/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/th/firefox-64.0b5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "4d652e220438babe1695ff144008eab854dfb529c7fdf6ac2381411dbbe3a926801d0919ceaac50ce30b5141835edebab846ffb2bd44ecb0c735a386bc49adab"; + sha512 = "bec60214a51569fe579013169f89c428c11e8848de93187ff35405fba581b3dfe57dae7cea740a8173640295fd5f85944366c3ef607af17c396e85f26fa29860"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/tr/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/tr/firefox-64.0b5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "65fc1a5e20e0fcf0c2440df4627e0a79600380fc8aa3638922a7ad10e6d3e0a50bd60d99ec69b4d3040fdb37869cb2141594bef5e052949ae01330166bc8b901"; + sha512 = "ccc79057928f70cb1d499efb3acea41869d79d8cd6984735bd753f9f138a5b628be9965251b880fda3d107d511404953d954694e16cd53106a243561f2d1bc8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/uk/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/uk/firefox-64.0b5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "38702b51bbde6c4d73c78991eff55a3228db540fd3e6f524a1bdfaa7c8092012ebb9cc7621d933dd4fa0bf054edbceca2e7b642bec8e223c8f8dc611f26257b2"; + sha512 = "05e66edc75c37fc2cd29ce5ad307a999deabfc1efcd4ef2e9f1914efed86cbe2a9c52dbc6ca850547e3accfb70e942a5c7efe5de6753bf3641813a08576abf97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/ur/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/ur/firefox-64.0b5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "ba13c463bc1b966d7b3d12f1c18eec4fbc6dc9d17a618f5b973afa116950f324c9c224f4807c36e79e5bf27428b47c886ae9c0e86ec57c8f6e48846c51ee9ecf"; + sha512 = "51ec1522897092a2d91a748d5f684776aa8b7b1ac1cf4f84a36ab955a2ebed17959695877d65185584247c19af4d581004e707ed67d8eeccbd8f7f946173038e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/uz/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/uz/firefox-64.0b5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "8458f27bef11639229dace0403d3750fbeccd8c7232b42aefd0aac5a9bbe8fb9541523072c6274795637210f889e9b1f86dacb94c3622e62d890a27c4b24e8d1"; + sha512 = "51570ce758165616e6931f89384d1262622ae8788f39717a8af291b2a0cefda6e6c9d694c04c703eca545d3ad4680c1ecbc84c68e60b28c7cf741eff66e8a8a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/vi/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/vi/firefox-64.0b5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "54dd9d15abbdf9ff1d0f48cc1a3dcf4d977e044471066d8bd1dabe953dd150b16b132a5c09378defc1dc179aebb43cd1eed8fee8130ffd1f92fb686c8d78389c"; + sha512 = "c51b1eada1aee0e985e7eba9040a6b87b36c76e83df53b69d032c7dc3e6bebde23735a8a817a9e267606bc9528dc341ed4675158d222b3507ceec65f0152c202"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/xh/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/xh/firefox-64.0b5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "7c52cc72839ed80704e89a0cf6b35c090c18bfe0bd5f55e5a562bf13163f2f6920cc3d4aa6bfd218c7d264d5b44bdb400570e98747592cedf0e191ad0fd00660"; + sha512 = "36bc39b2a9fbadc5cb30d7896df384d87c3005b6bb57041c1af681ec6b66af9dcf0b17d6be4aedcfd2aa031b3813ef6d3c4345484321d11339fc3178ec93e6e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/zh-CN/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/zh-CN/firefox-64.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "9caf08219db7531732250cd1584d8c914965af4697363c722398e815e1f1fb9c666bb9983d8581b10f84cf03ea7bb215d2560bad653edf1d285a4cb9da29692c"; + sha512 = "d55e96e8c235f74df987ab589d6921d31faf3527e1eafae75192a26b9fee79bc9d4778a1012341e4be119b314d553703b4105d2bdd2481917218fd3d530100c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b3/linux-i686/zh-TW/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b5/linux-i686/zh-TW/firefox-64.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "a4224c57508466f4d23248e607d53f5b06b5f498a828d7e6bf81b4aa60a74e91237c53343bcf9c6b12c33df23633d85efd4a65fb5fd8b8fd1d624a335f06e17d"; + sha512 = "26c3ddf916c45d0f364b23bd113be300e6094d3b29d32df24543690ff53e16168a51979e8bbff262614fbe40ad6d0ddd249f64a63ed8bb03285eb5209818630e"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 5cbc37fbe5bc..d79bf3fed7e0 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,995 +1,995 @@ { - version = "64.0b3"; + version = "64.0b5"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ach/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ach/firefox-64.0b5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "39642bce504c68c2ebbc7c5ae42664f1b7b0da218e58a7340d28abf639d8c034b33603146070006c914a19beb9e2659fcc3e2023018db36fc51cd7405620756e"; + sha512 = "81aac1100191780e1cf6b7ac8dd1fd12493b67fd73c41c79be165dc2f998b4d9efa299f005e982707cf347493bec984924f31ed96717205e12365b33a242e09f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/af/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/af/firefox-64.0b5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "8a8f1335e91a510f3e884fc19e2babfbc279135392d4d527dcd634cc3f08a7c914b13ca8439dd3f9a7fedb021b13b4a79355b89c12c38280c09c78e11aaba64c"; + sha512 = "f68851efcfd8cf4cc4828cf94fa97f9aaac4af8087ee21d7b7c3c5bb01ce471122488eff26747022e73a5c0421a40d8ca0b815dc5cce21e68f7e5c36ba3f414e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/an/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/an/firefox-64.0b5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "f8589a2bbe767c61387239218feafc622c786521d6435c7a25e587e81dec365bfbf8381a46345a5c96ca3ffb3e27eb5085ce3305a95f76c7d1a05a4fbec50600"; + sha512 = "73ffee783d5d3dbdb42169a4bedc1c50f38e34062ee418670d3b9dc10a6c7f9c34752cf885e35e2591d1affecd7fe5e0dc4f3659b76354f932d3e00c856d71ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ar/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ar/firefox-64.0b5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "3ce0f917a1dd3c8aa624b1868acc213e45cc0208e5020beb4264d288b017d573f634bf0a98fe9ea9023aec42a3a468fe13876c1a8b5ad17295a17063b38e3623"; + sha512 = "717a711d20d36b0983f80e662f1ec25d29c92af6ea5d7a8f03c63a94f60637495e6a9e6c170de8ba3b26473dd79cb4a1d5580effdda024d58af78445a2ff3a3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/as/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/as/firefox-64.0b5.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "5fe875648ba0ded96cc065751e23d687c22da8cf708283ebe96836afaebaa74c38e275dcbfdbb3a9b0959071a682d21714fe313e3d458864d0d6e22414014e8a"; + sha512 = "60bf2b47020e3e78a6e2e00a30c6d56039b81c973366076ad615890b4fced04bd967947abc75c80cf79a808b86859a1874bc8dd4bb7c6b55989e27a34f10f3dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ast/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ast/firefox-64.0b5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "0b39ba80b1d60a34e762b89ab0639dacd0785af151c11b38666706f4a3e2a9e902b5c7917e31275a93818453dbd32557ffcb71160a9acde09bfe01ff507aa212"; + sha512 = "f16f083788c4893715c8151d9ad5725a23bf4105d43e3728dc9b60cdd2eb50695c1393da8ebac5d45e5c5f0d9cdcec333569868a6d46b108a503c94ae7c9b100"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/az/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/az/firefox-64.0b5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "f02866a3a0881eb2f63677346ab45b6e8b9d7f1d3d15d2e2ee088017bab77ec6632cb73a1983fe17b5ce9e5376d43f836087abd8e277f53baea609872c907245"; + sha512 = "8ee0f0f58a7b16b70e4843f71b9852935e665a670659915e27069d5c2fa33d8e9e10ffe0f47b255eba0d0e184ea22ee6ec5d0c0f05e9a74af280ac36b37eea6a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/be/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/be/firefox-64.0b5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "c33b9825759f0375bc65d3139b00adcdde6c89fbdc1e2f38b552374042c455a1512d377ff60bcd294848f85ea03631fa0b5cb2278ad5c07dd83be8760d53f09a"; + sha512 = "82806e493c7d9177f514a043b4ab96530da971c2193040bc12fddd33bad71fa53b3c67acdcdf4484afb00eac7d878fd6ca5ef772e710b4e6694354cac8dbaacc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/bg/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/bg/firefox-64.0b5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "90977c309a39b065425c93005717a97cfabf78734a20c8146e763ea7af49de4a51d49a7b20b061681130d19a911f4d4f9ddbde24f3cbc546b14014a4550619d3"; + sha512 = "68ea491b58296bc2039f583cf8f0a2d04b7558b4588d39cf42863258ba5178e9f9732b6584c18f4833273e341dfc21eeae6dd6073e0d9bb4c407705f89e147f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/bn-BD/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/bn-BD/firefox-64.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "25d6703e8c02bf65e3f6aabf6a5a6f31cb375cd22c299ada483e9a0dd075eb57798d40ae4b1bbfe72f6f4fc78989b9849d1c98d540fe5f7de235343ba1e3231f"; + sha512 = "56a8c627416c1f5a42223e5ffa0f6f14f838a75f26e71bbe9d0a7b3286dfa93edb29d5c099bf7f0e8a9f840ef86dca0d900831f82bb7fdf0672e69d8427f26c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/bn-IN/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/bn-IN/firefox-64.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "b89cb442136dd3a28cb30cff95f31e24ca43af11ebcb23e16a7e3fec1d2e9f6ddddab9c7a14304a52b52a68a520d0bd6c7ccc34b4835953d2428de84c2cfb3c3"; + sha512 = "34f490a5395a1cfcbed9f2858f21bf17792147ff12a1baa1ab4d0febbc98bc3137bdb54ae037d3f641963923a9cd52ca9e83fb728e93b807f3077541522d5923"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/br/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/br/firefox-64.0b5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "f848cd20d0c550896a5a791ab0746ed7a0f52f065563d42e0fe4489982978cda1ed0be5a1425166e61445dc605db3aa8f052099434d91f81d489c5c3bca6d5b5"; + sha512 = "521560eb7055f55aca2461cb445478ab3f17c91ac5304bc9f3cb3d85d22d742e403937e87fb58ec7d9e7c55647451510d043ce5696603dab76bb142d736c8059"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/bs/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/bs/firefox-64.0b5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "338e2e595929b2a08e055a268357cb7a3d869c94bb7a2050375a24baea19bad6c0f381564f2c43cbd16091630b8c701987484633682ffd6875adcac480fa5ba0"; + sha512 = "ff43a09e4b19f0ebfa89b607f84e24ad1c633fbbff34b92f87afc73d85da28acf1db2b3f05af053117ff31c6a4f2f7293b8cc68fe77baaaae52d9d079b4f108c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ca/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ca/firefox-64.0b5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "778e3ab1556e929cd8b3e842024d2f59558066dbb8970516017068139ce8c703f151d2ff735b091492e26e21effa18bc02dd8479819504b679f2ac9a8ee2f657"; + sha512 = "d6b55dfcf3199a138b0292f93a83e3fd12512a37d786ab4aff422dee36db26209da62c42ced0d2f13679c2bb4e33d2c3062d2b08f1efc5b9c3c55ef86f54485d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/cak/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/cak/firefox-64.0b5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "a3d19ffbb0e4319623de006b97c9d7988cfb3d00ccbb996c3cb12e527fde0c6d39480f00e67c27939935ac44bb8422ca8dca4d91b87a349fdb7e6165062fe3d5"; + sha512 = "2bf7d817fa93b47db181da82cd2f4ff35c279d3403dd147e0eedd7c64919b5bae9495fe3cc683829707bbc659403a38502ff769074e0c87405ba857b2750c4c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/cs/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/cs/firefox-64.0b5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "259e511ad5c253c9015b44e0c0d014f2b618b4c821eb5e5c1d8dac4fcaaef00255c80c401705815a1283cface8209a41550aee0a2d5c17b020a8630be2819d19"; + sha512 = "a62f39843b5b9af972951e63c4e5ae9daf827483575a566099e1fd1a9a297534cbb8ad2d1c7681c1bbd69062a511705ad7be6fb8c7e1458bee63b142070cacec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/cy/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/cy/firefox-64.0b5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "70fe96e7d36afa26e49bc2e2cce52e30bc41f4e56cda5942364a9cc4a37a4caf8fbda4915cb1857432624826633bd35ebcb732e2db1f07629b8854b59e06fa62"; + sha512 = "7a333ac0514b9cf910bfaebd1d0e7a1056ee231a36fb67746dea83fa78d7e32a14f2b6e7bf5a051fbbd41be0c2378a46f29faa54cb25ea897ac31792071e2570"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/da/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/da/firefox-64.0b5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "017e6d0f9ae0ef68cc6ffe5fc9f572c5d7fa9c950ba5f337e992800e703d381e854a0b7379fc89ffd837a1fc2e731dff7feeb078b58cf39481a7d8730db8c4a5"; + sha512 = "3a46329e0ad1ce8c46318198f684d7291bd1caafee4ca959cba9b4826234527472a4ad3bd3c720792c02cb7f48be78d456c4d027d318807d6433c5f715d16a01"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/de/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/de/firefox-64.0b5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "9f5116f3e1d6cd87d245b0afb95b8c7d8de55603294f8cd3dc7e841ae74a6cc54cf39200fd0f1765a8e74e7d95b5de975365c26eeb728e90c2797183e26a5bca"; + sha512 = "635b85102d95d50ec0445d98d5356ef71da7cc8d010e9756c9fc33af36ca0c6f86a9bc1a4d8f6d74d9aec2586290471195eeb565f9161a265b2fae28d558249b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/dsb/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/dsb/firefox-64.0b5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "0399dfaa14e453c22ca1ad133ba61358c5a88b79e36262d91e1fc2d7981dfd2f0a37266fcc8c737f4cbe84429e6ba0682551c453370f8f40167c4fc1e27921ec"; + sha512 = "76703c4354dc9c504e6f07655a449aa080626e0dfd345196baee1eaa63245b7c4967fe539955c8e4e5322fbfc8fa68f2384f0925e8a9183113f61b872df67ca4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/el/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/el/firefox-64.0b5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "b5960880be96730ed01b1ad5da7625dd42d44bc9d2256d3daba5c4d8bdc52eb97fa123ab187a88c3e3d17e5affdc302e869793a30cad55080755d330ce8961c7"; + sha512 = "7b2b3592d9c7834cf1dee91c49aa8dee48451d4eda0408c7f7eb27f975a8db8f5ba632dcd2ec65081da5357225c4a6af8031dc723a4d266972484a0724968a23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/en-CA/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/en-CA/firefox-64.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "ea19403c07d0371a36dc0611a79589807f44eb1f2e238c86de21412dbdc0c29bf99f3df88ae9c5be356c263d5b021e888a786b24d0c11e13bed8ec27e6bf4a72"; + sha512 = "ed9c05783a0f226487f56afaf501bb682a4b442a58d06ca344b79e358f70bc506a6960b29c8ab66571a3e53d97ab8aac8dbf2ec3acabe37ddad47ceb25146378"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/en-GB/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/en-GB/firefox-64.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "e6ec9b351c0e130ced1fb4caf131fa8b547ac46255b1a63b135b370b8d5b6c855bae8b2ef349a6ee67d77ce69043ca374d40277e6b2befd89e94f7ac404c072a"; + sha512 = "3f72d87dc2c800c3f64a754dd6bd1ff598896c15eb63e1ac7ff48481c3609b34ea12a2a425c417ba1573de0b01e10d4c55ab046224edb6fb40cbac6db3a2586f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/en-US/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/en-US/firefox-64.0b5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "0304a7916ea7daa22756e484ebee602c6ae7bcd68b853b46f36189dfa1e0ef81ce4293a04dd0694d9c6b2fd3b3ee5ea1199776943d8db54fe0ad2ff6cc1355e9"; + sha512 = "ad422fad714e3ee5cc673fcf4c74b2ba3ae57f5009aa6d3a8bdeba830adbfef2c1f744f7e258b8d17ffd351af1e917ec09662f02a765839016a724d37744f5c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/en-ZA/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/en-ZA/firefox-64.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "931901f6dbc21cc2dc35a99aea6789a4567c98184e0d79bdaf03087155723e9a0046398ce611a290c554e2f7a832f4423549ed451ae6ebb4e7b21abd1880a076"; + sha512 = "eec901b5dc89ac13c2238a61f0d59038abb8f5f1a565e1d056cc43fc541de35a129f0d97ab9edaf3e2c0ea3f229d99ee0e870eda3f755d3bfb3d8d80785e649b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/eo/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/eo/firefox-64.0b5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "dd6c54b9bbd2817537efbdf0ee1396fd92fc0682c6a864b759664b438afc8b9021b6ef3f602ff7132d5ea1ce2e03135dc708f768496387e219c102076f13b5d7"; + sha512 = "1b78a67706055353c3c8291e222431923d1016cf91748c4b220bf4e116d8bf177201fa3468775ff0fb478282ea3947e270c8b6840671210f01391e2a4afd5cd0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/es-AR/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/es-AR/firefox-64.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "ff8843659cf29e667d2e2f79e58bf8bb24a766de624c2e99e9ac809357c537527110af39790596689ad8eef0455229e40e5ecd5ed51f41a68c28aae47a9db076"; + sha512 = "826504e926041cc0edc18b17e32c41cc6ce7ac9f5a1abab4be57806004054f97ce5fd6de7002e5b693b81ef92a1589344d29a4f1a7ba813d6e36f8789bd6799d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/es-CL/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/es-CL/firefox-64.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "5971ea9c0e8cb49e57fc26b744ccf3e0726dc60575dcf53c63599ab20de6ff84825ebee5a8c37eafc1d442559d92e7e4aad770222991dc34c17fbb4a6c58ec44"; + sha512 = "015110f3098fd8f47a9df5ff33b16f52a2fc5279de442002276d0782ad65baeaa6e48d742c8dc91b7da2485bfac10917b1f7441e8f0436843c046dfd313b2a4f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/es-ES/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/es-ES/firefox-64.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "ce13162b414694992bbe2d49ed66d9b6c2a7c80121a057ba12a473e14a7d5efdcf867e864a0809c219e9c0bbe3995320873162b028510cfb10f0459d9c223315"; + sha512 = "1a101456683823886d045621515f85e1e7099acba790cbf429d094e4e61c7778797fc921657c60865a382c34ee3505b5be13da726308ec95a844ec4ce829e1a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/es-MX/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/es-MX/firefox-64.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "25a771fa0f7d36214a5e641bd5f13a8ab5459bdc516fc37541b42e27fb66ba00889001ada3a89c9199ae53293126dd5df86533bc7a9f5760e20ed60db954cd09"; + sha512 = "56424f6281e7b9bc1cc7e9f7a56ac16d4cb655a6371a90253087634ce183dbc3e9292e64e73755ae59c2b258b3fa549926ba75fb6e986bb615e27e4a874bc1ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/et/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/et/firefox-64.0b5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "dcfbfb270fd8265a9e6deeea0f2645d224385e860034568fe38d49547159920bf2d954e4f2c64c9530f8a8468ef7b1a7b626b1702c4fcafbe186d887d826503a"; + sha512 = "24a86e5dfbcff7d42e30483da3c72ddb1e85ffaa2cfef3dbafb5e6a8a5d65a80c1a5a41764dfdf46cd3ca2481e00e3a8c2977c3b7dd2cfc3e55f97b482c75263"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/eu/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/eu/firefox-64.0b5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "d58ece9f65f1279930b3860582fe4f430c8dd7cfed2a2b85b7447af6d86935948e6e0d1c3f067c67e9561853149b2807c011317a9d78cc07c619aa6deb21a43a"; + sha512 = "98133db0edc236c0699e7d436d31f9ff88759d93f08c2271889b45e33ad8d81cc92d8c72c1d406c099690d6814be95bf2cc5a72f8f95b2ed1d8157cc8d192373"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/fa/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/fa/firefox-64.0b5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "d0d06deb139f57539631cc44544a773abfa305bacbc81bb4e89a90fade0e9dabd4977934356e00a0cef4117b27d8d66aef8d6b34049759fb911cda580da98fd5"; + sha512 = "973d5194c5cb15f8260fc9f035abd405faf2a511ac89c1dc2b87061c49c01c33a87f3b37e5ead26675a197408106f7db4486372cc4e667564f6f4a4c1448948e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ff/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ff/firefox-64.0b5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "602c9e6044cc0aa16cf80ff015fdf03ce48312321fd8a52445db871dfc1c475b05a2cccc36355f5c1681d540fca94e3e1c566b6153b2ed4038a6b69a3356d222"; + sha512 = "4036608d60ca101474ab1e417241f596ab2736683e6bd0e382a4f32eeeee0bf5ee46132bcf72f71316dca480b97afb1623b823d0afd55c3f387580974e81aa48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/fi/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/fi/firefox-64.0b5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "bcca1c3cc30f78712fea324b6bf4f3c6020b47dcf95abe5013eb0e2f588a7ca5c80261707922443a35e4d355f5f0cdeeea9a094f1c3c00a695a42692f6519cd1"; + sha512 = "42b4729cac15f33040a7501a1310522e2536e8ffae8b181c1013f6342b1d3c802639945676a022a8bb599d3829f063ccc47a5e37bf445016201a0786962711bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/fr/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/fr/firefox-64.0b5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "14ba146eef2148b5f4617a9ba73499bd783cf030683d87dc9ea75feb31cdec3b52636d8df3ef36001b5304237b39fda42d76d0f70e56283211d49abfa7b2fc8c"; + sha512 = "68982aa52660936221db6d8c2c752de00ca627d010d3c33bcf905693a5fe8f2faae0fa81e09e04adabf4b0542b415543453357f721cf31c5be6e06a24c921a9b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/fy-NL/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/fy-NL/firefox-64.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "70711c19244e034ebd8ab944e71c9604b26704c87e114db8a0daed9048a8ad54c1931c33b7dfac152f737f543cc58fa65262ad7f3d7af20321e3600437826467"; + sha512 = "19bf324234da4bc6de2eceb4a7a44af8fa72e37deae31168575376499746934679e311d8a17bb766fbc3203ae8245706e0ccf7b484ad4ef38fbc9f12ab8ef289"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ga-IE/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ga-IE/firefox-64.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "3633ae56e5a9d84e81fa5ad6110c5804a56681ab9ec526750aca51f11296b82a6f3f6531c3a2b83d6e86d414df47e6087937fe4ef08eaca36f77afe7d5d3591b"; + sha512 = "55ec4531c0b99d3de20f7089cb898f4b5cebd91a9dac8117999c3c17156f7b719a00cc0c393c5454d194247f7117a4fc6b8d724be353c58085241ab5b1081b28"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/gd/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/gd/firefox-64.0b5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "7d6bf6919815935dbe77ed44832d8fb5b22bc96beb5f3d061ada46d6b4840fa1bd248f1bae7c7c3296e5e10dbf78216a427c1f0c9d76e6f1d9396288ef2b8823"; + sha512 = "b1555a090268b93f569bd2f370863821f8d83db5a02f06b44f672753521832cb5653ad586331c90a75a285eb60c5d4d7b785be68e970fdff959e39372ac2865f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/gl/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/gl/firefox-64.0b5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "eba1485f5942820a30c5d0c176ff6fba83a2af8020c4d83c00242d1266abca53046d2dea6920e38390a2044f25cc8868319c0f94453631140ab91ac68aaf0be7"; + sha512 = "f4291ac9f59fc4b577abc890aa5be7d8a39107f60e8b20c0d2376999d530c34ceb41dc06232ca0edbbe6b6ad4babf0140e2de037bf8a17e867161cfba612add4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/gn/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/gn/firefox-64.0b5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "e0fd4b5235ae9120f32bee6e2a1a04abae9576e7222f201006ba56f66e48f5c7ea98a1b01a777316252a21f807744a7a9393dace8195b96375233c72f31c381a"; + sha512 = "92c18a333e131bd331dbaa032f901ffa73cca2feef7399498e73576d3224675c0199339d2ac20074ee2d9e202df7f6cca81c2f0a39f562816a7e05ce474f03ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/gu-IN/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/gu-IN/firefox-64.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "be52a2122ff012ecd2990ef7ef03de4e84ca675ceca9c81d4f8f1fbfc82e911c65d36f83a20d372e765ac3b741924df85043e4585309c8e37ea84dea5e89f192"; + sha512 = "1a3934233439dde03be043c1e07b8391319076e4033cd5b70830aab2a33c3ae935ed87d807e867e0c7f1b5c9bd220f04a1d5f1e9eab5744b1f7bcfe24ae29f3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/he/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/he/firefox-64.0b5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "8c66a38eeab2c15a532bd0170ec70f7a22cdbe49cccf0d0d1baedd30f6e708b1c67eab3c4db2a42826b9e05a7252bb57d5c5a67bc8adfd6c0235c5a4a410c981"; + sha512 = "9316abe49f3766dad4083e02c170e4f631986f727d937f67e0b8e680c8338166e0a7cf89b6b244b3dd1723576a664ac4d3eea6bbba59cd12aea574c53bf1757f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/hi-IN/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/hi-IN/firefox-64.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "03d51782a0c80240b84c2240aebe3940c6fec5972e1a39d875717c9d4ef9496cb43dcba5a5009319c4b174dd85d3ba2753d71d60bb64c030f07604e63499f4e2"; + sha512 = "97f51fa99e99227d6463e43a265757d33a7201dd9f48bfe6c315d788d06d20016e673c52545fc1fda2e96056457d77d5e1aa3f97066ce1fd9f6bbc39dca6504f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/hr/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/hr/firefox-64.0b5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "af26fe8a3bc9523e50425aecdb735f6b6dbb4f1285d0eeb97f91e0da6148012c608e33c683d800ab2062bb7fec21045263ccd1263f07dba0ef96323db30668c4"; + sha512 = "61ea25d4257d72c8ed07f4b65be21feaa8b0fe26808eeb2f98e8ef5f3a85a44820c368541a4c19417d4d3190f5a198c92c5b5c1d1cbf5cd6c2157cf14a5794d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/hsb/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/hsb/firefox-64.0b5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "7437f1108ca22f77ef0b61346e5a18042981d268ebae2465dd7f3699e7ecd99dbc782302e48f8a7a16d4db17ba2c4f6167a6f137f711a713bced7c7ccb3fb19a"; + sha512 = "cb609d6635be14f53d89cc19396842a2aa389decd48b817ad4788e5fef629f9bf336ca63a513b4e876b15e8c283679b77ebd5dbc0cf4309b9d8d50177d5bb3c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/hu/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/hu/firefox-64.0b5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "1a430eba889ec39be81a19b747a43be86fc6751281a24cadd421fd2677e0b7b28f5338847213fd9e548c8451a44a5d181b6efa19bd1cd200cba3405f8a1969df"; + sha512 = "2bedb1c0d7d7b76738d112fa731d8c92dc7d9408c4936d408950b026f6b70b8de288a8a74ed6fab8f331c793ecce10fd267e21580a814aa604ae62677d57db4b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/hy-AM/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/hy-AM/firefox-64.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "00ae1aa437e4f145ce89e9081d2c01498201cfe39e48466521c29a678708bd48a3f9931dc7c039d9c313129b851afbfa7b24658087bbfe7e0c0e9bfb37ebc90c"; + sha512 = "158e04e00fab8ef62f375395d4a8c969c4b41fd583fe26046d1989a784f42b821daf341ceada29fdc2dfb61703df071578ba8bd33d074a5f15c7840a9127f5db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ia/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ia/firefox-64.0b5.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "97b1555eeae73c0b84141f6be1f6555bd91543f6f8fb89b09c3d25bbff5067476ff67a08a6c9e433e6d0059a8ccbdef8ede224ad7eda6e7805e3f15a13279235"; + sha512 = "88b7cc2f451439c909cf965daa653524c15b38d121076d7cfad551806138a1974fd3d5383b511b57c942682ef307db9cb59b0dadc246de515c58d00a5edc630e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/id/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/id/firefox-64.0b5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "14f56d956644d22f58b882bb6cfb941031716ea651009c72ab08e0501ca05ea5ed60658763a19ece7d6ef28a77afb2898fb998a17ef4620690cd527340c5d994"; + sha512 = "73462dd62170339ceede8adbf13dc067f3dd253fdbb4bef1321506782797821c49126b0a876159861827876f5a9c2f674db53fa79081ea1b5b8ab07a676faff1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/is/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/is/firefox-64.0b5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "000f64b07f9be1b56fa47ef0b2222ef9669355a1c415da73e6b11dfc9efc89a4ae07ca7de6c2367d9f2c19c91dfb3cdfa484e1dfd25fbbce759d4d3bdf09b0ef"; + sha512 = "e94a7270bb4221fda6c525c0eb0e15ec6b5480baded71ce03f17288e5c0523e3d0043ff3b278259ba4ceb76b9580d99e5234668d2d05a61e1532b23cd8c78267"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/it/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/it/firefox-64.0b5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "6d1a2184869f746ff413b71bfc0f356ecb00a7f9bf996054a5ce3142482ded733ea3bae76a0e19d07ed2dea8edf3d16f346ceb1f09c4b3477491c8ac428979b3"; + sha512 = "ab4a5c6e16d0c8275b8d319916911c504ddd642ce0f523113620491a3e415727700d8636406c3a870fc491f55e9e96c516a32b564689656647f72345a384e704"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ja/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ja/firefox-64.0b5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "1bcaf9dbbffb01cab2f4c84bfde1b98238344d6a44ecb209b61caf9f30ef6a6629c3c702951a4f2405efc72272612edcce98b0979e09131f930995adf94ec60b"; + sha512 = "612c52a9405d5a8c1bfcbc0e14f2e9d5ea30318276b2c5042df6eee15f0ef6adf724d3f8e82effa5bdd1ce352399c4316dacee89e275fbf71a88224d747cb8e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ka/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ka/firefox-64.0b5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "0137e1f0148f641748e98ed10554b3c6db319ed2b7e8e382fd80c6fb425a588951d7c78047afa9daacdf0d401790a441cd95bd055a4862e3f3991846499b313d"; + sha512 = "45a6f17197b801cf7d0d69fac67876d0d51af25e3da044ca85304116fea4a440be2256d33fa6b83a6612f564a7846ba74094226f56df5dcb06586912b7051126"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/kab/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/kab/firefox-64.0b5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "75343d0c3ba1dcb04b87571a376a0d223d38b32b939111d6d3fc3e2ac416980b8e6d0023c07daa6ac1484336a1268ffd6cb47c1d7dddb294257106146ae53ec1"; + sha512 = "588c4ac270443ff1f06ba6df52ef0deb97718c0b1e889d16324e50c5bcf40b05178f41777a91d228d3eb2055cd527407dd00f613abfa3e45f56dda11e5ab506f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/kk/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/kk/firefox-64.0b5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "caba86f7350e41b996c5c8e2c3cd5e7b227ac8714aea82eb74ca114c588eed5184f023caf1b4b6586c21c2eba66d3c53070aa6bfefa072113cd2a4a74110fdfb"; + sha512 = "a7b19b76d0d1d029d4779957c5b35dccaa41eb5adf4ae0a5546c5194e6e69466aacdc4c257f85998260b13ebbbd7a53f697245590fa71834a46598b950177121"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/km/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/km/firefox-64.0b5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "572222b72b9853e2d71662f4ecd62af748d872c18f01dba6c0168dee69d383d4c54cbcc2786a66ea09b6c79014923fd9be34d9505c06bcaa4660ea071a9f9a33"; + sha512 = "4989c898cde62b09d953e91efd9746d0070fa8cf9a18b00928f2b03f4737541ddd8d50ecdf01b82357618065c2ae1b08b35c5b049abd30b1532034e0789b8ba0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/kn/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/kn/firefox-64.0b5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "57208fa78265ca4ce0b19a53b455cfaa8d048423f3f1d5626601aba89ff272c3a008a37682e1f706b7e499361cf4f8fe3fab42f43fbc0fd362d4a461b3578e9f"; + sha512 = "a8af1cd9b9668bf22bf42fde6fba750f9e7e8786d7e05cfa0d37e79e37daa8529e0acde655ae23f45c2b6e4c46716d90fba2053a51d84bbb58b760f541dbf552"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ko/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ko/firefox-64.0b5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "78f372aeb663752c5981ce15a955480317ee40ae29a83e55c53328d51a76ea1800e74fa64a35ac10d94297418a50de1da16f9b2352159ed0d08579a1de46c5ce"; + sha512 = "03c7d8711f7a847144a38bf4303ad492994b6e1ad86f1c6758e048c89b5c28dea2507eb33819b2f577fa708fee66f489df9319cc99a5f1c497fd405dfd459343"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/lij/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/lij/firefox-64.0b5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "6f3355264ab1599122f5e9ecf3112d069184ee2b4208d7e6fba6dd97a358bbf4beda43ccacca63fed9837632d5d8f979403e5404aa3513ea21487eaefb4fc519"; + sha512 = "d157eb6b3cbc3d540ea8bc290694ed651c3be2f582bd662b0ae1c052759685ecaa2a4cfbd6814677c048dc273ae95e4c12b2e199a5c4a202885511c65c59b3ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/lt/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/lt/firefox-64.0b5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "145963b3e8d88b6cac78d25aa6d34b3991e7432bfdb11e53df86e1cfc6ac5d88a43b535ce64a4225174c41c9aa48065f766c49cb70828a22bfb6791aab83f68d"; + sha512 = "0ef3d34d04d3897b3adeb7d5bca3959ad2681c5c1986c542c04b584c16c052471bd2b6c5c35ef772f7033d5806f3528a263b79d88566815696a1f7bb7d823989"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/lv/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/lv/firefox-64.0b5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "8fd53f1f2fef7bca7a75a8e18a4268d9e2bff0f550b23c8a817b51f9791b2e31061a612dcd8f72a61e5f8dd51b973b6e8d4b86481ef07f973335cd1e7d8af42e"; + sha512 = "ea88b2cad9411a347aea0da17f3cd97c8375488b699f1bea608440f604c0dda4199fd341bcedd721eeb06e701c8b05baadf4b4ed1c437acb11cb2945bb8fef43"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/mai/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/mai/firefox-64.0b5.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "ab9910b231e6d395bd9142f6a2d7ac5d565317abe5cc977e602055d5eea83f5520918ff17372e6fedcaebce4509d30dbd0c9a1d89bcc5ec3728c2406ac62bc8f"; + sha512 = "35b468bed701d8d961aae420ae674a3cd249d8ecdb8038f1e89b6538a1a6bc118940df150d0c9bb372da180a14f0ae24cdbb18ba562b73cd9fff57e595c56228"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/mk/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/mk/firefox-64.0b5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "a84ff39f063a0aa11490f6d059a2112a1e0e2ae931dd8b3a576ffe2253c4f0a2600c221d9cefa2bdac8c3af87b4aa6bc571caeffeda10d78b7dcea7bab694a1e"; + sha512 = "ccd010af8e7e0fe1eb399e7bc239c9fab4a162f49a482db7e75f2ef60f35335d0afb0ef4a7abc7896f0cf702a42e045099725898bc687a50c6aa039ea354e929"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ml/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ml/firefox-64.0b5.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "46db7c4284ad4441877c8a72560c560bd4e46d0669ab4144a5296f1f25c796943253dfb1e55882e9443f1f4bd2f083f83e00dca597e20a35f241e8bd54cf5727"; + sha512 = "e9cefba5184026b288e73d6b94a35e6c3624ddf40645ca74d769136bd92b24ba50c4add4cc9141cd237ca87a5b5caa0f6a3c487aa4f559676045df533398b4c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/mr/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/mr/firefox-64.0b5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "5182c8648adc51b04354ef1dc4848b4245800dc57a80d54dd605c56c9a792cc9b3d57085c0c125e27453fbdb0f55523c555c91b84b7f8462df365b7d47d7c1f5"; + sha512 = "ef5f47c810c5758c7d8e03cfa3e856b219fe9856f811f72b566a0726ba0a2932324ec342f2135908f894f7c0359d153690d0cde864111d1717c303821bee8a04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ms/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ms/firefox-64.0b5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "599f460adbb94ab3adac29bdfa7849dc0e44c975fb2b8d4cca4ba25980bbd36085eecfde7a23dd26c223b0d9917a6800de230ccab738fc4e23f7863dbec21fc8"; + sha512 = "f88bc8b0f709d6f3388bfc634581c2e47dcdea8d63346efa9a939ff9db2b828c0f1e6e78178c89bdb821233eefbd8c504856f8af3d88819392be720c498e49c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/my/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/my/firefox-64.0b5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "86f01c39b760489c33d81b18507af2e365d2269ee33b8149d66447b57d35d41316f65e187d81faa24e5d1f9f045c69beb6e7ccf660f89793bb7d68263c451416"; + sha512 = "fd84eff8586f1db62baed0fa483fac26b8473a16b1caccda4c6340f7a3098560afe1c3696c7aceae84fd3091527a727a2d256e7840a61b7a1142211e80c3f697"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/nb-NO/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/nb-NO/firefox-64.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "717096bac06b4dc090dfd751352f1dc081f0df04e52e09cc8cc4645c9bf7f95f4e6170e2871bfd86516c24b5feb125a0fb6c6f798f0eaa806299bc225abc0d97"; + sha512 = "9f83bc551ccfb669bacfb59e90c9c239fd00615752b83358f4ac1110329df95678517cdedeadc6e6a3c96f8c41473ff2e60bef23043c56f384452bcefb2252f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ne-NP/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ne-NP/firefox-64.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "487cc658fd62dc09ee3b58372dbfc94d8ceab4c2455018ead3eb7cceb2912740d2a63b3d9f2ffbd92de14c538511641028b50e41b03e27b4a741cbdba6b63a80"; + sha512 = "0bba062f46bf1d52381dfa6de465b98815c8c727222caba8e7e9038473f9758d2d94ebf74027342ead58f91324be246b39c27b735a92f5034c8d4a3e270fc7a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/nl/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/nl/firefox-64.0b5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "094fe47b6f3da6b807f951664c4172766281f8b359fbb461a1ae724197931a259a02dc24f6bb47643ad4a14bd6a415e74f3ad4ca12ee66aa6ab0ba727479195b"; + sha512 = "a218656ce7057e636678a4636256530c3121ca57a21ab2caf1abd468399bd0049deb3a583c0622df54b4245263ccf2f6b50f83b3ba5b941f8d2c4cc3e913f84f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/nn-NO/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/nn-NO/firefox-64.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "298fabc34d153c384502b2a218f147c64734f0b5d2db810ad711ae09cea45aedc8d2dc70065845925bc7c79bf6567beee1977786be035f3e3c8955affb412a1c"; + sha512 = "7681f80d70b68e4db99df44fdcae41f0d7c53d057c5a4604d2e5e5685e1dbbc35b456113ef56e619dea9c157951d9e2404125b75c99f76d1dddee484f886d948"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/oc/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/oc/firefox-64.0b5.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "05775a6cf16a7afade486ea6475e5d0de668ed474ff35d22a97dcf7b732fcbc718ce2d83673cf6257e2304e649c1d4535483e88b1c448f1eb8a667a75432e74a"; + sha512 = "97f71a8f5d6b2595e49a72de736804afd59bc937b4a082dd9d2b6e0376e1da42ad702f4121294515fd399eebe73fdf67befe2e3a32e1518970156d2fb1acf160"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/or/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/or/firefox-64.0b5.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "e748661be43563316b621243d5643e1e0d4ef4784dcc0bb6781e2d656d50476f8985826fbf169808793cf0354f206a3192f8d4976a21d3ea9175617682e4a8d5"; + sha512 = "6313389e0b4c05e2002c74bc233365cad1e8d2ac1fa381096a93e3aa1eab6e7f4b3aa5f793f373f8da88ff47d951adef16ac1d31b9bd1553b945eb71bb73e0e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/pa-IN/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/pa-IN/firefox-64.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "c1f497bbba045b5f416c3c471954592e5932300a941b9df27cdbd4c488d2690fa3a4f6f97f566b3dcda9ed21c1f7ac4bef7ea487adbf36f88a6245ac885cb5e8"; + sha512 = "99a81b88fc9a4962406f929b052cf324275b2b236b60f71eaaa4faceeaddc107b10ce51cb22c4b29d58107c582735f17de3bd6f3ed858812036f53151fe4ce27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/pl/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/pl/firefox-64.0b5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "2333b1e05501918abe9a47efd061ae946eddb7f6c0ed687cbb6a9e2816af31f956482dfa916c4cee23c61d2a98be21d43c866daa4bc84ce5a1b9b01f4138c742"; + sha512 = "4121b5dc0fb3f150ab985d2a792c59666d76054968e8cd657c58cd6e7c9d8419a64dac04d5c7d6b6989c9c111ce4ee98a5e96f5565e56be28c0f11ce6db9866a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/pt-BR/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/pt-BR/firefox-64.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "f5b63931cb71e6d9a0c483e2b73cae04b38bcd78492082cb56bbe42b95732d450d7956f39edff29d33eeca24678d8db7e85c18cd3b8530123917cae58b685a73"; + sha512 = "32c9e49b4a51fdcc2d982b21783d8c5b9eb790c506e57d916722396d2bbab82e0b08d0e97d95bbc994639ebcf65a70fa8179067db5589ef4cb5c1fba8956c348"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/pt-PT/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/pt-PT/firefox-64.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "691b48471848e11fc30388904cf20150eff3ce0cf60de319523153afc13a28179309861957abe0222bd96fa15bdf27f2051f353b9e89c47e4706f2ed8e08181e"; + sha512 = "c55470dc75d2fc41194a38edf686f1ea1e35919dfc2853553a3e6399770173eca7f7f8ddcf79ddeb346b73454dc21f1c31bb4e4438b157dafe4ea50671073676"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/rm/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/rm/firefox-64.0b5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "854ae30ccae7a822ca2e33671d3bc900f9f86734fdd625097b6c4c5e4dd83369ce420244395451a5d740032d7024437cf4fc3a492921044a030cdcbc389db620"; + sha512 = "8a794da90bdca6c8103d86a46eea907cb83050b15aee851bf9c7589e736a008b0d302dd7b33a1db1fbf4ffd09916e5babb5f01bb2ba7f237217c26272d681965"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ro/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ro/firefox-64.0b5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "b2ba3286621fcbc43809dfaa029f5dc7f5a1b7fb7603e570698ee2a9666797e4fbdef147c3a437064502ec7612b951cdb7420a325f1e2eb102ddacc37596c771"; + sha512 = "29da12673c2d2f44f287fdf09e3196ede2bb0c16c2316478cb544f050e1bbb9b917e305478470fd3220632ffbcdb3943030f2e3575dc8ddfb0322dd0ba9ff0ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ru/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ru/firefox-64.0b5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "c248bc397970040678d3ae715e6519a2707553417aa1afad5ca2261b1cdd6bafbf01ad21a5209b7ddd0676cf432bbfed2e4ae52302c2df7bb9562f98803934f4"; + sha512 = "b29fe978b1ea5bbf8d433fd0970727c792476798f67973e05893e871f636bc74d2bdfb9aa0a10446378df3d5b07a31aa7e34e71852c855ecb13f7703dc7fd3db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/si/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/si/firefox-64.0b5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "09ddc10e60db630c40e449c7cf7c85eaf843eed2305361a50de001fced23bc622d6a754dee8a7f5086d570eeabee318da0141c92ba04f242afa172346f54494f"; + sha512 = "342a9a25b0deb04237ba01126187227d6983ff98984af727ab8767687993c9ab433da715f7955f2e9450f82b1da97be17eae5803509381b9f415b319cec822cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/sk/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/sk/firefox-64.0b5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "fbdd72fe546d00bb5bbb5879d85107b29286100edcb57f00ceac36a22729e7c33b648af7a064d79287a87bede24077fefee589865ce0e36e34e281391ee2deda"; + sha512 = "90628c0c8b7ac0b7618f9d0c3fe9f12ef44fed90c59869666ea0c086e41a337ac4d94797fac0cd5caadc50fa3d4770d1c071dace976c9ac14b60fb3cd0fc573c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/sl/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/sl/firefox-64.0b5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "725e1d1d1d551be26298224bb1d28ad868a0ff6f186417af95e6687eacd2a43c750c69b7156559019691b43bc71d71b9624cc541f87ed967af2645040c135169"; + sha512 = "21b134325122455c9f3b9e3b7abf30dd0ff1480c617e077c978d06d4be657811697c237d8ea5974439af01a0df2e19258116289184229d765d403a753ff045f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/son/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/son/firefox-64.0b5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "5366370c753b5879186bf1bcb288a8bf54e1d6c7615176f90e4bcdb75210472b05b20c5253972dc89d517523f02859c57387ef5dda5c3cdd6ca1feaf087bcfbe"; + sha512 = "1b41c4604b7e4614a578278cdc17d176e68197c1560fc662a41c3081804de6932fd57b8c6fc5b9848e5efdc0de42634507e3859baccd957d1fc14f23ee46741e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/sq/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/sq/firefox-64.0b5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "33e85039f5a57c4e3c18777cf42096e8025aede9e40286533d3bea42635829d91065ba9d96e3270aaf0347425fafe726f220c3ca2a68ffb8d07f6e97fc38b489"; + sha512 = "9d1fdf818948d9ec89b6b6ca084c34b85038fb502e455be8db93635f96dfe4cd51d29396190c7a75b36bed7fd52555370b340e54967258df9e2b4c1271e68a0e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/sr/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/sr/firefox-64.0b5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "0f2effc9cab91295e5e715853a3d632b42c0236d07438187581a93acf4c5206625f11072828f552988708d6a093bdb165ef95030a2ca42f70613237c4a121d21"; + sha512 = "5f8875e395f7df78bcfffacd0bacfcbd6c963a4781bc20b6c58d047f2021313401dc05216a15cf94ab9ac4d765c03061299f6da174b0410a99c4f42b42a3b507"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/sv-SE/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/sv-SE/firefox-64.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "273be614a7da8eeea5b88b12d8e5dae30782af8d70b0fb6eaef0c6f0f32863bf7b36e2b4f6597c67580077e4e0a57361c7016598f421dcf295e2bea3789bac15"; + sha512 = "45b59535abc9c339bc2ad6b574801af30bf1d923d1a92f75084c695263868adf5f7a686a6cb35e7ee0d6a0df44072dbacdf5877981ee3d2bfc7c06553504df98"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ta/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ta/firefox-64.0b5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "9573f6bb941dc4d82ecc257ca31b5c5112c1a5c8fa489ff4b588ae66eda36963c614f4ed526f863f65f6aa0c4d0d1884a4300ae69359c3a35144b4b6abcd9d2f"; + sha512 = "1b903da600a61ebe4c0b310fb99c61b59100e21226e6c61cce85b1618ddaf672cf595dc4371948c8baeef47ebf5f068c192ba963bbfe5b77f70ee0ce5be1c72a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/te/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/te/firefox-64.0b5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "2280629fa2611033c1c3c614af54ae2ebf76fdb0576670a4e8d8fd5ba3a288ad56cedf6486883c7bf26194910944c73c0e15d14514b91c179510b555cd8b369a"; + sha512 = "ac37414b90ea357475a63b02c26a9a332809201cd29dce2e145db8690cdb6501476f00820bae2db2cf018a4b7a5fe71e7733453403344c8575cd5cb73a269ad2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/th/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/th/firefox-64.0b5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "4b0b6a910e66bdeba240a5b6580ea7f00e8da8a4aaa932448a8c6050bc2f5e0d2eeb6c87a8c7c093a2060faee2d3f94be7de4934bc4774a7beb3b9cf147444f6"; + sha512 = "502f9fd0d17f08ea7391cfbdd826ab934efd2a6f5e21a3271d5983d9d3db5be467d69832ae3bf510f5718eae81918bdedd820369021d4c716f826c9b5ae86095"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/tr/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/tr/firefox-64.0b5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "a9c5aea78fe892e7351e2fa98afd3ed14a5ebec3011ff015389842f5a42bb791f0a9f52a07cf09c62a3861c918dbaf87b5c571adf4c06e73814e4d070b4f1be4"; + sha512 = "d9c49b713c718f8519dc9cfe2931e5211cf3a797695d2734c5ba7c1c14ab0b088b1bfaee383e149830d452470b9eaf7e8889a9efbc0e044c26258bddc830dd16"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/uk/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/uk/firefox-64.0b5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "1ee682f1b801e181f6c12380b6a7ca0008893adaaa31b74cde539a316169e96fa67d2c74205d65fdfe1ecc246c3a60265c898ac931b6a153fe991f8669bdf02b"; + sha512 = "358ee397b2729111502c00c14e463dda4669a5ce071293a9f5ebadd5f6c444602ec5859a6c92c5ae9f8755c2e4857b969d63074934b0be4e4fbd4ace539456d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/ur/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/ur/firefox-64.0b5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "0e80e4691add90b17185e8499ec764ce490e6a80e21c0fc1f551073e8809de1ea25ec15ee23fd5b7e4821f35b83c7b9abb6ae7a8592ab575c5cd3b851966bc6d"; + sha512 = "b39c6063620457365790e836c2e52818d63241d38911fda2df920fe0fcab520b982ab84683a1d42f74a8ccec37355abc50fcd528a6f51bfa80d5fa5742bf0e9d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/uz/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/uz/firefox-64.0b5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "1bbd37542b7afd25d767512f55b5444b0d3b464da5219d7983f3c816e9dd31bfe3546e51087fa939a92e96dbe89c5edd5e2a01222ab86bfb48cad4b87f71fa14"; + sha512 = "e0a80be5432e22b3f445e1cdff70dce8b4622ffde42bb77dda8d1cbb12b539edaf249ed57400ccf8d9e147d5dff5ebf61336756d1d2c57f6f419461dc575f3cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/vi/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/vi/firefox-64.0b5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "8445821da59233ed45571d1378348208c23d0738f4a3361e880f174601a64190d32ba859299e340a906d81da08131ce74cf7aa7e083b66fe117009e97bb1a0f1"; + sha512 = "1d566481abc9c246cde2153c02e45edf0b03d9c8e4eed9680df76532ef5c39d0d900778bb6be8cdd48633168935df318154e4fe9cca056f0ba696d9019225905"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/xh/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/xh/firefox-64.0b5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "46bcd715cd6656a64acfcccb73a04c60f358c64fd227ca6a973e52d285733ab7af81633a931f15b847b4791f42aa6fa4629ca269d71d31c1f51d6f52a6c06e7a"; + sha512 = "0e3e520084603e8aeeb67e2f5a9206b7a7fc15b13d4abdd0dac1f6bd7f6234b0044f6656e0457b4012ec7c4efae8f7ed9dc8999dbb43131794dd2d53b7f8ba74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/zh-CN/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/zh-CN/firefox-64.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "498c416d53a7d75657b13ffd98b6f15d7654a59bfe7326bc6ed69137fc4b124bbb8ba746da6b71a5486c802afbee54f291457ce67cb073496a688c815d03d6c9"; + sha512 = "ab4ff188c7917944924cf29fddc78946b15905eed83dab45daa5efe87f834a292b8fde892d870490f954eee74f8503b82ff2259d1398d5e16c71b483d39f13be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-x86_64/zh-TW/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-x86_64/zh-TW/firefox-64.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "dcf126fe240e0eeeb52d402dacb6750a80e2d4b2342da71e7869875d92e0bc1ae60e6204ee7c68b78ad116d5029ba1c0f841dfb9908ba18361df85ce9d2bd8b3"; + sha512 = "9a37f5fc55a328b032d21088bb1989994fc2e63495e765822e93275ddfa99739113fd4724d26751840bcaf56bece59e77ff3f7574e97e946794cc475c11bb4ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ach/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ach/firefox-64.0b5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "a3db29314db1fdd166bf452bdc2f9633a1aacddfe825220b1c3952190201c407a116d90cfaf356b27039db2c313261ffd8bb450b15f7d5b03a3cfed1002254c1"; + sha512 = "1147ab94d780c868e5c2bb45f0739a9cd1f69a03b4ade4a4e06f301a576247e73e4aec1422d4de4711d0134a1a1f3774ce9fec54ac91b88fad353f8b9054926c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/af/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/af/firefox-64.0b5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "fec2646759f8ab2dc3485c907da2e94cbeb452ecc49863172ba4cbcaaf1efd7d29753a70aded63ba7431bb6d1042bd17ffcece5b47aa1e8caa9ebf9ca836c47e"; + sha512 = "22330ec29ca5486905e36a7e59a077d33d8239f3f462a3bb49fb38a407dd5ba15ea5979b032d76dc8eac427cc9305a1a207de6f147a528d1e68d69973bcc94f9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/an/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/an/firefox-64.0b5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "38570642baff4a9e3430e39204c2a06c090127a41465b217bbf33a6b8e131ae649cdb746bc2a7f7af89c8dc3fd6f52c39dff8b88428d35a105e47f82bbbb592d"; + sha512 = "ec0aa858937a3683b496e0569433bfb6d080de6f03fd8b281cd920afa58aa0cff7212b077c1581b0cedd7ff47b4a0523a361c2fbdac14b8281bdbc48422cffb3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ar/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ar/firefox-64.0b5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "472925b60b35d42953b8cfe381de13f6080dd4f378870c27899c53419aa8341be7f713816539477eba34281a2b08b233529305f187f851372ea02e6369ff4d77"; + sha512 = "7a64016633b1b8b4a505a387d0f565b6f42ee6b0fe729d0f76465db0231c14e00dfc263bf96c646aab09b40edf9ac6009055b87acc64eb087cb621d3620375eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/as/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/as/firefox-64.0b5.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "271091d9e6f28849a9d58f5760cc35f1789cd651fef30ff1d9cfcae66c84653e4ec8ef30889a6379ed5427e9abc84433684ced99bb314e380302253afda047fa"; + sha512 = "41b51269a45f2250e100fdee3bc0ea3fc1714f9ed104d36a51eaa1b26fe852eafd586ee95f34f1690f5b1fd88b56f3667dbb155374536daa2637225fd8f7a3f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ast/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ast/firefox-64.0b5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "c4ff0474f6233bf7c93cf031edb629103adeba462c2f28eda3075b41c1ab690ca13adc0875a97bc65ff1c7e3c1102d601a62cc3804fc89262afcf898684977f4"; + sha512 = "055e6b6d874cdf10a80c9d3ae64cad9a298e0c7d1dc15dd175c9060f71187a7e212386e09334e7345172bbc8f1ced771cd67e46ed7ec0f3320d57f675c007091"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/az/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/az/firefox-64.0b5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "4a8454e339dbaa80024debf6e7c852195dc4be476da263613dc1bc086301f780ab12cdcfff5720d655b0f8d6731efe28f1afd0c0be4cf9ac2698914835cc9988"; + sha512 = "1b3d7db566b9ccfb1623a812c6bec619bdce2cd0c5e16e1fa1861e9a599f84a4f4e13f436a5559d29c1058022c43aebe7aa913efa2d2fac382ea2e477fdbed2a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/be/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/be/firefox-64.0b5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "2c1fd73725b6a776ca6dcdf1b6a3b7c0493c70ca01e2c90790d963fb7edf6f6a5b826e032cb9378de7b1b86ad08610b683214d8b02d8217df6a3a44676f68afe"; + sha512 = "63247e5984ecaf234bb2ef53335c992b9630936ca2a13d7fa00e263edbb365a2da49ed5125c3a75e92a0a7a9f53c6c5590c9097cd3adec252da2516fbbdafad1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/bg/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/bg/firefox-64.0b5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "88d6cd39c2531b32c57ed2fef3ca0bb2e949be1abdc7b8e1b67411f8a7437bd7d8bcc0f2f6f366122ca08069390d3cf58e1b188cae6ea9be498385e0c03c37e0"; + sha512 = "d81c639ee1dc900760c44c8751dd63985eec2196306215568adc0b988fe973a9f10115b4b8c2d24f75713450161281cf4aea03f83720ef2fc27a5bc2108c6dc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/bn-BD/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/bn-BD/firefox-64.0b5.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "426c76c24a0cb7ad7fe8854e4ade3d4b965f44b02e61c1bd83943ea53b68a863c278d751549f84b5aaa8aa2403398d68ecc665e855adc1e898c83a2e47bde3b2"; + sha512 = "96e7842e71f4bf4f3430d2e13a814420b7433b0933d697313103d062f4b3da55a62f6f7538e84d8b53c6e627487f41b916c27b0aae6b5e537f31c1a6444228ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/bn-IN/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/bn-IN/firefox-64.0b5.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "9d368244d95642c5ae5059fbce23eef91b91913910f2df69cd0f9133aef194f94307b3db1bc8b54a8c9c74128e0478053380e7c80835ffc0c63b930032f61ccb"; + sha512 = "9274209f21853a03c5fc6617cee96be8267cec053717f74dba21fe8042b0e22b04b22096b91c26d8b887dea92b74dc113e4c4a1889ec01a78669fa79a1a2c02b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/br/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/br/firefox-64.0b5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "ff4a92180da0afcb9b4819d4548fe999ce855db2a7ad23b9bbf63028f48a91e734782b5f72637546c318739006b72e97da4957186989a5565499ab406b66dc9f"; + sha512 = "709924f55418bbce8d5d4cc903dc6f8f9e0e1e6047744658f8ccc8aecb13fabd475b1e1dbbb99c6f4d8c95d0745ed940e8c259420b9f4c941879199ce970eee2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/bs/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/bs/firefox-64.0b5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "752d225d3a02bc576d586126cbb855a104eb31ded32b878ca48dd75a33497fde68e02625d65155df103dc3e09f52e86e94532f0654c5cc278f543a2f52c2665d"; + sha512 = "083071a5927c89a233e203e34655e8d094fde5cb3d2644bdf7b713005c88f61d17750daff6076cd01858d7c51fb7265c7af9c20a11d2050568ee601e83127d45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ca/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ca/firefox-64.0b5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "cec7cc4b77318726fb2ceb348bbb888c2b06d43d991ab05f0b55b60a50ddd1878b6518c70cadb0846b722fad9faf753be3efe7130c5ada1b22bc339169418ce3"; + sha512 = "5ec1b606b3ff9df57963a4519ee42cf39d6a0d3bfcc87e4767cf853ab0b5b412a8b790bfcb552f8637c0f2ae63e4b4e6c6c896ff307612678aa2cfcc5d465b45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/cak/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/cak/firefox-64.0b5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "46c5ef10eababc1478ac40cbb94911061bd75e7b74e3dbcae6a42ca8afaa6f0ce4a60e1fd9cab4739b4862938c8330880e966160cb87c59006df2087a3208e8d"; + sha512 = "fa3f55f8515f54190bbb0607e26e907253b13bdaae18ac732da96750fd206aab2b4930d45f615f9aa095c972655c8c64d19961fc6549d17ad607fb7d81236042"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/cs/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/cs/firefox-64.0b5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "77fe4977710da8503a9df99e9e2969baea734ccc5634c9d3bf250e336018d99779317569840dfae21445131a534e1817cd7de199266bb144498fc0d361f6e63a"; + sha512 = "476a0a9a68e659f9894cc55d697522f323bffa7f432feab90b67a2160b6518b1f3ae1f7e8e14aed0ca630e2cde0571b206146cc3cfed4b43462cec2408dc1c58"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/cy/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/cy/firefox-64.0b5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "b8e56afce6df77270c3f33ffacf219b6ddfc78a42396caf98fdb88662cc84d477c6cb367d7118b9ec628f498943ab0d3e3711d076c3f01c4c226b8379f85f4f7"; + sha512 = "b3d6e2c250c64e22c58050a266e95ef3cf5fbb49bb0993a4c471ec50be1d7c1a35183b80fe147d67ee53035e4ee203a4e26d5a8efee6985e8d0cf5a41e513a1c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/da/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/da/firefox-64.0b5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "f733b6a7a470b63d450bf842d20ffda14f2e77a8a4da6ed327b0406d1d1627898ee592491a9d3f2b30e6f5ee14616251e31e14bca995459545a69f2629b5059e"; + sha512 = "786207343d449e5c3b2fdf5f2926dcb84d11dc9b7903af050fae4aab84b63fe6da3ccf2a8679745a7937620aa1267f06eed4ed8e284a203e665036c37293378b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/de/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/de/firefox-64.0b5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "85d7c8320e815a8462a0bab7931edd439a726618839501e5201cfc526d6fffa401ee696a0cb3dcb6b07b303d1cca96a87805ab593b6d02a9eadc0b8e9dbf4afb"; + sha512 = "2d69bf8217fba68ee5ef386c34ddbcf5eb7a7be7e13b5a975c99817a0ee4d9b297ec7a9bd1c2a660c14b8734f909660bd7f8af65812f78aafb73630c7927e727"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/dsb/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/dsb/firefox-64.0b5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "9aad72f2f479cb00ed2f862797efe7ee1d0b478aa0fa0c26c22b37c0da1553e62cf16786a7fd285a67fde183a8b01142bf8e80f16ed69ee11162568575aa8a5e"; + sha512 = "b59664f5b599d719b9748de8dea1f4a70d4f2d37f22a7dbc8f2ea09ca0f56fd130c25d44b8bdecbcdbb93d5f531bf91afc06842734de5ecdf03b4ba670d542cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/el/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/el/firefox-64.0b5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "60c271b8d83b4ced29b608b6ae16fa1acaf16c63c6fcc0c779e5fcacf1943e86a12acc9d5ec1cb2b3675d85b633c9a809e244d1172bb9666a80af997b4cd5075"; + sha512 = "18a3069d101488c682f134be7797877e5bc80817073e26d7d1693c3b161224aa90105f6aba84bb2a8841a8859b7b72b19e2260ba36924baee3c8c8a83898121b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/en-CA/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/en-CA/firefox-64.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "ad63eb42001b165bdb453ac5a0e090ad1e42bb6350c8f600d0a50528fa56ed32c5aa96112f79480e68e9c6cf36965986ec322175ef9f36b6265eba75eab37c73"; + sha512 = "945df8ffb124f39b592e70adc94b79fab92704e1fa02e15316a6e8a765a93d660dd6aaba6f5d3359fbb2cbfc61f256da5d17091d77762969fe6de873201a1228"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/en-GB/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/en-GB/firefox-64.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "9ad916313359aa3a31407ee0a31d49c3f80a5fb3aaf5167d55e0f01fda49cb85769a8cb70632d82040823ccecf03bccc3d5b1765d96bc3755eb2da785fec0577"; + sha512 = "c06dc5969ed6a3663e2b865579ac69300a654300f01bddc384bf6528105077c2899a625bb304673f94d4243152fad34254493a992d880740f556fc6b538898c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/en-US/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/en-US/firefox-64.0b5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "4a6e9eae976726c2f3f7652ef82b7787a7d2e173c2894e49317f5d2de8cb546a1ed1f3e9d75c0a610e85883f9009dd2e77045383758565205a3d3d27c05e1e5f"; + sha512 = "d9e9ee4bebdd16886eaa6a3c2d31b0efd31b72058c6616d0a3dbf3b7b15987ada3479584ae626c31543a1ce1fb5aaf8a557fe095e5d3a753eec28b617b339e77"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/en-ZA/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/en-ZA/firefox-64.0b5.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "abc7464bdb8da37f436ae8dc3d32beabfff657b52a257ef934f61b885f876d06f67a35515aab702dce9bf5cac2d10c192c4ea367c77eaed53acee84e1ab0d52e"; + sha512 = "a9d0795bc6486c694b0b8c01025112d94fa6eea436bbaf4fe31877b090346ed87ab9708453e2543c6f85bf92399326a182d5b2d3fc619a51bd9ce15fe11e1f7d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/eo/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/eo/firefox-64.0b5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "5f0d1732271245a380ee0dcd7e0cbb6dcdd7a428796d7421683708ed10962d3706e7e95047753c1d081239aec0d3319dade644e2ed70474f88621ac8e35a5e51"; + sha512 = "6fc6c26e0b95660c14d55b60c42f60421a8c534efbf2a2427814783aecd2580709cac4224766212afbf224011d60c7c1a6d4e62e8811640c0709124a5417763a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/es-AR/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/es-AR/firefox-64.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "5cdf81fc39ae3ea414f9ca4b85f273c79001395cc309ff5dbc0e55d29033c476395b1fa952206757c40b8d3189c69ae97a0a4d909a3eda39669bdae5983f5f31"; + sha512 = "13053c9b91cfe8aefdf5ddff59fda4056522c1c5ba2da0a6ca9f0de561395191b67b62603588aee3b79a1c3ddfb8a71b1f0a84f8e6dbc8f4373d91ac63b54cda"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/es-CL/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/es-CL/firefox-64.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "22d5bc6c5ffb9753d27dd5384b38f06abb85e2903b768dc322e449c9281a850b90de4a281a86dd197cddc57ab0f4f2eadf5cdb5a603d1a2848d8e83cace0554f"; + sha512 = "e6be34e40dfea1424e4a164f7d1c61fb4f4c358e9e5f8fdbe7debb554178b46e8e7cefa4815819693afd5c0756762802f3952303df5d38159a0c302bbaca77f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/es-ES/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/es-ES/firefox-64.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "2983df2889567e630c0d8b5657e93bfd2898a97a6bc8507f1279c845e5b98bf2993c807009ec6dc8b1870d55810ca0cd1ffce7bcbd3e7eaae17a9bf8948320ba"; + sha512 = "5b086e89b6fabd55f11dd4a3e8ddbe935418e28c5bf14a24039f43abe5c2816099d8ecc018a7b555ffb70e8b5d88aff847e700521ab357cde56aad569758f687"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/es-MX/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/es-MX/firefox-64.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "43297a1ce9fb0a4cce569706563ba7921be9729a732597991bd67a995c89ae40c65b2a8c9849f1a8f7671ad85c424c763462761c8fb7d11ca25c3b8385e96d7a"; + sha512 = "1e224d5ed0f709576468db21c0ec82e15099a90392529dd5229af5f6efba52748ae17dd11a46abd0637b3e063962322ca2684a866b3fd73358f72a8440f302ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/et/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/et/firefox-64.0b5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "02bbea64ddb822000542412c20f351e4c7debb690ba06d9fd22215ad866eeb0e170b0a109b51c7e4e23741cf87177b75c3ff62cc356b4d2fc58847423ff6d3e5"; + sha512 = "a7b74f1a940fd945d42e4ba670d0ba2c4b33470ced5e1bdb71eafa7caa580ebe9b19a44455f5b7ac2b74a994318eb0b3ab038c9f3246a1f6979dbe225fdbf0fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/eu/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/eu/firefox-64.0b5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "424bb950eb0393079654ef652ed5366029567fbad87ef0afa127a26ffd863ba01709ecc037d3e09c59fceac27957c8d88211a17434cfacec6fb4f178db8eb912"; + sha512 = "3ab39e8011d7996582318daa9fc3eb89c3cb099f344bf1af7e045e1cb82d063e547029939c6afa3c212add6944e05687557063a34d1ae1675615f96734c0ebc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/fa/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/fa/firefox-64.0b5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "06b05c63f63e3316b3dcee41f5f3296cc88052137cf9bccefd0f1dd51202613c61d9d4e43d5131174a91c38bbeb28450c92aa9e183cbed74ec283ec9c48a72b7"; + sha512 = "e7325bedf5f0bcdaf6710ed4a46333321f3493c1dd7c6ba5d10a5b978bd5bfc4745872d817555e2767758f861429872c0628d9158bdc9923b5eb09f497b4d85f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ff/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ff/firefox-64.0b5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "226f1e5ad28ae5e43e6475f9fc3deb7d7a602097df2d587919490d6e584b6aeaddc632186180f9d63ab75ecde0afb203cba89ee8749724466a85e7a259813fcf"; + sha512 = "20c7f71ec371ae8e3798a46ca3b7b0fe8f449d761c033f4e731283652027193a636b01a37cb9020180e423ccb7a6b888f9c42e415be84117c9e18666b8476434"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/fi/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/fi/firefox-64.0b5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "484d9c73ef78217ec3f72146507286002eb798a1a3a7089a927969b48c2dbef1804930758c87b116324f5f348efa3d1b1dc3416e55bac7e30da7315c778cfad2"; + sha512 = "2085656a737f129f0db8e8479a818138e516f378c93cd3ac2af0005907f3e5b969a4c76b2a94cadfd3bcde062c9496910a81f2866987876d60a9393132e4567d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/fr/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/fr/firefox-64.0b5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "e4d3ee3716acbda8e132cf7f41160c376560bb2c31219014d1e6ded0c330cba43b7c5fa1ff41591a3c2c9e0ddbb0d9d9894b5dadb42e49af4b992440929e3e9d"; + sha512 = "be8b9b06dfa34ddb73cb7a7903f9b010ce133c531839f10be360e3826077143600b9ff0b4ddb9e48bcca72a3ad5a299ef12751701113073e2f0b4765b5d56a6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/fy-NL/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/fy-NL/firefox-64.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "37ce8e65248aeaa25768eb49aeaf0c0d697c6cc32601090525a7aa9879b631e70587c2059148689de358817926e0937ff056796db4381303ee87c2cd72f9dab7"; + sha512 = "fe0bfc1fb17d83c3636860acd2cbdf0281902de1e272f0fd2f6ee9c16e4972e697e219a5e94609919dd070171bf935955097a8332846ccf8f6ff605297c735e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ga-IE/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ga-IE/firefox-64.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "f7037a0fff6948e10a3f45c90f115845e7b5d2e6e7db973db361a70ed000e62482eb89f91cad12a939e5df81588f06116b64bdeb72ee247725b042243c53062f"; + sha512 = "673dc827b03735844db037f8a40e82b14c7947cfdc8a3a0a7baa206c1c5a16a7984459dadfb94a9b86b8d5737aea5f904e0db1bee7b2041b55eba3b6144b7002"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/gd/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/gd/firefox-64.0b5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "e3ebec821362effab4eabf1c14a912a3b40e30ca1392cae5c3cf5df844cb5a0b675f046924117c9b414ed7315acd0c23a7259b19fd480d38801c61d45885db7e"; + sha512 = "a5f3ed796ccd1b28b1a383372815e9ee31589de60095a010199348051310651abe0a1d54a38daa76409a6c23fc82bfe52330287d1996413d919786a4852123ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/gl/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/gl/firefox-64.0b5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "2681686a797d128b9715835f05fbb9a266150594da19d4c5a4d5135e3301974db8e8db3da2ff27091339e3e6144b81e1726337f6d1fb7abdf2fbf9f567143103"; + sha512 = "2a43984e243576915335df43bc8dfae37ea5243d31e8a8a60ffe74bccd58919bb0c544a89d7b7cbec72aebb378d64db5d9da3a8a237ed490f6c1efaaf2a926de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/gn/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/gn/firefox-64.0b5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "21d2c731ffba1abc9929c312852b856b5875261899867d27633024e0d185525b958d6261bfdb12e986bbc3d3ea5d73cf3200386a760858fadacd410898a255c6"; + sha512 = "b95c3518c71bbba3d60dc90187b0255619776f85c326d1349cd9d08ebb16139c2e21944c4c581044e8550fb2ca35643ed109abce0f2428db56d36514ab3482ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/gu-IN/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/gu-IN/firefox-64.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "cae83ee0284af96069c96841097ec33eece0a9f2cb5f084ae9356f50af03dbb38df156eeb876164281c69553d46f2c0a6f11036faf58e78d49c297748c1b25fc"; + sha512 = "2352149bc1d680b86576f95faa26efde328132f37a8f5dd6fbde24b339439548d263c0e84995260b25a785456424ac424aabb78378d2c341e2d66ab06579e720"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/he/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/he/firefox-64.0b5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "2b22318e0b591b4d959a8365dbff5471e8fe4667a8a1f0eeb6810f1f61734edd88f656f36c36bdc56e71667313cafd017a26ccd9b11cdd4d1bd6c7599c1e5013"; + sha512 = "2de0df8440195e085f11ebdc8ba0cd55983045227fb0c9af15b7edbeb2f8a912970ec392ab4773753b5489c37e7fdf580899e5886679c7ca11301fc56e6a283f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/hi-IN/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/hi-IN/firefox-64.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "5a297a9898c04d3566e9841f67eb62fc3eb01bce2d4d643d10d9c1dfb09c55281a67810581f2391e29a9cdc41e7c9488d965c7f6202e5aadc3c6001d12f5a2d5"; + sha512 = "a35c8fca1a0e9e17f4445478700e0e04d6ef46e528c6b1a9bf7f5cb97f5b0d2344a1b93c8871726a592225835b85506aa1e02598515a02d077e403b0a4d817e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/hr/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/hr/firefox-64.0b5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "90a98b1f6cca47dee81c4970586a0d791720ccbcc11e1146143324b4afe019aca700824feaa228b773bb5786ce3b173f6675f47ab63127480e8b832601026300"; + sha512 = "7db8e1304ff41616ff152d87850968339e8699720d4dca156acb9d15af72d4e947d36e0363fc258197ff2b6e3c11651b0b75e6404bbef65d673289a407cc11ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/hsb/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/hsb/firefox-64.0b5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "fb1ff2cad69462b6eb5e6b017af7b9f97c99a7267b7c0d5708d876b3443e3eaf588b7154c19cf0e7afc1ad68b16434812904c5ca0989aad56cbaf47b76ba4bee"; + sha512 = "d171281af80764d6b9d7f1a31836ce5136a1f75cbd299e02801937d8eace6bf4d452cecae0a0010582c39920e4592a499ec856d2b208fba61bf3b8c169e22389"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/hu/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/hu/firefox-64.0b5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "6c4cd05567597aaacce7903b149778cc55163a64625dd70ea83432b841299c8c46afacf643be84a2322ddc4d5331c0fc2a578e94a1b89cbc53bc5d65c5d1521d"; + sha512 = "f49d7703230f981b821d504395158ec3ee291614070d6aed0215c096eef8fba7aa44ee74c8342e75b80f1bf701699d9a4f17a34d5f0e7d846b7cb126de32a4e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/hy-AM/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/hy-AM/firefox-64.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "ab3d4dc4b723e425739ade0263a43367b15ab84cce796afdfb392a60aef1789a27a5153632a9c9efc5e2a4c732f300d86b5e35b07790fa83792f6b70c5bdb232"; + sha512 = "a4363b39fdf2932c618a56f14405963d9240e331ec2a26e72c47cb7cf12a510b03b078cbcc73f5376d8e5be0e64444de2f9bea954806bddc9559da86dcce37d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ia/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ia/firefox-64.0b5.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "5e5306c35a3d6834f3beb5e9d102d014cfafe1c2ce9b7da4939af347166c3fb78db1ebafb5699ef206df62fbf99d7b220f5ac205cc50c626c304584145a5e022"; + sha512 = "65c5e07098ee6016f81d3ef9666aafcf2e6ae0fa16acc1f0d2d58b07f0da84189b9b297667e352d9a4dab06d0b9ee2ec6778151d2e4d320bfb7291e9004b27dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/id/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/id/firefox-64.0b5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "1377eeb88eca23bdf50925b1e6ba606205994c9bdd55776a8d41bbe99a9f57f4a213a4766005af1daa44c0a20a1f053fdd54195e586536dfdf658daa4e55be48"; + sha512 = "145a31f95c54186dd52ccdde90ad24a12246a3949411756ae8c7b86fa20e3919dd6a6a32cd16f23ea607f2245ceabbe6588bb7345ce056a45e123bf2300a244c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/is/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/is/firefox-64.0b5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "b92211a08e555606e2b38d400e89a941920eedcb0da593bc3daf4ec37e93a8d796145bc088b4a1f6a3f93c0568c281790db025eb2e21a85e4a72b2bfb9e6f5fa"; + sha512 = "e9ca61c38b46819b79ff1f3c4c333f3ca7939de2f029bfafcdae6c154f209ac65f9407f3e0945ce6e49ba415b2d53c8c03f4eb81b735501e4349557b5558871e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/it/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/it/firefox-64.0b5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "4faa4d802e59c7cbe684ae07ed499275200dc77f16ef0e262d0fff72ed3b8435e05a9aa710a3640ce94f5f8331c7044d449ec303d301de393ad1defe171e677c"; + sha512 = "6496ca8078d7e7137caa8274df1f51765178d0f39d7cdcc1667193b0cce3f9c514d00183b15a0c278f7cd4c32ac9933b6e11b2bf5e806aa0ef5cb88487b3e4e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ja/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ja/firefox-64.0b5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "9532bc0b84dacd779df9ee323e1c2a9f62f178b2972a1cc3936ee6ca4bbb867d217e2d11aaf9a79fbe4f18f9d53dcbfd91f2cb27aa7b45321d44ca6de72fd9fc"; + sha512 = "9271078fd3eaa61538659f3e7bb068c87acbac807b14424c5b56085801593e77dafd15340f814f3674c644f76cb42c9289f9d464d7dc596d58a656a2e8d871e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ka/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ka/firefox-64.0b5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "062eb5cd16d0ca7890bad1e250836314758ff8dc5c56d426d24f72f23258af357f4eaee9f58b7991712b60dcf8969863abb9b2f49b7fda3317c48d612a26d0e6"; + sha512 = "8b7ea0b40195ec541acf60cf4fa5d89c62d4afb04d3f2e569acf8920bf89b89b4cf30f9af45c3faabd76f7aae89a09d9530f16108e66fc2748c934ea459aff63"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/kab/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/kab/firefox-64.0b5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "ed1802bd61889dc1627db1bc410713f498fdc3155e8c32b7f210226bef04ad6d6b34555a5578384d427acd092c48ab15f282f870df69f60a9dbe9ea65382c83d"; + sha512 = "ec41baa1cb3a4b543a5a961f6c54c6ed62e16888b0073a93bead75baa4cb836eb05aa90b02ee09911f31c9b106945bc62051edc3f681ad6d8dce33dca918b8bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/kk/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/kk/firefox-64.0b5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "83c3cb82272b5e078de1ab71e936ab91e4a386f4ff94c690d62bf546f1d0794daeed53d7b7fdb2334ea378608655cedcd105d90bbcab9a5c9092ab1927a7b534"; + sha512 = "9b2b6c3b6ebd7b43e86ac000d7ef0c5b9f1225b01f41bd17fb3293b7a89df8f34858bea5aa4370c25b0d15757acd701b1844c3ecf7ea6b38ac28fe701cdc5866"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/km/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/km/firefox-64.0b5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "7968176245c32c729884550b7c8b2677b7856a086c06683c8808f29f1517872310daf54ad5618630fd3284e9e1eeb88dba14d629487906b696f87feaaf056e40"; + sha512 = "9afddbc1e372b7f41790ff84f43770c6a48d23165ee56d540f0ae624fd563b0a9bfe18872ff668113a7c2ef66314c6bfe36ecddce45ba7411817c4d574fcdde9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/kn/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/kn/firefox-64.0b5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "93926d6ff2e6b466f21386643f045f65a819fde5b1276ab889d9fc6d7bfbc7b0d979f9da15744c59e1ecc565c4960c7f1e96657db2e4fdd9e04b9a3b46378925"; + sha512 = "fdd56e2934767f5656027bf7995d91293bd1be5bc6d5948538cabbd3976dec220d4d54fcb94bc9b6246d1e10c50015c7ba20846010aa9767fd120645a37c0887"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ko/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ko/firefox-64.0b5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "09c829a2de1727c6b26ccb8810bf2cae48fc2db84011337bbd3afcf6d64e9ddfad7d982816d2acea227ffe6ba94c387f8a8cedf45c390199c078eb8ff42a0886"; + sha512 = "9b59b35cc8bdf6eb3980c3ca9bd313ba7584e6c24eec4521d2ac3a4acaafd2b1f7aab1bdeea4c2219bb9c45e04c56de1d669245649a309fb422903db0f73d266"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/lij/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/lij/firefox-64.0b5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "3b2b39b158059f223c476635bbf4fc2f8ec352c45a76a750391c425d996bda699d6e7a72aa7abef5ca13d6e62bd2577533b916902775567bb2838b88d975bed5"; + sha512 = "e49c4440031487d74406f62d8028202839f0ae314a6264beecf86db736589cc6f0a9c3afa73644325f5a2befcb6403719b5bfdbd94d46489f06b45a2e20336d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/lt/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/lt/firefox-64.0b5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "048ab9de33176583c324428366e2f950de38eb29ae8d72309ab5559768818f6094cb47e6f4092fd05973a5dc21c1ca554e86dfaa254930802dcbb05e895067bb"; + sha512 = "029492263010205a78b17652dd3c668acca99bc15ba9f420bf5f8a3109a1f7b6fc654c9be866a16ecfb95c612c3161e019d6924f1737a180f670bf32f9888d94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/lv/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/lv/firefox-64.0b5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "6887e5286c28fa4e26b3b0323533dd3fd6850da62aa2180520200fcc24c7a3ba1ed1fe818f61144b522a268ebf38755650e8bb6f4bdb406418897a2ac978609b"; + sha512 = "8d376091e155bb9675a83cb828f07f7e6b6d778a10937f83bdd4109b1e61b89fdc28dc5742a006515a8d8830a5bdcee070abacb9b857e8c084cef6a26312f8e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/mai/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/mai/firefox-64.0b5.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "51a4ed003b8bae2971a8f6f58d1c0a2f738e225a7f5bb53f3e0d6f2dc3028cfe4e6b7deb40dd65d67f4cd57b85e0943e495000a47aeab991f7ff08bb211c79d8"; + sha512 = "891093ad33a07775b91d3a62eeb10be4b83771fcd44076588aa6c5821135ae14ac4577d5f1b9c26b5c7e1803c50d642cd473ad7676f935895392f2956b724ec9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/mk/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/mk/firefox-64.0b5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "4e430913b1a6bc6206bd2e4fef04c235e2b3ba4bd672692e3d2c37d7dc56fa902bcdfc58a16e6a66c40999fd94c80169c129cdc4618f6dc1f73b2f094a36801a"; + sha512 = "a6e21d9ecbc563830afa618bb24201b13da61b028aa35c594ff387bfab5931b4d907076fad2c9dd70211dbd19c4f8aceaefbab5e9f4fd32188ec1f0231cdb427"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ml/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ml/firefox-64.0b5.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "992693c9e20d6f08815b636c711c8f27bf616133365f2204d78e93c37b2c0f88454af1b562b2aa7879b7ce94621980e90451636cd0db8493e054b69519406895"; + sha512 = "c7e1e410264837aff25f994cc1642ee7f3c5a45a4ae6f6c353b6506fe982abbb6eea2d6407337d83c9d0126d9debb78e08d8a7d2740a52cda1dd47e4a62be0fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/mr/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/mr/firefox-64.0b5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "92f040a94ecfbdef4f48813b21050a767ec7dbf71613630b9afaabd6d4bd6821b7baf8b445d2456c29e5f708a0c6d3858b8cd8e3143bdd3abfa5a43dba4e6484"; + sha512 = "4615e472d4acf1e3af2dc2a4cbfb289ca7a369adb47db898be8aa12bbcd2eda39d627c729314172c10da938113148be271a4c77a9f5c95a771f32ca7a107b78b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ms/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ms/firefox-64.0b5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "2c6bbf0a52b1ae0c9a63480768ece2bc43ca147c38d8288f0845068b29dcd995bc4b8744215258bfae4e2b90cdcd27d64860d9125330ed43fbe9cd3f823af73d"; + sha512 = "93a19678ae8699493e9500bc2d2398beb6a10b725a127098a5754dda592cb6484988ab34bef7b2f4b62a12abcae9a3d58d50f47926533cf8bcd080aee6a82464"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/my/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/my/firefox-64.0b5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "a8dc48cac66e89b7e2f8044f1091cc0e57fa791acd7f9af2dfdf4225e4c9c3b738c88f7a6e5f5683ddfe016b6158d87ead62f0fcf33e5bee48cb69eabe444921"; + sha512 = "6a866798a4a90883010bf62ef153f192b8a83af0e4ddca34d06d1dbe5f7111b042a02993c2d18a2a34f54a66d944130b4a7f9a3d37a28794653cb794ee106af3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/nb-NO/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/nb-NO/firefox-64.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "d05467ca3e2f4839419fe463a090ec3fd5fa80dda6d2e6b51ace3ea3df793332a1071b1cdc1b1187d73fda996ee59c97f6c2448cd29142fb8b27d4338fa24e4b"; + sha512 = "0afb2a0652fad855227235e40edeaf78046a47cb18033bedd895baf0c7766ef3837cc3273e92298814b8cf02240298a08ac489cdf3867a07a3b6c40ef826fb8a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ne-NP/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ne-NP/firefox-64.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "6d2da614f0afe7e40edebdd823f25233050108301cf0dde1df62a336bdd97449fd2d4635e1ec9b9bcc33a9103633995ab92b4a1c691939b5486bf7d49bfc5cd5"; + sha512 = "802a49e37f62924a20076e0a24357d6f695ebbd75b82d7e292d91cf01436ae644b08dea289a344499238183d0a70ecf0407c37f89369c2f4cbf75f015584fc7b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/nl/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/nl/firefox-64.0b5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "b1acb0a977be5af4a539839b01a871aae8cdcd709a3fcef8f8793eb9e56a52fcf39e7459e915ae109387041f8a6c65c55c234bc088823fc790b1c56e68acdbfa"; + sha512 = "eb689a073634f18ff9397bf2d43b870a314fb630304f76758d8683a5e16670877f87c2b56ff35c2534904744fa546b70eecc1ec88b2ebd6e3f577ecdebedaec0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/nn-NO/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/nn-NO/firefox-64.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "5d72d260044921cd9108264991fb1158397d2bad147baa15472f4aa7722349694dccde1c60fe7ae593141100bf26d5f09031f36a893e49e902cb3b40c076c76b"; + sha512 = "91d00cba89b26c0d3d9cc5670d3a876194cdf545c9fe96b6afd1087296f1c9b9840dd020b39384a0de7135069ca473001d85c51b6c5ec12d5d0719d116d28e87"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/oc/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/oc/firefox-64.0b5.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "1c66a63a4ba36dd1ec7883c1cc41db9665b5b141a607ded2dade770461365aac2f8430d7039dfec4de3d1baa5d12fe3fc4b36e7ecf08c706544d443fd7ffca73"; + sha512 = "48c3b0658763328c6ad16097a1eae37117dcca6e2484a42eb3e4b6fa1f3ff687ecf820c64cde0ec7bc4e2e860a7574ed5066422ce894fe538b1788e4827d7927"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/or/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/or/firefox-64.0b5.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "e2f24ed7e4ae2e2601700f02b7abeca63546c82fbb4c67ece0815474ef13421e6c06b4a14c3886813c28f722a2e7f3b421358bba089d67356448b0a00655a6ca"; + sha512 = "0470149a2f1ac7125069fdd537e89b81761b61a3de8b5392e85c9a8e57a7aec9bec65d5c58f3087dd54fffee09a52de6ba59a5c52d41d33c333c9bb577169614"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/pa-IN/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/pa-IN/firefox-64.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "536d1a61b2849950a44d3a3b4cba9d468876c038cfc109449b9f7f3c24ca7ed1c50ff28e48658f3b90a6b7833c9a1b337ebe1cb63bdf7f8dc7b9c11f03a5885b"; + sha512 = "b1fd71af6a370750ea69ab1468bfdd15fa5735c767ed46365e3ab786ebda0cdb8475bbf1e46328cf26123f191ee428298fd609e1b848df7f0ef2625f8dc5755f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/pl/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/pl/firefox-64.0b5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "9c3c2bd596ab937e9757f2c6204f3866e0a6432802dec1019c9878c83f1a85a863df6f3759e992f0641af5135fe917ad9ee5988eed83407a94aaa2b7b24d140b"; + sha512 = "5f06388ba94f7dc497c97870bdb48be8873b4623f95f858ddcfd3160e7476cf04f15b7226822429031b4c31bffb52e807f9f3fbe5d3edeff4cb82ed3384002a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/pt-BR/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/pt-BR/firefox-64.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "0a854b735af9ef1a72d90d5508209098d70bec03d93e1590e04ef3e1d0e1ea9577d617c0acba8aaa490090daaa2b9281b6bfd1c8e3af964146c8e7cc182bfcb0"; + sha512 = "ce6e73c840210560cc1bb6006ba69031daddc59f0cc89a652fbda7dad4cf39165f474e9b4601baafa1e6622e78a1fb37411f611e21221c7f7e059e42bfbcc4fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/pt-PT/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/pt-PT/firefox-64.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "e7510b5ba67d92be489098e9b79a39ebece92f54ac8d2420629b44d80d9cd3045bb46989ac84b57c6297ace41503ff7cf6738b6aae0e00e6ff16f9478566848b"; + sha512 = "3c906e720fd30682cfe17cafc668e2e058cd42c2a76dde01bfd7162afca4dd777d108099a79c16dd46f35818c4c6a3f5bbcfec2c1ff8efc374ca9b2036b22a63"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/rm/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/rm/firefox-64.0b5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "cc05bcdcb8e0f796b3007132657980f8e61ea392a79b4a06bb0cdce3ac35cfec7b96f0e49bcf0517dd2e74309e58a67db69718a7f003093026bca1126ce1c399"; + sha512 = "f166737666fde11631a28d521ecfdc6b159694a88c59f78f87d5b304a5a6b83c614dab05357520f6cd92a33a8d390dbc86d15f7f980c6a81646f6fba7e0e9cd1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ro/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ro/firefox-64.0b5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "158fd225dece07d6820609846ca1bd12e046dce97f8c20bf7386aa57f4c3f22db7611ec845bf48922f1fcb995d8218970a09b7c6a750f3a056c22a5a9266e3df"; + sha512 = "eea5028452c79c93334a43596a145422df3371b8aae90af7f6e65f013c845398a780367d1a3a8e9c2709d506b9f0349fd42ccc93d3e24ab44fcb4677be68be65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ru/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ru/firefox-64.0b5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "271455f7bbeb694e932d09e32b9c2c3b898a83178bd38f9880acb087dfff33b7e9cf8558977167be0dd9022e18df0919472e3d5c665a9f107424074c8e4df85f"; + sha512 = "a81cfed25b0c89f33419b7ad6aeef1dab4896deb9e04293bd4224c6c8fa6a9ac3e1c5aea027d2785a6cb537f5d18077a436afbf95ae79c3843744a219d49f017"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/si/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/si/firefox-64.0b5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "7c8b690c348a06c9be6179befd0d7a2700e8aa78a9d1c33c4c10c82553b738339f8cdf1be52c5e4fcf5eb980a6ca4074bde18f1ac3a20e0614cdb9d474b371c8"; + sha512 = "e19b775d7bdcfbcb7bbcc43235dbaf6401628fdf6c008cfcec34b3095ebe5a71912645301034d7f941146b298fdb57262a9cdf7e28208302c82909e4665aa210"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/sk/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/sk/firefox-64.0b5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "096084ca8f060031fda50d698e264127309911da0adea44c55c2e64a29fce2fa0553ced2198c65e47c851a99f9a95d07373dbabc13fa05bb5df3552910fe2c5a"; + sha512 = "a183a3a9fcb3611f3f07ef2f5051c50f8ca32b41c629afc9f0176ebd18b88155b2cf3e67fe201aba02efb11ffab24fc8fba603de619a0a8f2815605eba1b2e83"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/sl/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/sl/firefox-64.0b5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "0d7cd746877b8e275a6c17c7723c43831716ed48c28d0e2498a5ff483324e31926b5e69f4b14aaadac3e3eb126fd369e8ed334f1e1f38ab7e399edf5cbdad4ee"; + sha512 = "f3dd8256b8a71fcac09b776b43496c7a4c862a5a86612235012c9b70e0b1a80001aaea187c45a6e1e43ed2b6a445311b7f3d52b579a048e4e122b24dc30a760a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/son/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/son/firefox-64.0b5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "31f13990de570121e4124ae53e450344a8c52e98547eed09434ef716446953bd27466bf550dda4be88b59ba22d0300087a741112fc2cc649bd9d8b97d21a1a52"; + sha512 = "0c45580a4029119cc5e7318a83f04de4275add2d105acc360ae8045ce0b0042204f6b07389a6300571bd9cccef3eac782eefee6b8af06e7c8b10a5551c4ac97a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/sq/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/sq/firefox-64.0b5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "07aa225a0f257fa277a932ea3c069ee13b29d2baa79c376ca73a44e04c3e409fe9ae2d65116bc7c3ffacd77685ee111dc68cfeab16432103044025d2a77707d4"; + sha512 = "f2ac8a3440456f0daccec3f4a4f45119bdcb6fad29e931bef8a69f6fb864ecca0e77d3f6bee10600688e9cab3ae2bae91a9dee51d8c398df5d102e56e4e15722"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/sr/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/sr/firefox-64.0b5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "99f8dc070613334eac983c5da8ec9f3b36cbee42dacb68d3c9b3d9c2f4f0df0652fb1ee1350c08c2376e0000539a3ab64b8ab742cccc4da72868e8cc323b49ab"; + sha512 = "82ecb371e5b612638d4bfcf0fc42454a7a1a01bc6a291fca06a96ae3e28c70b2a37b2504cd340941f74fb7ab44a7a8d11219d313b78dc9a4923128b9fc4e8060"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/sv-SE/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/sv-SE/firefox-64.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "6b11e0b66177ec6bcd30f3c30f9a2d3be0f9b2edfccd1ba1374b12e04f450bba4dbe03760650e596b9bd56c9a21cbd2c4b73140d84cdcdef528fceca5db7464a"; + sha512 = "6e04d05d8c7fdbe6c118f71b1ec1cb7eee698b980c70832885541cc89f9b794c2d8d273f2b9c55bd4b57f7fed53390c0dec6bcfc0545d60541ada4ca52c879b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ta/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ta/firefox-64.0b5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "1e5f31e988489825a56ad6ef94d1c1b4df5206cd4548bb7b4d624f9472d591c88ab10dc9233f34b81a1fb421638de33905dc825e73f7df1a2378c87091a157f0"; + sha512 = "10cd65336a77f30b04ea9f9b12e48ed103b66edb187909ad7ae7636b7f8f4cf86aaa96838fc60bb24731ea4ce539a8de1787c3d3f24325c7a93c8269a7045e83"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/te/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/te/firefox-64.0b5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "de45851b5a4b0c748405354542273d9489cd852e40dc8c23dddfbed2b5ffe8c988ee9090f098001ff4da9e446384bb65165c7a8f9445adaa8287c57786a34ac8"; + sha512 = "c56b853b0256ffeb75595755cd0c71e847958cd3e7c753231399e89739b90396effa6ab80016143b18fb49940945ee724ba7f6da2a891c06e26854c02ea7b25e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/th/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/th/firefox-64.0b5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "b0f06d7e3bfbd2d06c2b95cc9afeb1b24f46368daa3f8bf93c9eb5b3d939a5cb20a1ec65310f15a554fbc3640c7495ccd6333e202d01d72b4af667c91da45526"; + sha512 = "2248c67eadfea27633b2fa60506964adf965c4be82948476bc89c4f7665bbd174bc157e925502fb7ff95e15f6a51e732620a7323f2c498e20c918382c6befde4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/tr/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/tr/firefox-64.0b5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "e05572dca0d8c7539f433a72c4958a270d7e81bf74c9eb01b7838d0f52b00d0e3a2f399d69ccebc5fcf7041f9993b2ca18c8e078ba1b84b693dfd013460e4e5e"; + sha512 = "4a33814d0c9cc3be0b589ba4a6755b640804d3bece452acc2d482d4896197822066be77c2eee9cd7cc5d58f00df9d2a97b47db05e4b1c2e1695a02d20ead593f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/uk/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/uk/firefox-64.0b5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "67b3484136deee0c48c99177e7efd8f9287f278b750da94483df9f0eea80e5abba6bfff021f6a5713df86e74032d29ffe9c712a0d5df874a9dcd554a18938aa4"; + sha512 = "49361995ba6358733fb9c51780ed1d31e921ed0e3ed27c8e777575c93e723702aa0e47f6ed80ef282b28d5588029ce850a3dd9118a047867466acbc661f6fb1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/ur/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/ur/firefox-64.0b5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "9bcf8b221de817429b00d9aa229b49d99a67bab1b39a265adad6f54b543e07d98d715038ad2f17abb4b4c408fc741094f2a05dae3ad77006d683af5b67793854"; + sha512 = "74b6a3ba8c19acb2dfd2c9f2590dbcebd832f8f1fc06fb805bc7c9ab008e0cf8bbb4a829ce87d807193d8be124c04cf6bfcbd786fa7af1e6d86e20aa8e81f8c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/uz/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/uz/firefox-64.0b5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "46a22299c91c7924ec3020221556ba213accf7459c01b9ed42241f92e18e410943bc26a3cbee0e01e268285d30affa240e690b18c9347557dde3924e2c9c0fd5"; + sha512 = "08ae1db8130aa6112df406e622c27b96758b825e55e988c81e0dbb746691ce69cea4305a88851399a8c988d386702ed968a512d2f763e3452c7ec48c8d832c7f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/vi/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/vi/firefox-64.0b5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "9fd932091d7e24f64cf6f275b28a02c90d2ba5d1fecf81f2d029b3b3891eb7e22da03932d8b96929c229d46bc28e8905147f4cbc7be0676b2caa85bb57ad5ad6"; + sha512 = "20bcb0b9986d0360868b8fd8ab3925e2ea031814944255938bb81f57a21881fccfb0f4648bbe689b8828fa8283c7d56c028533770dfe66a4fc11a7d0240afe2d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/xh/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/xh/firefox-64.0b5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "bb06b8a88a6b4086f3efb5a310c8e87e61d549ad5a0b3f192015676c15b720333011d4ed7829a5165c2703d4a49d3454512f18dfcd27496aaee2580283f78d00"; + sha512 = "ebb6f05a771b155e43a88b8dcd25d1a77d254900b7eeab8d9a7284a616268f9c7718c4fb6febdf5cbe697407842f3c4d820a057b66d7b6ff7977f66385360004"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/zh-CN/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/zh-CN/firefox-64.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "65a328cd8f87ac7ff2561ea7ce105e1faa33bdd727edc05488a4a5c75f456506373de5fa5d393c5050d7a2a1d600fcf754b80ecf56144f64248e491fed45a194"; + sha512 = "16c75f1d64ed123752d7c28fd637749fb74f533a809f9b07d4f64dac3dbd1b2cc4141e4639f6f0b57d4e639c5214647ec68c759f2811a2613b54491d83ef0eb2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b3/linux-i686/zh-TW/firefox-64.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b5/linux-i686/zh-TW/firefox-64.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "4cc0ec59a111a22a81047bbf68c364629bd2376763bac9c361faf33db781c3dfa5a22b896a0cd3b36baaeb935bdf4340d64357496fe12c01c0256e3bdb95751f"; + sha512 = "99b91025c160cd024b0954249efa7f1f17f8f327185ae77930bb5ecdae741487532e2a3b8a3e34ae3117e3f9c00faab0d3fd29e9f62c94e1d4e48bde6fbe8894"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 826956eb5640..102b0de3fcc1 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -14,12 +14,6 @@ let sha256 = "11acb0ms4jrswp7268nm2p8g8l4lv8zc666a5bqjbb09x9k6b78k"; }; - firefox60_triplet_patch = fetchpatch { - name = "triplet.patch"; - url = https://hg.mozilla.org/releases/mozilla-release/raw-rev/bc651d3d910c; - sha256 = "0iybkadsgsf6a3pq3jh8z1p110vmpkih8i35jfj8micdkhxzi89g"; - }; - in rec { @@ -116,8 +110,7 @@ rec { find . -exec touch -d'2010-01-01 00:00' {} \; ''; - patches = nixpkgsPatches - ++ lib.optional (args.tbversion == "8.0.2") firefox60_triplet_patch; + patches = nixpkgsPatches; meta = { description = "A web browser built from TorBrowser source tree"; @@ -173,16 +166,16 @@ in rec { }; tor-browser-8-0 = tbcommon rec { - ffversion = "60.2.1esr"; - tbversion = "8.0.2"; + ffversion = "60.3.0esr"; + tbversion = "8.0.3"; # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { owner = "SLNOS"; repo = "tor-browser"; - # branch "tor-browser-60.2.1esr-8.0-1-slnos" - rev = "4f71403a3e6203baa349a8f81d8664782c5ea548"; - sha256 = "0zxdi162gpnfca7g77hc0rw4wkmxhfzp9hfmw6dpn97d5kn1zqq3"; + # branch "tor-browser-60.3.0esr-8.0-1-slnos" + rev = "bd512ad9c40069adfc983f4f03dbd9d220cdf2f9"; + sha256 = "1j349aqiqrf58zrx8pkqvh292w41v1vwr7x7dmd74hq4pi2iwpn8"; }; }; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index bf3debf6c7b8..8b7dfc860275 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -28,12 +28,12 @@ let in python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.5.1"; + version = "1.5.2"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1yn181gscj04ni58swk6cmggn047q29siqwgn66pvxhfdf0ny7fq"; + sha256 = "0ki19mynq91aih3kxhipnay3jmn56s7p6rilws0gq0k98li6a4my"; }; # Needs tox diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 8a21f2f0cc2a..7ef2bde68f20 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi"; - version = "2.0.1309.29-2"; + version = "2.1.1337.36-1"; src = fetchurl { url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb"; - sha256 = "09vaf191djbrfijvhklivh2ifj8w68car2vz956gsw4lhz07kzck"; + sha256 = "14qf3gk46m65yfc7q7gsnkj6av8yhg7byi0h1yv24sr7n4rrnrsc"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 87ca350731db..349ef233ae21 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "vivaldi-ffmpeg-codecs"; - version = "69.0.3497.73"; + version = "70.0.3538.77"; src = fetchurl { url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"; - sha512 = "3qyzxdybiszwy62izr35wffnh1a1plg9y536vrmd4b2xl8p4nz18c7439blr0cdzsr5qplgrdl64446a27mkyhbw8c3iy0gb4zgb5j9"; + sha512 = "128hvkcbyw70j31dj4jviqqjrzyfx38689nb8v0kk5vi2zlgfy5ibz2gyrv4bvrb53ld262y9pvam51nbdmrx2vqd9xrs173py7v0a0"; }; buildInputs = [ ]; diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 7c630e522afe..46157c2a35f3 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -1,4 +1,6 @@ -{ stdenv, newScope, makeWrapper, electron, xdg_utils, makeDesktopItem +{ stdenv, newScope, makeWrapper +, wrapGAppsHook, gnome3, glib +, electron, xdg_utils, makeDesktopItem , auth0ClientID ? "0spuNKfIGeLAQ_Iki9t3fGxbfJl3k8SU" , auth0Domain ? "nixpkgs.auth0.com" }: @@ -26,16 +28,25 @@ with self; stdenv.mkDerivation { name = "rambox-${rambox-bare.version}"; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + buildInputs = [ glib gnome3.gsettings_desktop_schemas ]; unpackPhase = ":"; + dontWrapGApps = true; # we only want $gappsWrapperArgs here + installPhase = '' - makeWrapper ${electron}/bin/electron $out/bin/rambox \ - --add-flags "${rambox-bare} --without-update" \ - --prefix PATH : ${xdg_utils}/bin + runHook preInstall mkdir -p $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications + runHook postInstall + ''; + + postFixup = '' + makeWrapper ${electron}/bin/electron $out/bin/rambox \ + --add-flags "${rambox-bare} --without-update" \ + "''${gappsWrapperArgs[@]}" \ + --prefix PATH : ${xdg_utils}/bin ''; inherit (rambox-bare.meta // { diff --git a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix index af92462a2a49..efecebe169e9 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/sencha/bare.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, gzip, which, unzip, jdk }: let - version = "6.5.3.6"; + version = "6.6.0.13"; srcs = { i686-linux = fetchurl { url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-i386.sh.zip"; - sha256 = "0g3hk3fdgmkdsr6ck1fgsmaxa9wbj2fpk84rk382ff9ny55bbzv9"; + sha256 = "15b197108b49mf0afpihkh3p68lxm7580zz2w0xsbahglnvhwyfz"; }; x86_64-linux = fetchurl { url = "https://cdn.sencha.com/cmd/${version}/no-jre/SenchaCmd-${version}-linux-amd64.sh.zip"; - sha256 = "08j8gak1xsxdjgkv6s24jv97jc49pi5yf906ynjmxb27wqpxn9mz"; + sha256 = "1cxhckmx1802p9qiw09cgb1v5f30wcvnrwkshmia8p8n0q47lpp4"; }; }; in diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index f123770197fd..3c2109f14c5d 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -56,11 +56,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.17.1"; + version = "1.17.2"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1cvgjllnbdsr61pz6r4dkbbz58cf69k7p8wriyp1vpzkdi7k5bpl"; + sha256 = "1ibci07w4dh7r0dkwb3nbqm470rgak2a98rlqf8390rxrinfli3p"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix index eb4d710857c1..72b9ce09d76d 100644 --- a/pkgs/applications/networking/mailreaders/inboxer/default.nix +++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "inboxer-${version}"; - version = "1.1.5"; + version = "1.2.1"; meta = with stdenv.lib; { description = "Unofficial, free and open-source Google Inbox Desktop App"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/denysdovhan/inboxer/releases/download/v${version}/inboxer_${version}_amd64.deb"; - sha256 = "11xid07rqn7j6nxn0azxwf0g8g3jhams2fmf9q7xc1is99zfy7z4"; + sha256 = "0nyxas07d6ckgjazxapmc6iyakd2cddla6wflr5rhfp78d7kax3a"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 753defb0b4f0..5d82b1174866 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -17,6 +17,7 @@ let in stdenv.mkDerivation { name = "wireshark-${variant}-${version}"; + outputs = [ "out" "dev" ]; src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; @@ -87,6 +88,16 @@ in stdenv.mkDerivation { --replace "Exec=wireshark" "Exec=$out/bin/wireshark" install -Dm644 ../image/wsicon.svg $out/share/icons/wireshark.svg + mkdir $dev/include/{epan/{wmem,ftypes,dfilter},wsutil,wiretap} -pv + + cp config.h $dev/include/ + cp ../ws_*.h $dev/include + cp ../epan/*.h $dev/include/epan/ + cp ../epan/wmem/*.h $dev/include/epan/wmem/ + cp ../epan/ftypes/*.h $dev/include/epan/ftypes/ + cp ../epan/dfilter/*.h $dev/include/epan/dfilter/ + cp ../wsutil/*.h $dev/include/wsutil/ + cp ../wiretap/*.h $dev/include/wiretap ''; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index 861e7d24275d..2f736dd5856d 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -4,6 +4,9 @@ , withTcl ? false, tcl , withCyrus ? true, cyrus_sasl , withUnicode ? true, icu +, withZlib ? true, zlib +, withIPv6 ? true +, withDebug ? false }: with stdenv.lib; @@ -24,7 +27,8 @@ stdenv.mkDerivation rec { ++ optional withPython python3 ++ optional withTcl tcl ++ optional withCyrus cyrus_sasl - ++ optional withUnicode icu; + ++ optional withUnicode icu + ++ optional withZlib zlib; configureFlags = [ (stdenv.lib.enableFeature withPerl "perl") @@ -32,7 +36,8 @@ stdenv.mkDerivation rec { (stdenv.lib.enableFeature withTcl "tcl") (stdenv.lib.withFeatureAs withTcl "tcl" "${tcl}/lib") (stdenv.lib.enableFeature withCyrus "cyrus") - ]; + ] ++ optional (!withIPv6) [ "--disable-ipv6" ] + ++ optional withDebug [ "--enable-debug" ]; meta = with stdenv.lib; { description = "Advanced IRC bouncer"; diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index a799df2d1ed0..42d2093ee3a0 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -9,6 +9,8 @@ let inherit buildPhase; inherit installPhase; + buildInputs = znc.buildInputs; + meta = a.meta // { platforms = stdenv.lib.platforms.unix; }; passthru.module_name = module_name; }); diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index a7d93c3b0cb9..740224b15b3d 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -1,16 +1,16 @@ -{ stdenv, python3, glibcLocales }: +{ stdenv, python3, glibcLocales, fetchpatch }: let inherit (python3.pkgs) buildPythonApplication fetchPypi; in buildPythonApplication rec { pname = "todoman"; - version = "3.4.0"; + version = "3.4.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "09441fdrwz2irsbrxnpwys51372z6rn6gnxn87p95r3fv9gmh0fw"; + sha256 = "1rvid1rklvgvsf6xmxd91j2fi46v4fzn5z6zbs5yn0wpb0k605r5"; }; LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux @@ -29,9 +29,17 @@ buildPythonApplication rec { makeWrapperArgs = [ "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive" "--set CHARSET en_us.UTF-8" ]; + patches = [ + (fetchpatch { + url = "https://github.com/pimutils/todoman/commit/3e191111b72df9ec91a773befefa291799374422.patch"; + sha256 = "12mskbp0d8p2lllkxm3m9wyy2hsbnz2qs297civsc3ly2l5bcrag"; + }) + ]; + preCheck = '' # Remove one failing test that only checks whether the command line works rm tests/test_main.py + rm tests/test_cli.py ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/logic/coq/8.4.nix b/pkgs/applications/science/logic/coq/8.4.nix deleted file mode 100644 index c3da1205ab0c..000000000000 --- a/pkgs/applications/science/logic/coq/8.4.nix +++ /dev/null @@ -1,97 +0,0 @@ -# - coqide compilation can be disabled by setting lablgtk to null; -# - The csdp program used for the Micromega tactic is statically referenced. -# However, coq can build without csdp by setting it to null. -# In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found. - -{stdenv, fetchurl, pkgconfig, writeText, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}: - -let - version = "8.4pl6"; - coq-version = "8.4"; - buildIde = lablgtk != null; - ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; - csdpPatch = if csdp != null then '' - substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" - substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true" - '' else ""; - -self = -stdenv.mkDerivation { - name = "coq-${version}"; - - inherit coq-version; - inherit ocaml camlp5; - - src = fetchurl { - url = "https://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz"; - sha256 = "1mpbj4yf36kpjg2v2sln12i8dzqn8rag6fd07hslj2lpm4qs4h55"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml findlib camlp5 ncurses lablgtk ]; - - patches = [ ./configure.patch ]; - - postPatch = '' - UNAME=$(type -tp uname) - RM=$(type -tp rm) - substituteInPlace configure --replace "/bin/uname" "$UNAME" - substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM" - ${csdpPatch} - ''; - - preConfigure = '' - configureFlagsArray=( - -opt - -camldir ${ocaml}/bin - -camlp5dir $(ocamlfind query camlp5) - ${ideFlags} - ) - ''; - - prefixKey = "-prefix "; - - buildFlags = "revision coq coqide"; - - setupHook = writeText "setupHook.sh" '' - addCoqPath () { - if test -d "''$1/lib/coq/${coq-version}/user-contrib"; then - export COQPATH="''${COQPATH}''${COQPATH:+:}''$1/lib/coq/${coq-version}/user-contrib/" - fi - } - - addEnvHooks "$targetOffset" addCoqPath - ''; - - passthru = { - inherit findlib; - emacsBufferSetup = pkgs: '' - ; Propagate coq paths to children - (inherit-local-permanent coq-prog-name "${self}/bin/coqtop") - (inherit-local-permanent coq-dependency-analyzer "${self}/bin/coqdep") - (inherit-local-permanent coq-compiler "${self}/bin/coqc") - ; If the coq-library path was already set, re-set it based on our current coq - (when (fboundp 'get-coq-library-directory) - (inherit-local-permanent coq-library-directory (get-coq-library-directory)) - (coq-prog-args)) - (mapc (lambda (arg) - (when (file-directory-p (concat arg "/lib/coq/${coq-version}/user-contrib")) - (setenv "COQPATH" (concat (getenv "COQPATH") ":" arg "/lib/coq/${coq-version}/user-contrib")))) '(${stdenv.lib.concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) - ''; - }; - - meta = with stdenv.lib; { - description = "Formal proof management system"; - longDescription = '' - Coq is a formal proof management system. It provides a formal language - to write mathematical definitions, executable algorithms and theorems - together with an environment for semi-interactive development of - machine-checked proofs. - ''; - homepage = http://coq.inria.fr; - license = licenses.lgpl21; - branch = coq-version; - maintainers = with maintainers; [ roconnor thoughtpolice vbgl ]; - platforms = platforms.unix; - }; -}; in self diff --git a/pkgs/applications/science/logic/coq/configure.patch b/pkgs/applications/science/logic/coq/configure.patch deleted file mode 100644 index aa38ce06e92b..000000000000 --- a/pkgs/applications/science/logic/coq/configure.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nuar coq-8.3pl3-orig/configure coq-8.3pl3/configure ---- coq-8.3pl3-orig/configure 2011-12-19 22:57:30.000000000 +0100 -+++ coq-8.3pl3/configure 2012-03-17 16:38:16.000000000 +0100 -@@ -395,7 +395,6 @@ - ocamlyaccexec=$CAMLBIN/ocamlyacc - ocamlmktopexec=$CAMLBIN/ocamlmktop - ocamlmklibexec=$CAMLBIN/ocamlmklib -- camlp4oexec=$CAMLBIN/camlp4o - esac - - if test ! -f "$CAMLC" ; then diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index b86f9d1aa0de..f631fe38a5b0 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -58,6 +58,13 @@ stdenv.mkDerivation rec { url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/sagemath-lcalc-c++11.patch?h=packages/sagemath&id=0e31ae526ab7c6b5c0bfacb3f8b1c4fd490035aa"; sha256 = "0p5wnvbx65i7cp0bjyaqgp4rly8xgnk12pqwaq3dqby0j2bk6ijb"; }) + + # https://trac.sagemath.org/ticket/26360 + (fetchpatch { + name = "arb-2.15.1.patch"; + url = "https://git.sagemath.org/sage.git/patch/?id=30cc778d46579bd0c7537ed33e8d7a4f40fd5c31"; + sha256 = "13vc2q799dh745sm59xjjabllfj0sfjzcacf8k59kwj04x755d30"; + }) ]; patches = nixPatches ++ packageUpgradePatches ++ [ diff --git a/pkgs/applications/science/math/sage/sage-wrapper.nix b/pkgs/applications/science/math/sage/sage-wrapper.nix index 06b667f426fa..4b2f9c461c18 100644 --- a/pkgs/applications/science/math/sage/sage-wrapper.nix +++ b/pkgs/applications/science/math/sage/sage-wrapper.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = sage.version; - name = "sage-wrapper-${version}"; + name = "sage-${version}"; buildInputs = [ makeWrapper diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix index b1e5d7278b0f..ad9a32e0ca56 100644 --- a/pkgs/applications/science/math/sage/sage.nix +++ b/pkgs/applications/science/math/sage/sage.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = sage-with-env.version; - name = "sage-${version}"; + name = "sage-tests-${version}"; buildInputs = [ makeWrapper diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 58cfa1862604..a25492e4546c 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -39,7 +39,7 @@ buildGoPackage rec { postInstall = '' mkdir $data - cp -R $src/{public,templates} $data + cp -R $src/{public,templates,options} $data mkdir -p $out cp -R $src/options/locale $out/locale diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index ba37091c433f..ace0df5efdfd 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -11,29 +11,29 @@ let groups = [ "default" "unicorn" "ed25519" "metrics" ]; }; - version = "11.4.0"; + version = "11.4.3"; sources = if gitlabEnterprise then { gitlabDeb = fetchurl { url = "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_${version}-ee.0_amd64.deb/download.deb"; - sha256 = "1y2a8acgsgrgcjazijsflhxq4fwqvd9yhrjx5pcncb24vl0x6dg4"; + sha256 = "1cw75qj508z6n00rqgqjzdm2013kyb7c57cypmq0m08nc6f3jspz"; }; gitlab = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-ee"; rev = "v${version}-ee"; - sha256 = "1pyqk1c5bml7chs4pq1fcxkrhk5r327xx9my6zmp2cb503s5m590"; + sha256 = "1vqc77whpbsifbm9vgcmpxnw13v8jz1s9q04i8jfv99c59fjlids"; }; } else { gitlabDeb = fetchurl { url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_${version}-ce.0_amd64.deb/download.deb"; - sha256 = "0wiizjihn1a6hg6a2wpwmnh5a34n102va4djac3sgx74mwx4bniq"; + sha256 = "0vk03k42pp92h520wnynl9czcigjhj9m7y68z1x0gwqr9m61r7zm"; }; gitlab = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-ce"; rev = "v${version}"; - sha256 = "1a8pavqc9bblss5z9ikc9b0k0ra33vw73zy7rvn0v1wgvbqpc24k"; + sha256 = "1zvjz2gv2vwqqjz52zcvi0ap3d8rdbpgsqk9wv80hqq4v37a5gfx"; }; }; diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 1a8fe6f5fe5c..7419c52c48b3 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -1,24 +1,35 @@ -{ stdenv, fetchurl, rustPlatform, darwin }: +{ stdenv, fetchurl, rustPlatform, darwin, openssl, libsodium, pkgconfig }: with rustPlatform; buildRustPackage rec { name = "pijul-${version}"; - version = "0.8.0"; + version = "0.10.0"; src = fetchurl { url = "https://pijul.org/releases/${name}.tar.gz"; - sha256 = "00pi03yp2bgnjpsz2hgaapxfw2i4idbjqc88cagpvn4yr1612wqx"; + sha256 = "1lkipcp83rfsj9yqddvb46dmqdf2ch9njwvjv8f3g91rmfjcngys"; }; - sourceRoot = "${name}/pijul"; + cargoPatches = [ + ./libpijul.patch + ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin + nativeBuildInputs = [ pkgconfig ]; + + postInstall = '' + mkdir -p $out/share/{bash-completion/completions,zsh/site-functions,fish/vendor_completions.d} + $out/bin/pijul generate-completions --bash > $out/share/bash-completion/completions/pijul + $out/bin/pijul generate-completions --zsh > $out/share/zsh/site-functions/_pijul + $out/bin/pijul generate-completions --fish > $out/share/fish/vendor_completions.d/pijul.fish + ''; + + buildInputs = [ openssl libsodium ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]); doCheck = false; - cargoSha256 = "1cnr08qbpia3336l37k1jli20d7kwnrw2gys8s9mg271cb4vdx03"; + cargoSha256 = "1419mlxa4p53hm5qzfd1yi2k0n1bcv8kaslls1nyx661vknhfamw"; meta = with stdenv.lib; { description = "A distributed version control system"; diff --git a/pkgs/applications/version-management/pijul/libpijul.patch b/pkgs/applications/version-management/pijul/libpijul.patch new file mode 100644 index 000000000000..9e4aa3cdd4b7 --- /dev/null +++ b/pkgs/applications/version-management/pijul/libpijul.patch @@ -0,0 +1,61 @@ +--- 2/pijul-0.10.0/Cargo.lock 1970-01-01 01:00:00.000000000 +0100 ++++ pijul-0.10.0/Cargo.lock 2018-10-28 10:09:48.557639255 +0000 +@@ -552,7 +552,7 @@ + + [[package]] + name = "libpijul" +-version = "0.10.0" ++version = "0.10.1" + dependencies = [ + "base64 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -577,9 +577,29 @@ + + [[package]] + name = "libpijul" +-version = "0.10.0" ++version = "0.10.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-replace = "libpijul 0.10.0" ++dependencies = [ ++ "base64 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bs58 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "chrono 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "flate2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ignore 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "sanakirja 0.8.16 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_json 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thrussh-keys 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] + + [[package]] + name = "line" +@@ -917,7 +937,7 @@ + "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ignore 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "isatty 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", +- "libpijul 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libpijul 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", + "line 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "pager 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -1796,7 +1816,7 @@ + "checksum lazycell 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a6f08839bc70ef4a3fe1d566d5350f519c5912ea86be0df1740a7d247c7fc0ef" + "checksum libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "6fd41f331ac7c5b8ac259b8bf82c75c0fb2e469bbf37d2becbba9a6a2221965b" + "checksum libflate 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "1a429b86418868c7ea91ee50e9170683f47fd9d94f5375438ec86ec3adb74e8e" +-"checksum libpijul 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "80fd579ba6762eac3f12c9624d5496edaba5a2f2e8785bcf8310372328e06ebe" ++"checksum libpijul 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cf6fc1aa0e9402f8283bdeb2507cfb6798d2f2f973da34c3f4b0c96a456b74cd" + "checksum line 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ecdd22a3856203276b7854e16213139428e82922530438f36356e5b361ea4a42" + "checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" + "checksum log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "89f010e843f2b1a31dbd316b3b8d443758bc634bed37aabade59c686d644e0a2" diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 7d9ce1ac453b..3464b7aaeaa2 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "27.0.0"; + version = "28.2.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "0pcf0bzs588p0a4j01jzcy5y9c4hiblz3kwfznn1sjcyxm552z6n"; + sha256 = "162qj5z9wzm63im6jnd0n95ggzdk6fzq5bxgrr0l3y82ahfb7qwa"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index b08ff812ace4..6cba5236a5f1 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -12,6 +12,7 @@ , withQt5 ? true, qtbase ? null, qtsvg ? null, qtx11extras ? null , jackSupport ? false , fetchpatch +, removeReferencesTo }: with stdenv.lib; @@ -42,7 +43,7 @@ stdenv.mkDerivation rec { ] ++ optionals withQt5 [ qtbase qtsvg qtx11extras ] ++ optional jackSupport libjack2; - nativeBuildInputs = [ autoreconfHook perl pkgconfig ]; + nativeBuildInputs = [ autoreconfHook perl pkgconfig removeReferencesTo ]; enableParallelBuilding = true; @@ -60,10 +61,14 @@ stdenv.mkDerivation rec { /usr/share/fonts/truetype/freefont ${freefont_ttf}/share/fonts/truetype ''; - # https://github.com/NixOS/nixpkgs/pull/35124#issuecomment-370552830 + # - Touch plugins (plugins cache keyed off mtime and file size: + # https://github.com/NixOS/nixpkgs/pull/35124#issuecomment-370552830 + # - Remove references to the Qt development headers (used in error messages) postFixup = '' find $out/lib/vlc/plugins -exec touch -d @1 '{}' ';' $out/lib/vlc/vlc-cache-gen $out/vlc/plugins + + remove-references-to -t "${qtbase.dev}" $out/lib/vlc/plugins/gui/libqt_plugin.so ''; # Most of the libraries are auto-detected so we don't need to set a bunch of @@ -72,6 +77,11 @@ stdenv.mkDerivation rec { "--with-kde-solid=$out/share/apps/solid/actions" ] ++ optional onlyLibVLC "--disable-vlc"; + # Remove runtime dependencies on libraries + postConfigure = '' + sed -i 's|^#define CONFIGURE_LINE.*$|#define CONFIGURE_LINE ""|g' config.h + ''; + meta = with stdenv.lib; { description = "Cross-platform media player and streaming server"; homepage = http://www.videolan.org/vlc/; diff --git a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix new file mode 100644 index 000000000000..3b764e7095be --- /dev/null +++ b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, libXpm, libGL, fltk, hicolor-icon-theme, glib, gnome2, which }: + +stdenv.mkDerivation rec { + name = "jwm-settings-manager-${version}"; + version = "2018-10-19"; + + src = fetchFromGitHub { + owner = "Israel-D"; + repo = "jwm-settings-manager"; + rev = "cb32a70563cf1f3927339093481542b85ec3c8c8"; + sha256 = "0d5bqf74p8zg8azns44g46q973blhmp715k8kcd73x88g7sfir8s"; + }; + + nativeBuildInputs = [ + cmake + pkgconfig + gettext + ]; + + buildInputs = [ + libXpm + libGL + fltk + hicolor-icon-theme + which # needed at runtime to locate optional programs + glib.bin # provides gsettings + gnome2.GConf # provides gconftool-2 + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace 'CMAKE_INSTALL_PREFIX "/usr"' "CMAKE_INSTALL_PREFIX $out" + substituteInPlace data/CMakeLists.txt \ + --replace 'DESTINATION usr/share' "DESTINATION share" + ''; + + meta = with stdenv.lib; { + description = "A full configuration manager for JWM"; + homepage = https://joewing.net/projects/jwm; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index f9ca245beea6..3ac1e52f3092 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -186,6 +186,7 @@ stdenv.mkDerivation { }.${targetPlatform.parsed.cpu.name} else if targetPlatform.isPower then if targetPlatform.isBigEndian then "ppc" else "lppc" else if targetPlatform.isSparc then "sparc" + else if targetPlatform.isAvr then "avr" else throw "unknown emulation for platform: " + targetPlatform.config; in targetPlatform.platform.bfdEmulation or (fmt + sep + arch); @@ -209,7 +210,7 @@ stdenv.mkDerivation { ## General libc support ## - echo "-L${libc_lib}/lib" > $out/nix-support/libc-ldflags + echo "-L${libc_lib}${libc.libdir or "/lib"}" > $out/nix-support/libc-ldflags echo "${libc_lib}" > $out/nix-support/orig-libc echo "${libc_dev}" > $out/nix-support/orig-libc-dev @@ -292,6 +293,16 @@ stdenv.mkDerivation { hardening_unsupported_flags+=" pic" '' + + optionalString targetPlatform.isAvr '' + hardening_unsupported_flags+=" relro bindnow" + '' + + + optionalString (libc != null && targetPlatform.isAvr) '' + for isa in avr5 avr3 avr4 avr6 avr25 avr31 avr35 avr51 avrxmega2 avrxmega4 avrxmega5 avrxmega6 avrxmega7 tiny-stack; do + echo "-L${getLib libc}/avr/lib/$isa" >> $out/nix-support/libc-cflags + done + '' + + '' set +u substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index e59758371a38..06aa9436bfc0 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -232,7 +232,7 @@ stdenv.mkDerivation { # compile, because it uses "#include_next " to find the # limits.h file in ../includes-fixed. To remedy the problem, # another -idirafter is necessary to add that directory again. - echo "-B${libc_lib}/lib/ -idirafter ${libc_dev}/include ${optionalString isGNU "-idirafter ${cc}/lib/gcc/*/*/include-fixed"}" > $out/nix-support/libc-cflags + echo "-B${libc_lib}${libc.libdir or "/lib/"} -idirafter ${libc_dev}${libc.incdir or "/include"} ${optionalString isGNU "-idirafter ${cc}/lib/gcc/*/*/include-fixed"}" > $out/nix-support/libc-cflags echo "${libc_lib}" > $out/nix-support/orig-libc echo "${libc_dev}" > $out/nix-support/orig-libc-dev @@ -284,6 +284,20 @@ stdenv.mkDerivation { hardening_unsupported_flags+=" stackprotector" '' + + optionalString targetPlatform.isAvr '' + hardening_unsupported_flags+=" stackprotector pic" + '' + + + optionalString (targetPlatform.libc == "newlib") '' + hardening_unsupported_flags+=" stackprotector fortify pie pic" + '' + + + optionalString (libc != null && targetPlatform.isAvr) '' + for isa in avr5 avr3 avr4 avr6 avr25 avr31 avr35 avr51 avrxmega2 avrxmega4 avrxmega5 avrxmega6 avrxmega7 tiny-stack; do + echo "-B${getLib libc}/avr/lib/$isa" >> $out/nix-support/libc-cflags + done + '' + + '' substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index f65118ba4a64..252a0ff521fd 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -2,7 +2,7 @@ { crateName, dependencies, crateFeatures, libName, release, libPath, - crateType, metadata, crateBin, + crateType, metadata, crateBin, hasCrateBin, extraRustcOpts, verbose, colors }: let @@ -13,6 +13,17 @@ (if release then "-C opt-level=3" else "-C debuginfo=2") (["-C codegen-units=1"] ++ extraRustcOpts); rustcMeta = "-C metadata=${metadata} -C extra-filename=-${metadata}"; + + # Some platforms have different names for rustc. + rustPlatform = + with stdenv.hostPlatform.parsed; + let cpu_ = if cpu.name == "armv7a" then "armv7" + else cpu.name; + vendor_ = vendor.name; + kernel_ = kernel.name; + abi_ = abi.name; + in + "${cpu_}-${vendor_}-${kernel_}-${abi_}"; in '' runHook preBuild norm="" @@ -32,7 +43,8 @@ lib_src=$1 echo_build_heading $lib_src ${libName} - noisily rustc --crate-name $CRATE_NAME $lib_src --crate-type ${crateType} \ + noisily rustc --crate-name $CRATE_NAME $lib_src \ + ${lib.strings.concatStrings (map (x: " --crate-type ${x}") crateType)} \ ${rustcOpts} ${rustcMeta} ${crateFeatures} --out-dir target/lib \ --emit=dep-info,link -L dependency=target/deps ${deps} --cap-lints allow \ $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors} @@ -54,7 +66,8 @@ noisily rustc --crate-name $crate_name_ $main_file --crate-type bin ${rustcOpts}\ ${crateFeatures} --out-dir target/bin --emit=dep-info,link -L dependency=target/deps \ $LINK ${deps}$EXTRA_LIB --cap-lints allow \ - $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors} + $BUILD_OUT_DIR $EXTRA_BUILD $EXTRA_FEATURES --color ${colors} \ + ${if stdenv.hostPlatform != stdenv.buildPlatform then "--target ${rustPlatform} -C linker=${stdenv.hostPlatform.config}-gcc" else ""} if [ "$crate_name_" != "$crate_name" ]; then mv target/bin/$crate_name_ target/bin/$crate_name fi @@ -103,9 +116,9 @@ tr '\n' ' ' < target/link > target/link_ LINK=$(cat target/link_) fi - - mkdir -p target/bin + ${lib.optionalString (crateBin != "") '' printf "%s\n" "${crateBin}" | head -n1 | tr -s ',' '\n' | while read -r BIN_NAME BIN_PATH; do + mkdir -p target/bin # filter empty entries / empty "lines" if [[ -z "$BIN_NAME" ]]; then continue @@ -141,13 +154,15 @@ fi build_bin "$BIN_NAME" "$BIN_PATH" done + ''} - - ${lib.optionalString (crateBin == "") '' + ${lib.optionalString (crateBin == "" && !hasCrateBin) '' if [[ -e src/main.rs ]]; then + mkdir -p target/bin build_bin ${crateName} src/main.rs fi for i in src/bin/*.rs; do #*/ + mkdir -p target/bin build_bin "$(basename $i .rs)" "$i" done ''} diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index a11cef9f1f46..ec11472bbaeb 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -4,7 +4,7 @@ # This can be useful for deploying packages with NixOps, and to share # binary dependencies between projects. -{ lib, stdenv, defaultCrateOverrides, fetchCrate, ncurses, rustc }: +{ lib, stdenv, defaultCrateOverrides, fetchCrate, rustc }: let # This doesn't appear to be officially documented anywhere yet. @@ -16,7 +16,7 @@ let makeDeps = dependencies: (lib.concatMapStringsSep " " (dep: let extern = lib.strings.replaceStrings ["-"] ["_"] dep.libName; in - (if dep.crateType == "lib" then + (if lib.lists.any (x: x == "lib") dep.crateType then " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}.rlib" else " --extern ${extern}=${dep.out}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}") @@ -86,7 +86,8 @@ stdenv.mkDerivation (rec { else fetchCrate { inherit (crate) crateName version sha256; }; name = "rust_${crate.crateName}-${crate.version}"; - buildInputs = [ rust ncurses ] ++ (crate.buildInputs or []) ++ buildInputs_; + depsBuildBuild = [ rust stdenv.cc ]; + buildInputs = (crate.buildInputs or []) ++ buildInputs_; dependencies = builtins.map (dep: dep.override { rust = rust; release = release; verbose = verbose; crateOverrides = crateOverrides; }) @@ -122,15 +123,16 @@ stdenv.mkDerivation (rec { ) "" crate.crateBin else ""; + hasCrateBin = crate ? crateBin; build = crate.build or ""; workspace_member = crate.workspace_member or "."; crateVersion = crate.version; crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else []; crateType = - if lib.attrByPath ["procMacro"] false crate then "proc-macro" else - if lib.attrByPath ["plugin"] false crate then "dylib" else - (crate.type or "lib"); + if lib.attrByPath ["procMacro"] false crate then ["proc-macro"] else + if lib.attrByPath ["plugin"] false crate then ["dylib"] else + (crate.type or ["lib"]); colors = lib.attrByPath [ "colors" ] "always" crate; extraLinkFlags = builtins.concatStringsSep " " (crate.extraLinkFlags or []); configurePhase = configureCrate { @@ -143,7 +145,7 @@ stdenv.mkDerivation (rec { buildPhase = buildCrate { inherit crateName dependencies crateFeatures libName release libPath crateType - metadata crateBin verbose colors + metadata crateBin hasCrateBin verbose colors extraRustcOpts; }; installPhase = installCrate crateName metadata; diff --git a/pkgs/build-support/rust/build-rust-crate/helpers.nix b/pkgs/build-support/rust/build-rust-crate/helpers.nix new file mode 100644 index 000000000000..e04324684e50 --- /dev/null +++ b/pkgs/build-support/rust/build-rust-crate/helpers.nix @@ -0,0 +1,24 @@ +{stdenv, lib}: +{ + kernel = stdenv.hostPlatform.parsed.kernel.name; + abi = stdenv.hostPlatform.parsed.abi.name; + updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); + mapFeatures = features: map (fun: fun { features = features; }); + mkFeatures = feat: lib.lists.foldl (features: featureName: + if feat.${featureName} or false then + [ featureName ] ++ features + else + features + ) [] (builtins.attrNames feat); + include = includedFiles: src: builtins.filterSource (path: type: + lib.lists.any (f: + let p = toString (src + ("/" + f)); in + (path == p) || (type == "directory" && lib.strings.hasPrefix path p) + ) includedFiles + ) src; + exclude = excludedFiles: src: builtins.filterSource (path: type: + lib.lists.all (f: + !lib.strings.hasPrefix (toString (src + ("/" + f))) path + ) excludedFiles + ) src; +} diff --git a/pkgs/build-support/rust/carnix.nix b/pkgs/build-support/rust/carnix.nix index 0b8b3d60b6c9..7a0d92f81b45 100644 --- a/pkgs/build-support/rust/carnix.nix +++ b/pkgs/build-support/rust/carnix.nix @@ -1,1444 +1,251 @@ -# Generated by carnix 0.7.2: carnix nix -{ lib, stdenv, buildRustCrate, fetchgit }: -let kernel = stdenv.hostPlatform.parsed.kernel.name; - abi = stdenv.hostPlatform.parsed.abi.name; - updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions); - mapFeatures = features: map (fun: fun { features = features; }); - mkFeatures = feat: lib.lists.foldl (features: featureName: - if feat.${featureName} or false then - [ featureName ] ++ features - else - features - ) [] (builtins.attrNames feat); +# Generated by carnix 0.8.11: carnix generate-nix +{ lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }: +with buildRustCrateHelpers; +let inherit (lib.lists) fold; + inherit (lib.attrsets) recursiveUpdate; in +let crates = cratesIO; in rec { - carnix = f: carnix_0_7_2 { features = carnix_0_7_2_features { carnix_0_7_2 = f; }; }; + carnix = crates.crates.carnix."0.8.11" deps; __all = [ (carnix {}) ]; - aho_corasick_0_6_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "aho-corasick"; - version = "0.6.4"; - authors = [ "Andrew Gallant " ]; - sha256 = "189v919mp6rzzgjp1khpn4zlq8ls81gh43x1lmc8kbkagdlpq888"; - libName = "aho_corasick"; - crateBin = [ { name = "aho-corasick-dot"; } ]; - inherit dependencies buildDependencies features; + deps.aho_corasick."0.6.8" = { + memchr = "2.1.0"; + }; + deps.ansi_term."0.11.0" = { + winapi = "0.3.6"; + }; + deps.argon2rs."0.2.5" = { + blake2_rfc = "0.2.18"; + scoped_threadpool = "0.1.9"; + }; + deps.arrayvec."0.4.7" = { + nodrop = "0.1.12"; + }; + deps.atty."0.2.11" = { + termion = "1.5.1"; + libc = "0.2.43"; + winapi = "0.3.6"; + }; + deps.backtrace."0.3.9" = { + cfg_if = "0.1.6"; + rustc_demangle = "0.1.9"; + backtrace_sys = "0.1.24"; + libc = "0.2.43"; + winapi = "0.3.6"; + }; + deps.backtrace_sys."0.1.24" = { + libc = "0.2.43"; + cc = "1.0.25"; + }; + deps.bitflags."1.0.4" = {}; + deps.blake2_rfc."0.2.18" = { + arrayvec = "0.4.7"; + constant_time_eq = "0.1.3"; + }; + deps.carnix."0.8.11" = { + clap = "2.32.0"; + dirs = "1.0.4"; + env_logger = "0.5.13"; + error_chain = "0.12.0"; + itertools = "0.7.8"; + log = "0.4.5"; + nom = "3.2.1"; + regex = "1.0.5"; + rusqlite = "0.14.0"; + serde = "1.0.80"; + serde_derive = "1.0.80"; + serde_json = "1.0.32"; + tempdir = "0.3.7"; + toml = "0.4.8"; + }; + deps.cc."1.0.25" = {}; + deps.cfg_if."0.1.6" = {}; + deps.clap."2.32.0" = { + atty = "0.2.11"; + bitflags = "1.0.4"; + strsim = "0.7.0"; + textwrap = "0.10.0"; + unicode_width = "0.1.5"; + vec_map = "0.8.1"; + ansi_term = "0.11.0"; + }; + deps.constant_time_eq."0.1.3" = {}; + deps.dirs."1.0.4" = { + redox_users = "0.2.0"; + libc = "0.2.43"; + winapi = "0.3.6"; + }; + deps.either."1.5.0" = {}; + deps.env_logger."0.5.13" = { + atty = "0.2.11"; + humantime = "1.1.1"; + log = "0.4.5"; + regex = "1.0.5"; + termcolor = "1.0.4"; + }; + deps.error_chain."0.12.0" = { + backtrace = "0.3.9"; + }; + deps.failure."0.1.3" = { + backtrace = "0.3.9"; + failure_derive = "0.1.3"; + }; + deps.failure_derive."0.1.3" = { + proc_macro2 = "0.4.20"; + quote = "0.6.8"; + syn = "0.15.13"; + synstructure = "0.10.0"; + }; + deps.fuchsia_zircon."0.3.3" = { + bitflags = "1.0.4"; + fuchsia_zircon_sys = "0.3.3"; + }; + deps.fuchsia_zircon_sys."0.3.3" = {}; + deps.humantime."1.1.1" = { + quick_error = "1.2.2"; + }; + deps.itertools."0.7.8" = { + either = "1.5.0"; + }; + deps.itoa."0.4.3" = {}; + deps.lazy_static."1.1.0" = { + version_check = "0.1.5"; + }; + deps.libc."0.2.43" = {}; + deps.libsqlite3_sys."0.9.3" = { + pkg_config = "0.3.14"; + }; + deps.linked_hash_map."0.4.2" = {}; + deps.log."0.4.5" = { + cfg_if = "0.1.6"; + }; + deps.lru_cache."0.1.1" = { + linked_hash_map = "0.4.2"; + }; + deps.memchr."1.0.2" = { + libc = "0.2.43"; + }; + deps.memchr."2.1.0" = { + cfg_if = "0.1.6"; + libc = "0.2.43"; + version_check = "0.1.5"; + }; + deps.nodrop."0.1.12" = {}; + deps.nom."3.2.1" = { + memchr = "1.0.2"; + }; + deps.pkg_config."0.3.14" = {}; + deps.proc_macro2."0.4.20" = { + unicode_xid = "0.1.0"; + }; + deps.quick_error."1.2.2" = {}; + deps.quote."0.6.8" = { + proc_macro2 = "0.4.20"; + }; + deps.rand."0.4.3" = { + fuchsia_zircon = "0.3.3"; + libc = "0.2.43"; + winapi = "0.3.6"; + }; + deps.redox_syscall."0.1.40" = {}; + deps.redox_termios."0.1.1" = { + redox_syscall = "0.1.40"; + }; + deps.redox_users."0.2.0" = { + argon2rs = "0.2.5"; + failure = "0.1.3"; + rand = "0.4.3"; + redox_syscall = "0.1.40"; + }; + deps.regex."1.0.5" = { + aho_corasick = "0.6.8"; + memchr = "2.1.0"; + regex_syntax = "0.6.2"; + thread_local = "0.3.6"; + utf8_ranges = "1.0.1"; + }; + deps.regex_syntax."0.6.2" = { + ucd_util = "0.1.1"; + }; + deps.remove_dir_all."0.5.1" = { + winapi = "0.3.6"; + }; + deps.rusqlite."0.14.0" = { + bitflags = "1.0.4"; + libsqlite3_sys = "0.9.3"; + lru_cache = "0.1.1"; + time = "0.1.40"; + }; + deps.rustc_demangle."0.1.9" = {}; + deps.ryu."0.2.6" = {}; + deps.scoped_threadpool."0.1.9" = {}; + deps.serde."1.0.80" = {}; + deps.serde_derive."1.0.80" = { + proc_macro2 = "0.4.20"; + quote = "0.6.8"; + syn = "0.15.13"; + }; + deps.serde_json."1.0.32" = { + itoa = "0.4.3"; + ryu = "0.2.6"; + serde = "1.0.80"; + }; + deps.strsim."0.7.0" = {}; + deps.syn."0.15.13" = { + proc_macro2 = "0.4.20"; + quote = "0.6.8"; + unicode_xid = "0.1.0"; + }; + deps.synstructure."0.10.0" = { + proc_macro2 = "0.4.20"; + quote = "0.6.8"; + syn = "0.15.13"; + unicode_xid = "0.1.0"; + }; + deps.tempdir."0.3.7" = { + rand = "0.4.3"; + remove_dir_all = "0.5.1"; + }; + deps.termcolor."1.0.4" = { + wincolor = "1.0.1"; + }; + deps.termion."1.5.1" = { + libc = "0.2.43"; + redox_syscall = "0.1.40"; + redox_termios = "0.1.1"; + }; + deps.textwrap."0.10.0" = { + unicode_width = "0.1.5"; + }; + deps.thread_local."0.3.6" = { + lazy_static = "1.1.0"; + }; + deps.time."0.1.40" = { + libc = "0.2.43"; + redox_syscall = "0.1.40"; + winapi = "0.3.6"; + }; + deps.toml."0.4.8" = { + serde = "1.0.80"; + }; + deps.ucd_util."0.1.1" = {}; + deps.unicode_width."0.1.5" = {}; + deps.unicode_xid."0.1.0" = {}; + deps.utf8_ranges."1.0.1" = {}; + deps.vcpkg."0.2.6" = {}; + deps.vec_map."0.8.1" = {}; + deps.version_check."0.1.5" = {}; + deps.winapi."0.3.6" = { + winapi_i686_pc_windows_gnu = "0.4.0"; + winapi_x86_64_pc_windows_gnu = "0.4.0"; + }; + deps.winapi_i686_pc_windows_gnu."0.4.0" = {}; + deps.winapi_util."0.1.1" = { + winapi = "0.3.6"; + }; + deps.winapi_x86_64_pc_windows_gnu."0.4.0" = {}; + deps.wincolor."1.0.1" = { + winapi = "0.3.6"; + winapi_util = "0.1.1"; }; - ansi_term_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "ansi_term"; - version = "0.11.0"; - authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " "Josh Triplett " ]; - sha256 = "08fk0p2xvkqpmz3zlrwnf6l8sj2vngw464rvzspzp31sbgxbwm4v"; - inherit dependencies buildDependencies features; - }; - atty_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "atty"; - version = "0.2.8"; - authors = [ "softprops " ]; - sha256 = "03w1q3h4w7vhcdxdwa9cirjkzdjz3ja636fj3g64659z6yax6p6d"; - inherit dependencies buildDependencies features; - }; - backtrace_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "backtrace"; - version = "0.3.6"; - authors = [ "Alex Crichton " "The Rust Project Developers" ]; - sha256 = "00p77iqrv2p47m4y5lq1clb8fi1xfmnz2520frqx88497ff4zhrx"; - inherit dependencies buildDependencies features; - }; - backtrace_sys_0_1_16_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "backtrace-sys"; - version = "0.1.16"; - authors = [ "Alex Crichton " ]; - sha256 = "1cn2c8q3dn06crmnk0p62czkngam4l8nf57wy33nz1y5g25pszwy"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - bitflags_1_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "bitflags"; - version = "1.0.1"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0p4b3nr0s5nda2qmm7xdhnvh4lkqk3xd8l9ffmwbvqw137vx7mj1"; - inherit dependencies buildDependencies features; - }; - carnix_0_7_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "carnix"; - version = "0.7.2"; - authors = [ "pe@pijul.org " ]; - sha256 = "0zsmc4wiz7vill676mcdh6ibyzmr9rn030j555ncqgavs7k5yhq5"; - crateBin = [ { name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; } { name = "carnix"; path = "src/main.rs"; } ]; - inherit dependencies buildDependencies features; - }; - cc_1_0_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "cc"; - version = "1.0.10"; - authors = [ "Alex Crichton " ]; - sha256 = "0fqchrxcrd2j2b9x7cqs49ck7b3ilsap8s9xhs75gzgl6c1ylpdn"; - inherit dependencies buildDependencies features; - }; - cfg_if_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "cfg-if"; - version = "0.1.2"; - authors = [ "Alex Crichton " ]; - sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi"; - inherit dependencies buildDependencies features; - }; - clap_2_31_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "clap"; - version = "2.31.2"; - authors = [ "Kevin K. " ]; - sha256 = "0r24ziw85a8y1sf2l21y4mvv5qan3rjafcshpyfsjfadqfxsij72"; - inherit dependencies buildDependencies features; - }; - dtoa_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "dtoa"; - version = "0.4.2"; - authors = [ "David Tolnay " ]; - sha256 = "1bxsh6fags7nr36vlz07ik2a1rzyipc8x1y30kjk832hf2pzadmw"; - inherit dependencies buildDependencies features; - }; - either_1_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "either"; - version = "1.5.0"; - authors = [ "bluss" ]; - sha256 = "1f7kl2ln01y02m8fpd2zrdjiwqmgfvl9nxxrfry3k19d1gd2bsvz"; - inherit dependencies buildDependencies features; - }; - env_logger_0_5_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "env_logger"; - version = "0.5.7"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0wgd9fashmwbx5ssrxx69naam6hlb5c7qmh1nln645q4gms35i2l"; - inherit dependencies buildDependencies features; - }; - error_chain_0_11_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "error-chain"; - version = "0.11.0"; - authors = [ "Brian Anderson " "Paul Colomiets " "Colin Kiegel " "Yamakaky " ]; - sha256 = "19nz17q6dzp0mx2jhh9qbj45gkvvgcl7zq9z2ai5a8ihbisfj6d7"; - inherit dependencies buildDependencies features; - }; - fuchsia_zircon_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "fuchsia-zircon"; - version = "0.3.3"; - authors = [ "Raph Levien " ]; - sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk"; - inherit dependencies buildDependencies features; - }; - fuchsia_zircon_sys_0_3_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "fuchsia-zircon-sys"; - version = "0.3.3"; - authors = [ "Raph Levien " ]; - sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5"; - inherit dependencies buildDependencies features; - }; - humantime_1_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "humantime"; - version = "1.1.1"; - authors = [ "Paul Colomiets " ]; - sha256 = "1lzdfsfzdikcp1qb6wcdvnsdv16pmzr7p7cv171vnbnyz2lrwbgn"; - libPath = "src/lib.rs"; - inherit dependencies buildDependencies features; - }; - itertools_0_7_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "itertools"; - version = "0.7.8"; - authors = [ "bluss" ]; - sha256 = "0ib30cd7d1icjxsa13mji1gry3grp72kx8p33yd84mphdbc3d357"; - inherit dependencies buildDependencies features; - }; - itoa_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "itoa"; - version = "0.4.1"; - authors = [ "David Tolnay " ]; - sha256 = "1jyrsmrm5q4r2ipmq5hvvkqg0mgnlbk44lm7gr0v9ymvbrh2gbij"; - inherit dependencies buildDependencies features; - }; - lazy_static_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "lazy_static"; - version = "1.0.0"; - authors = [ "Marvin Löbel " ]; - sha256 = "0wfvqyr2nvx2mbsrscg5y7gfa9skhb8p72ayanl8vl49pw24v4fh"; - inherit dependencies buildDependencies features; - }; - libc_0_2_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libc"; - version = "0.2.40"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1xfc39237ldzgr8x8wcflgdr8zssi3wif7g2zxc02d94gzkjsw83"; - inherit dependencies buildDependencies features; - }; - libsqlite3_sys_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "libsqlite3-sys"; - version = "0.9.1"; - authors = [ "John Gallagher " ]; - sha256 = "1j599xygsh564xmx29942w0sq7w05c1jipk6dsyrxj6b33kw3fw7"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - linked_hash_map_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "linked-hash-map"; - version = "0.4.2"; - authors = [ "Stepan Koltsov " "Andrew Paseltiner " ]; - sha256 = "04da208h6jb69f46j37jnvsw2i1wqplglp4d61csqcrhh83avbgl"; - inherit dependencies buildDependencies features; - }; - log_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "log"; - version = "0.4.1"; - authors = [ "The Rust Project Developers" ]; - sha256 = "01vm8yy3wngvyj6qp1x3xpcb4xq7v67yn9l7fsma8kz28mliz90d"; - inherit dependencies buildDependencies features; - }; - lru_cache_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "lru-cache"; - version = "0.1.1"; - authors = [ "Stepan Koltsov " ]; - sha256 = "1hl6kii1g54sq649gnscv858mmw7a02xj081l4vcgvrswdi2z8fw"; - inherit dependencies buildDependencies features; - }; - memchr_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "memchr"; - version = "1.0.2"; - authors = [ "Andrew Gallant " "bluss" ]; - sha256 = "0dfb8ifl9nrc9kzgd5z91q6qg87sh285q1ih7xgrsglmqfav9lg7"; - inherit dependencies buildDependencies features; - }; - memchr_2_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "memchr"; - version = "2.0.1"; - authors = [ "Andrew Gallant " "bluss" ]; - sha256 = "0ls2y47rjwapjdax6bp974gdp06ggm1v8d1h69wyydmh1nhgm5gr"; - inherit dependencies buildDependencies features; - }; - nom_3_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "nom"; - version = "3.2.1"; - authors = [ "contact@geoffroycouprie.com" ]; - sha256 = "1vcllxrz9hdw6j25kn020ka3psz1vkaqh1hm3yfak2240zrxgi07"; - inherit dependencies buildDependencies features; - }; - num_traits_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "num-traits"; - version = "0.2.2"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1gcqhcd27gi72al5salxlp3m374qr3xnc3zh249f7dsrxc9rmgh0"; - inherit dependencies buildDependencies features; - }; - pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "pkg-config"; - version = "0.3.9"; - authors = [ "Alex Crichton " ]; - sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146"; - inherit dependencies buildDependencies features; - }; - proc_macro2_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "proc-macro2"; - version = "0.3.6"; - authors = [ "Alex Crichton " ]; - sha256 = "1viqlvsknzvgc2j0bcz53n94zxv7c816py7hv2r27y0bv1dq4iqp"; - inherit dependencies buildDependencies features; - }; - quick_error_1_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "quick-error"; - version = "1.2.1"; - authors = [ "Paul Colomiets " "Colin Kiegel " ]; - sha256 = "0vq41csw68ynaq2fy5dvldh4lx7pnbw6pr332kv5rvrz4pz0jnq6"; - inherit dependencies buildDependencies features; - }; - quote_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "quote"; - version = "0.5.1"; - authors = [ "David Tolnay " ]; - sha256 = "0jppgddqp6vp67ns4hpyf644n5678fligp711isp0xkvfv19la3r"; - inherit dependencies buildDependencies features; - }; - rand_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rand"; - version = "0.4.2"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0h8pkg23wb67i8904sm76iyr1jlmhklb85vbpz9c9191a24xzkfm"; - inherit dependencies buildDependencies features; - }; - redox_syscall_0_1_37_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "redox_syscall"; - version = "0.1.37"; - authors = [ "Jeremy Soller " ]; - sha256 = "0qa0jl9cr3qp80an8vshp2mcn8rzvwiavs1398hq1vsjw7pc3h2v"; - libName = "syscall"; - inherit dependencies buildDependencies features; - }; - redox_termios_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "redox_termios"; - version = "0.1.1"; - authors = [ "Jeremy Soller " ]; - sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh"; - libPath = "src/lib.rs"; - inherit dependencies buildDependencies features; - }; - regex_0_2_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "regex"; - version = "0.2.10"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0cwdmcllssm984b5nnpr55rgla1yzw31kmp2imxdpgk6hvlhf1ca"; - inherit dependencies buildDependencies features; - }; - regex_syntax_0_5_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "regex-syntax"; - version = "0.5.5"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1m5v66r6xxglgkdl1ci23qq0bl0k2wqplm6li4pmg1k7szvgxcbp"; - inherit dependencies buildDependencies features; - }; - remove_dir_all_0_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "remove_dir_all"; - version = "0.5.0"; - authors = [ "Aaronepower " ]; - sha256 = "0cgmlm9xvf19z84zcb7d62c2lfv60g6gd58c9717giq7c9ib284y"; - inherit dependencies buildDependencies features; - }; - rusqlite_0_13_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rusqlite"; - version = "0.13.0"; - authors = [ "John Gallagher " ]; - sha256 = "1hj2464ar2y4324sk3jx7m9byhkcp60krrrs1v1i8dlhhlnkb9hc"; - inherit dependencies buildDependencies features; - }; - rustc_demangle_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "rustc-demangle"; - version = "0.1.7"; - authors = [ "Alex Crichton " ]; - sha256 = "0wrln6jvwmqrhyvqlw5vq9a2s4r04ja8mrybxjj9aaaar1fyvns6"; - inherit dependencies buildDependencies features; - }; - serde_1_0_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde"; - version = "1.0.38"; - authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "0dri7vmzjsfmak1qq5wdinykqqvd5shpms504p8acpgyx7817jgk"; - inherit dependencies buildDependencies features; - }; - serde_derive_1_0_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde_derive"; - version = "1.0.38"; - authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "027c13sbnqkfzc8vxx0m6wnkr68im8kdbkbnix07dgw1l616yw0m"; - procMacro = true; - inherit dependencies buildDependencies features; - }; - serde_derive_internals_0_23_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde_derive_internals"; - version = "0.23.1"; - authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "0bjgcn2irh6sd34q3j3xkbn5ghfgiv3cfdlffb31lh0bikwpk1b4"; - inherit dependencies buildDependencies features; - }; - serde_json_1_0_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "serde_json"; - version = "1.0.14"; - authors = [ "Erick Tryzelaar " "David Tolnay " ]; - sha256 = "053n2vbcx32f28pr8fxi0fxq7m3g0gm94kz9i1fmi1kiwq9j5lsj"; - inherit dependencies buildDependencies features; - }; - strsim_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "strsim"; - version = "0.7.0"; - authors = [ "Danny Guo " ]; - sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv"; - inherit dependencies buildDependencies features; - }; - syn_0_13_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "syn"; - version = "0.13.1"; - authors = [ "David Tolnay " ]; - sha256 = "1pimp7fpvillhz06xz0k6450h9nis3ab6h1j2hzrzykrpxs2qnyg"; - inherit dependencies buildDependencies features; - }; - tempdir_0_3_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "tempdir"; - version = "0.3.7"; - authors = [ "The Rust Project Developers" ]; - sha256 = "0y53sxybyljrr7lh0x0ysrsa7p7cljmwv9v80acy3rc6n97g67vy"; - inherit dependencies buildDependencies features; - }; - termcolor_0_3_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "termcolor"; - version = "0.3.6"; - authors = [ "Andrew Gallant " ]; - sha256 = "0w609sa1apl1kii67ln2g82r4rrycw45zgjq7mxxjrx1fa21v05z"; - inherit dependencies buildDependencies features; - }; - termion_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "termion"; - version = "1.5.1"; - authors = [ "ticki " "gycos " "IGI-111 " ]; - sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1"; - inherit dependencies buildDependencies features; - }; - textwrap_0_9_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "textwrap"; - version = "0.9.0"; - authors = [ "Martin Geisler " ]; - sha256 = "18jg79ndjlwndz01mlbh82kkr2arqm658yn5kwp65l5n1hz8w4yb"; - inherit dependencies buildDependencies features; - }; - thread_local_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "thread_local"; - version = "0.3.5"; - authors = [ "Amanieu d'Antras " ]; - sha256 = "0mkp0sp91aqsk7brgygai4igv751r1754rsxn37mig3ag5rx8np6"; - inherit dependencies buildDependencies features; - }; - time_0_1_39_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "time"; - version = "0.1.39"; - authors = [ "The Rust Project Developers" ]; - sha256 = "1ryy3bwhvyzj6fym123il38mk9ranm4vradj2a47l5ij8jd7w5if"; - inherit dependencies buildDependencies features; - }; - toml_0_4_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "toml"; - version = "0.4.6"; - authors = [ "Alex Crichton " ]; - sha256 = "0rfl7lyb5f67spk69s604nw87f97g7fvv36hj9v88qlr2bwyrn8v"; - inherit dependencies buildDependencies features; - }; - ucd_util_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "ucd-util"; - version = "0.1.1"; - authors = [ "Andrew Gallant " ]; - sha256 = "02a8h3siipx52b832xc8m8rwasj6nx9jpiwfldw8hp6k205hgkn0"; - inherit dependencies buildDependencies features; - }; - unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-width"; - version = "0.1.4"; - authors = [ "kwantam " ]; - sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; - inherit dependencies buildDependencies features; - }; - unicode_xid_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unicode-xid"; - version = "0.1.0"; - authors = [ "erick.tryzelaar " "kwantam " ]; - sha256 = "05wdmwlfzxhq3nhsxn6wx4q8dhxzzfb9szsz6wiw092m1rjj01zj"; - inherit dependencies buildDependencies features; - }; - unreachable_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "unreachable"; - version = "1.0.0"; - authors = [ "Jonathan Reem " ]; - sha256 = "1am8czbk5wwr25gbp2zr007744fxjshhdqjz9liz7wl4pnv3whcf"; - inherit dependencies buildDependencies features; - }; - utf8_ranges_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "utf8-ranges"; - version = "1.0.0"; - authors = [ "Andrew Gallant " ]; - sha256 = "0rzmqprwjv9yp1n0qqgahgm24872x6c0xddfym5pfndy7a36vkn0"; - inherit dependencies buildDependencies features; - }; - vcpkg_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "vcpkg"; - version = "0.2.3"; - authors = [ "Jim McGrath " ]; - sha256 = "0achi8sfy0wm4q04gj7nwpq9xfx8ynk6vv4r12a3ijg26hispq0c"; - inherit dependencies buildDependencies features; - }; - vec_map_0_8_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "vec_map"; - version = "0.8.0"; - authors = [ "Alex Crichton " "Jorge Aparicio " "Alexis Beingessner " "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon " "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood " "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens " "Josh Branchaud " "Huon Wilson " "Corey Farwell " "Aaron Liblong <>" "Nick Cameron " "Patrick Walton " "Felix S Klock II <>" "Andrew Paseltiner " "Sean McArthur " "Vadim Petrochenkov <>" ]; - sha256 = "07sgxp3cf1a4cxm9n3r27fcvqmld32bl2576mrcahnvm34j11xay"; - inherit dependencies buildDependencies features; - }; - void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "void"; - version = "1.0.2"; - authors = [ "Jonathan Reem " ]; - sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3"; - inherit dependencies buildDependencies features; - }; - winapi_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi"; - version = "0.3.4"; - authors = [ "Peter Atashian " ]; - sha256 = "1qbrf5dcnd8j36cawby5d9r5vx07r0l4ryf672pfncnp8895k9lx"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - winapi_i686_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi-i686-pc-windows-gnu"; - version = "0.4.0"; - authors = [ "Peter Atashian " ]; - sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - winapi_x86_64_pc_windows_gnu_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "winapi-x86_64-pc-windows-gnu"; - version = "0.4.0"; - authors = [ "Peter Atashian " ]; - sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj"; - build = "build.rs"; - inherit dependencies buildDependencies features; - }; - wincolor_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "wincolor"; - version = "0.1.6"; - authors = [ "Andrew Gallant " ]; - sha256 = "0f8m3l86pw6qi31jidqj78pgd15xj914850lyvsxkbln4f1drv47"; - inherit dependencies buildDependencies features; - }; - aho_corasick_0_6_4 = { features?(aho_corasick_0_6_4_features {}) }: aho_corasick_0_6_4_ { - dependencies = mapFeatures features ([ memchr_2_0_1 ]); - }; - aho_corasick_0_6_4_features = f: updateFeatures f (rec { - aho_corasick_0_6_4.default = (f.aho_corasick_0_6_4.default or true); - memchr_2_0_1.default = true; - }) [ memchr_2_0_1_features ]; - ansi_term_0_11_0 = { features?(ansi_term_0_11_0_features {}) }: ansi_term_0_11_0_ { - dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); - }; - ansi_term_0_11_0_features = f: updateFeatures f (rec { - ansi_term_0_11_0.default = (f.ansi_term_0_11_0.default or true); - winapi_0_3_4.consoleapi = true; - winapi_0_3_4.default = true; - winapi_0_3_4.errhandlingapi = true; - winapi_0_3_4.processenv = true; - }) [ winapi_0_3_4_features ]; - atty_0_2_8 = { features?(atty_0_2_8_features {}) }: atty_0_2_8_ { - dependencies = (if kernel == "redox" then mapFeatures features ([ termion_1_5_1 ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_40 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); - }; - atty_0_2_8_features = f: updateFeatures f (rec { - atty_0_2_8.default = (f.atty_0_2_8.default or true); - libc_0_2_40.default = (f.libc_0_2_40.default or false); - termion_1_5_1.default = true; - winapi_0_3_4.consoleapi = true; - winapi_0_3_4.default = true; - winapi_0_3_4.minwinbase = true; - winapi_0_3_4.minwindef = true; - winapi_0_3_4.processenv = true; - winapi_0_3_4.winbase = true; - }) [ termion_1_5_1_features libc_0_2_40_features winapi_0_3_4_features ]; - backtrace_0_3_6 = { features?(backtrace_0_3_6_features {}) }: backtrace_0_3_6_ { - dependencies = mapFeatures features ([ cfg_if_0_1_2 rustc_demangle_0_1_7 ]) - ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([ ] - ++ (if features.backtrace_0_3_6.backtrace-sys or false then [ backtrace_sys_0_1_16 ] else [])) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_40 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ ] - ++ (if features.backtrace_0_3_6.winapi or false then [ winapi_0_3_4 ] else [])) else []); - features = mkFeatures (features.backtrace_0_3_6 or {}); - }; - backtrace_0_3_6_features = f: updateFeatures f (rec { - backtrace_0_3_6.addr2line = - (f.backtrace_0_3_6.addr2line or false) || - (f.backtrace_0_3_6.gimli-symbolize or false) || - (backtrace_0_3_6.gimli-symbolize or false); - backtrace_0_3_6.backtrace-sys = - (f.backtrace_0_3_6.backtrace-sys or false) || - (f.backtrace_0_3_6.libbacktrace or false) || - (backtrace_0_3_6.libbacktrace or false); - backtrace_0_3_6.coresymbolication = - (f.backtrace_0_3_6.coresymbolication or false) || - (f.backtrace_0_3_6.default or false) || - (backtrace_0_3_6.default or false); - backtrace_0_3_6.dbghelp = - (f.backtrace_0_3_6.dbghelp or false) || - (f.backtrace_0_3_6.default or false) || - (backtrace_0_3_6.default or false); - backtrace_0_3_6.default = (f.backtrace_0_3_6.default or true); - backtrace_0_3_6.dladdr = - (f.backtrace_0_3_6.dladdr or false) || - (f.backtrace_0_3_6.default or false) || - (backtrace_0_3_6.default or false); - backtrace_0_3_6.findshlibs = - (f.backtrace_0_3_6.findshlibs or false) || - (f.backtrace_0_3_6.gimli-symbolize or false) || - (backtrace_0_3_6.gimli-symbolize or false); - backtrace_0_3_6.gimli = - (f.backtrace_0_3_6.gimli or false) || - (f.backtrace_0_3_6.gimli-symbolize or false) || - (backtrace_0_3_6.gimli-symbolize or false); - backtrace_0_3_6.libbacktrace = - (f.backtrace_0_3_6.libbacktrace or false) || - (f.backtrace_0_3_6.default or false) || - (backtrace_0_3_6.default or false); - backtrace_0_3_6.libunwind = - (f.backtrace_0_3_6.libunwind or false) || - (f.backtrace_0_3_6.default or false) || - (backtrace_0_3_6.default or false); - backtrace_0_3_6.memmap = - (f.backtrace_0_3_6.memmap or false) || - (f.backtrace_0_3_6.gimli-symbolize or false) || - (backtrace_0_3_6.gimli-symbolize or false); - backtrace_0_3_6.object = - (f.backtrace_0_3_6.object or false) || - (f.backtrace_0_3_6.gimli-symbolize or false) || - (backtrace_0_3_6.gimli-symbolize or false); - backtrace_0_3_6.rustc-serialize = - (f.backtrace_0_3_6.rustc-serialize or false) || - (f.backtrace_0_3_6.serialize-rustc or false) || - (backtrace_0_3_6.serialize-rustc or false); - backtrace_0_3_6.serde = - (f.backtrace_0_3_6.serde or false) || - (f.backtrace_0_3_6.serialize-serde or false) || - (backtrace_0_3_6.serialize-serde or false); - backtrace_0_3_6.serde_derive = - (f.backtrace_0_3_6.serde_derive or false) || - (f.backtrace_0_3_6.serialize-serde or false) || - (backtrace_0_3_6.serialize-serde or false); - backtrace_0_3_6.winapi = - (f.backtrace_0_3_6.winapi or false) || - (f.backtrace_0_3_6.dbghelp or false) || - (backtrace_0_3_6.dbghelp or false); - backtrace_sys_0_1_16.default = true; - cfg_if_0_1_2.default = true; - libc_0_2_40.default = true; - rustc_demangle_0_1_7.default = true; - winapi_0_3_4.dbghelp = true; - winapi_0_3_4.default = true; - winapi_0_3_4.minwindef = true; - winapi_0_3_4.processthreadsapi = true; - winapi_0_3_4.std = true; - winapi_0_3_4.winnt = true; - }) [ cfg_if_0_1_2_features rustc_demangle_0_1_7_features backtrace_sys_0_1_16_features libc_0_2_40_features winapi_0_3_4_features ]; - backtrace_sys_0_1_16 = { features?(backtrace_sys_0_1_16_features {}) }: backtrace_sys_0_1_16_ { - dependencies = mapFeatures features ([ libc_0_2_40 ]); - buildDependencies = mapFeatures features ([ cc_1_0_10 ]); - }; - backtrace_sys_0_1_16_features = f: updateFeatures f (rec { - backtrace_sys_0_1_16.default = (f.backtrace_sys_0_1_16.default or true); - cc_1_0_10.default = true; - libc_0_2_40.default = true; - }) [ libc_0_2_40_features cc_1_0_10_features ]; - bitflags_1_0_1 = { features?(bitflags_1_0_1_features {}) }: bitflags_1_0_1_ { - features = mkFeatures (features.bitflags_1_0_1 or {}); - }; - bitflags_1_0_1_features = f: updateFeatures f (rec { - bitflags_1_0_1.default = (f.bitflags_1_0_1.default or true); - bitflags_1_0_1.example_generated = - (f.bitflags_1_0_1.example_generated or false) || - (f.bitflags_1_0_1.default or false) || - (bitflags_1_0_1.default or false); - }) []; - carnix_0_7_2 = { features?(carnix_0_7_2_features {}) }: carnix_0_7_2_ { - dependencies = mapFeatures features ([ clap_2_31_2 env_logger_0_5_7 error_chain_0_11_0 itertools_0_7_8 log_0_4_1 nom_3_2_1 regex_0_2_10 rusqlite_0_13_0 serde_1_0_38 serde_derive_1_0_38 serde_json_1_0_14 tempdir_0_3_7 toml_0_4_6 ]); - }; - carnix_0_7_2_features = f: updateFeatures f (rec { - carnix_0_7_2.default = (f.carnix_0_7_2.default or true); - clap_2_31_2.default = true; - env_logger_0_5_7.default = true; - error_chain_0_11_0.default = true; - itertools_0_7_8.default = true; - log_0_4_1.default = true; - nom_3_2_1.default = true; - regex_0_2_10.default = true; - rusqlite_0_13_0.default = true; - serde_1_0_38.default = true; - serde_derive_1_0_38.default = true; - serde_json_1_0_14.default = true; - tempdir_0_3_7.default = true; - toml_0_4_6.default = true; - }) [ clap_2_31_2_features env_logger_0_5_7_features error_chain_0_11_0_features itertools_0_7_8_features log_0_4_1_features nom_3_2_1_features regex_0_2_10_features rusqlite_0_13_0_features serde_1_0_38_features serde_derive_1_0_38_features serde_json_1_0_14_features tempdir_0_3_7_features toml_0_4_6_features ]; - cc_1_0_10 = { features?(cc_1_0_10_features {}) }: cc_1_0_10_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.cc_1_0_10 or {}); - }; - cc_1_0_10_features = f: updateFeatures f (rec { - cc_1_0_10.default = (f.cc_1_0_10.default or true); - cc_1_0_10.rayon = - (f.cc_1_0_10.rayon or false) || - (f.cc_1_0_10.parallel or false) || - (cc_1_0_10.parallel or false); - }) []; - cfg_if_0_1_2 = { features?(cfg_if_0_1_2_features {}) }: cfg_if_0_1_2_ {}; - cfg_if_0_1_2_features = f: updateFeatures f (rec { - cfg_if_0_1_2.default = (f.cfg_if_0_1_2.default or true); - }) []; - clap_2_31_2 = { features?(clap_2_31_2_features {}) }: clap_2_31_2_ { - dependencies = mapFeatures features ([ bitflags_1_0_1 textwrap_0_9_0 unicode_width_0_1_4 ] - ++ (if features.clap_2_31_2.atty or false then [ atty_0_2_8 ] else []) - ++ (if features.clap_2_31_2.strsim or false then [ strsim_0_7_0 ] else []) - ++ (if features.clap_2_31_2.vec_map or false then [ vec_map_0_8_0 ] else [])) - ++ (if !(kernel == "windows") then mapFeatures features ([ ] - ++ (if features.clap_2_31_2.ansi_term or false then [ ansi_term_0_11_0 ] else [])) else []); - features = mkFeatures (features.clap_2_31_2 or {}); - }; - clap_2_31_2_features = f: updateFeatures f (rec { - ansi_term_0_11_0.default = true; - atty_0_2_8.default = true; - bitflags_1_0_1.default = true; - clap_2_31_2.ansi_term = - (f.clap_2_31_2.ansi_term or false) || - (f.clap_2_31_2.color or false) || - (clap_2_31_2.color or false); - clap_2_31_2.atty = - (f.clap_2_31_2.atty or false) || - (f.clap_2_31_2.color or false) || - (clap_2_31_2.color or false); - clap_2_31_2.clippy = - (f.clap_2_31_2.clippy or false) || - (f.clap_2_31_2.lints or false) || - (clap_2_31_2.lints or false); - clap_2_31_2.color = - (f.clap_2_31_2.color or false) || - (f.clap_2_31_2.default or false) || - (clap_2_31_2.default or false); - clap_2_31_2.default = (f.clap_2_31_2.default or true); - clap_2_31_2.strsim = - (f.clap_2_31_2.strsim or false) || - (f.clap_2_31_2.suggestions or false) || - (clap_2_31_2.suggestions or false); - clap_2_31_2.suggestions = - (f.clap_2_31_2.suggestions or false) || - (f.clap_2_31_2.default or false) || - (clap_2_31_2.default or false); - clap_2_31_2.term_size = - (f.clap_2_31_2.term_size or false) || - (f.clap_2_31_2.wrap_help or false) || - (clap_2_31_2.wrap_help or false); - clap_2_31_2.vec_map = - (f.clap_2_31_2.vec_map or false) || - (f.clap_2_31_2.default or false) || - (clap_2_31_2.default or false); - clap_2_31_2.yaml = - (f.clap_2_31_2.yaml or false) || - (f.clap_2_31_2.doc or false) || - (clap_2_31_2.doc or false); - clap_2_31_2.yaml-rust = - (f.clap_2_31_2.yaml-rust or false) || - (f.clap_2_31_2.yaml or false) || - (clap_2_31_2.yaml or false); - strsim_0_7_0.default = true; - textwrap_0_9_0.default = true; - textwrap_0_9_0.term_size = - (f.textwrap_0_9_0.term_size or false) || - (clap_2_31_2.wrap_help or false) || - (f.clap_2_31_2.wrap_help or false); - unicode_width_0_1_4.default = true; - vec_map_0_8_0.default = true; - }) [ atty_0_2_8_features bitflags_1_0_1_features strsim_0_7_0_features textwrap_0_9_0_features unicode_width_0_1_4_features vec_map_0_8_0_features ansi_term_0_11_0_features ]; - dtoa_0_4_2 = { features?(dtoa_0_4_2_features {}) }: dtoa_0_4_2_ {}; - dtoa_0_4_2_features = f: updateFeatures f (rec { - dtoa_0_4_2.default = (f.dtoa_0_4_2.default or true); - }) []; - either_1_5_0 = { features?(either_1_5_0_features {}) }: either_1_5_0_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.either_1_5_0 or {}); - }; - either_1_5_0_features = f: updateFeatures f (rec { - either_1_5_0.default = (f.either_1_5_0.default or true); - either_1_5_0.use_std = - (f.either_1_5_0.use_std or false) || - (f.either_1_5_0.default or false) || - (either_1_5_0.default or false); - }) []; - env_logger_0_5_7 = { features?(env_logger_0_5_7_features {}) }: env_logger_0_5_7_ { - dependencies = mapFeatures features ([ atty_0_2_8 humantime_1_1_1 log_0_4_1 termcolor_0_3_6 ] - ++ (if features.env_logger_0_5_7.regex or false then [ regex_0_2_10 ] else [])); - features = mkFeatures (features.env_logger_0_5_7 or {}); - }; - env_logger_0_5_7_features = f: updateFeatures f (rec { - atty_0_2_8.default = true; - env_logger_0_5_7.default = (f.env_logger_0_5_7.default or true); - env_logger_0_5_7.regex = - (f.env_logger_0_5_7.regex or false) || - (f.env_logger_0_5_7.default or false) || - (env_logger_0_5_7.default or false); - humantime_1_1_1.default = true; - log_0_4_1.default = true; - log_0_4_1.std = true; - regex_0_2_10.default = true; - termcolor_0_3_6.default = true; - }) [ atty_0_2_8_features humantime_1_1_1_features log_0_4_1_features regex_0_2_10_features termcolor_0_3_6_features ]; - error_chain_0_11_0 = { features?(error_chain_0_11_0_features {}) }: error_chain_0_11_0_ { - dependencies = mapFeatures features ([ ] - ++ (if features.error_chain_0_11_0.backtrace or false then [ backtrace_0_3_6 ] else [])); - features = mkFeatures (features.error_chain_0_11_0 or {}); - }; - error_chain_0_11_0_features = f: updateFeatures f (rec { - backtrace_0_3_6.default = true; - error_chain_0_11_0.backtrace = - (f.error_chain_0_11_0.backtrace or false) || - (f.error_chain_0_11_0.default or false) || - (error_chain_0_11_0.default or false); - error_chain_0_11_0.default = (f.error_chain_0_11_0.default or true); - error_chain_0_11_0.example_generated = - (f.error_chain_0_11_0.example_generated or false) || - (f.error_chain_0_11_0.default or false) || - (error_chain_0_11_0.default or false); - }) [ backtrace_0_3_6_features ]; - fuchsia_zircon_0_3_3 = { features?(fuchsia_zircon_0_3_3_features {}) }: fuchsia_zircon_0_3_3_ { - dependencies = mapFeatures features ([ bitflags_1_0_1 fuchsia_zircon_sys_0_3_3 ]); - }; - fuchsia_zircon_0_3_3_features = f: updateFeatures f (rec { - bitflags_1_0_1.default = true; - fuchsia_zircon_0_3_3.default = (f.fuchsia_zircon_0_3_3.default or true); - fuchsia_zircon_sys_0_3_3.default = true; - }) [ bitflags_1_0_1_features fuchsia_zircon_sys_0_3_3_features ]; - fuchsia_zircon_sys_0_3_3 = { features?(fuchsia_zircon_sys_0_3_3_features {}) }: fuchsia_zircon_sys_0_3_3_ {}; - fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f (rec { - fuchsia_zircon_sys_0_3_3.default = (f.fuchsia_zircon_sys_0_3_3.default or true); - }) []; - humantime_1_1_1 = { features?(humantime_1_1_1_features {}) }: humantime_1_1_1_ { - dependencies = mapFeatures features ([ quick_error_1_2_1 ]); - }; - humantime_1_1_1_features = f: updateFeatures f (rec { - humantime_1_1_1.default = (f.humantime_1_1_1.default or true); - quick_error_1_2_1.default = true; - }) [ quick_error_1_2_1_features ]; - itertools_0_7_8 = { features?(itertools_0_7_8_features {}) }: itertools_0_7_8_ { - dependencies = mapFeatures features ([ either_1_5_0 ]); - features = mkFeatures (features.itertools_0_7_8 or {}); - }; - itertools_0_7_8_features = f: updateFeatures f (rec { - either_1_5_0.default = (f.either_1_5_0.default or false); - itertools_0_7_8.default = (f.itertools_0_7_8.default or true); - itertools_0_7_8.use_std = - (f.itertools_0_7_8.use_std or false) || - (f.itertools_0_7_8.default or false) || - (itertools_0_7_8.default or false); - }) [ either_1_5_0_features ]; - itoa_0_4_1 = { features?(itoa_0_4_1_features {}) }: itoa_0_4_1_ { - features = mkFeatures (features.itoa_0_4_1 or {}); - }; - itoa_0_4_1_features = f: updateFeatures f (rec { - itoa_0_4_1.default = (f.itoa_0_4_1.default or true); - itoa_0_4_1.std = - (f.itoa_0_4_1.std or false) || - (f.itoa_0_4_1.default or false) || - (itoa_0_4_1.default or false); - }) []; - lazy_static_1_0_0 = { features?(lazy_static_1_0_0_features {}) }: lazy_static_1_0_0_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.lazy_static_1_0_0 or {}); - }; - lazy_static_1_0_0_features = f: updateFeatures f (rec { - lazy_static_1_0_0.compiletest_rs = - (f.lazy_static_1_0_0.compiletest_rs or false) || - (f.lazy_static_1_0_0.compiletest or false) || - (lazy_static_1_0_0.compiletest or false); - lazy_static_1_0_0.default = (f.lazy_static_1_0_0.default or true); - lazy_static_1_0_0.nightly = - (f.lazy_static_1_0_0.nightly or false) || - (f.lazy_static_1_0_0.spin_no_std or false) || - (lazy_static_1_0_0.spin_no_std or false); - lazy_static_1_0_0.spin = - (f.lazy_static_1_0_0.spin or false) || - (f.lazy_static_1_0_0.spin_no_std or false) || - (lazy_static_1_0_0.spin_no_std or false); - }) []; - libc_0_2_40 = { features?(libc_0_2_40_features {}) }: libc_0_2_40_ { - features = mkFeatures (features.libc_0_2_40 or {}); - }; - libc_0_2_40_features = f: updateFeatures f (rec { - libc_0_2_40.default = (f.libc_0_2_40.default or true); - libc_0_2_40.use_std = - (f.libc_0_2_40.use_std or false) || - (f.libc_0_2_40.default or false) || - (libc_0_2_40.default or false); - }) []; - libsqlite3_sys_0_9_1 = { features?(libsqlite3_sys_0_9_1_features {}) }: libsqlite3_sys_0_9_1_ { - dependencies = (if abi == "msvc" then mapFeatures features ([]) else []); - buildDependencies = mapFeatures features ([ ] - ++ (if features.libsqlite3_sys_0_9_1.pkg-config or false then [ pkg_config_0_3_9 ] else [])); - features = mkFeatures (features.libsqlite3_sys_0_9_1 or {}); - }; - libsqlite3_sys_0_9_1_features = f: updateFeatures f (rec { - libsqlite3_sys_0_9_1.bindgen = - (f.libsqlite3_sys_0_9_1.bindgen or false) || - (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) || - (libsqlite3_sys_0_9_1.buildtime_bindgen or false); - libsqlite3_sys_0_9_1.cc = - (f.libsqlite3_sys_0_9_1.cc or false) || - (f.libsqlite3_sys_0_9_1.bundled or false) || - (libsqlite3_sys_0_9_1.bundled or false); - libsqlite3_sys_0_9_1.default = (f.libsqlite3_sys_0_9_1.default or true); - libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 = - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || - (f.libsqlite3_sys_0_9_1.default or false) || - (libsqlite3_sys_0_9_1.default or false); - libsqlite3_sys_0_9_1.pkg-config = - (f.libsqlite3_sys_0_9_1.pkg-config or false) || - (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) || - (libsqlite3_sys_0_9_1.buildtime_bindgen or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false); - libsqlite3_sys_0_9_1.vcpkg = - (f.libsqlite3_sys_0_9_1.vcpkg or false) || - (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) || - (libsqlite3_sys_0_9_1.buildtime_bindgen or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_6_8 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_16 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false) || - (libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false); - pkg_config_0_3_9.default = true; - }) [ pkg_config_0_3_9_features ]; - linked_hash_map_0_4_2 = { features?(linked_hash_map_0_4_2_features {}) }: linked_hash_map_0_4_2_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.linked_hash_map_0_4_2 or {}); - }; - linked_hash_map_0_4_2_features = f: updateFeatures f (rec { - linked_hash_map_0_4_2.default = (f.linked_hash_map_0_4_2.default or true); - linked_hash_map_0_4_2.heapsize = - (f.linked_hash_map_0_4_2.heapsize or false) || - (f.linked_hash_map_0_4_2.heapsize_impl or false) || - (linked_hash_map_0_4_2.heapsize_impl or false); - linked_hash_map_0_4_2.serde = - (f.linked_hash_map_0_4_2.serde or false) || - (f.linked_hash_map_0_4_2.serde_impl or false) || - (linked_hash_map_0_4_2.serde_impl or false); - linked_hash_map_0_4_2.serde_test = - (f.linked_hash_map_0_4_2.serde_test or false) || - (f.linked_hash_map_0_4_2.serde_impl or false) || - (linked_hash_map_0_4_2.serde_impl or false); - }) []; - log_0_4_1 = { features?(log_0_4_1_features {}) }: log_0_4_1_ { - dependencies = mapFeatures features ([ cfg_if_0_1_2 ]); - features = mkFeatures (features.log_0_4_1 or {}); - }; - log_0_4_1_features = f: updateFeatures f (rec { - cfg_if_0_1_2.default = true; - log_0_4_1.default = (f.log_0_4_1.default or true); - }) [ cfg_if_0_1_2_features ]; - lru_cache_0_1_1 = { features?(lru_cache_0_1_1_features {}) }: lru_cache_0_1_1_ { - dependencies = mapFeatures features ([ linked_hash_map_0_4_2 ]); - features = mkFeatures (features.lru_cache_0_1_1 or {}); - }; - lru_cache_0_1_1_features = f: updateFeatures f (rec { - linked_hash_map_0_4_2.default = true; - linked_hash_map_0_4_2.heapsize_impl = - (f.linked_hash_map_0_4_2.heapsize_impl or false) || - (lru_cache_0_1_1.heapsize_impl or false) || - (f.lru_cache_0_1_1.heapsize_impl or false); - lru_cache_0_1_1.default = (f.lru_cache_0_1_1.default or true); - lru_cache_0_1_1.heapsize = - (f.lru_cache_0_1_1.heapsize or false) || - (f.lru_cache_0_1_1.heapsize_impl or false) || - (lru_cache_0_1_1.heapsize_impl or false); - }) [ linked_hash_map_0_4_2_features ]; - memchr_1_0_2 = { features?(memchr_1_0_2_features {}) }: memchr_1_0_2_ { - dependencies = mapFeatures features ([ ] - ++ (if features.memchr_1_0_2.libc or false then [ libc_0_2_40 ] else [])); - features = mkFeatures (features.memchr_1_0_2 or {}); - }; - memchr_1_0_2_features = f: updateFeatures f (rec { - libc_0_2_40.default = (f.libc_0_2_40.default or false); - libc_0_2_40.use_std = - (f.libc_0_2_40.use_std or false) || - (memchr_1_0_2.use_std or false) || - (f.memchr_1_0_2.use_std or false); - memchr_1_0_2.default = (f.memchr_1_0_2.default or true); - memchr_1_0_2.libc = - (f.memchr_1_0_2.libc or false) || - (f.memchr_1_0_2.default or false) || - (memchr_1_0_2.default or false) || - (f.memchr_1_0_2.use_std or false) || - (memchr_1_0_2.use_std or false); - memchr_1_0_2.use_std = - (f.memchr_1_0_2.use_std or false) || - (f.memchr_1_0_2.default or false) || - (memchr_1_0_2.default or false); - }) [ libc_0_2_40_features ]; - memchr_2_0_1 = { features?(memchr_2_0_1_features {}) }: memchr_2_0_1_ { - dependencies = mapFeatures features ([ ] - ++ (if features.memchr_2_0_1.libc or false then [ libc_0_2_40 ] else [])); - features = mkFeatures (features.memchr_2_0_1 or {}); - }; - memchr_2_0_1_features = f: updateFeatures f (rec { - libc_0_2_40.default = (f.libc_0_2_40.default or false); - libc_0_2_40.use_std = - (f.libc_0_2_40.use_std or false) || - (memchr_2_0_1.use_std or false) || - (f.memchr_2_0_1.use_std or false); - memchr_2_0_1.default = (f.memchr_2_0_1.default or true); - memchr_2_0_1.libc = - (f.memchr_2_0_1.libc or false) || - (f.memchr_2_0_1.default or false) || - (memchr_2_0_1.default or false) || - (f.memchr_2_0_1.use_std or false) || - (memchr_2_0_1.use_std or false); - memchr_2_0_1.use_std = - (f.memchr_2_0_1.use_std or false) || - (f.memchr_2_0_1.default or false) || - (memchr_2_0_1.default or false); - }) [ libc_0_2_40_features ]; - nom_3_2_1 = { features?(nom_3_2_1_features {}) }: nom_3_2_1_ { - dependencies = mapFeatures features ([ memchr_1_0_2 ]); - features = mkFeatures (features.nom_3_2_1 or {}); - }; - nom_3_2_1_features = f: updateFeatures f (rec { - memchr_1_0_2.default = (f.memchr_1_0_2.default or false); - memchr_1_0_2.use_std = - (f.memchr_1_0_2.use_std or false) || - (nom_3_2_1.std or false) || - (f.nom_3_2_1.std or false); - nom_3_2_1.compiler_error = - (f.nom_3_2_1.compiler_error or false) || - (f.nom_3_2_1.nightly or false) || - (nom_3_2_1.nightly or false); - nom_3_2_1.default = (f.nom_3_2_1.default or true); - nom_3_2_1.lazy_static = - (f.nom_3_2_1.lazy_static or false) || - (f.nom_3_2_1.regexp_macros or false) || - (nom_3_2_1.regexp_macros or false); - nom_3_2_1.regex = - (f.nom_3_2_1.regex or false) || - (f.nom_3_2_1.regexp or false) || - (nom_3_2_1.regexp or false); - nom_3_2_1.regexp = - (f.nom_3_2_1.regexp or false) || - (f.nom_3_2_1.regexp_macros or false) || - (nom_3_2_1.regexp_macros or false); - nom_3_2_1.std = - (f.nom_3_2_1.std or false) || - (f.nom_3_2_1.default or false) || - (nom_3_2_1.default or false); - nom_3_2_1.stream = - (f.nom_3_2_1.stream or false) || - (f.nom_3_2_1.default or false) || - (nom_3_2_1.default or false); - }) [ memchr_1_0_2_features ]; - num_traits_0_2_2 = { features?(num_traits_0_2_2_features {}) }: num_traits_0_2_2_ { - features = mkFeatures (features.num_traits_0_2_2 or {}); - }; - num_traits_0_2_2_features = f: updateFeatures f (rec { - num_traits_0_2_2.default = (f.num_traits_0_2_2.default or true); - num_traits_0_2_2.std = - (f.num_traits_0_2_2.std or false) || - (f.num_traits_0_2_2.default or false) || - (num_traits_0_2_2.default or false); - }) []; - pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {}; - pkg_config_0_3_9_features = f: updateFeatures f (rec { - pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true); - }) []; - proc_macro2_0_3_6 = { features?(proc_macro2_0_3_6_features {}) }: proc_macro2_0_3_6_ { - dependencies = mapFeatures features ([ unicode_xid_0_1_0 ]); - features = mkFeatures (features.proc_macro2_0_3_6 or {}); - }; - proc_macro2_0_3_6_features = f: updateFeatures f (rec { - proc_macro2_0_3_6.default = (f.proc_macro2_0_3_6.default or true); - proc_macro2_0_3_6.proc-macro = - (f.proc_macro2_0_3_6.proc-macro or false) || - (f.proc_macro2_0_3_6.default or false) || - (proc_macro2_0_3_6.default or false) || - (f.proc_macro2_0_3_6.nightly or false) || - (proc_macro2_0_3_6.nightly or false); - unicode_xid_0_1_0.default = true; - }) [ unicode_xid_0_1_0_features ]; - quick_error_1_2_1 = { features?(quick_error_1_2_1_features {}) }: quick_error_1_2_1_ {}; - quick_error_1_2_1_features = f: updateFeatures f (rec { - quick_error_1_2_1.default = (f.quick_error_1_2_1.default or true); - }) []; - quote_0_5_1 = { features?(quote_0_5_1_features {}) }: quote_0_5_1_ { - dependencies = mapFeatures features ([ proc_macro2_0_3_6 ]); - features = mkFeatures (features.quote_0_5_1 or {}); - }; - quote_0_5_1_features = f: updateFeatures f (rec { - proc_macro2_0_3_6.default = (f.proc_macro2_0_3_6.default or false); - proc_macro2_0_3_6.proc-macro = - (f.proc_macro2_0_3_6.proc-macro or false) || - (quote_0_5_1.proc-macro or false) || - (f.quote_0_5_1.proc-macro or false); - quote_0_5_1.default = (f.quote_0_5_1.default or true); - quote_0_5_1.proc-macro = - (f.quote_0_5_1.proc-macro or false) || - (f.quote_0_5_1.default or false) || - (quote_0_5_1.default or false); - }) [ proc_macro2_0_3_6_features ]; - rand_0_4_2 = { features?(rand_0_4_2_features {}) }: rand_0_4_2_ { - dependencies = (if kernel == "fuchsia" then mapFeatures features ([ fuchsia_zircon_0_3_3 ]) else []) - ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ ] - ++ (if features.rand_0_4_2.libc or false then [ libc_0_2_40 ] else [])) else []) - ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); - features = mkFeatures (features.rand_0_4_2 or {}); - }; - rand_0_4_2_features = f: updateFeatures f (rec { - fuchsia_zircon_0_3_3.default = true; - libc_0_2_40.default = true; - rand_0_4_2.default = (f.rand_0_4_2.default or true); - rand_0_4_2.i128_support = - (f.rand_0_4_2.i128_support or false) || - (f.rand_0_4_2.nightly or false) || - (rand_0_4_2.nightly or false); - rand_0_4_2.libc = - (f.rand_0_4_2.libc or false) || - (f.rand_0_4_2.std or false) || - (rand_0_4_2.std or false); - rand_0_4_2.std = - (f.rand_0_4_2.std or false) || - (f.rand_0_4_2.default or false) || - (rand_0_4_2.default or false); - winapi_0_3_4.default = true; - winapi_0_3_4.minwindef = true; - winapi_0_3_4.ntsecapi = true; - winapi_0_3_4.profileapi = true; - winapi_0_3_4.winnt = true; - }) [ fuchsia_zircon_0_3_3_features libc_0_2_40_features winapi_0_3_4_features ]; - redox_syscall_0_1_37 = { features?(redox_syscall_0_1_37_features {}) }: redox_syscall_0_1_37_ {}; - redox_syscall_0_1_37_features = f: updateFeatures f (rec { - redox_syscall_0_1_37.default = (f.redox_syscall_0_1_37.default or true); - }) []; - redox_termios_0_1_1 = { features?(redox_termios_0_1_1_features {}) }: redox_termios_0_1_1_ { - dependencies = mapFeatures features ([ redox_syscall_0_1_37 ]); - }; - redox_termios_0_1_1_features = f: updateFeatures f (rec { - redox_syscall_0_1_37.default = true; - redox_termios_0_1_1.default = (f.redox_termios_0_1_1.default or true); - }) [ redox_syscall_0_1_37_features ]; - regex_0_2_10 = { features?(regex_0_2_10_features {}) }: regex_0_2_10_ { - dependencies = mapFeatures features ([ aho_corasick_0_6_4 memchr_2_0_1 regex_syntax_0_5_5 thread_local_0_3_5 utf8_ranges_1_0_0 ]); - features = mkFeatures (features.regex_0_2_10 or {}); - }; - regex_0_2_10_features = f: updateFeatures f (rec { - aho_corasick_0_6_4.default = true; - memchr_2_0_1.default = true; - regex_0_2_10.default = (f.regex_0_2_10.default or true); - regex_0_2_10.pattern = - (f.regex_0_2_10.pattern or false) || - (f.regex_0_2_10.unstable or false) || - (regex_0_2_10.unstable or false); - regex_syntax_0_5_5.default = true; - thread_local_0_3_5.default = true; - utf8_ranges_1_0_0.default = true; - }) [ aho_corasick_0_6_4_features memchr_2_0_1_features regex_syntax_0_5_5_features thread_local_0_3_5_features utf8_ranges_1_0_0_features ]; - regex_syntax_0_5_5 = { features?(regex_syntax_0_5_5_features {}) }: regex_syntax_0_5_5_ { - dependencies = mapFeatures features ([ ucd_util_0_1_1 ]); - }; - regex_syntax_0_5_5_features = f: updateFeatures f (rec { - regex_syntax_0_5_5.default = (f.regex_syntax_0_5_5.default or true); - ucd_util_0_1_1.default = true; - }) [ ucd_util_0_1_1_features ]; - remove_dir_all_0_5_0 = { features?(remove_dir_all_0_5_0_features {}) }: remove_dir_all_0_5_0_ { - dependencies = (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); - }; - remove_dir_all_0_5_0_features = f: updateFeatures f (rec { - remove_dir_all_0_5_0.default = (f.remove_dir_all_0_5_0.default or true); - winapi_0_3_4.default = true; - winapi_0_3_4.errhandlingapi = true; - winapi_0_3_4.fileapi = true; - winapi_0_3_4.std = true; - winapi_0_3_4.winbase = true; - winapi_0_3_4.winerror = true; - }) [ winapi_0_3_4_features ]; - rusqlite_0_13_0 = { features?(rusqlite_0_13_0_features {}) }: rusqlite_0_13_0_ { - dependencies = mapFeatures features ([ bitflags_1_0_1 libsqlite3_sys_0_9_1 lru_cache_0_1_1 time_0_1_39 ]); - features = mkFeatures (features.rusqlite_0_13_0 or {}); - }; - rusqlite_0_13_0_features = f: updateFeatures f (rec { - bitflags_1_0_1.default = true; - libsqlite3_sys_0_9_1.buildtime_bindgen = - (f.libsqlite3_sys_0_9_1.buildtime_bindgen or false) || - (rusqlite_0_13_0.buildtime_bindgen or false) || - (f.rusqlite_0_13_0.buildtime_bindgen or false); - libsqlite3_sys_0_9_1.bundled = - (f.libsqlite3_sys_0_9_1.bundled or false) || - (rusqlite_0_13_0.bundled or false) || - (f.rusqlite_0_13_0.bundled or false); - libsqlite3_sys_0_9_1.default = true; - libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 = - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_11 or false) || - (rusqlite_0_13_0.backup or false) || - (f.rusqlite_0_13_0.backup or false); - libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 = - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_6_23 or false) || - (rusqlite_0_13_0.trace or false) || - (f.rusqlite_0_13_0.trace or false); - libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 = - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_3 or false) || - (rusqlite_0_13_0.functions or false) || - (f.rusqlite_0_13_0.functions or false); - libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 = - (f.libsqlite3_sys_0_9_1.min_sqlite_version_3_7_4 or false) || - (rusqlite_0_13_0.blob or false) || - (f.rusqlite_0_13_0.blob or false); - libsqlite3_sys_0_9_1.sqlcipher = - (f.libsqlite3_sys_0_9_1.sqlcipher or false) || - (rusqlite_0_13_0.sqlcipher or false) || - (f.rusqlite_0_13_0.sqlcipher or false); - lru_cache_0_1_1.default = true; - rusqlite_0_13_0.default = (f.rusqlite_0_13_0.default or true); - time_0_1_39.default = true; - }) [ bitflags_1_0_1_features libsqlite3_sys_0_9_1_features lru_cache_0_1_1_features time_0_1_39_features ]; - rustc_demangle_0_1_7 = { features?(rustc_demangle_0_1_7_features {}) }: rustc_demangle_0_1_7_ {}; - rustc_demangle_0_1_7_features = f: updateFeatures f (rec { - rustc_demangle_0_1_7.default = (f.rustc_demangle_0_1_7.default or true); - }) []; - serde_1_0_38 = { features?(serde_1_0_38_features {}) }: serde_1_0_38_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.serde_1_0_38 or {}); - }; - serde_1_0_38_features = f: updateFeatures f (rec { - serde_1_0_38.default = (f.serde_1_0_38.default or true); - serde_1_0_38.serde_derive = - (f.serde_1_0_38.serde_derive or false) || - (f.serde_1_0_38.derive or false) || - (serde_1_0_38.derive or false) || - (f.serde_1_0_38.playground or false) || - (serde_1_0_38.playground or false); - serde_1_0_38.std = - (f.serde_1_0_38.std or false) || - (f.serde_1_0_38.default or false) || - (serde_1_0_38.default or false); - serde_1_0_38.unstable = - (f.serde_1_0_38.unstable or false) || - (f.serde_1_0_38.alloc or false) || - (serde_1_0_38.alloc or false); - }) []; - serde_derive_1_0_38 = { features?(serde_derive_1_0_38_features {}) }: serde_derive_1_0_38_ { - dependencies = mapFeatures features ([ proc_macro2_0_3_6 quote_0_5_1 serde_derive_internals_0_23_1 syn_0_13_1 ]); - features = mkFeatures (features.serde_derive_1_0_38 or {}); - }; - serde_derive_1_0_38_features = f: updateFeatures f (rec { - proc_macro2_0_3_6.default = true; - quote_0_5_1.default = true; - serde_derive_1_0_38.default = (f.serde_derive_1_0_38.default or true); - serde_derive_internals_0_23_1.default = (f.serde_derive_internals_0_23_1.default or false); - syn_0_13_1.default = true; - syn_0_13_1.visit = true; - }) [ proc_macro2_0_3_6_features quote_0_5_1_features serde_derive_internals_0_23_1_features syn_0_13_1_features ]; - serde_derive_internals_0_23_1 = { features?(serde_derive_internals_0_23_1_features {}) }: serde_derive_internals_0_23_1_ { - dependencies = mapFeatures features ([ proc_macro2_0_3_6 syn_0_13_1 ]); - }; - serde_derive_internals_0_23_1_features = f: updateFeatures f (rec { - proc_macro2_0_3_6.default = true; - serde_derive_internals_0_23_1.default = (f.serde_derive_internals_0_23_1.default or true); - syn_0_13_1.clone-impls = true; - syn_0_13_1.default = (f.syn_0_13_1.default or false); - syn_0_13_1.derive = true; - syn_0_13_1.parsing = true; - }) [ proc_macro2_0_3_6_features syn_0_13_1_features ]; - serde_json_1_0_14 = { features?(serde_json_1_0_14_features {}) }: serde_json_1_0_14_ { - dependencies = mapFeatures features ([ dtoa_0_4_2 itoa_0_4_1 num_traits_0_2_2 serde_1_0_38 ]); - features = mkFeatures (features.serde_json_1_0_14 or {}); - }; - serde_json_1_0_14_features = f: updateFeatures f (rec { - dtoa_0_4_2.default = true; - itoa_0_4_1.default = true; - num_traits_0_2_2.default = (f.num_traits_0_2_2.default or false); - serde_1_0_38.default = true; - serde_json_1_0_14.default = (f.serde_json_1_0_14.default or true); - serde_json_1_0_14.linked-hash-map = - (f.serde_json_1_0_14.linked-hash-map or false) || - (f.serde_json_1_0_14.preserve_order or false) || - (serde_json_1_0_14.preserve_order or false); - }) [ dtoa_0_4_2_features itoa_0_4_1_features num_traits_0_2_2_features serde_1_0_38_features ]; - strsim_0_7_0 = { features?(strsim_0_7_0_features {}) }: strsim_0_7_0_ {}; - strsim_0_7_0_features = f: updateFeatures f (rec { - strsim_0_7_0.default = (f.strsim_0_7_0.default or true); - }) []; - syn_0_13_1 = { features?(syn_0_13_1_features {}) }: syn_0_13_1_ { - dependencies = mapFeatures features ([ proc_macro2_0_3_6 unicode_xid_0_1_0 ] - ++ (if features.syn_0_13_1.quote or false then [ quote_0_5_1 ] else [])); - features = mkFeatures (features.syn_0_13_1 or {}); - }; - syn_0_13_1_features = f: updateFeatures f (rec { - proc_macro2_0_3_6.default = (f.proc_macro2_0_3_6.default or false); - proc_macro2_0_3_6.proc-macro = - (f.proc_macro2_0_3_6.proc-macro or false) || - (syn_0_13_1.proc-macro or false) || - (f.syn_0_13_1.proc-macro or false); - quote_0_5_1.default = (f.quote_0_5_1.default or false); - quote_0_5_1.proc-macro = - (f.quote_0_5_1.proc-macro or false) || - (syn_0_13_1.proc-macro or false) || - (f.syn_0_13_1.proc-macro or false); - syn_0_13_1.clone-impls = - (f.syn_0_13_1.clone-impls or false) || - (f.syn_0_13_1.default or false) || - (syn_0_13_1.default or false); - syn_0_13_1.default = (f.syn_0_13_1.default or true); - syn_0_13_1.derive = - (f.syn_0_13_1.derive or false) || - (f.syn_0_13_1.default or false) || - (syn_0_13_1.default or false); - syn_0_13_1.parsing = - (f.syn_0_13_1.parsing or false) || - (f.syn_0_13_1.default or false) || - (syn_0_13_1.default or false); - syn_0_13_1.printing = - (f.syn_0_13_1.printing or false) || - (f.syn_0_13_1.default or false) || - (syn_0_13_1.default or false); - syn_0_13_1.proc-macro = - (f.syn_0_13_1.proc-macro or false) || - (f.syn_0_13_1.default or false) || - (syn_0_13_1.default or false); - syn_0_13_1.quote = - (f.syn_0_13_1.quote or false) || - (f.syn_0_13_1.printing or false) || - (syn_0_13_1.printing or false); - unicode_xid_0_1_0.default = true; - }) [ proc_macro2_0_3_6_features quote_0_5_1_features unicode_xid_0_1_0_features ]; - tempdir_0_3_7 = { features?(tempdir_0_3_7_features {}) }: tempdir_0_3_7_ { - dependencies = mapFeatures features ([ rand_0_4_2 remove_dir_all_0_5_0 ]); - }; - tempdir_0_3_7_features = f: updateFeatures f (rec { - rand_0_4_2.default = true; - remove_dir_all_0_5_0.default = true; - tempdir_0_3_7.default = (f.tempdir_0_3_7.default or true); - }) [ rand_0_4_2_features remove_dir_all_0_5_0_features ]; - termcolor_0_3_6 = { features?(termcolor_0_3_6_features {}) }: termcolor_0_3_6_ { - dependencies = (if kernel == "windows" then mapFeatures features ([ wincolor_0_1_6 ]) else []); - }; - termcolor_0_3_6_features = f: updateFeatures f (rec { - termcolor_0_3_6.default = (f.termcolor_0_3_6.default or true); - wincolor_0_1_6.default = true; - }) [ wincolor_0_1_6_features ]; - termion_1_5_1 = { features?(termion_1_5_1_features {}) }: termion_1_5_1_ { - dependencies = (if !(kernel == "redox") then mapFeatures features ([ libc_0_2_40 ]) else []) - ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_37 redox_termios_0_1_1 ]) else []); - }; - termion_1_5_1_features = f: updateFeatures f (rec { - libc_0_2_40.default = true; - redox_syscall_0_1_37.default = true; - redox_termios_0_1_1.default = true; - termion_1_5_1.default = (f.termion_1_5_1.default or true); - }) [ libc_0_2_40_features redox_syscall_0_1_37_features redox_termios_0_1_1_features ]; - textwrap_0_9_0 = { features?(textwrap_0_9_0_features {}) }: textwrap_0_9_0_ { - dependencies = mapFeatures features ([ unicode_width_0_1_4 ]); - }; - textwrap_0_9_0_features = f: updateFeatures f (rec { - textwrap_0_9_0.default = (f.textwrap_0_9_0.default or true); - unicode_width_0_1_4.default = true; - }) [ unicode_width_0_1_4_features ]; - thread_local_0_3_5 = { features?(thread_local_0_3_5_features {}) }: thread_local_0_3_5_ { - dependencies = mapFeatures features ([ lazy_static_1_0_0 unreachable_1_0_0 ]); - }; - thread_local_0_3_5_features = f: updateFeatures f (rec { - lazy_static_1_0_0.default = true; - thread_local_0_3_5.default = (f.thread_local_0_3_5.default or true); - unreachable_1_0_0.default = true; - }) [ lazy_static_1_0_0_features unreachable_1_0_0_features ]; - time_0_1_39 = { features?(time_0_1_39_features {}) }: time_0_1_39_ { - dependencies = mapFeatures features ([ libc_0_2_40 ]) - ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_37 ]) else []) - ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_3_4 ]) else []); - }; - time_0_1_39_features = f: updateFeatures f (rec { - libc_0_2_40.default = true; - redox_syscall_0_1_37.default = true; - time_0_1_39.default = (f.time_0_1_39.default or true); - winapi_0_3_4.default = true; - winapi_0_3_4.minwinbase = true; - winapi_0_3_4.minwindef = true; - winapi_0_3_4.ntdef = true; - winapi_0_3_4.profileapi = true; - winapi_0_3_4.std = true; - winapi_0_3_4.sysinfoapi = true; - winapi_0_3_4.timezoneapi = true; - }) [ libc_0_2_40_features redox_syscall_0_1_37_features winapi_0_3_4_features ]; - toml_0_4_6 = { features?(toml_0_4_6_features {}) }: toml_0_4_6_ { - dependencies = mapFeatures features ([ serde_1_0_38 ]); - }; - toml_0_4_6_features = f: updateFeatures f (rec { - serde_1_0_38.default = true; - toml_0_4_6.default = (f.toml_0_4_6.default or true); - }) [ serde_1_0_38_features ]; - ucd_util_0_1_1 = { features?(ucd_util_0_1_1_features {}) }: ucd_util_0_1_1_ {}; - ucd_util_0_1_1_features = f: updateFeatures f (rec { - ucd_util_0_1_1.default = (f.ucd_util_0_1_1.default or true); - }) []; - unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ { - features = mkFeatures (features.unicode_width_0_1_4 or {}); - }; - unicode_width_0_1_4_features = f: updateFeatures f (rec { - unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true); - }) []; - unicode_xid_0_1_0 = { features?(unicode_xid_0_1_0_features {}) }: unicode_xid_0_1_0_ { - features = mkFeatures (features.unicode_xid_0_1_0 or {}); - }; - unicode_xid_0_1_0_features = f: updateFeatures f (rec { - unicode_xid_0_1_0.default = (f.unicode_xid_0_1_0.default or true); - }) []; - unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ { - dependencies = mapFeatures features ([ void_1_0_2 ]); - }; - unreachable_1_0_0_features = f: updateFeatures f (rec { - unreachable_1_0_0.default = (f.unreachable_1_0_0.default or true); - void_1_0_2.default = (f.void_1_0_2.default or false); - }) [ void_1_0_2_features ]; - utf8_ranges_1_0_0 = { features?(utf8_ranges_1_0_0_features {}) }: utf8_ranges_1_0_0_ {}; - utf8_ranges_1_0_0_features = f: updateFeatures f (rec { - utf8_ranges_1_0_0.default = (f.utf8_ranges_1_0_0.default or true); - }) []; - vcpkg_0_2_3 = { features?(vcpkg_0_2_3_features {}) }: vcpkg_0_2_3_ {}; - vcpkg_0_2_3_features = f: updateFeatures f (rec { - vcpkg_0_2_3.default = (f.vcpkg_0_2_3.default or true); - }) []; - vec_map_0_8_0 = { features?(vec_map_0_8_0_features {}) }: vec_map_0_8_0_ { - dependencies = mapFeatures features ([]); - features = mkFeatures (features.vec_map_0_8_0 or {}); - }; - vec_map_0_8_0_features = f: updateFeatures f (rec { - vec_map_0_8_0.default = (f.vec_map_0_8_0.default or true); - vec_map_0_8_0.serde = - (f.vec_map_0_8_0.serde or false) || - (f.vec_map_0_8_0.eders or false) || - (vec_map_0_8_0.eders or false); - vec_map_0_8_0.serde_derive = - (f.vec_map_0_8_0.serde_derive or false) || - (f.vec_map_0_8_0.eders or false) || - (vec_map_0_8_0.eders or false); - }) []; - void_1_0_2 = { features?(void_1_0_2_features {}) }: void_1_0_2_ { - features = mkFeatures (features.void_1_0_2 or {}); - }; - void_1_0_2_features = f: updateFeatures f (rec { - void_1_0_2.default = (f.void_1_0_2.default or true); - void_1_0_2.std = - (f.void_1_0_2.std or false) || - (f.void_1_0_2.default or false) || - (void_1_0_2.default or false); - }) []; - winapi_0_3_4 = { features?(winapi_0_3_4_features {}) }: winapi_0_3_4_ { - dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([ winapi_i686_pc_windows_gnu_0_4_0 ]) else []) - ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ winapi_x86_64_pc_windows_gnu_0_4_0 ]) else []); - features = mkFeatures (features.winapi_0_3_4 or {}); - }; - winapi_0_3_4_features = f: updateFeatures f (rec { - winapi_0_3_4.default = (f.winapi_0_3_4.default or true); - winapi_i686_pc_windows_gnu_0_4_0.default = true; - winapi_x86_64_pc_windows_gnu_0_4_0.default = true; - }) [ winapi_i686_pc_windows_gnu_0_4_0_features winapi_x86_64_pc_windows_gnu_0_4_0_features ]; - winapi_i686_pc_windows_gnu_0_4_0 = { features?(winapi_i686_pc_windows_gnu_0_4_0_features {}) }: winapi_i686_pc_windows_gnu_0_4_0_ {}; - winapi_i686_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec { - winapi_i686_pc_windows_gnu_0_4_0.default = (f.winapi_i686_pc_windows_gnu_0_4_0.default or true); - }) []; - winapi_x86_64_pc_windows_gnu_0_4_0 = { features?(winapi_x86_64_pc_windows_gnu_0_4_0_features {}) }: winapi_x86_64_pc_windows_gnu_0_4_0_ {}; - winapi_x86_64_pc_windows_gnu_0_4_0_features = f: updateFeatures f (rec { - winapi_x86_64_pc_windows_gnu_0_4_0.default = (f.winapi_x86_64_pc_windows_gnu_0_4_0.default or true); - }) []; - wincolor_0_1_6 = { features?(wincolor_0_1_6_features {}) }: wincolor_0_1_6_ { - dependencies = mapFeatures features ([ winapi_0_3_4 ]); - }; - wincolor_0_1_6_features = f: updateFeatures f (rec { - winapi_0_3_4.consoleapi = true; - winapi_0_3_4.default = true; - winapi_0_3_4.minwindef = true; - winapi_0_3_4.processenv = true; - winapi_0_3_4.winbase = true; - winapi_0_3_4.wincon = true; - wincolor_0_1_6.default = (f.wincolor_0_1_6.default or true); - }) [ winapi_0_3_4_features ]; } diff --git a/pkgs/build-support/rust/crates-io.nix b/pkgs/build-support/rust/crates-io.nix new file mode 100644 index 000000000000..9d9cafe4cbf2 --- /dev/null +++ b/pkgs/build-support/rust/crates-io.nix @@ -0,0 +1,2050 @@ +{ lib, buildRustCrate, buildRustCrateHelpers }: +with buildRustCrateHelpers; +let inherit (lib.lists) fold; + inherit (lib.attrsets) recursiveUpdate; +in +rec { + + crates.aho_corasick."0.6.8" = deps: { features?(features_.aho_corasick."0.6.8" deps {}) }: buildRustCrate { + crateName = "aho-corasick"; + version = "0.6.8"; + authors = [ "Andrew Gallant " ]; + sha256 = "04bz5m32ykyn946iwxgbrl8nwca7ssxsqma140hgmkchaay80nfr"; + libName = "aho_corasick"; + crateBin = + [{ name = "aho-corasick-dot"; path = "src/main.rs"; }]; + dependencies = mapFeatures features ([ + (crates."memchr"."${deps."aho_corasick"."0.6.8"."memchr"}" deps) + ]); + }; + features_.aho_corasick."0.6.8" = deps: f: updateFeatures f (rec { + aho_corasick."0.6.8".default = (f.aho_corasick."0.6.8".default or true); + memchr."${deps.aho_corasick."0.6.8".memchr}".default = true; + }) [ + (features_.memchr."${deps."aho_corasick"."0.6.8"."memchr"}" deps) + ]; + + + crates.ansi_term."0.11.0" = deps: { features?(features_.ansi_term."0.11.0" deps {}) }: buildRustCrate { + crateName = "ansi_term"; + version = "0.11.0"; + authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " "Josh Triplett " ]; + sha256 = "08fk0p2xvkqpmz3zlrwnf6l8sj2vngw464rvzspzp31sbgxbwm4v"; + dependencies = (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."ansi_term"."0.11.0"."winapi"}" deps) + ]) else []); + }; + features_.ansi_term."0.11.0" = deps: f: updateFeatures f (rec { + ansi_term."0.11.0".default = (f.ansi_term."0.11.0".default or true); + winapi = fold recursiveUpdate {} [ + { "${deps.ansi_term."0.11.0".winapi}"."consoleapi" = true; } + { "${deps.ansi_term."0.11.0".winapi}"."errhandlingapi" = true; } + { "${deps.ansi_term."0.11.0".winapi}"."processenv" = true; } + { "${deps.ansi_term."0.11.0".winapi}".default = true; } + ]; + }) [ + (features_.winapi."${deps."ansi_term"."0.11.0"."winapi"}" deps) + ]; + + + crates.argon2rs."0.2.5" = deps: { features?(features_.argon2rs."0.2.5" deps {}) }: buildRustCrate { + crateName = "argon2rs"; + version = "0.2.5"; + authors = [ "bryant " ]; + sha256 = "1byl9b3wwyrarn8qack21v5fi2qsnn3y5clvikk2apskhmnih1rw"; + dependencies = mapFeatures features ([ + (crates."blake2_rfc"."${deps."argon2rs"."0.2.5"."blake2_rfc"}" deps) + (crates."scoped_threadpool"."${deps."argon2rs"."0.2.5"."scoped_threadpool"}" deps) + ]); + features = mkFeatures (features."argon2rs"."0.2.5" or {}); + }; + features_.argon2rs."0.2.5" = deps: f: updateFeatures f (rec { + argon2rs."0.2.5".default = (f.argon2rs."0.2.5".default or true); + blake2_rfc = fold recursiveUpdate {} [ + { "${deps.argon2rs."0.2.5".blake2_rfc}".default = true; } + { "0.2.18".simd_asm = + (f.blake2_rfc."0.2.18".simd_asm or false) || + (argon2rs."0.2.5"."simd" or false) || + (f."argon2rs"."0.2.5"."simd" or false); } + ]; + scoped_threadpool."${deps.argon2rs."0.2.5".scoped_threadpool}".default = true; + }) [ + (features_.blake2_rfc."${deps."argon2rs"."0.2.5"."blake2_rfc"}" deps) + (features_.scoped_threadpool."${deps."argon2rs"."0.2.5"."scoped_threadpool"}" deps) + ]; + + + crates.arrayvec."0.4.7" = deps: { features?(features_.arrayvec."0.4.7" deps {}) }: buildRustCrate { + crateName = "arrayvec"; + version = "0.4.7"; + authors = [ "bluss" ]; + sha256 = "0fzgv7z1x1qnyd7j32vdcadk4k9wfx897y06mr3bw1yi52iqf4z4"; + dependencies = mapFeatures features ([ + (crates."nodrop"."${deps."arrayvec"."0.4.7"."nodrop"}" deps) + ]); + features = mkFeatures (features."arrayvec"."0.4.7" or {}); + }; + features_.arrayvec."0.4.7" = deps: f: updateFeatures f (rec { + arrayvec = fold recursiveUpdate {} [ + { "0.4.7".default = (f.arrayvec."0.4.7".default or true); } + { "0.4.7".serde = + (f.arrayvec."0.4.7".serde or false) || + (f.arrayvec."0.4.7".serde-1 or false) || + (arrayvec."0.4.7"."serde-1" or false); } + { "0.4.7".std = + (f.arrayvec."0.4.7".std or false) || + (f.arrayvec."0.4.7".default or false) || + (arrayvec."0.4.7"."default" or false); } + ]; + nodrop."${deps.arrayvec."0.4.7".nodrop}".default = (f.nodrop."${deps.arrayvec."0.4.7".nodrop}".default or false); + }) [ + (features_.nodrop."${deps."arrayvec"."0.4.7"."nodrop"}" deps) + ]; + + + crates.atty."0.2.11" = deps: { features?(features_.atty."0.2.11" deps {}) }: buildRustCrate { + crateName = "atty"; + version = "0.2.11"; + authors = [ "softprops " ]; + sha256 = "0by1bj2km9jxi4i4g76zzi76fc2rcm9934jpnyrqd95zw344pb20"; + dependencies = (if kernel == "redox" then mapFeatures features ([ + (crates."termion"."${deps."atty"."0.2.11"."termion"}" deps) + ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."atty"."0.2.11"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."atty"."0.2.11"."winapi"}" deps) + ]) else []); + }; + features_.atty."0.2.11" = deps: f: updateFeatures f (rec { + atty."0.2.11".default = (f.atty."0.2.11".default or true); + libc."${deps.atty."0.2.11".libc}".default = (f.libc."${deps.atty."0.2.11".libc}".default or false); + termion."${deps.atty."0.2.11".termion}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.atty."0.2.11".winapi}"."consoleapi" = true; } + { "${deps.atty."0.2.11".winapi}"."minwinbase" = true; } + { "${deps.atty."0.2.11".winapi}"."minwindef" = true; } + { "${deps.atty."0.2.11".winapi}"."processenv" = true; } + { "${deps.atty."0.2.11".winapi}"."winbase" = true; } + { "${deps.atty."0.2.11".winapi}".default = true; } + ]; + }) [ + (features_.termion."${deps."atty"."0.2.11"."termion"}" deps) + (features_.libc."${deps."atty"."0.2.11"."libc"}" deps) + (features_.winapi."${deps."atty"."0.2.11"."winapi"}" deps) + ]; + + + crates.backtrace."0.3.9" = deps: { features?(features_.backtrace."0.3.9" deps {}) }: buildRustCrate { + crateName = "backtrace"; + version = "0.3.9"; + authors = [ "Alex Crichton " "The Rust Project Developers" ]; + sha256 = "137pjkcn89b7fqk78w65ggj92pynmf1hkr1sjz53aga4b50lkmwm"; + dependencies = mapFeatures features ([ + (crates."cfg_if"."${deps."backtrace"."0.3.9"."cfg_if"}" deps) + (crates."rustc_demangle"."${deps."backtrace"."0.3.9"."rustc_demangle"}" deps) + ]) + ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([ + ] + ++ (if features.backtrace."0.3.9".backtrace-sys or false then [ (crates.backtrace_sys."0.1.24" deps) ] else [])) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."backtrace"."0.3.9"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + ] + ++ (if features.backtrace."0.3.9".winapi or false then [ (crates.winapi."0.3.6" deps) ] else [])) else []); + features = mkFeatures (features."backtrace"."0.3.9" or {}); + }; + features_.backtrace."0.3.9" = deps: f: updateFeatures f (rec { + backtrace = fold recursiveUpdate {} [ + { "0.3.9".addr2line = + (f.backtrace."0.3.9".addr2line or false) || + (f.backtrace."0.3.9".gimli-symbolize or false) || + (backtrace."0.3.9"."gimli-symbolize" or false); } + { "0.3.9".backtrace-sys = + (f.backtrace."0.3.9".backtrace-sys or false) || + (f.backtrace."0.3.9".libbacktrace or false) || + (backtrace."0.3.9"."libbacktrace" or false); } + { "0.3.9".coresymbolication = + (f.backtrace."0.3.9".coresymbolication or false) || + (f.backtrace."0.3.9".default or false) || + (backtrace."0.3.9"."default" or false); } + { "0.3.9".dbghelp = + (f.backtrace."0.3.9".dbghelp or false) || + (f.backtrace."0.3.9".default or false) || + (backtrace."0.3.9"."default" or false); } + { "0.3.9".default = (f.backtrace."0.3.9".default or true); } + { "0.3.9".dladdr = + (f.backtrace."0.3.9".dladdr or false) || + (f.backtrace."0.3.9".default or false) || + (backtrace."0.3.9"."default" or false); } + { "0.3.9".findshlibs = + (f.backtrace."0.3.9".findshlibs or false) || + (f.backtrace."0.3.9".gimli-symbolize or false) || + (backtrace."0.3.9"."gimli-symbolize" or false); } + { "0.3.9".gimli = + (f.backtrace."0.3.9".gimli or false) || + (f.backtrace."0.3.9".gimli-symbolize or false) || + (backtrace."0.3.9"."gimli-symbolize" or false); } + { "0.3.9".libbacktrace = + (f.backtrace."0.3.9".libbacktrace or false) || + (f.backtrace."0.3.9".default or false) || + (backtrace."0.3.9"."default" or false); } + { "0.3.9".libunwind = + (f.backtrace."0.3.9".libunwind or false) || + (f.backtrace."0.3.9".default or false) || + (backtrace."0.3.9"."default" or false); } + { "0.3.9".memmap = + (f.backtrace."0.3.9".memmap or false) || + (f.backtrace."0.3.9".gimli-symbolize or false) || + (backtrace."0.3.9"."gimli-symbolize" or false); } + { "0.3.9".object = + (f.backtrace."0.3.9".object or false) || + (f.backtrace."0.3.9".gimli-symbolize or false) || + (backtrace."0.3.9"."gimli-symbolize" or false); } + { "0.3.9".rustc-serialize = + (f.backtrace."0.3.9".rustc-serialize or false) || + (f.backtrace."0.3.9".serialize-rustc or false) || + (backtrace."0.3.9"."serialize-rustc" or false); } + { "0.3.9".serde = + (f.backtrace."0.3.9".serde or false) || + (f.backtrace."0.3.9".serialize-serde or false) || + (backtrace."0.3.9"."serialize-serde" or false); } + { "0.3.9".serde_derive = + (f.backtrace."0.3.9".serde_derive or false) || + (f.backtrace."0.3.9".serialize-serde or false) || + (backtrace."0.3.9"."serialize-serde" or false); } + { "0.3.9".winapi = + (f.backtrace."0.3.9".winapi or false) || + (f.backtrace."0.3.9".dbghelp or false) || + (backtrace."0.3.9"."dbghelp" or false); } + ]; + backtrace_sys."${deps.backtrace."0.3.9".backtrace_sys}".default = true; + cfg_if."${deps.backtrace."0.3.9".cfg_if}".default = true; + libc."${deps.backtrace."0.3.9".libc}".default = true; + rustc_demangle."${deps.backtrace."0.3.9".rustc_demangle}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.backtrace."0.3.9".winapi}"."dbghelp" = true; } + { "${deps.backtrace."0.3.9".winapi}"."minwindef" = true; } + { "${deps.backtrace."0.3.9".winapi}"."processthreadsapi" = true; } + { "${deps.backtrace."0.3.9".winapi}"."std" = true; } + { "${deps.backtrace."0.3.9".winapi}"."winnt" = true; } + { "${deps.backtrace."0.3.9".winapi}".default = true; } + ]; + }) [ + (features_.cfg_if."${deps."backtrace"."0.3.9"."cfg_if"}" deps) + (features_.rustc_demangle."${deps."backtrace"."0.3.9"."rustc_demangle"}" deps) + (features_.backtrace_sys."${deps."backtrace"."0.3.9"."backtrace_sys"}" deps) + (features_.libc."${deps."backtrace"."0.3.9"."libc"}" deps) + (features_.winapi."${deps."backtrace"."0.3.9"."winapi"}" deps) + ]; + + + crates.backtrace_sys."0.1.24" = deps: { features?(features_.backtrace_sys."0.1.24" deps {}) }: buildRustCrate { + crateName = "backtrace-sys"; + version = "0.1.24"; + authors = [ "Alex Crichton " ]; + sha256 = "15d6jlknykiijcin3vqbx33760w24ss5qw3l1xd3hms5k4vc8305"; + build = "build.rs"; + dependencies = mapFeatures features ([ + (crates."libc"."${deps."backtrace_sys"."0.1.24"."libc"}" deps) + ]); + + buildDependencies = mapFeatures features ([ + (crates."cc"."${deps."backtrace_sys"."0.1.24"."cc"}" deps) + ]); + }; + features_.backtrace_sys."0.1.24" = deps: f: updateFeatures f (rec { + backtrace_sys."0.1.24".default = (f.backtrace_sys."0.1.24".default or true); + cc."${deps.backtrace_sys."0.1.24".cc}".default = true; + libc."${deps.backtrace_sys."0.1.24".libc}".default = true; + }) [ + (features_.libc."${deps."backtrace_sys"."0.1.24"."libc"}" deps) + (features_.cc."${deps."backtrace_sys"."0.1.24"."cc"}" deps) + ]; + + + crates.bitflags."1.0.4" = deps: { features?(features_.bitflags."1.0.4" deps {}) }: buildRustCrate { + crateName = "bitflags"; + version = "1.0.4"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1g1wmz2001qmfrd37dnd5qiss5njrw26aywmg6yhkmkbyrhjxb08"; + features = mkFeatures (features."bitflags"."1.0.4" or {}); + }; + features_.bitflags."1.0.4" = deps: f: updateFeatures f (rec { + bitflags."1.0.4".default = (f.bitflags."1.0.4".default or true); + }) []; + + + crates.blake2_rfc."0.2.18" = deps: { features?(features_.blake2_rfc."0.2.18" deps {}) }: buildRustCrate { + crateName = "blake2-rfc"; + version = "0.2.18"; + authors = [ "Cesar Eduardo Barros " ]; + sha256 = "0pyqrik4471ljk16prs0iwb2sam39z0z6axyyjxlqxdmf4wprf0l"; + dependencies = mapFeatures features ([ + (crates."arrayvec"."${deps."blake2_rfc"."0.2.18"."arrayvec"}" deps) + (crates."constant_time_eq"."${deps."blake2_rfc"."0.2.18"."constant_time_eq"}" deps) + ]); + features = mkFeatures (features."blake2_rfc"."0.2.18" or {}); + }; + features_.blake2_rfc."0.2.18" = deps: f: updateFeatures f (rec { + arrayvec."${deps.blake2_rfc."0.2.18".arrayvec}".default = (f.arrayvec."${deps.blake2_rfc."0.2.18".arrayvec}".default or false); + blake2_rfc = fold recursiveUpdate {} [ + { "0.2.18".default = (f.blake2_rfc."0.2.18".default or true); } + { "0.2.18".simd = + (f.blake2_rfc."0.2.18".simd or false) || + (f.blake2_rfc."0.2.18".simd_opt or false) || + (blake2_rfc."0.2.18"."simd_opt" or false); } + { "0.2.18".simd_opt = + (f.blake2_rfc."0.2.18".simd_opt or false) || + (f.blake2_rfc."0.2.18".simd_asm or false) || + (blake2_rfc."0.2.18"."simd_asm" or false); } + { "0.2.18".std = + (f.blake2_rfc."0.2.18".std or false) || + (f.blake2_rfc."0.2.18".default or false) || + (blake2_rfc."0.2.18"."default" or false); } + ]; + constant_time_eq."${deps.blake2_rfc."0.2.18".constant_time_eq}".default = true; + }) [ + (features_.arrayvec."${deps."blake2_rfc"."0.2.18"."arrayvec"}" deps) + (features_.constant_time_eq."${deps."blake2_rfc"."0.2.18"."constant_time_eq"}" deps) + ]; + + + crates.carnix."0.8.11" = deps: { features?(features_.carnix."0.8.11" deps {}) }: buildRustCrate { + crateName = "carnix"; + version = "0.8.11"; + authors = [ "pe@pijul.org " ]; + sha256 = "1i5iz51mradd3vishc19cd0nfh9r2clbmiq94f83npny65dnp6ch"; + crateBin = + [{ name = "cargo-generate-nixfile"; path = "src/cargo-generate-nixfile.rs"; }] ++ + [{ name = "carnix"; path = "src/main.rs"; }]; + dependencies = mapFeatures features ([ + (crates."clap"."${deps."carnix"."0.8.11"."clap"}" deps) + (crates."dirs"."${deps."carnix"."0.8.11"."dirs"}" deps) + (crates."env_logger"."${deps."carnix"."0.8.11"."env_logger"}" deps) + (crates."error_chain"."${deps."carnix"."0.8.11"."error_chain"}" deps) + (crates."itertools"."${deps."carnix"."0.8.11"."itertools"}" deps) + (crates."log"."${deps."carnix"."0.8.11"."log"}" deps) + (crates."nom"."${deps."carnix"."0.8.11"."nom"}" deps) + (crates."regex"."${deps."carnix"."0.8.11"."regex"}" deps) + (crates."rusqlite"."${deps."carnix"."0.8.11"."rusqlite"}" deps) + (crates."serde"."${deps."carnix"."0.8.11"."serde"}" deps) + (crates."serde_derive"."${deps."carnix"."0.8.11"."serde_derive"}" deps) + (crates."serde_json"."${deps."carnix"."0.8.11"."serde_json"}" deps) + (crates."tempdir"."${deps."carnix"."0.8.11"."tempdir"}" deps) + (crates."toml"."${deps."carnix"."0.8.11"."toml"}" deps) + ]); + }; + features_.carnix."0.8.11" = deps: f: updateFeatures f (rec { + carnix."0.8.11".default = (f.carnix."0.8.11".default or true); + clap."${deps.carnix."0.8.11".clap}".default = true; + dirs."${deps.carnix."0.8.11".dirs}".default = true; + env_logger."${deps.carnix."0.8.11".env_logger}".default = true; + error_chain."${deps.carnix."0.8.11".error_chain}".default = true; + itertools."${deps.carnix."0.8.11".itertools}".default = true; + log."${deps.carnix."0.8.11".log}".default = true; + nom."${deps.carnix."0.8.11".nom}".default = true; + regex."${deps.carnix."0.8.11".regex}".default = true; + rusqlite."${deps.carnix."0.8.11".rusqlite}".default = true; + serde."${deps.carnix."0.8.11".serde}".default = true; + serde_derive."${deps.carnix."0.8.11".serde_derive}".default = true; + serde_json."${deps.carnix."0.8.11".serde_json}".default = true; + tempdir."${deps.carnix."0.8.11".tempdir}".default = true; + toml."${deps.carnix."0.8.11".toml}".default = true; + }) [ + (features_.clap."${deps."carnix"."0.8.11"."clap"}" deps) + (features_.dirs."${deps."carnix"."0.8.11"."dirs"}" deps) + (features_.env_logger."${deps."carnix"."0.8.11"."env_logger"}" deps) + (features_.error_chain."${deps."carnix"."0.8.11"."error_chain"}" deps) + (features_.itertools."${deps."carnix"."0.8.11"."itertools"}" deps) + (features_.log."${deps."carnix"."0.8.11"."log"}" deps) + (features_.nom."${deps."carnix"."0.8.11"."nom"}" deps) + (features_.regex."${deps."carnix"."0.8.11"."regex"}" deps) + (features_.rusqlite."${deps."carnix"."0.8.11"."rusqlite"}" deps) + (features_.serde."${deps."carnix"."0.8.11"."serde"}" deps) + (features_.serde_derive."${deps."carnix"."0.8.11"."serde_derive"}" deps) + (features_.serde_json."${deps."carnix"."0.8.11"."serde_json"}" deps) + (features_.tempdir."${deps."carnix"."0.8.11"."tempdir"}" deps) + (features_.toml."${deps."carnix"."0.8.11"."toml"}" deps) + ]; + + + crates.cc."1.0.25" = deps: { features?(features_.cc."1.0.25" deps {}) }: buildRustCrate { + crateName = "cc"; + version = "1.0.25"; + authors = [ "Alex Crichton " ]; + sha256 = "0pd8fhjlpr5qan984frkf1c8nxrqp6827wmmfzhm2840229z2hq0"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."cc"."1.0.25" or {}); + }; + features_.cc."1.0.25" = deps: f: updateFeatures f (rec { + cc = fold recursiveUpdate {} [ + { "1.0.25".default = (f.cc."1.0.25".default or true); } + { "1.0.25".rayon = + (f.cc."1.0.25".rayon or false) || + (f.cc."1.0.25".parallel or false) || + (cc."1.0.25"."parallel" or false); } + ]; + }) []; + + + crates.cfg_if."0.1.6" = deps: { features?(features_.cfg_if."0.1.6" deps {}) }: buildRustCrate { + crateName = "cfg-if"; + version = "0.1.6"; + authors = [ "Alex Crichton " ]; + sha256 = "11qrix06wagkplyk908i3423ps9m9np6c4vbcq81s9fyl244xv3n"; + }; + features_.cfg_if."0.1.6" = deps: f: updateFeatures f (rec { + cfg_if."0.1.6".default = (f.cfg_if."0.1.6".default or true); + }) []; + + + crates.clap."2.32.0" = deps: { features?(features_.clap."2.32.0" deps {}) }: buildRustCrate { + crateName = "clap"; + version = "2.32.0"; + authors = [ "Kevin K. " ]; + sha256 = "1hdjf0janvpjkwrjdjx1mm2aayzr54k72w6mriyr0n5anjkcj1lx"; + dependencies = mapFeatures features ([ + (crates."bitflags"."${deps."clap"."2.32.0"."bitflags"}" deps) + (crates."textwrap"."${deps."clap"."2.32.0"."textwrap"}" deps) + (crates."unicode_width"."${deps."clap"."2.32.0"."unicode_width"}" deps) + ] + ++ (if features.clap."2.32.0".atty or false then [ (crates.atty."0.2.11" deps) ] else []) + ++ (if features.clap."2.32.0".strsim or false then [ (crates.strsim."0.7.0" deps) ] else []) + ++ (if features.clap."2.32.0".vec_map or false then [ (crates.vec_map."0.8.1" deps) ] else [])) + ++ (if !(kernel == "windows") then mapFeatures features ([ + ] + ++ (if features.clap."2.32.0".ansi_term or false then [ (crates.ansi_term."0.11.0" deps) ] else [])) else []); + features = mkFeatures (features."clap"."2.32.0" or {}); + }; + features_.clap."2.32.0" = deps: f: updateFeatures f (rec { + ansi_term."${deps.clap."2.32.0".ansi_term}".default = true; + atty."${deps.clap."2.32.0".atty}".default = true; + bitflags."${deps.clap."2.32.0".bitflags}".default = true; + clap = fold recursiveUpdate {} [ + { "2.32.0".ansi_term = + (f.clap."2.32.0".ansi_term or false) || + (f.clap."2.32.0".color or false) || + (clap."2.32.0"."color" or false); } + { "2.32.0".atty = + (f.clap."2.32.0".atty or false) || + (f.clap."2.32.0".color or false) || + (clap."2.32.0"."color" or false); } + { "2.32.0".clippy = + (f.clap."2.32.0".clippy or false) || + (f.clap."2.32.0".lints or false) || + (clap."2.32.0"."lints" or false); } + { "2.32.0".color = + (f.clap."2.32.0".color or false) || + (f.clap."2.32.0".default or false) || + (clap."2.32.0"."default" or false); } + { "2.32.0".default = (f.clap."2.32.0".default or true); } + { "2.32.0".strsim = + (f.clap."2.32.0".strsim or false) || + (f.clap."2.32.0".suggestions or false) || + (clap."2.32.0"."suggestions" or false); } + { "2.32.0".suggestions = + (f.clap."2.32.0".suggestions or false) || + (f.clap."2.32.0".default or false) || + (clap."2.32.0"."default" or false); } + { "2.32.0".term_size = + (f.clap."2.32.0".term_size or false) || + (f.clap."2.32.0".wrap_help or false) || + (clap."2.32.0"."wrap_help" or false); } + { "2.32.0".vec_map = + (f.clap."2.32.0".vec_map or false) || + (f.clap."2.32.0".default or false) || + (clap."2.32.0"."default" or false); } + { "2.32.0".yaml = + (f.clap."2.32.0".yaml or false) || + (f.clap."2.32.0".doc or false) || + (clap."2.32.0"."doc" or false); } + { "2.32.0".yaml-rust = + (f.clap."2.32.0".yaml-rust or false) || + (f.clap."2.32.0".yaml or false) || + (clap."2.32.0"."yaml" or false); } + ]; + strsim."${deps.clap."2.32.0".strsim}".default = true; + textwrap = fold recursiveUpdate {} [ + { "${deps.clap."2.32.0".textwrap}".default = true; } + { "0.10.0".term_size = + (f.textwrap."0.10.0".term_size or false) || + (clap."2.32.0"."wrap_help" or false) || + (f."clap"."2.32.0"."wrap_help" or false); } + ]; + unicode_width."${deps.clap."2.32.0".unicode_width}".default = true; + vec_map."${deps.clap."2.32.0".vec_map}".default = true; + }) [ + (features_.atty."${deps."clap"."2.32.0"."atty"}" deps) + (features_.bitflags."${deps."clap"."2.32.0"."bitflags"}" deps) + (features_.strsim."${deps."clap"."2.32.0"."strsim"}" deps) + (features_.textwrap."${deps."clap"."2.32.0"."textwrap"}" deps) + (features_.unicode_width."${deps."clap"."2.32.0"."unicode_width"}" deps) + (features_.vec_map."${deps."clap"."2.32.0"."vec_map"}" deps) + (features_.ansi_term."${deps."clap"."2.32.0"."ansi_term"}" deps) + ]; + + + crates.constant_time_eq."0.1.3" = deps: { features?(features_.constant_time_eq."0.1.3" deps {}) }: buildRustCrate { + crateName = "constant_time_eq"; + version = "0.1.3"; + authors = [ "Cesar Eduardo Barros " ]; + sha256 = "03qri9hjf049gwqg9q527lybpg918q6y5q4g9a5lma753nff49wd"; + }; + features_.constant_time_eq."0.1.3" = deps: f: updateFeatures f (rec { + constant_time_eq."0.1.3".default = (f.constant_time_eq."0.1.3".default or true); + }) []; + + + crates.dirs."1.0.4" = deps: { features?(features_.dirs."1.0.4" deps {}) }: buildRustCrate { + crateName = "dirs"; + version = "1.0.4"; + authors = [ "Simon Ochsenreither " ]; + sha256 = "1hp3nz0350b0gpavb3w5ajqc9l1k59cfrcsr3hcavwlkizdnpv1y"; + dependencies = (if kernel == "redox" then mapFeatures features ([ + (crates."redox_users"."${deps."dirs"."1.0.4"."redox_users"}" deps) + ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."dirs"."1.0.4"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."dirs"."1.0.4"."winapi"}" deps) + ]) else []); + }; + features_.dirs."1.0.4" = deps: f: updateFeatures f (rec { + dirs."1.0.4".default = (f.dirs."1.0.4".default or true); + libc."${deps.dirs."1.0.4".libc}".default = true; + redox_users."${deps.dirs."1.0.4".redox_users}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.dirs."1.0.4".winapi}"."knownfolders" = true; } + { "${deps.dirs."1.0.4".winapi}"."objbase" = true; } + { "${deps.dirs."1.0.4".winapi}"."shlobj" = true; } + { "${deps.dirs."1.0.4".winapi}"."winbase" = true; } + { "${deps.dirs."1.0.4".winapi}"."winerror" = true; } + { "${deps.dirs."1.0.4".winapi}".default = true; } + ]; + }) [ + (features_.redox_users."${deps."dirs"."1.0.4"."redox_users"}" deps) + (features_.libc."${deps."dirs"."1.0.4"."libc"}" deps) + (features_.winapi."${deps."dirs"."1.0.4"."winapi"}" deps) + ]; + + + crates.either."1.5.0" = deps: { features?(features_.either."1.5.0" deps {}) }: buildRustCrate { + crateName = "either"; + version = "1.5.0"; + authors = [ "bluss" ]; + sha256 = "1f7kl2ln01y02m8fpd2zrdjiwqmgfvl9nxxrfry3k19d1gd2bsvz"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."either"."1.5.0" or {}); + }; + features_.either."1.5.0" = deps: f: updateFeatures f (rec { + either = fold recursiveUpdate {} [ + { "1.5.0".default = (f.either."1.5.0".default or true); } + { "1.5.0".use_std = + (f.either."1.5.0".use_std or false) || + (f.either."1.5.0".default or false) || + (either."1.5.0"."default" or false); } + ]; + }) []; + + + crates.env_logger."0.5.13" = deps: { features?(features_.env_logger."0.5.13" deps {}) }: buildRustCrate { + crateName = "env_logger"; + version = "0.5.13"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1q6vylngcz4bn088b4hvsl879l8yz1k2bma75waljb5p4h4kbb72"; + dependencies = mapFeatures features ([ + (crates."atty"."${deps."env_logger"."0.5.13"."atty"}" deps) + (crates."humantime"."${deps."env_logger"."0.5.13"."humantime"}" deps) + (crates."log"."${deps."env_logger"."0.5.13"."log"}" deps) + (crates."termcolor"."${deps."env_logger"."0.5.13"."termcolor"}" deps) + ] + ++ (if features.env_logger."0.5.13".regex or false then [ (crates.regex."1.0.5" deps) ] else [])); + features = mkFeatures (features."env_logger"."0.5.13" or {}); + }; + features_.env_logger."0.5.13" = deps: f: updateFeatures f (rec { + atty."${deps.env_logger."0.5.13".atty}".default = true; + env_logger = fold recursiveUpdate {} [ + { "0.5.13".default = (f.env_logger."0.5.13".default or true); } + { "0.5.13".regex = + (f.env_logger."0.5.13".regex or false) || + (f.env_logger."0.5.13".default or false) || + (env_logger."0.5.13"."default" or false); } + ]; + humantime."${deps.env_logger."0.5.13".humantime}".default = true; + log = fold recursiveUpdate {} [ + { "${deps.env_logger."0.5.13".log}"."std" = true; } + { "${deps.env_logger."0.5.13".log}".default = true; } + ]; + regex."${deps.env_logger."0.5.13".regex}".default = true; + termcolor."${deps.env_logger."0.5.13".termcolor}".default = true; + }) [ + (features_.atty."${deps."env_logger"."0.5.13"."atty"}" deps) + (features_.humantime."${deps."env_logger"."0.5.13"."humantime"}" deps) + (features_.log."${deps."env_logger"."0.5.13"."log"}" deps) + (features_.regex."${deps."env_logger"."0.5.13"."regex"}" deps) + (features_.termcolor."${deps."env_logger"."0.5.13"."termcolor"}" deps) + ]; + + + crates.error_chain."0.12.0" = deps: { features?(features_.error_chain."0.12.0" deps {}) }: buildRustCrate { + crateName = "error-chain"; + version = "0.12.0"; + authors = [ "Brian Anderson " "Paul Colomiets " "Colin Kiegel " "Yamakaky " ]; + sha256 = "1m6wk1r6wqg1mn69bxxvk5k081cb4xy6bfhsxb99rv408x9wjcnl"; + dependencies = mapFeatures features ([ + ] + ++ (if features.error_chain."0.12.0".backtrace or false then [ (crates.backtrace."0.3.9" deps) ] else [])); + features = mkFeatures (features."error_chain"."0.12.0" or {}); + }; + features_.error_chain."0.12.0" = deps: f: updateFeatures f (rec { + backtrace."${deps.error_chain."0.12.0".backtrace}".default = true; + error_chain = fold recursiveUpdate {} [ + { "0.12.0".backtrace = + (f.error_chain."0.12.0".backtrace or false) || + (f.error_chain."0.12.0".default or false) || + (error_chain."0.12.0"."default" or false); } + { "0.12.0".default = (f.error_chain."0.12.0".default or true); } + { "0.12.0".example_generated = + (f.error_chain."0.12.0".example_generated or false) || + (f.error_chain."0.12.0".default or false) || + (error_chain."0.12.0"."default" or false); } + ]; + }) [ + (features_.backtrace."${deps."error_chain"."0.12.0"."backtrace"}" deps) + ]; + + + crates.failure."0.1.3" = deps: { features?(features_.failure."0.1.3" deps {}) }: buildRustCrate { + crateName = "failure"; + version = "0.1.3"; + authors = [ "Without Boats " ]; + sha256 = "0cibp01z0clyxrvkl7v7kq6jszsgcg9vwv6d9l6d1drk9jqdss4s"; + dependencies = mapFeatures features ([ + ] + ++ (if features.failure."0.1.3".backtrace or false then [ (crates.backtrace."0.3.9" deps) ] else []) + ++ (if features.failure."0.1.3".failure_derive or false then [ (crates.failure_derive."0.1.3" deps) ] else [])); + features = mkFeatures (features."failure"."0.1.3" or {}); + }; + features_.failure."0.1.3" = deps: f: updateFeatures f (rec { + backtrace."${deps.failure."0.1.3".backtrace}".default = true; + failure = fold recursiveUpdate {} [ + { "0.1.3".backtrace = + (f.failure."0.1.3".backtrace or false) || + (f.failure."0.1.3".std or false) || + (failure."0.1.3"."std" or false); } + { "0.1.3".default = (f.failure."0.1.3".default or true); } + { "0.1.3".derive = + (f.failure."0.1.3".derive or false) || + (f.failure."0.1.3".default or false) || + (failure."0.1.3"."default" or false); } + { "0.1.3".failure_derive = + (f.failure."0.1.3".failure_derive or false) || + (f.failure."0.1.3".derive or false) || + (failure."0.1.3"."derive" or false); } + { "0.1.3".std = + (f.failure."0.1.3".std or false) || + (f.failure."0.1.3".default or false) || + (failure."0.1.3"."default" or false); } + ]; + failure_derive."${deps.failure."0.1.3".failure_derive}".default = true; + }) [ + (features_.backtrace."${deps."failure"."0.1.3"."backtrace"}" deps) + (features_.failure_derive."${deps."failure"."0.1.3"."failure_derive"}" deps) + ]; + + + crates.failure_derive."0.1.3" = deps: { features?(features_.failure_derive."0.1.3" deps {}) }: buildRustCrate { + crateName = "failure_derive"; + version = "0.1.3"; + authors = [ "Without Boats " ]; + sha256 = "1mh7ad2d17f13g0k29bskp0f9faws0w1q4a5yfzlzi75bw9kidgm"; + procMacro = true; + build = "build.rs"; + dependencies = mapFeatures features ([ + (crates."proc_macro2"."${deps."failure_derive"."0.1.3"."proc_macro2"}" deps) + (crates."quote"."${deps."failure_derive"."0.1.3"."quote"}" deps) + (crates."syn"."${deps."failure_derive"."0.1.3"."syn"}" deps) + (crates."synstructure"."${deps."failure_derive"."0.1.3"."synstructure"}" deps) + ]); + features = mkFeatures (features."failure_derive"."0.1.3" or {}); + }; + features_.failure_derive."0.1.3" = deps: f: updateFeatures f (rec { + failure_derive."0.1.3".default = (f.failure_derive."0.1.3".default or true); + proc_macro2."${deps.failure_derive."0.1.3".proc_macro2}".default = true; + quote."${deps.failure_derive."0.1.3".quote}".default = true; + syn."${deps.failure_derive."0.1.3".syn}".default = true; + synstructure."${deps.failure_derive."0.1.3".synstructure}".default = true; + }) [ + (features_.proc_macro2."${deps."failure_derive"."0.1.3"."proc_macro2"}" deps) + (features_.quote."${deps."failure_derive"."0.1.3"."quote"}" deps) + (features_.syn."${deps."failure_derive"."0.1.3"."syn"}" deps) + (features_.synstructure."${deps."failure_derive"."0.1.3"."synstructure"}" deps) + ]; + + + crates.fuchsia_zircon."0.3.3" = deps: { features?(features_.fuchsia_zircon."0.3.3" deps {}) }: buildRustCrate { + crateName = "fuchsia-zircon"; + version = "0.3.3"; + authors = [ "Raph Levien " ]; + sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk"; + dependencies = mapFeatures features ([ + (crates."bitflags"."${deps."fuchsia_zircon"."0.3.3"."bitflags"}" deps) + (crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps) + ]); + }; + features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f (rec { + bitflags."${deps.fuchsia_zircon."0.3.3".bitflags}".default = true; + fuchsia_zircon."0.3.3".default = (f.fuchsia_zircon."0.3.3".default or true); + fuchsia_zircon_sys."${deps.fuchsia_zircon."0.3.3".fuchsia_zircon_sys}".default = true; + }) [ + (features_.bitflags."${deps."fuchsia_zircon"."0.3.3"."bitflags"}" deps) + (features_.fuchsia_zircon_sys."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps) + ]; + + + crates.fuchsia_zircon_sys."0.3.3" = deps: { features?(features_.fuchsia_zircon_sys."0.3.3" deps {}) }: buildRustCrate { + crateName = "fuchsia-zircon-sys"; + version = "0.3.3"; + authors = [ "Raph Levien " ]; + sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5"; + }; + features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f (rec { + fuchsia_zircon_sys."0.3.3".default = (f.fuchsia_zircon_sys."0.3.3".default or true); + }) []; + + + crates.humantime."1.1.1" = deps: { features?(features_.humantime."1.1.1" deps {}) }: buildRustCrate { + crateName = "humantime"; + version = "1.1.1"; + authors = [ "Paul Colomiets " ]; + sha256 = "1lzdfsfzdikcp1qb6wcdvnsdv16pmzr7p7cv171vnbnyz2lrwbgn"; + libPath = "src/lib.rs"; + dependencies = mapFeatures features ([ + (crates."quick_error"."${deps."humantime"."1.1.1"."quick_error"}" deps) + ]); + }; + features_.humantime."1.1.1" = deps: f: updateFeatures f (rec { + humantime."1.1.1".default = (f.humantime."1.1.1".default or true); + quick_error."${deps.humantime."1.1.1".quick_error}".default = true; + }) [ + (features_.quick_error."${deps."humantime"."1.1.1"."quick_error"}" deps) + ]; + + + crates.itertools."0.7.8" = deps: { features?(features_.itertools."0.7.8" deps {}) }: buildRustCrate { + crateName = "itertools"; + version = "0.7.8"; + authors = [ "bluss" ]; + sha256 = "0ib30cd7d1icjxsa13mji1gry3grp72kx8p33yd84mphdbc3d357"; + dependencies = mapFeatures features ([ + (crates."either"."${deps."itertools"."0.7.8"."either"}" deps) + ]); + features = mkFeatures (features."itertools"."0.7.8" or {}); + }; + features_.itertools."0.7.8" = deps: f: updateFeatures f (rec { + either."${deps.itertools."0.7.8".either}".default = (f.either."${deps.itertools."0.7.8".either}".default or false); + itertools = fold recursiveUpdate {} [ + { "0.7.8".default = (f.itertools."0.7.8".default or true); } + { "0.7.8".use_std = + (f.itertools."0.7.8".use_std or false) || + (f.itertools."0.7.8".default or false) || + (itertools."0.7.8"."default" or false); } + ]; + }) [ + (features_.either."${deps."itertools"."0.7.8"."either"}" deps) + ]; + + + crates.itoa."0.4.3" = deps: { features?(features_.itoa."0.4.3" deps {}) }: buildRustCrate { + crateName = "itoa"; + version = "0.4.3"; + authors = [ "David Tolnay " ]; + sha256 = "0zadimmdgvili3gdwxqg7ljv3r4wcdg1kkdfp9nl15vnm23vrhy1"; + features = mkFeatures (features."itoa"."0.4.3" or {}); + }; + features_.itoa."0.4.3" = deps: f: updateFeatures f (rec { + itoa = fold recursiveUpdate {} [ + { "0.4.3".default = (f.itoa."0.4.3".default or true); } + { "0.4.3".std = + (f.itoa."0.4.3".std or false) || + (f.itoa."0.4.3".default or false) || + (itoa."0.4.3"."default" or false); } + ]; + }) []; + + + crates.lazy_static."1.1.0" = deps: { features?(features_.lazy_static."1.1.0" deps {}) }: buildRustCrate { + crateName = "lazy_static"; + version = "1.1.0"; + authors = [ "Marvin Löbel " ]; + sha256 = "1da2b6nxfc2l547qgl9kd1pn9sh1af96a6qx6xw8xdnv6hh5fag0"; + build = "build.rs"; + dependencies = mapFeatures features ([ +]); + + buildDependencies = mapFeatures features ([ + (crates."version_check"."${deps."lazy_static"."1.1.0"."version_check"}" deps) + ]); + features = mkFeatures (features."lazy_static"."1.1.0" or {}); + }; + features_.lazy_static."1.1.0" = deps: f: updateFeatures f (rec { + lazy_static = fold recursiveUpdate {} [ + { "1.1.0".default = (f.lazy_static."1.1.0".default or true); } + { "1.1.0".nightly = + (f.lazy_static."1.1.0".nightly or false) || + (f.lazy_static."1.1.0".spin_no_std or false) || + (lazy_static."1.1.0"."spin_no_std" or false); } + { "1.1.0".spin = + (f.lazy_static."1.1.0".spin or false) || + (f.lazy_static."1.1.0".spin_no_std or false) || + (lazy_static."1.1.0"."spin_no_std" or false); } + ]; + version_check."${deps.lazy_static."1.1.0".version_check}".default = true; + }) [ + (features_.version_check."${deps."lazy_static"."1.1.0"."version_check"}" deps) + ]; + + + crates.libc."0.2.43" = deps: { features?(features_.libc."0.2.43" deps {}) }: buildRustCrate { + crateName = "libc"; + version = "0.2.43"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0pshydmsq71kl9276zc2928ld50sp524ixcqkcqsgq410dx6c50b"; + features = mkFeatures (features."libc"."0.2.43" or {}); + }; + features_.libc."0.2.43" = deps: f: updateFeatures f (rec { + libc = fold recursiveUpdate {} [ + { "0.2.43".default = (f.libc."0.2.43".default or true); } + { "0.2.43".use_std = + (f.libc."0.2.43".use_std or false) || + (f.libc."0.2.43".default or false) || + (libc."0.2.43"."default" or false); } + ]; + }) []; + + + crates.libsqlite3_sys."0.9.3" = deps: { features?(features_.libsqlite3_sys."0.9.3" deps {}) }: buildRustCrate { + crateName = "libsqlite3-sys"; + version = "0.9.3"; + authors = [ "John Gallagher " ]; + sha256 = "128bv2y342iksv693bffvybr3zzi04vd8p0307zi9wixbdxyp021"; + build = "build.rs"; + dependencies = (if abi == "msvc" then mapFeatures features ([ +]) else []); + + buildDependencies = mapFeatures features ([ + ] + ++ (if features.libsqlite3_sys."0.9.3".pkg-config or false then [ (crates.pkg_config."0.3.14" deps) ] else [])); + features = mkFeatures (features."libsqlite3_sys"."0.9.3" or {}); + }; + features_.libsqlite3_sys."0.9.3" = deps: f: updateFeatures f (rec { + libsqlite3_sys = fold recursiveUpdate {} [ + { "0.9.3".bindgen = + (f.libsqlite3_sys."0.9.3".bindgen or false) || + (f.libsqlite3_sys."0.9.3".buildtime_bindgen or false) || + (libsqlite3_sys."0.9.3"."buildtime_bindgen" or false); } + { "0.9.3".cc = + (f.libsqlite3_sys."0.9.3".cc or false) || + (f.libsqlite3_sys."0.9.3".bundled or false) || + (libsqlite3_sys."0.9.3"."bundled" or false); } + { "0.9.3".default = (f.libsqlite3_sys."0.9.3".default or true); } + { "0.9.3".min_sqlite_version_3_6_8 = + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_8 or false) || + (f.libsqlite3_sys."0.9.3".default or false) || + (libsqlite3_sys."0.9.3"."default" or false); } + { "0.9.3".pkg-config = + (f.libsqlite3_sys."0.9.3".pkg-config or false) || + (f.libsqlite3_sys."0.9.3".buildtime_bindgen or false) || + (libsqlite3_sys."0.9.3"."buildtime_bindgen" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_11 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_11" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_23 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_23" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_8 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_8" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_16 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_16" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_3 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_3" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_4 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_4" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_7 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_7" or false); } + { "0.9.3".vcpkg = + (f.libsqlite3_sys."0.9.3".vcpkg or false) || + (f.libsqlite3_sys."0.9.3".buildtime_bindgen or false) || + (libsqlite3_sys."0.9.3"."buildtime_bindgen" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_11 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_11" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_23 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_23" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_8 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_6_8" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_16 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_16" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_3 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_3" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_4 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_4" or false) || + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_7 or false) || + (libsqlite3_sys."0.9.3"."min_sqlite_version_3_7_7" or false); } + ]; + pkg_config."${deps.libsqlite3_sys."0.9.3".pkg_config}".default = true; + }) [ + (features_.pkg_config."${deps."libsqlite3_sys"."0.9.3"."pkg_config"}" deps) + ]; + + + crates.linked_hash_map."0.4.2" = deps: { features?(features_.linked_hash_map."0.4.2" deps {}) }: buildRustCrate { + crateName = "linked-hash-map"; + version = "0.4.2"; + authors = [ "Stepan Koltsov " "Andrew Paseltiner " ]; + sha256 = "04da208h6jb69f46j37jnvsw2i1wqplglp4d61csqcrhh83avbgl"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."linked_hash_map"."0.4.2" or {}); + }; + features_.linked_hash_map."0.4.2" = deps: f: updateFeatures f (rec { + linked_hash_map = fold recursiveUpdate {} [ + { "0.4.2".default = (f.linked_hash_map."0.4.2".default or true); } + { "0.4.2".heapsize = + (f.linked_hash_map."0.4.2".heapsize or false) || + (f.linked_hash_map."0.4.2".heapsize_impl or false) || + (linked_hash_map."0.4.2"."heapsize_impl" or false); } + { "0.4.2".serde = + (f.linked_hash_map."0.4.2".serde or false) || + (f.linked_hash_map."0.4.2".serde_impl or false) || + (linked_hash_map."0.4.2"."serde_impl" or false); } + { "0.4.2".serde_test = + (f.linked_hash_map."0.4.2".serde_test or false) || + (f.linked_hash_map."0.4.2".serde_impl or false) || + (linked_hash_map."0.4.2"."serde_impl" or false); } + ]; + }) []; + + + crates.log."0.4.5" = deps: { features?(features_.log."0.4.5" deps {}) }: buildRustCrate { + crateName = "log"; + version = "0.4.5"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1hdcj17al94ga90q7jx2y1rmxi68n3akra1awv3hr3s9b9zipgq6"; + dependencies = mapFeatures features ([ + (crates."cfg_if"."${deps."log"."0.4.5"."cfg_if"}" deps) + ]); + features = mkFeatures (features."log"."0.4.5" or {}); + }; + features_.log."0.4.5" = deps: f: updateFeatures f (rec { + cfg_if."${deps.log."0.4.5".cfg_if}".default = true; + log."0.4.5".default = (f.log."0.4.5".default or true); + }) [ + (features_.cfg_if."${deps."log"."0.4.5"."cfg_if"}" deps) + ]; + + + crates.lru_cache."0.1.1" = deps: { features?(features_.lru_cache."0.1.1" deps {}) }: buildRustCrate { + crateName = "lru-cache"; + version = "0.1.1"; + authors = [ "Stepan Koltsov " ]; + sha256 = "1hl6kii1g54sq649gnscv858mmw7a02xj081l4vcgvrswdi2z8fw"; + dependencies = mapFeatures features ([ + (crates."linked_hash_map"."${deps."lru_cache"."0.1.1"."linked_hash_map"}" deps) + ]); + features = mkFeatures (features."lru_cache"."0.1.1" or {}); + }; + features_.lru_cache."0.1.1" = deps: f: updateFeatures f (rec { + linked_hash_map = fold recursiveUpdate {} [ + { "${deps.lru_cache."0.1.1".linked_hash_map}".default = true; } + { "0.4.2".heapsize_impl = + (f.linked_hash_map."0.4.2".heapsize_impl or false) || + (lru_cache."0.1.1"."heapsize_impl" or false) || + (f."lru_cache"."0.1.1"."heapsize_impl" or false); } + ]; + lru_cache = fold recursiveUpdate {} [ + { "0.1.1".default = (f.lru_cache."0.1.1".default or true); } + { "0.1.1".heapsize = + (f.lru_cache."0.1.1".heapsize or false) || + (f.lru_cache."0.1.1".heapsize_impl or false) || + (lru_cache."0.1.1"."heapsize_impl" or false); } + ]; + }) [ + (features_.linked_hash_map."${deps."lru_cache"."0.1.1"."linked_hash_map"}" deps) + ]; + + + crates.memchr."1.0.2" = deps: { features?(features_.memchr."1.0.2" deps {}) }: buildRustCrate { + crateName = "memchr"; + version = "1.0.2"; + authors = [ "Andrew Gallant " "bluss" ]; + sha256 = "0dfb8ifl9nrc9kzgd5z91q6qg87sh285q1ih7xgrsglmqfav9lg7"; + dependencies = mapFeatures features ([ + ] + ++ (if features.memchr."1.0.2".libc or false then [ (crates.libc."0.2.43" deps) ] else [])); + features = mkFeatures (features."memchr"."1.0.2" or {}); + }; + features_.memchr."1.0.2" = deps: f: updateFeatures f (rec { + libc = fold recursiveUpdate {} [ + { "${deps.memchr."1.0.2".libc}".default = (f.libc."${deps.memchr."1.0.2".libc}".default or false); } + { "0.2.43".use_std = + (f.libc."0.2.43".use_std or false) || + (memchr."1.0.2"."use_std" or false) || + (f."memchr"."1.0.2"."use_std" or false); } + ]; + memchr = fold recursiveUpdate {} [ + { "1.0.2".default = (f.memchr."1.0.2".default or true); } + { "1.0.2".libc = + (f.memchr."1.0.2".libc or false) || + (f.memchr."1.0.2".default or false) || + (memchr."1.0.2"."default" or false) || + (f.memchr."1.0.2".use_std or false) || + (memchr."1.0.2"."use_std" or false); } + { "1.0.2".use_std = + (f.memchr."1.0.2".use_std or false) || + (f.memchr."1.0.2".default or false) || + (memchr."1.0.2"."default" or false); } + ]; + }) [ + (features_.libc."${deps."memchr"."1.0.2"."libc"}" deps) + ]; + + + crates.memchr."2.1.0" = deps: { features?(features_.memchr."2.1.0" deps {}) }: buildRustCrate { + crateName = "memchr"; + version = "2.1.0"; + authors = [ "Andrew Gallant " "bluss" ]; + sha256 = "02w1fc5z1ccx8fbzgcr0mpk0xf2i9g4vbx9q5c2g8pjddbaqvjjq"; + dependencies = mapFeatures features ([ + (crates."cfg_if"."${deps."memchr"."2.1.0"."cfg_if"}" deps) + ] + ++ (if features.memchr."2.1.0".libc or false then [ (crates.libc."0.2.43" deps) ] else [])); + + buildDependencies = mapFeatures features ([ + (crates."version_check"."${deps."memchr"."2.1.0"."version_check"}" deps) + ]); + features = mkFeatures (features."memchr"."2.1.0" or {}); + }; + features_.memchr."2.1.0" = deps: f: updateFeatures f (rec { + cfg_if."${deps.memchr."2.1.0".cfg_if}".default = true; + libc = fold recursiveUpdate {} [ + { "${deps.memchr."2.1.0".libc}".default = (f.libc."${deps.memchr."2.1.0".libc}".default or false); } + { "0.2.43".use_std = + (f.libc."0.2.43".use_std or false) || + (memchr."2.1.0"."use_std" or false) || + (f."memchr"."2.1.0"."use_std" or false); } + ]; + memchr = fold recursiveUpdate {} [ + { "2.1.0".default = (f.memchr."2.1.0".default or true); } + { "2.1.0".libc = + (f.memchr."2.1.0".libc or false) || + (f.memchr."2.1.0".default or false) || + (memchr."2.1.0"."default" or false) || + (f.memchr."2.1.0".use_std or false) || + (memchr."2.1.0"."use_std" or false); } + { "2.1.0".use_std = + (f.memchr."2.1.0".use_std or false) || + (f.memchr."2.1.0".default or false) || + (memchr."2.1.0"."default" or false); } + ]; + version_check."${deps.memchr."2.1.0".version_check}".default = true; + }) [ + (features_.cfg_if."${deps."memchr"."2.1.0"."cfg_if"}" deps) + (features_.libc."${deps."memchr"."2.1.0"."libc"}" deps) + (features_.version_check."${deps."memchr"."2.1.0"."version_check"}" deps) + ]; + + + crates.nodrop."0.1.12" = deps: { features?(features_.nodrop."0.1.12" deps {}) }: buildRustCrate { + crateName = "nodrop"; + version = "0.1.12"; + authors = [ "bluss" ]; + sha256 = "1b9rxvdg8061gxjc239l9slndf0ds3m6fy2sf3gs8f9kknqgl49d"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."nodrop"."0.1.12" or {}); + }; + features_.nodrop."0.1.12" = deps: f: updateFeatures f (rec { + nodrop = fold recursiveUpdate {} [ + { "0.1.12".default = (f.nodrop."0.1.12".default or true); } + { "0.1.12".nodrop-union = + (f.nodrop."0.1.12".nodrop-union or false) || + (f.nodrop."0.1.12".use_union or false) || + (nodrop."0.1.12"."use_union" or false); } + { "0.1.12".std = + (f.nodrop."0.1.12".std or false) || + (f.nodrop."0.1.12".default or false) || + (nodrop."0.1.12"."default" or false); } + ]; + }) []; + + + crates.nom."3.2.1" = deps: { features?(features_.nom."3.2.1" deps {}) }: buildRustCrate { + crateName = "nom"; + version = "3.2.1"; + authors = [ "contact@geoffroycouprie.com" ]; + sha256 = "1vcllxrz9hdw6j25kn020ka3psz1vkaqh1hm3yfak2240zrxgi07"; + dependencies = mapFeatures features ([ + (crates."memchr"."${deps."nom"."3.2.1"."memchr"}" deps) + ]); + features = mkFeatures (features."nom"."3.2.1" or {}); + }; + features_.nom."3.2.1" = deps: f: updateFeatures f (rec { + memchr = fold recursiveUpdate {} [ + { "${deps.nom."3.2.1".memchr}".default = (f.memchr."${deps.nom."3.2.1".memchr}".default or false); } + { "1.0.2".use_std = + (f.memchr."1.0.2".use_std or false) || + (nom."3.2.1"."std" or false) || + (f."nom"."3.2.1"."std" or false); } + ]; + nom = fold recursiveUpdate {} [ + { "3.2.1".compiler_error = + (f.nom."3.2.1".compiler_error or false) || + (f.nom."3.2.1".nightly or false) || + (nom."3.2.1"."nightly" or false); } + { "3.2.1".default = (f.nom."3.2.1".default or true); } + { "3.2.1".lazy_static = + (f.nom."3.2.1".lazy_static or false) || + (f.nom."3.2.1".regexp_macros or false) || + (nom."3.2.1"."regexp_macros" or false); } + { "3.2.1".regex = + (f.nom."3.2.1".regex or false) || + (f.nom."3.2.1".regexp or false) || + (nom."3.2.1"."regexp" or false); } + { "3.2.1".regexp = + (f.nom."3.2.1".regexp or false) || + (f.nom."3.2.1".regexp_macros or false) || + (nom."3.2.1"."regexp_macros" or false); } + { "3.2.1".std = + (f.nom."3.2.1".std or false) || + (f.nom."3.2.1".default or false) || + (nom."3.2.1"."default" or false); } + { "3.2.1".stream = + (f.nom."3.2.1".stream or false) || + (f.nom."3.2.1".default or false) || + (nom."3.2.1"."default" or false); } + ]; + }) [ + (features_.memchr."${deps."nom"."3.2.1"."memchr"}" deps) + ]; + + + crates.pkg_config."0.3.14" = deps: { features?(features_.pkg_config."0.3.14" deps {}) }: buildRustCrate { + crateName = "pkg-config"; + version = "0.3.14"; + authors = [ "Alex Crichton " ]; + sha256 = "0207fsarrm412j0dh87lfcas72n8mxar7q3mgflsbsrqnb140sv6"; + }; + features_.pkg_config."0.3.14" = deps: f: updateFeatures f (rec { + pkg_config."0.3.14".default = (f.pkg_config."0.3.14".default or true); + }) []; + + + crates.proc_macro2."0.4.20" = deps: { features?(features_.proc_macro2."0.4.20" deps {}) }: buildRustCrate { + crateName = "proc-macro2"; + version = "0.4.20"; + authors = [ "Alex Crichton " ]; + sha256 = "0yr74b00d3wzg21kjvfln7vzzvf9aghbaff4c747i3grbd997ys2"; + build = "build.rs"; + dependencies = mapFeatures features ([ + (crates."unicode_xid"."${deps."proc_macro2"."0.4.20"."unicode_xid"}" deps) + ]); + features = mkFeatures (features."proc_macro2"."0.4.20" or {}); + }; + features_.proc_macro2."0.4.20" = deps: f: updateFeatures f (rec { + proc_macro2 = fold recursiveUpdate {} [ + { "0.4.20".default = (f.proc_macro2."0.4.20".default or true); } + { "0.4.20".proc-macro = + (f.proc_macro2."0.4.20".proc-macro or false) || + (f.proc_macro2."0.4.20".default or false) || + (proc_macro2."0.4.20"."default" or false) || + (f.proc_macro2."0.4.20".nightly or false) || + (proc_macro2."0.4.20"."nightly" or false); } + ]; + unicode_xid."${deps.proc_macro2."0.4.20".unicode_xid}".default = true; + }) [ + (features_.unicode_xid."${deps."proc_macro2"."0.4.20"."unicode_xid"}" deps) + ]; + + + crates.quick_error."1.2.2" = deps: { features?(features_.quick_error."1.2.2" deps {}) }: buildRustCrate { + crateName = "quick-error"; + version = "1.2.2"; + authors = [ "Paul Colomiets " "Colin Kiegel " ]; + sha256 = "192a3adc5phgpibgqblsdx1b421l5yg9bjbmv552qqq9f37h60k5"; + }; + features_.quick_error."1.2.2" = deps: f: updateFeatures f (rec { + quick_error."1.2.2".default = (f.quick_error."1.2.2".default or true); + }) []; + + + crates.quote."0.6.8" = deps: { features?(features_.quote."0.6.8" deps {}) }: buildRustCrate { + crateName = "quote"; + version = "0.6.8"; + authors = [ "David Tolnay " ]; + sha256 = "0dq6j23w6pmc4l6v490arixdwypy0b82z76nrzaingqhqri4p3mh"; + dependencies = mapFeatures features ([ + (crates."proc_macro2"."${deps."quote"."0.6.8"."proc_macro2"}" deps) + ]); + features = mkFeatures (features."quote"."0.6.8" or {}); + }; + features_.quote."0.6.8" = deps: f: updateFeatures f (rec { + proc_macro2 = fold recursiveUpdate {} [ + { "${deps.quote."0.6.8".proc_macro2}".default = (f.proc_macro2."${deps.quote."0.6.8".proc_macro2}".default or false); } + { "0.4.20".proc-macro = + (f.proc_macro2."0.4.20".proc-macro or false) || + (quote."0.6.8"."proc-macro" or false) || + (f."quote"."0.6.8"."proc-macro" or false); } + ]; + quote = fold recursiveUpdate {} [ + { "0.6.8".default = (f.quote."0.6.8".default or true); } + { "0.6.8".proc-macro = + (f.quote."0.6.8".proc-macro or false) || + (f.quote."0.6.8".default or false) || + (quote."0.6.8"."default" or false); } + ]; + }) [ + (features_.proc_macro2."${deps."quote"."0.6.8"."proc_macro2"}" deps) + ]; + + + crates.rand."0.4.3" = deps: { features?(features_.rand."0.4.3" deps {}) }: buildRustCrate { + crateName = "rand"; + version = "0.4.3"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1644wri45l147822xy7dgdm4k7myxzs66cb795ga0x7dan11ci4f"; + dependencies = (if kernel == "fuchsia" then mapFeatures features ([ + (crates."fuchsia_zircon"."${deps."rand"."0.4.3"."fuchsia_zircon"}" deps) + ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + ] + ++ (if features.rand."0.4.3".libc or false then [ (crates.libc."0.2.43" deps) ] else [])) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."rand"."0.4.3"."winapi"}" deps) + ]) else []); + features = mkFeatures (features."rand"."0.4.3" or {}); + }; + features_.rand."0.4.3" = deps: f: updateFeatures f (rec { + fuchsia_zircon."${deps.rand."0.4.3".fuchsia_zircon}".default = true; + libc."${deps.rand."0.4.3".libc}".default = true; + rand = fold recursiveUpdate {} [ + { "0.4.3".default = (f.rand."0.4.3".default or true); } + { "0.4.3".i128_support = + (f.rand."0.4.3".i128_support or false) || + (f.rand."0.4.3".nightly or false) || + (rand."0.4.3"."nightly" or false); } + { "0.4.3".libc = + (f.rand."0.4.3".libc or false) || + (f.rand."0.4.3".std or false) || + (rand."0.4.3"."std" or false); } + { "0.4.3".std = + (f.rand."0.4.3".std or false) || + (f.rand."0.4.3".default or false) || + (rand."0.4.3"."default" or false); } + ]; + winapi = fold recursiveUpdate {} [ + { "${deps.rand."0.4.3".winapi}"."minwindef" = true; } + { "${deps.rand."0.4.3".winapi}"."ntsecapi" = true; } + { "${deps.rand."0.4.3".winapi}"."profileapi" = true; } + { "${deps.rand."0.4.3".winapi}"."winnt" = true; } + { "${deps.rand."0.4.3".winapi}".default = true; } + ]; + }) [ + (features_.fuchsia_zircon."${deps."rand"."0.4.3"."fuchsia_zircon"}" deps) + (features_.libc."${deps."rand"."0.4.3"."libc"}" deps) + (features_.winapi."${deps."rand"."0.4.3"."winapi"}" deps) + ]; + + + crates.redox_syscall."0.1.40" = deps: { features?(features_.redox_syscall."0.1.40" deps {}) }: buildRustCrate { + crateName = "redox_syscall"; + version = "0.1.40"; + authors = [ "Jeremy Soller " ]; + sha256 = "132rnhrq49l3z7gjrwj2zfadgw6q0355s6a7id7x7c0d7sk72611"; + libName = "syscall"; + }; + features_.redox_syscall."0.1.40" = deps: f: updateFeatures f (rec { + redox_syscall."0.1.40".default = (f.redox_syscall."0.1.40".default or true); + }) []; + + + crates.redox_termios."0.1.1" = deps: { features?(features_.redox_termios."0.1.1" deps {}) }: buildRustCrate { + crateName = "redox_termios"; + version = "0.1.1"; + authors = [ "Jeremy Soller " ]; + sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh"; + libPath = "src/lib.rs"; + dependencies = mapFeatures features ([ + (crates."redox_syscall"."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps) + ]); + }; + features_.redox_termios."0.1.1" = deps: f: updateFeatures f (rec { + redox_syscall."${deps.redox_termios."0.1.1".redox_syscall}".default = true; + redox_termios."0.1.1".default = (f.redox_termios."0.1.1".default or true); + }) [ + (features_.redox_syscall."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps) + ]; + + + crates.redox_users."0.2.0" = deps: { features?(features_.redox_users."0.2.0" deps {}) }: buildRustCrate { + crateName = "redox_users"; + version = "0.2.0"; + authors = [ "Jose Narvaez " "Wesley Hershberger " ]; + sha256 = "0s9jrh378jk8rfi1xfwxvh2r1gv6rn3bq6n7sbajkrqqq0xzijvf"; + dependencies = mapFeatures features ([ + (crates."argon2rs"."${deps."redox_users"."0.2.0"."argon2rs"}" deps) + (crates."failure"."${deps."redox_users"."0.2.0"."failure"}" deps) + (crates."rand"."${deps."redox_users"."0.2.0"."rand"}" deps) + (crates."redox_syscall"."${deps."redox_users"."0.2.0"."redox_syscall"}" deps) + ]); + }; + features_.redox_users."0.2.0" = deps: f: updateFeatures f (rec { + argon2rs."${deps.redox_users."0.2.0".argon2rs}".default = (f.argon2rs."${deps.redox_users."0.2.0".argon2rs}".default or false); + failure."${deps.redox_users."0.2.0".failure}".default = true; + rand."${deps.redox_users."0.2.0".rand}".default = true; + redox_syscall."${deps.redox_users."0.2.0".redox_syscall}".default = true; + redox_users."0.2.0".default = (f.redox_users."0.2.0".default or true); + }) [ + (features_.argon2rs."${deps."redox_users"."0.2.0"."argon2rs"}" deps) + (features_.failure."${deps."redox_users"."0.2.0"."failure"}" deps) + (features_.rand."${deps."redox_users"."0.2.0"."rand"}" deps) + (features_.redox_syscall."${deps."redox_users"."0.2.0"."redox_syscall"}" deps) + ]; + + + crates.regex."1.0.5" = deps: { features?(features_.regex."1.0.5" deps {}) }: buildRustCrate { + crateName = "regex"; + version = "1.0.5"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1nb4dva9lhb3v76bdds9qcxldb2xy998sdraqnqaqdr6axfsfp02"; + dependencies = mapFeatures features ([ + (crates."aho_corasick"."${deps."regex"."1.0.5"."aho_corasick"}" deps) + (crates."memchr"."${deps."regex"."1.0.5"."memchr"}" deps) + (crates."regex_syntax"."${deps."regex"."1.0.5"."regex_syntax"}" deps) + (crates."thread_local"."${deps."regex"."1.0.5"."thread_local"}" deps) + (crates."utf8_ranges"."${deps."regex"."1.0.5"."utf8_ranges"}" deps) + ]); + features = mkFeatures (features."regex"."1.0.5" or {}); + }; + features_.regex."1.0.5" = deps: f: updateFeatures f (rec { + aho_corasick."${deps.regex."1.0.5".aho_corasick}".default = true; + memchr."${deps.regex."1.0.5".memchr}".default = true; + regex = fold recursiveUpdate {} [ + { "1.0.5".default = (f.regex."1.0.5".default or true); } + { "1.0.5".pattern = + (f.regex."1.0.5".pattern or false) || + (f.regex."1.0.5".unstable or false) || + (regex."1.0.5"."unstable" or false); } + { "1.0.5".use_std = + (f.regex."1.0.5".use_std or false) || + (f.regex."1.0.5".default or false) || + (regex."1.0.5"."default" or false); } + ]; + regex_syntax."${deps.regex."1.0.5".regex_syntax}".default = true; + thread_local."${deps.regex."1.0.5".thread_local}".default = true; + utf8_ranges."${deps.regex."1.0.5".utf8_ranges}".default = true; + }) [ + (features_.aho_corasick."${deps."regex"."1.0.5"."aho_corasick"}" deps) + (features_.memchr."${deps."regex"."1.0.5"."memchr"}" deps) + (features_.regex_syntax."${deps."regex"."1.0.5"."regex_syntax"}" deps) + (features_.thread_local."${deps."regex"."1.0.5"."thread_local"}" deps) + (features_.utf8_ranges."${deps."regex"."1.0.5"."utf8_ranges"}" deps) + ]; + + + crates.regex_syntax."0.6.2" = deps: { features?(features_.regex_syntax."0.6.2" deps {}) }: buildRustCrate { + crateName = "regex-syntax"; + version = "0.6.2"; + authors = [ "The Rust Project Developers" ]; + sha256 = "109426mj7nhwr6szdzbcvn1a8g5zy52f9maqxjd9agm8wg87ylyw"; + dependencies = mapFeatures features ([ + (crates."ucd_util"."${deps."regex_syntax"."0.6.2"."ucd_util"}" deps) + ]); + }; + features_.regex_syntax."0.6.2" = deps: f: updateFeatures f (rec { + regex_syntax."0.6.2".default = (f.regex_syntax."0.6.2".default or true); + ucd_util."${deps.regex_syntax."0.6.2".ucd_util}".default = true; + }) [ + (features_.ucd_util."${deps."regex_syntax"."0.6.2"."ucd_util"}" deps) + ]; + + + crates.remove_dir_all."0.5.1" = deps: { features?(features_.remove_dir_all."0.5.1" deps {}) }: buildRustCrate { + crateName = "remove_dir_all"; + version = "0.5.1"; + authors = [ "Aaronepower " ]; + sha256 = "1chx3yvfbj46xjz4bzsvps208l46hfbcy0sm98gpiya454n4rrl7"; + dependencies = (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."remove_dir_all"."0.5.1"."winapi"}" deps) + ]) else []); + }; + features_.remove_dir_all."0.5.1" = deps: f: updateFeatures f (rec { + remove_dir_all."0.5.1".default = (f.remove_dir_all."0.5.1".default or true); + winapi = fold recursiveUpdate {} [ + { "${deps.remove_dir_all."0.5.1".winapi}"."errhandlingapi" = true; } + { "${deps.remove_dir_all."0.5.1".winapi}"."fileapi" = true; } + { "${deps.remove_dir_all."0.5.1".winapi}"."std" = true; } + { "${deps.remove_dir_all."0.5.1".winapi}"."winbase" = true; } + { "${deps.remove_dir_all."0.5.1".winapi}"."winerror" = true; } + { "${deps.remove_dir_all."0.5.1".winapi}".default = true; } + ]; + }) [ + (features_.winapi."${deps."remove_dir_all"."0.5.1"."winapi"}" deps) + ]; + + + crates.rusqlite."0.14.0" = deps: { features?(features_.rusqlite."0.14.0" deps {}) }: buildRustCrate { + crateName = "rusqlite"; + version = "0.14.0"; + authors = [ "John Gallagher " ]; + sha256 = "06j1z8yicn6jg8irxclsvgp0575gz5k24jgnbk0d807i5gvsg9jq"; + dependencies = mapFeatures features ([ + (crates."bitflags"."${deps."rusqlite"."0.14.0"."bitflags"}" deps) + (crates."libsqlite3_sys"."${deps."rusqlite"."0.14.0"."libsqlite3_sys"}" deps) + (crates."lru_cache"."${deps."rusqlite"."0.14.0"."lru_cache"}" deps) + (crates."time"."${deps."rusqlite"."0.14.0"."time"}" deps) + ]); + features = mkFeatures (features."rusqlite"."0.14.0" or {}); + }; + features_.rusqlite."0.14.0" = deps: f: updateFeatures f (rec { + bitflags."${deps.rusqlite."0.14.0".bitflags}".default = true; + libsqlite3_sys = fold recursiveUpdate {} [ + { "${deps.rusqlite."0.14.0".libsqlite3_sys}".default = true; } + { "0.9.3".buildtime_bindgen = + (f.libsqlite3_sys."0.9.3".buildtime_bindgen or false) || + (rusqlite."0.14.0"."buildtime_bindgen" or false) || + (f."rusqlite"."0.14.0"."buildtime_bindgen" or false); } + { "0.9.3".bundled = + (f.libsqlite3_sys."0.9.3".bundled or false) || + (rusqlite."0.14.0"."bundled" or false) || + (f."rusqlite"."0.14.0"."bundled" or false); } + { "0.9.3".min_sqlite_version_3_6_11 = + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_11 or false) || + (rusqlite."0.14.0"."backup" or false) || + (f."rusqlite"."0.14.0"."backup" or false); } + { "0.9.3".min_sqlite_version_3_6_23 = + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_6_23 or false) || + (rusqlite."0.14.0"."trace" or false) || + (f."rusqlite"."0.14.0"."trace" or false); } + { "0.9.3".min_sqlite_version_3_7_3 = + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_3 or false) || + (rusqlite."0.14.0"."functions" or false) || + (f."rusqlite"."0.14.0"."functions" or false); } + { "0.9.3".min_sqlite_version_3_7_4 = + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_4 or false) || + (rusqlite."0.14.0"."blob" or false) || + (f."rusqlite"."0.14.0"."blob" or false); } + { "0.9.3".min_sqlite_version_3_7_7 = + (f.libsqlite3_sys."0.9.3".min_sqlite_version_3_7_7 or false) || + (rusqlite."0.14.0"."vtab" or false) || + (f."rusqlite"."0.14.0"."vtab" or false); } + { "0.9.3".sqlcipher = + (f.libsqlite3_sys."0.9.3".sqlcipher or false) || + (rusqlite."0.14.0"."sqlcipher" or false) || + (f."rusqlite"."0.14.0"."sqlcipher" or false); } + { "0.9.3".unlock_notify = + (f.libsqlite3_sys."0.9.3".unlock_notify or false) || + (rusqlite."0.14.0"."unlock_notify" or false) || + (f."rusqlite"."0.14.0"."unlock_notify" or false); } + ]; + lru_cache."${deps.rusqlite."0.14.0".lru_cache}".default = true; + rusqlite = fold recursiveUpdate {} [ + { "0.14.0".bundled = + (f.rusqlite."0.14.0".bundled or false) || + (f.rusqlite."0.14.0".array or false) || + (rusqlite."0.14.0"."array" or false); } + { "0.14.0".csv = + (f.rusqlite."0.14.0".csv or false) || + (f.rusqlite."0.14.0".csvtab or false) || + (rusqlite."0.14.0"."csvtab" or false); } + { "0.14.0".default = (f.rusqlite."0.14.0".default or true); } + { "0.14.0".lazy_static = + (f.rusqlite."0.14.0".lazy_static or false) || + (f.rusqlite."0.14.0".vtab or false) || + (rusqlite."0.14.0"."vtab" or false); } + { "0.14.0".vtab = + (f.rusqlite."0.14.0".vtab or false) || + (f.rusqlite."0.14.0".array or false) || + (rusqlite."0.14.0"."array" or false) || + (f.rusqlite."0.14.0".csvtab or false) || + (rusqlite."0.14.0"."csvtab" or false); } + ]; + time."${deps.rusqlite."0.14.0".time}".default = true; + }) [ + (features_.bitflags."${deps."rusqlite"."0.14.0"."bitflags"}" deps) + (features_.libsqlite3_sys."${deps."rusqlite"."0.14.0"."libsqlite3_sys"}" deps) + (features_.lru_cache."${deps."rusqlite"."0.14.0"."lru_cache"}" deps) + (features_.time."${deps."rusqlite"."0.14.0"."time"}" deps) + ]; + + + crates.rustc_demangle."0.1.9" = deps: { features?(features_.rustc_demangle."0.1.9" deps {}) }: buildRustCrate { + crateName = "rustc-demangle"; + version = "0.1.9"; + authors = [ "Alex Crichton " ]; + sha256 = "00ma4r9haq0zv5krps617mym6y74056pfcivyld0kpci156vfaax"; + }; + features_.rustc_demangle."0.1.9" = deps: f: updateFeatures f (rec { + rustc_demangle."0.1.9".default = (f.rustc_demangle."0.1.9".default or true); + }) []; + + + crates.ryu."0.2.6" = deps: { features?(features_.ryu."0.2.6" deps {}) }: buildRustCrate { + crateName = "ryu"; + version = "0.2.6"; + authors = [ "David Tolnay " ]; + sha256 = "1vdh6z4aysc9kiiqhl7vxkqz3fykcnp24kgfizshlwfsz2j0p9dr"; + build = "build.rs"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."ryu"."0.2.6" or {}); + }; + features_.ryu."0.2.6" = deps: f: updateFeatures f (rec { + ryu."0.2.6".default = (f.ryu."0.2.6".default or true); + }) []; + + + crates.scoped_threadpool."0.1.9" = deps: { features?(features_.scoped_threadpool."0.1.9" deps {}) }: buildRustCrate { + crateName = "scoped_threadpool"; + version = "0.1.9"; + authors = [ "Marvin Löbel " ]; + sha256 = "1arqj2skcfr46s1lcyvnlmfr5456kg5nhn8k90xyfjnxkp5yga2v"; + features = mkFeatures (features."scoped_threadpool"."0.1.9" or {}); + }; + features_.scoped_threadpool."0.1.9" = deps: f: updateFeatures f (rec { + scoped_threadpool."0.1.9".default = (f.scoped_threadpool."0.1.9".default or true); + }) []; + + + crates.serde."1.0.80" = deps: { features?(features_.serde."1.0.80" deps {}) }: buildRustCrate { + crateName = "serde"; + version = "1.0.80"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "0vyciw2qhrws4hz87pfnsjdfzzdw2sclxqxq394g3a219a2rdcxz"; + build = "build.rs"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."serde"."1.0.80" or {}); + }; + features_.serde."1.0.80" = deps: f: updateFeatures f (rec { + serde = fold recursiveUpdate {} [ + { "1.0.80".default = (f.serde."1.0.80".default or true); } + { "1.0.80".serde_derive = + (f.serde."1.0.80".serde_derive or false) || + (f.serde."1.0.80".derive or false) || + (serde."1.0.80"."derive" or false); } + { "1.0.80".std = + (f.serde."1.0.80".std or false) || + (f.serde."1.0.80".default or false) || + (serde."1.0.80"."default" or false); } + { "1.0.80".unstable = + (f.serde."1.0.80".unstable or false) || + (f.serde."1.0.80".alloc or false) || + (serde."1.0.80"."alloc" or false); } + ]; + }) []; + + + crates.serde_derive."1.0.80" = deps: { features?(features_.serde_derive."1.0.80" deps {}) }: buildRustCrate { + crateName = "serde_derive"; + version = "1.0.80"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "1akvzhbnnqhd92lfj7vp43scs1vdml7x27c82l5yh0kz7xf7jaky"; + procMacro = true; + dependencies = mapFeatures features ([ + (crates."proc_macro2"."${deps."serde_derive"."1.0.80"."proc_macro2"}" deps) + (crates."quote"."${deps."serde_derive"."1.0.80"."quote"}" deps) + (crates."syn"."${deps."serde_derive"."1.0.80"."syn"}" deps) + ]); + features = mkFeatures (features."serde_derive"."1.0.80" or {}); + }; + features_.serde_derive."1.0.80" = deps: f: updateFeatures f (rec { + proc_macro2."${deps.serde_derive."1.0.80".proc_macro2}".default = true; + quote."${deps.serde_derive."1.0.80".quote}".default = true; + serde_derive."1.0.80".default = (f.serde_derive."1.0.80".default or true); + syn = fold recursiveUpdate {} [ + { "${deps.serde_derive."1.0.80".syn}"."visit" = true; } + { "${deps.serde_derive."1.0.80".syn}".default = true; } + ]; + }) [ + (features_.proc_macro2."${deps."serde_derive"."1.0.80"."proc_macro2"}" deps) + (features_.quote."${deps."serde_derive"."1.0.80"."quote"}" deps) + (features_.syn."${deps."serde_derive"."1.0.80"."syn"}" deps) + ]; + + + crates.serde_json."1.0.32" = deps: { features?(features_.serde_json."1.0.32" deps {}) }: buildRustCrate { + crateName = "serde_json"; + version = "1.0.32"; + authors = [ "Erick Tryzelaar " "David Tolnay " ]; + sha256 = "1dqkvizi02j1bs5c21kw20idf4aa5399g29ndwl6vkmmrqkr1gr0"; + dependencies = mapFeatures features ([ + (crates."itoa"."${deps."serde_json"."1.0.32"."itoa"}" deps) + (crates."ryu"."${deps."serde_json"."1.0.32"."ryu"}" deps) + (crates."serde"."${deps."serde_json"."1.0.32"."serde"}" deps) + ]); + features = mkFeatures (features."serde_json"."1.0.32" or {}); + }; + features_.serde_json."1.0.32" = deps: f: updateFeatures f (rec { + itoa."${deps.serde_json."1.0.32".itoa}".default = true; + ryu."${deps.serde_json."1.0.32".ryu}".default = true; + serde."${deps.serde_json."1.0.32".serde}".default = true; + serde_json = fold recursiveUpdate {} [ + { "1.0.32".default = (f.serde_json."1.0.32".default or true); } + { "1.0.32".indexmap = + (f.serde_json."1.0.32".indexmap or false) || + (f.serde_json."1.0.32".preserve_order or false) || + (serde_json."1.0.32"."preserve_order" or false); } + ]; + }) [ + (features_.itoa."${deps."serde_json"."1.0.32"."itoa"}" deps) + (features_.ryu."${deps."serde_json"."1.0.32"."ryu"}" deps) + (features_.serde."${deps."serde_json"."1.0.32"."serde"}" deps) + ]; + + + crates.strsim."0.7.0" = deps: { features?(features_.strsim."0.7.0" deps {}) }: buildRustCrate { + crateName = "strsim"; + version = "0.7.0"; + authors = [ "Danny Guo " ]; + sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv"; + }; + features_.strsim."0.7.0" = deps: f: updateFeatures f (rec { + strsim."0.7.0".default = (f.strsim."0.7.0".default or true); + }) []; + + + crates.syn."0.15.13" = deps: { features?(features_.syn."0.15.13" deps {}) }: buildRustCrate { + crateName = "syn"; + version = "0.15.13"; + authors = [ "David Tolnay " ]; + sha256 = "1zvnppl08f2njpkl3m10h221sdl4vsm7v6vyq63dxk16nn37b1bh"; + dependencies = mapFeatures features ([ + (crates."proc_macro2"."${deps."syn"."0.15.13"."proc_macro2"}" deps) + (crates."unicode_xid"."${deps."syn"."0.15.13"."unicode_xid"}" deps) + ] + ++ (if features.syn."0.15.13".quote or false then [ (crates.quote."0.6.8" deps) ] else [])); + features = mkFeatures (features."syn"."0.15.13" or {}); + }; + features_.syn."0.15.13" = deps: f: updateFeatures f (rec { + proc_macro2 = fold recursiveUpdate {} [ + { "${deps.syn."0.15.13".proc_macro2}".default = (f.proc_macro2."${deps.syn."0.15.13".proc_macro2}".default or false); } + { "0.4.20".proc-macro = + (f.proc_macro2."0.4.20".proc-macro or false) || + (syn."0.15.13"."proc-macro" or false) || + (f."syn"."0.15.13"."proc-macro" or false); } + ]; + quote = fold recursiveUpdate {} [ + { "${deps.syn."0.15.13".quote}".default = (f.quote."${deps.syn."0.15.13".quote}".default or false); } + { "0.6.8".proc-macro = + (f.quote."0.6.8".proc-macro or false) || + (syn."0.15.13"."proc-macro" or false) || + (f."syn"."0.15.13"."proc-macro" or false); } + ]; + syn = fold recursiveUpdate {} [ + { "0.15.13".clone-impls = + (f.syn."0.15.13".clone-impls or false) || + (f.syn."0.15.13".default or false) || + (syn."0.15.13"."default" or false); } + { "0.15.13".default = (f.syn."0.15.13".default or true); } + { "0.15.13".derive = + (f.syn."0.15.13".derive or false) || + (f.syn."0.15.13".default or false) || + (syn."0.15.13"."default" or false); } + { "0.15.13".parsing = + (f.syn."0.15.13".parsing or false) || + (f.syn."0.15.13".default or false) || + (syn."0.15.13"."default" or false); } + { "0.15.13".printing = + (f.syn."0.15.13".printing or false) || + (f.syn."0.15.13".default or false) || + (syn."0.15.13"."default" or false); } + { "0.15.13".proc-macro = + (f.syn."0.15.13".proc-macro or false) || + (f.syn."0.15.13".default or false) || + (syn."0.15.13"."default" or false); } + { "0.15.13".quote = + (f.syn."0.15.13".quote or false) || + (f.syn."0.15.13".printing or false) || + (syn."0.15.13"."printing" or false); } + ]; + unicode_xid."${deps.syn."0.15.13".unicode_xid}".default = true; + }) [ + (features_.proc_macro2."${deps."syn"."0.15.13"."proc_macro2"}" deps) + (features_.quote."${deps."syn"."0.15.13"."quote"}" deps) + (features_.unicode_xid."${deps."syn"."0.15.13"."unicode_xid"}" deps) + ]; + + + crates.synstructure."0.10.0" = deps: { features?(features_.synstructure."0.10.0" deps {}) }: buildRustCrate { + crateName = "synstructure"; + version = "0.10.0"; + authors = [ "Nika Layzell " ]; + sha256 = "1alb4hsbm5qf4jy7nmdkqrh3jagqk1xj88w0pmz67f16dvgpf0qf"; + dependencies = mapFeatures features ([ + (crates."proc_macro2"."${deps."synstructure"."0.10.0"."proc_macro2"}" deps) + (crates."quote"."${deps."synstructure"."0.10.0"."quote"}" deps) + (crates."syn"."${deps."synstructure"."0.10.0"."syn"}" deps) + (crates."unicode_xid"."${deps."synstructure"."0.10.0"."unicode_xid"}" deps) + ]); + features = mkFeatures (features."synstructure"."0.10.0" or {}); + }; + features_.synstructure."0.10.0" = deps: f: updateFeatures f (rec { + proc_macro2."${deps.synstructure."0.10.0".proc_macro2}".default = true; + quote."${deps.synstructure."0.10.0".quote}".default = true; + syn = fold recursiveUpdate {} [ + { "${deps.synstructure."0.10.0".syn}"."extra-traits" = true; } + { "${deps.synstructure."0.10.0".syn}"."visit" = true; } + { "${deps.synstructure."0.10.0".syn}".default = true; } + ]; + synstructure."0.10.0".default = (f.synstructure."0.10.0".default or true); + unicode_xid."${deps.synstructure."0.10.0".unicode_xid}".default = true; + }) [ + (features_.proc_macro2."${deps."synstructure"."0.10.0"."proc_macro2"}" deps) + (features_.quote."${deps."synstructure"."0.10.0"."quote"}" deps) + (features_.syn."${deps."synstructure"."0.10.0"."syn"}" deps) + (features_.unicode_xid."${deps."synstructure"."0.10.0"."unicode_xid"}" deps) + ]; + + + crates.tempdir."0.3.7" = deps: { features?(features_.tempdir."0.3.7" deps {}) }: buildRustCrate { + crateName = "tempdir"; + version = "0.3.7"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0y53sxybyljrr7lh0x0ysrsa7p7cljmwv9v80acy3rc6n97g67vy"; + dependencies = mapFeatures features ([ + (crates."rand"."${deps."tempdir"."0.3.7"."rand"}" deps) + (crates."remove_dir_all"."${deps."tempdir"."0.3.7"."remove_dir_all"}" deps) + ]); + }; + features_.tempdir."0.3.7" = deps: f: updateFeatures f (rec { + rand."${deps.tempdir."0.3.7".rand}".default = true; + remove_dir_all."${deps.tempdir."0.3.7".remove_dir_all}".default = true; + tempdir."0.3.7".default = (f.tempdir."0.3.7".default or true); + }) [ + (features_.rand."${deps."tempdir"."0.3.7"."rand"}" deps) + (features_.remove_dir_all."${deps."tempdir"."0.3.7"."remove_dir_all"}" deps) + ]; + + + crates.termcolor."1.0.4" = deps: { features?(features_.termcolor."1.0.4" deps {}) }: buildRustCrate { + crateName = "termcolor"; + version = "1.0.4"; + authors = [ "Andrew Gallant " ]; + sha256 = "0xydrjc0bxg08llcbcmkka29szdrfklk4vh6l6mdd67ajifqw1mv"; + dependencies = (if kernel == "windows" then mapFeatures features ([ + (crates."wincolor"."${deps."termcolor"."1.0.4"."wincolor"}" deps) + ]) else []); + }; + features_.termcolor."1.0.4" = deps: f: updateFeatures f (rec { + termcolor."1.0.4".default = (f.termcolor."1.0.4".default or true); + wincolor."${deps.termcolor."1.0.4".wincolor}".default = true; + }) [ + (features_.wincolor."${deps."termcolor"."1.0.4"."wincolor"}" deps) + ]; + + + crates.termion."1.5.1" = deps: { features?(features_.termion."1.5.1" deps {}) }: buildRustCrate { + crateName = "termion"; + version = "1.5.1"; + authors = [ "ticki " "gycos " "IGI-111 " ]; + sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1"; + dependencies = (if !(kernel == "redox") then mapFeatures features ([ + (crates."libc"."${deps."termion"."1.5.1"."libc"}" deps) + ]) else []) + ++ (if kernel == "redox" then mapFeatures features ([ + (crates."redox_syscall"."${deps."termion"."1.5.1"."redox_syscall"}" deps) + (crates."redox_termios"."${deps."termion"."1.5.1"."redox_termios"}" deps) + ]) else []); + }; + features_.termion."1.5.1" = deps: f: updateFeatures f (rec { + libc."${deps.termion."1.5.1".libc}".default = true; + redox_syscall."${deps.termion."1.5.1".redox_syscall}".default = true; + redox_termios."${deps.termion."1.5.1".redox_termios}".default = true; + termion."1.5.1".default = (f.termion."1.5.1".default or true); + }) [ + (features_.libc."${deps."termion"."1.5.1"."libc"}" deps) + (features_.redox_syscall."${deps."termion"."1.5.1"."redox_syscall"}" deps) + (features_.redox_termios."${deps."termion"."1.5.1"."redox_termios"}" deps) + ]; + + + crates.textwrap."0.10.0" = deps: { features?(features_.textwrap."0.10.0" deps {}) }: buildRustCrate { + crateName = "textwrap"; + version = "0.10.0"; + authors = [ "Martin Geisler " ]; + sha256 = "1s8d5cna12smhgj0x2y1xphklyk2an1yzbadnj89p1vy5vnjpsas"; + dependencies = mapFeatures features ([ + (crates."unicode_width"."${deps."textwrap"."0.10.0"."unicode_width"}" deps) + ]); + }; + features_.textwrap."0.10.0" = deps: f: updateFeatures f (rec { + textwrap."0.10.0".default = (f.textwrap."0.10.0".default or true); + unicode_width."${deps.textwrap."0.10.0".unicode_width}".default = true; + }) [ + (features_.unicode_width."${deps."textwrap"."0.10.0"."unicode_width"}" deps) + ]; + + + crates.thread_local."0.3.6" = deps: { features?(features_.thread_local."0.3.6" deps {}) }: buildRustCrate { + crateName = "thread_local"; + version = "0.3.6"; + authors = [ "Amanieu d'Antras " ]; + sha256 = "02rksdwjmz2pw9bmgbb4c0bgkbq5z6nvg510sq1s6y2j1gam0c7i"; + dependencies = mapFeatures features ([ + (crates."lazy_static"."${deps."thread_local"."0.3.6"."lazy_static"}" deps) + ]); + }; + features_.thread_local."0.3.6" = deps: f: updateFeatures f (rec { + lazy_static."${deps.thread_local."0.3.6".lazy_static}".default = true; + thread_local."0.3.6".default = (f.thread_local."0.3.6".default or true); + }) [ + (features_.lazy_static."${deps."thread_local"."0.3.6"."lazy_static"}" deps) + ]; + + + crates.time."0.1.40" = deps: { features?(features_.time."0.1.40" deps {}) }: buildRustCrate { + crateName = "time"; + version = "0.1.40"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0wgnbjamljz6bqxsd5axc4p2mmhkqfrryj4gf2yswjaxiw5dd01m"; + dependencies = mapFeatures features ([ + (crates."libc"."${deps."time"."0.1.40"."libc"}" deps) + ]) + ++ (if kernel == "redox" then mapFeatures features ([ + (crates."redox_syscall"."${deps."time"."0.1.40"."redox_syscall"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."time"."0.1.40"."winapi"}" deps) + ]) else []); + }; + features_.time."0.1.40" = deps: f: updateFeatures f (rec { + libc."${deps.time."0.1.40".libc}".default = true; + redox_syscall."${deps.time."0.1.40".redox_syscall}".default = true; + time."0.1.40".default = (f.time."0.1.40".default or true); + winapi = fold recursiveUpdate {} [ + { "${deps.time."0.1.40".winapi}"."minwinbase" = true; } + { "${deps.time."0.1.40".winapi}"."minwindef" = true; } + { "${deps.time."0.1.40".winapi}"."ntdef" = true; } + { "${deps.time."0.1.40".winapi}"."profileapi" = true; } + { "${deps.time."0.1.40".winapi}"."std" = true; } + { "${deps.time."0.1.40".winapi}"."sysinfoapi" = true; } + { "${deps.time."0.1.40".winapi}"."timezoneapi" = true; } + { "${deps.time."0.1.40".winapi}".default = true; } + ]; + }) [ + (features_.libc."${deps."time"."0.1.40"."libc"}" deps) + (features_.redox_syscall."${deps."time"."0.1.40"."redox_syscall"}" deps) + (features_.winapi."${deps."time"."0.1.40"."winapi"}" deps) + ]; + + + crates.toml."0.4.8" = deps: { features?(features_.toml."0.4.8" deps {}) }: buildRustCrate { + crateName = "toml"; + version = "0.4.8"; + authors = [ "Alex Crichton " ]; + sha256 = "1xm3chgsvi3qqi7vj8sb5xvnbfpkqyl4fiwh7y2cl6r4brwlmif1"; + dependencies = mapFeatures features ([ + (crates."serde"."${deps."toml"."0.4.8"."serde"}" deps) + ]); + }; + features_.toml."0.4.8" = deps: f: updateFeatures f (rec { + serde."${deps.toml."0.4.8".serde}".default = true; + toml."0.4.8".default = (f.toml."0.4.8".default or true); + }) [ + (features_.serde."${deps."toml"."0.4.8"."serde"}" deps) + ]; + + + crates.ucd_util."0.1.1" = deps: { features?(features_.ucd_util."0.1.1" deps {}) }: buildRustCrate { + crateName = "ucd-util"; + version = "0.1.1"; + authors = [ "Andrew Gallant " ]; + sha256 = "02a8h3siipx52b832xc8m8rwasj6nx9jpiwfldw8hp6k205hgkn0"; + }; + features_.ucd_util."0.1.1" = deps: f: updateFeatures f (rec { + ucd_util."0.1.1".default = (f.ucd_util."0.1.1".default or true); + }) []; + + + crates.unicode_width."0.1.5" = deps: { features?(features_.unicode_width."0.1.5" deps {}) }: buildRustCrate { + crateName = "unicode-width"; + version = "0.1.5"; + authors = [ "kwantam " ]; + sha256 = "0886lc2aymwgy0lhavwn6s48ik3c61ykzzd3za6prgnw51j7bi4w"; + features = mkFeatures (features."unicode_width"."0.1.5" or {}); + }; + features_.unicode_width."0.1.5" = deps: f: updateFeatures f (rec { + unicode_width."0.1.5".default = (f.unicode_width."0.1.5".default or true); + }) []; + + + crates.unicode_xid."0.1.0" = deps: { features?(features_.unicode_xid."0.1.0" deps {}) }: buildRustCrate { + crateName = "unicode-xid"; + version = "0.1.0"; + authors = [ "erick.tryzelaar " "kwantam " ]; + sha256 = "05wdmwlfzxhq3nhsxn6wx4q8dhxzzfb9szsz6wiw092m1rjj01zj"; + features = mkFeatures (features."unicode_xid"."0.1.0" or {}); + }; + features_.unicode_xid."0.1.0" = deps: f: updateFeatures f (rec { + unicode_xid."0.1.0".default = (f.unicode_xid."0.1.0".default or true); + }) []; + + + crates.utf8_ranges."1.0.1" = deps: { features?(features_.utf8_ranges."1.0.1" deps {}) }: buildRustCrate { + crateName = "utf8-ranges"; + version = "1.0.1"; + authors = [ "Andrew Gallant " ]; + sha256 = "1s56ihd2c8ba6191078wivvv59247szaiszrh8x2rxqfsxlfrnpp"; + }; + features_.utf8_ranges."1.0.1" = deps: f: updateFeatures f (rec { + utf8_ranges."1.0.1".default = (f.utf8_ranges."1.0.1".default or true); + }) []; + + + crates.vcpkg."0.2.6" = deps: { features?(features_.vcpkg."0.2.6" deps {}) }: buildRustCrate { + crateName = "vcpkg"; + version = "0.2.6"; + authors = [ "Jim McGrath " ]; + sha256 = "1ig6jqpzzl1z9vk4qywgpfr4hfbd8ny8frqsgm3r449wkc4n1i5x"; + }; + features_.vcpkg."0.2.6" = deps: f: updateFeatures f (rec { + vcpkg."0.2.6".default = (f.vcpkg."0.2.6".default or true); + }) []; + + + crates.vec_map."0.8.1" = deps: { features?(features_.vec_map."0.8.1" deps {}) }: buildRustCrate { + crateName = "vec_map"; + version = "0.8.1"; + authors = [ "Alex Crichton " "Jorge Aparicio " "Alexis Beingessner " "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon " "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood " "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens " "Josh Branchaud " "Huon Wilson " "Corey Farwell " "Aaron Liblong <>" "Nick Cameron " "Patrick Walton " "Felix S Klock II <>" "Andrew Paseltiner " "Sean McArthur " "Vadim Petrochenkov <>" ]; + sha256 = "1jj2nrg8h3l53d43rwkpkikq5a5x15ms4rf1rw92hp5lrqhi8mpi"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."vec_map"."0.8.1" or {}); + }; + features_.vec_map."0.8.1" = deps: f: updateFeatures f (rec { + vec_map = fold recursiveUpdate {} [ + { "0.8.1".default = (f.vec_map."0.8.1".default or true); } + { "0.8.1".serde = + (f.vec_map."0.8.1".serde or false) || + (f.vec_map."0.8.1".eders or false) || + (vec_map."0.8.1"."eders" or false); } + ]; + }) []; + + + crates.version_check."0.1.5" = deps: { features?(features_.version_check."0.1.5" deps {}) }: buildRustCrate { + crateName = "version_check"; + version = "0.1.5"; + authors = [ "Sergio Benitez " ]; + sha256 = "1yrx9xblmwbafw2firxyqbj8f771kkzfd24n3q7xgwiqyhi0y8qd"; + }; + features_.version_check."0.1.5" = deps: f: updateFeatures f (rec { + version_check."0.1.5".default = (f.version_check."0.1.5".default or true); + }) []; + + + crates.winapi."0.3.6" = deps: { features?(features_.winapi."0.3.6" deps {}) }: buildRustCrate { + crateName = "winapi"; + version = "0.3.6"; + authors = [ "Peter Atashian " ]; + sha256 = "1d9jfp4cjd82sr1q4dgdlrkvm33zhhav9d7ihr0nivqbncr059m4"; + build = "build.rs"; + dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([ + (crates."winapi_i686_pc_windows_gnu"."${deps."winapi"."0.3.6"."winapi_i686_pc_windows_gnu"}" deps) + ]) else []) + ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ + (crates."winapi_x86_64_pc_windows_gnu"."${deps."winapi"."0.3.6"."winapi_x86_64_pc_windows_gnu"}" deps) + ]) else []); + features = mkFeatures (features."winapi"."0.3.6" or {}); + }; + features_.winapi."0.3.6" = deps: f: updateFeatures f (rec { + winapi."0.3.6".default = (f.winapi."0.3.6".default or true); + winapi_i686_pc_windows_gnu."${deps.winapi."0.3.6".winapi_i686_pc_windows_gnu}".default = true; + winapi_x86_64_pc_windows_gnu."${deps.winapi."0.3.6".winapi_x86_64_pc_windows_gnu}".default = true; + }) [ + (features_.winapi_i686_pc_windows_gnu."${deps."winapi"."0.3.6"."winapi_i686_pc_windows_gnu"}" deps) + (features_.winapi_x86_64_pc_windows_gnu."${deps."winapi"."0.3.6"."winapi_x86_64_pc_windows_gnu"}" deps) + ]; + + + crates.winapi_i686_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_i686_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate { + crateName = "winapi-i686-pc-windows-gnu"; + version = "0.4.0"; + authors = [ "Peter Atashian " ]; + sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp"; + build = "build.rs"; + }; + features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec { + winapi_i686_pc_windows_gnu."0.4.0".default = (f.winapi_i686_pc_windows_gnu."0.4.0".default or true); + }) []; + + + crates.winapi_util."0.1.1" = deps: { features?(features_.winapi_util."0.1.1" deps {}) }: buildRustCrate { + crateName = "winapi-util"; + version = "0.1.1"; + authors = [ "Andrew Gallant " ]; + sha256 = "10madanla73aagbklx6y73r2g2vwq9w8a0qcghbbbpn9vfr6a95f"; + dependencies = (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."winapi_util"."0.1.1"."winapi"}" deps) + ]) else []); + }; + features_.winapi_util."0.1.1" = deps: f: updateFeatures f (rec { + winapi = fold recursiveUpdate {} [ + { "${deps.winapi_util."0.1.1".winapi}"."consoleapi" = true; } + { "${deps.winapi_util."0.1.1".winapi}"."errhandlingapi" = true; } + { "${deps.winapi_util."0.1.1".winapi}"."fileapi" = true; } + { "${deps.winapi_util."0.1.1".winapi}"."minwindef" = true; } + { "${deps.winapi_util."0.1.1".winapi}"."processenv" = true; } + { "${deps.winapi_util."0.1.1".winapi}"."std" = true; } + { "${deps.winapi_util."0.1.1".winapi}"."winbase" = true; } + { "${deps.winapi_util."0.1.1".winapi}"."wincon" = true; } + { "${deps.winapi_util."0.1.1".winapi}"."winerror" = true; } + { "${deps.winapi_util."0.1.1".winapi}".default = true; } + ]; + winapi_util."0.1.1".default = (f.winapi_util."0.1.1".default or true); + }) [ + (features_.winapi."${deps."winapi_util"."0.1.1"."winapi"}" deps) + ]; + + + crates.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_x86_64_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate { + crateName = "winapi-x86_64-pc-windows-gnu"; + version = "0.4.0"; + authors = [ "Peter Atashian " ]; + sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj"; + build = "build.rs"; + }; + features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec { + winapi_x86_64_pc_windows_gnu."0.4.0".default = (f.winapi_x86_64_pc_windows_gnu."0.4.0".default or true); + }) []; + + + crates.wincolor."1.0.1" = deps: { features?(features_.wincolor."1.0.1" deps {}) }: buildRustCrate { + crateName = "wincolor"; + version = "1.0.1"; + authors = [ "Andrew Gallant " ]; + sha256 = "0gr7v4krmjba7yq16071rfacz42qbapas7mxk5nphjwb042a8gvz"; + dependencies = mapFeatures features ([ + (crates."winapi"."${deps."wincolor"."1.0.1"."winapi"}" deps) + (crates."winapi_util"."${deps."wincolor"."1.0.1"."winapi_util"}" deps) + ]); + }; + features_.wincolor."1.0.1" = deps: f: updateFeatures f (rec { + winapi = fold recursiveUpdate {} [ + { "${deps.wincolor."1.0.1".winapi}"."minwindef" = true; } + { "${deps.wincolor."1.0.1".winapi}"."wincon" = true; } + { "${deps.wincolor."1.0.1".winapi}".default = true; } + ]; + winapi_util."${deps.wincolor."1.0.1".winapi_util}".default = true; + wincolor."1.0.1".default = (f.wincolor."1.0.1".default or true); + }) [ + (features_.winapi."${deps."wincolor"."1.0.1"."winapi"}" deps) + (features_.winapi_util."${deps."wincolor"."1.0.1"."winapi_util"}" deps) + ]; + + +} diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index d93e0a5f56df..da3f0a59eb60 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -6,76 +6,97 @@ let inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; in { + cairo-rs = attrs: { + buildInputs = [ cairo ]; + }; + cargo = attrs: { buildInputs = [ openssl zlib curl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ]; # TODO: buildRustCrate seems to use incorrect default inference crateBin = [ { name = "cargo"; path = "src/bin/cargo.rs"; } ]; }; + cargo-vendor = attrs: { buildInputs = [ openssl zlib curl ]; # TODO: this defaults to cargo_vendor; needs to be cargo-vendor to # be considered a cargo subcommand. crateBin = [ { name = "cargo-vendor"; path = "src/main.rs"; } ]; }; + curl-sys = attrs: { buildInputs = [ pkgconfig zlib curl ]; propagatedBuildInputs = [ curl zlib ]; extraLinkFlags = ["-L${zlib.out}/lib"]; }; - libgit2-sys = attrs: { - LIBGIT2_SYS_USE_PKG_CONFIG = true; - buildInputs = [ pkgconfig openssl zlib libgit2 ]; - }; - libsqlite3-sys = attrs: { - buildInputs = [ pkgconfig sqlite ]; - }; - libssh2-sys = attrs: { - buildInputs = [ pkgconfig openssl zlib libssh2 ]; - }; - openssl = attrs: { - buildInputs = [ openssl ]; - }; - openssl-sys = attrs: { - buildInputs = [ pkgconfig openssl ]; - }; dbus = attrs: { buildInputs = [ pkgconfig dbus ]; }; - libdbus-sys = attrs: { - buildInputs = [ pkgconfig dbus ]; - }; + gobject-sys = attrs: { buildInputs = [ dbus-glib ]; }; + gio-sys = attrs: { buildInputs = [ dbus-glib ]; }; + gdk-pixbuf-sys = attrs: { buildInputs = [ dbus-glib ]; }; + gdk-pixbuf = attrs: { buildInputs = [ gdk_pixbuf ]; }; + + libgit2-sys = attrs: { + LIBGIT2_SYS_USE_PKG_CONFIG = true; + buildInputs = [ pkgconfig openssl zlib libgit2 ]; + }; + + libsqlite3-sys = attrs: { + buildInputs = [ pkgconfig sqlite ]; + }; + + libssh2-sys = attrs: { + buildInputs = [ pkgconfig openssl zlib libssh2 ]; + }; + + libdbus-sys = attrs: { + buildInputs = [ pkgconfig dbus ]; + }; + + openssl = attrs: { + buildInputs = [ openssl ]; + }; + + openssl-sys = attrs: { + buildInputs = [ pkgconfig openssl ]; + }; + + pq-sys = attr: { + buildInputs = [ pkgconfig postgresql ]; + }; + rink = attrs: { buildInputs = [ gmp ]; crateBin = [ { name = "rink"; path = "src/bin/rink.rs"; } ]; }; - cairo-rs = attrs: { - buildInputs = [ cairo ]; + + security-framework-sys = attr: { + propagatedBuildInputs = [ Security ]; }; - xcb = attrs: { - buildInputs = [ python3 ]; + + serde_derive = attrs: { + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; }; thrussh-libsodium = attrs: { buildInputs = [ pkgconfig libsodium ]; }; - pq-sys = attr: { - buildInputs = [ pkgconfig postgresql ]; - }; - security-framework-sys = attr: { - propagatedBuildInputs = [ Security ]; + + xcb = attrs: { + buildInputs = [ python3 ]; }; } diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index 0be58d06fa4d..207f3615d1b4 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -37,9 +37,7 @@ stdenv.mkDerivation rec { installPhase = '' dest=$out/share/fonts/truetype - mkdir -p $dest - find . -name "*.ttf" -exec cp -v {} $dest \; - chmod -x $dest/*.ttf + find . -name '*.ttf' -exec install -m 444 -Dt $dest '{}' + ''; meta = with stdenv.lib; { diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index f0ad2c43a9c8..b5293c6d341e 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "wireless-regdb-${version}"; - version = "2018.09.07"; + version = "2018.10.24"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/wireless-regdb/${name}.tar.xz"; - sha256 = "0nnn10pk94qnrdy55pwcr7506bxdsywa88a3shgqxsd3y53q2sx3"; + sha256 = "05lixkdzy7f3wpan6svh1n9f70rs0kfw6hl6p34sl8bxqxd88ghd"; }; dontBuild = true; diff --git a/pkgs/desktops/deepin/dbus-factory/default.nix b/pkgs/desktops/deepin/dbus-factory/default.nix index 66d28cbcaf3e..610e367b09f8 100644 --- a/pkgs/desktops/deepin/dbus-factory/default.nix +++ b/pkgs/desktops/deepin/dbus-factory/default.nix @@ -18,7 +18,11 @@ stdenv.mkDerivation rec { go-dbus-generator ]; - makeFlags = [ "GOPATH=$(out)/share/gocode" ]; + makeFlags = [ "GOPATH=$(out)/share/go" ]; + + postPatch = '' + sed -i -e 's:/share/gocode:/share/go:' Makefile + ''; meta = with stdenv.lib; { description = "Generates static DBus bindings for Golang and QML at build-time"; diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix new file mode 100644 index 000000000000..fe2c5f8f55a1 --- /dev/null +++ b/pkgs/desktops/deepin/dde-daemon/default.nix @@ -0,0 +1,90 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkgconfig, + dbus-factory, go-dbus-factory, go-gir-generator, go-lib, + deepin-gettext-tools, dde-api, alsaLib, glib, gtk3, libinput, libnl, + librsvg, linux-pam, networkmanager, pulseaudio, xorg, gnome3, + python3Packages, hicolor-icon-theme, go }: + +buildGoPackage rec { + name = "${pname}-${version}"; + pname = "dde-daemon"; + version = "3.2.24.7"; + + goPackagePath = "pkg.deepin.io/dde/daemon"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "17dvhqrw0dqy3d0wd9ailb18y2rg7575g3ffy0d5rg9m3y65y1y6"; + }; + + patches = [ + # https://github.com/linuxdeepin/dde-daemon/issues/51 + (fetchpatch { + name = "dde-daemon_3.2.3.patch"; + url = https://github.com/jouyouyun/tap-gesture-patches/raw/master/patches/dde-daemon_3.2.3.patch; + sha256 = "0a3xb15czpfl2vajpf7ycw37vr7fbw2png1a67mvjjkgx7d1k7dg"; + }) + ]; + + goDeps = ./deps.nix; + + outputs = [ "out" ]; + + nativeBuildInputs = [ + pkgconfig + dbus-factory + go-dbus-factory + go-gir-generator + go-lib + deepin-gettext-tools + dde-api + linux-pam + networkmanager + networkmanager.dev + python3Packages.python + ]; + + buildInputs = [ + alsaLib + glib + gnome3.libgudev + gtk3 + hicolor-icon-theme + libinput + libnl + librsvg + pulseaudio + ]; + + postPatch = '' + patchShebangs . + + sed -i network/nm_generator/Makefile -e 's,/usr/share/gir-1.0/NM-1.0.gir,${networkmanager.dev}/share/gir-1.0/NM-1.0.gir,' + + sed -i -e "s|{DESTDIR}/etc|{DESTDIR}$out/etc|" Makefile + sed -i -e "s|{DESTDIR}/var|{DESTDIR}$out/var|" Makefile + sed -i -e "s|{DESTDIR}/lib|{DESTDIR}$out/lib|" Makefile + + find -type f -exec sed -i -e "s,/usr/lib/deepin-daemon,$out/lib/deepin-daemon," {} + + ''; + + buildPhase = '' + make -C go/src/${goPackagePath} + # compilation of the nm module is failing + #make -C go/src/${goPackagePath}/network/nm_generator gen-nm-code + ''; + + installPhase = '' + make install PREFIX="$out" -C go/src/${goPackagePath} + remove-references-to -t ${go} $out/lib/deepin-daemon/* + ''; + + meta = with stdenv.lib; { + description = "Daemon for handling Deepin Desktop Environment session settings"; + homepage = https://github.com/linuxdeepin/dde-daemon; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/dde-daemon/deps.nix b/pkgs/desktops/deepin/dde-daemon/deps.nix new file mode 100644 index 000000000000..5ffecc28882d --- /dev/null +++ b/pkgs/desktops/deepin/dde-daemon/deps.nix @@ -0,0 +1,102 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +[ + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/axgle/mahonia"; + fetch = { + type = "git"; + url = "https://github.com/axgle/mahonia"; + rev = "3358181d7394e26beccfae0ffde05193ef3be33a"; + sha256 = "0b8wsrxmv8a0cqbnsg55lpf29pxy2zw8azvgh3ck664lqpcfybhq"; + }; + } + { + goPackagePath = "github.com/cryptix/wav"; + fetch = { + type = "git"; + url = "https://github.com/cryptix/wav"; + rev = "8bdace674401f0bd3b63c65479b6a6ff1f9d5e44"; + sha256 = "18nyqv0ic35fs9fny8sj84c00vbxs8mnric6vr6yl42624fh5id6"; + }; + } + { + goPackagePath = "github.com/linuxdeepin/go-x11-client"; + fetch = { + type = "git"; + url = "https://github.com/linuxdeepin/go-x11-client"; + rev = "8f12fd35ff10b391f0321aa41b94db6acd951ea3"; + sha256 = "1axxzzhbiwvi76d19bix3zm5wv3qmlq0wgji9mwjbmkb4bvp0v3d"; + }; + } + { + goPackagePath = "github.com/msteinert/pam"; + fetch = { + type = "git"; + url = "https://github.com/msteinert/pam"; + rev = "f4cd9f5e29232537a12db1678f48c702ad6896b7"; + sha256 = "1vjawxswy3f23v4d72kk95y3b557580670ai9ffvrwy6wy85qync"; + }; + } + { + goPackagePath = "github.com/nfnt/resize"; + fetch = { + type = "git"; + url = "https://github.com/nfnt/resize"; + rev = "83c6a9932646f83e3267f353373d47347b6036b2"; + sha256 = "005cpiwq28krbjf0zjwpfh63rp4s4is58700idn24fs3g7wdbwya"; + }; + } + { + goPackagePath = "golang.org/x/image"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/image"; + rev = "991ec62608f3c0da01d400756917825d1e2fd528"; + sha256 = "0jipi9czjczi6hlqb5kchgml8r6h6qyb4gqrb0nnb63m25510019"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "04a2e542c03f1d053ab3e4d6e5abcd4b66e2be8e"; + sha256 = "040i9f6ymj4z25957h20id9kfmlrcp35y4sfd99hngw9li50ihql"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "4d1c5fb19474adfe9562c9847ba425e7da817e81"; + sha256 = "1y4rf9cmjyf8r56khr1sz0chbq1v0ynaj63i2z1mq6k6h6ww45da"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } +] diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix index a36a96771904..c46dea2875ad 100644 --- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { name = "deepin-gtk-theme-${version}"; - version = "17.10.8"; + version = "17.10.9"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "deepin-gtk-theme"; rev = version; - sha256 = "1z5f5dnda18gixkjcxpvsavhv9m5l2kq61958fdfm1idi0cbr7fp"; + sha256 = "02yn76h007hlmrd7syd82f0mz1c79rlkz3gy1w17zxfy0gdvagz3"; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; makeFlags = [ "PREFIX=$(out)" ]; - meta = { + meta = with stdenv.lib; { description = "Deepin GTK Theme"; homepage = https://github.com/linuxdeepin/deepin-gtk-theme; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.romildo ]; + license = licenses.lgpl3; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 86e5fc37fa54..a6163cd32e20 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -6,6 +6,7 @@ let dbus-factory = callPackage ./dbus-factory { }; dde-api = callPackage ./dde-api { }; dde-calendar = callPackage ./dde-calendar { }; + dde-daemon = callPackage ./dde-daemon { }; dde-polkit-agent = callPackage ./dde-polkit-agent { }; dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; dde-session-ui = callPackage ./dde-session-ui { }; diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix index a488bd7202cb..b9b3aa59a0b1 100644 --- a/pkgs/desktops/deepin/go-dbus-factory/default.nix +++ b/pkgs/desktops/deepin/go-dbus-factory/default.nix @@ -12,9 +12,11 @@ stdenv.mkDerivation rec { sha256 = "0gj2xxv45gh7wr5ry3mcsi46kdsyq9nbd7znssn34kapiv40ixcx"; }; - makeFlags = [ - "PREFIX=$(out)" - ]; + makeFlags = [ "PREFIX=$(out)" ]; + + postPatch = '' + sed -i -e 's:/share/gocode:/share/go:' Makefile + ''; meta = with stdenv.lib; { description = "GoLang DBus factory for the Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/pkgs/desktops/deepin/go-dbus-generator/default.nix index 2933c58f8d95..fa38e650c3a9 100644 --- a/pkgs/desktops/deepin/go-dbus-generator/default.nix +++ b/pkgs/desktops/deepin/go-dbus-generator/default.nix @@ -19,8 +19,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" - "GOPATH=$(GGOPATH):${go-lib}/share/gocode" - "HOME=$(TMP)" + "GOCACHE=off" ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix index 44de8889df28..ff9394425e08 100644 --- a/pkgs/desktops/deepin/go-lib/default.nix +++ b/pkgs/desktops/deepin/go-lib/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "go-lib"; - version = "1.2.16.1"; + version = "1.2.16.3"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0nl35dm0bdca38qhnzdpsv6b0vds9ccvm4c86rs42a7c6v655b1q"; + sha256 = "0dk6k53in3ffwwvkr0sazfk83rf4fyc6rvb6k8fi2n3qj4gp8xd2"; }; buildInputs = [ @@ -22,7 +22,10 @@ stdenv.mkDerivation rec { mobile-broadband-provider-info ]; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ + "PREFIX=$(out)" + "GOSITE_DIR=$(out)/share/go" + ]; meta = with stdenv.lib; { description = "Go bindings for Deepin Desktop Environment development"; diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index ce596ec628ec..1313527e20f1 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "adwaita-icon-theme-${version}"; - version = "3.28.0"; + version = "3.30.0"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0l114ildlb3lz3xymfxxi0wpr2x21rd3cg8slb8jyxynzwfqrbks"; + sha256 = "0jz6wiq2yw5jda56jgi1dys7hlvzk1a49xql7lccrrm3fj8p41li"; }; passthru = { diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix new file mode 100644 index 000000000000..c2c13649f885 --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix @@ -0,0 +1,59 @@ +{ name +, url +, sha256 +}: + +{ swingSupport ? true # not used for now +, stdenv +, fetchurl +}: + +let result = stdenv.mkDerivation rec { + inherit name; + + src = fetchurl { + inherit url sha256; + }; + + # See: https://github.com/NixOS/patchelf/issues/10 + dontStrip = 1; + + installPhase = '' + cd .. + + mv $sourceRoot $out + + rm -rf $out/Home/demo + + # Remove some broken manpages. + rm -rf $out/Home/man/ja* + + # for backward compatibility + ln -s $out/Contents/Home $out/jre + + ln -s $out/Contents/Home/* $out/ + + mkdir -p $out/nix-support + + # Set JAVA_HOME automatically. + cat <> $out/nix-support/setup-hook + if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi + EOF + ''; + + # FIXME: use multiple outputs or return actual JRE package + passthru.jre = result; + + passthru.home = result; + + # for backward compatibility + passthru.architecture = ""; + + meta = with stdenv.lib; { + license = licenses.gpl2Classpath; + description = "AdoptOpenJDK, prebuilt OpenJDK binary"; + platforms = [ "x86_64-darwin" ]; # some inherit jre.meta.platforms + maintainers = with stdenv.lib.maintainers; [ taku0 ]; + }; + +}; in result diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix new file mode 100644 index 000000000000..cf38ca9eaebe --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix @@ -0,0 +1,119 @@ +{ name +, url +, sha256 +}: + +{ swingSupport ? true +, stdenv +, fetchurl +, file +, xorg ? null +, glib +, libxml2 +, ffmpeg_2 +, libxslt +, libGL +, freetype +, fontconfig +, gtk2 +, pango +, cairo +, alsaLib +, atk +, gdk_pixbuf +, zlib +, elfutils +}: + +assert swingSupport -> xorg != null; + +let + rSubPaths = [ + "lib/jli" + "lib/server" + "lib/compressedrefs" # OpenJ9 + "lib/j9vm" # OpenJ9 + "lib" + ]; + + libraries = [ + stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt libGL + xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf + atk zlib elfutils + ] ++ (stdenv.lib.optionals swingSupport [ + xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt + xorg.libXrender + stdenv.cc.cc + ]); +in + +let result = stdenv.mkDerivation rec { + inherit name; + + src = fetchurl { + inherit url sha256; + }; + + nativeBuildInputs = [ file ]; + + # See: https://github.com/NixOS/patchelf/issues/10 + dontStrip = 1; + + installPhase = '' + cd .. + + # Set PaX markings + exes=$(file $sourceRoot/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') + for file in $exes; do + paxmark m "$file" + # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. + ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''} + done + + mv $sourceRoot $out + + rm -rf $out/demo + + # Remove some broken manpages. + rm -rf $out/man/ja* + + # for backward compatibility + ln -s $out $out/jre + + mkdir -p $out/nix-support + + # Set JAVA_HOME automatically. + cat <> $out/nix-support/setup-hook + if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi + EOF + ''; + + postFixup = '' + rpath+="''${rpath:+:}${stdenv.lib.concatStringsSep ":" (map (a: "$out/${a}") rSubPaths)}" + + # set all the dynamic linkers + find $out -type f -perm -0100 \ + -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "$rpath" {} \; + + find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; + ''; + + rpath = stdenv.lib.strings.makeLibraryPath libraries; + + # FIXME: use multiple outputs or return actual JRE package + passthru.jre = result; + + passthru.home = result; + + # for backward compatibility + passthru.architecture = ""; + + meta = with stdenv.lib; { + license = licenses.gpl2Classpath; + description = "AdoptOpenJDK, prebuilt OpenJDK binary"; + platforms = [ "x86_64-linux" ]; # some inherit jre.meta.platforms + maintainers = with stdenv.lib.maintainers; [ taku0 ]; + }; + +}; in result diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix new file mode 100644 index 000000000000..77d9d85aaa93 --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix @@ -0,0 +1,26 @@ +let + version = "11"; + buildNumber = "28"; + baseUrl = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}"; + makePackage = { packageType, vmType, sha256 }: import ./jdk-darwin-base.nix { + name = if packageType == "jdk" + then + "adoptopenjdk-${vmType}-bin-${version}" + else + "adoptopenjdk-${packageType}-${vmType}-bin-${version}"; + url = "${baseUrl}/OpenJDK${version}-${packageType}_x64_mac_${vmType}_${version}_${buildNumber}.tar.gz"; + inherit sha256; + }; +in +{ + jdk-hotspot = makePackage { + packageType = "jdk"; + vmType = "hotspot"; + sha256 = "ca0ec49548c626904061b491cae0a29b9b4b00fb34d8973dc217e10ab21fb0f3"; + }; + jre-hotspot = makePackage { + packageType = "jre"; + vmType = "hotspot"; + sha256 = "ef4dbfe5aed6ab2278fcc14db6cc73abbaab56e95f6ebb023790a7ebc6d7f30c"; + }; +} diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix new file mode 100644 index 000000000000..6e00782c3918 --- /dev/null +++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix @@ -0,0 +1,36 @@ +let + version = "11"; + buildNumber = "28"; + baseUrl = "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-${version}%2B${buildNumber}"; + makePackage = { packageType, vmType, sha256 }: import ./jdk-linux-base.nix { + name = if packageType == "jdk" + then + "adoptopenjdk-${vmType}-bin-${version}" + else + "adoptopenjdk-${packageType}-${vmType}-bin-${version}"; + url = "${baseUrl}/OpenJDK${version}-${packageType}_x64_linux_${vmType}_${version}_${buildNumber}.tar.gz"; + inherit sha256; + }; +in +{ + jdk-hotspot = makePackage { + packageType = "jdk"; + vmType = "hotspot"; + sha256 = "e1e18fc9ce2917473da3e0acb5a771bc651f600c0195a3cb40ef6f22f21660af"; + }; + jre-hotspot = makePackage { + packageType = "jre"; + vmType = "hotspot"; + sha256 = "346448142d46c6e51d0fadcaadbcde31251d7678922ec3eb010fcb1b6e17804c"; + }; + jdk-openj9 = makePackage { + packageType = "jdk"; + vmType = "openj9"; + sha256 = "fd77f22eb74078bcf974415abd888296284d2ceb81dbaca6ff32f59416ebc57f"; + }; + jre-openj9 = makePackage { + packageType = "jre"; + vmType = "openj9"; + sha256 = "83a7c95e6b2150a739bdd5e8a6fe0315904fd13d8867c95db67c0318304a2c42"; + }; +} diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 0648a245a4c8..51cea9810bc9 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchurl, makeWrapper , gmp, openssl, readline, tzdata, libxml2, libyaml -, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which }: +, boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib }: let binaryVersion = "0.26.0"; @@ -57,7 +57,7 @@ let buildInputs = [ boehmgc libatomic_ops pcre libevent - llvm + llvm zlib openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/development/compilers/dotnet/sdk/default.nix b/pkgs/development/compilers/dotnet/sdk/default.nix index eb7a1e737193..9970fd9b33d3 100644 --- a/pkgs/development/compilers/dotnet/sdk/default.nix +++ b/pkgs/development/compilers/dotnet/sdk/default.nix @@ -12,14 +12,14 @@ let rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libunwind libuuid icu openssl zlib curl ]; in stdenv.mkDerivation rec { - version = "2.1.402"; - netCoreVersion = "2.1.4"; + version = "2.1.403"; + netCoreVersion = "2.1.5"; name = "dotnet-sdk-${version}"; src = fetchurl { url = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/dotnet-sdk-${version}-linux-x64.tar.gz"; # use sha512 from the download page - sha512 = "dd7f15a8202ffa2a435b7289865af4483bb0f642ffcf98a1eb10464cb9c51dd1d771efbb6120f129fe9666f62707ba0b7c476cf1fd3536d3a29329f07456de48"; + sha512 = "903a8a633aea9211ba36232a2decb3b34a59bb62bc145a0e7a90ca46dd37bb6c2da02bcbe2c50c17e08cdff8e48605c0f990786faf1f06be1ea4a4d373beb8a9"; }; unpackPhase = '' diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix deleted file mode 100644 index 945649b29781..000000000000 --- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, fetchurl, ncurses5, python27 }: - -stdenv.mkDerivation rec { - name = "gcc-arm-embedded-${version}"; - version = "6-2017-q2-update"; - subdir = "6-2017q2"; - - platformString = - if stdenv.isLinux then "linux" - else if stdenv.isDarwin then "mac" - else throw "unsupported platform"; - - urlString = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${platformString}.tar.bz2"; - - src = - if stdenv.isLinux then fetchurl { url=urlString; sha256="1hvwi02mx34al525sngnl0cm7dkmzxfkb1brq9kvbv28wcplp3p6"; } - else if stdenv.isDarwin then fetchurl { url=urlString; sha256="0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x"; } - else throw "unsupported platform"; - - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - - installPhase = '' - mkdir -p $out - cp -r * $out - ''; - - dontPatchELF = true; - dontStrip = true; - - preFixup = '' - find $out -type f | while read f; do - patchelf $f > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true - done - ''; - - meta = { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors (Cortex-M0/M0+/M3/M4/M7, Cortex-R4/R5/R7/R8)"; - homepage = https://developer.arm.com/open-source/gnu-toolchain/gnu-rm; - license = with stdenv.lib.licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; - maintainers = with stdenv.lib.maintainers; [ vinymeuh ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; - }; -} diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix deleted file mode 100644 index c22683dae03a..000000000000 --- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, lib, fetchurl, ncurses5, python27 }: - -with lib; - -stdenv.mkDerivation rec { - name = "gcc-arm-embedded-${version}"; - version = "7-2018-q2-update"; - subdir = "7-2018q2"; - - urlString = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-linux.tar.bz2"; - - src = fetchurl { url=urlString; sha256="0sgysp3hfpgrkcbfiwkp0a7ymqs02khfbrjabm52b5z61sgi05xv"; }; - - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - - installPhase = '' - mkdir -p $out - cp -r * $out - ''; - - dontPatchELF = true; - dontStrip = true; - - preFixup = '' - find $out -type f | while read f; do - patchelf $f > /dev/null 2>&1 || continue - patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python27 ]} "$f" || true - done - ''; - - meta = { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors (Cortex-M0/M0+/M3/M4/M7, Cortex-R4/R5/R7/R8)"; - homepage = https://developer.arm.com/open-source/gnu-toolchain/gnu-rm; - license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; - maintainers = with maintainers; [ prusnak ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix deleted file mode 100644 index 039b5a9ce362..000000000000 --- a/pkgs/development/compilers/gcc-arm-embedded/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv, bzip2, patchelf, glibc, gcc, fetchurl, version, releaseType, sha256, ncurses -, dirName ? null, subdirName ? null }: -with stdenv.lib; -let - versionParts = splitString "-" version; # 4.7 2013q3 20130916 - majorVersion = elemAt versionParts 0; # 4.7 - yearQuarter = elemAt versionParts 1; # 2013q3 - underscoreVersion = replaceChars ["."] ["_"] version; # 4_7-2013q3-20130916 - yearQuarterParts = splitString "q" yearQuarter; # 2013 3 - year = elemAt yearQuarterParts 0; # 2013 - quarter = elemAt yearQuarterParts 1; # 3 - dirName_ = if dirName != null then dirName else majorVersion; - subdirName_ = if subdirName != null then subdirName - else "${majorVersion}-${year}-q${quarter}-${releaseType}"; # 4.7-2013-q3-update -in -stdenv.mkDerivation { - name = "gcc-arm-embedded-${version}"; - - src = fetchurl { - url = "https://launchpad.net/gcc-arm-embedded/${dirName_}/${subdirName_}/+download/gcc-arm-none-eabi-${underscoreVersion}-linux.tar.bz2"; - sha256 = sha256; - }; - - nativeBuildInputs = [ bzip2 patchelf ]; - - dontPatchELF = true; - - phases = "unpackPhase patchPhase installPhase"; - - installPhase = '' - mkdir -pv $out - cp -r ./* $out - - for f in $(find $out); do - if [ -f "$f" ] && patchelf "$f" 2> /dev/null; then - patchelf --set-interpreter ${getLib glibc}/lib/ld-linux.so.2 \ - --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" gcc ncurses ]} \ - "$f" || true - fi - done - ''; - - meta = with stdenv.lib; { - description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors (Cortex-M0/M0+/M3/M4, Cortex-R4/R5/R7)"; - homepage = https://launchpad.net/gcc-arm-embedded; - license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; - maintainers = [ maintainers.rasendubi ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index d9376f597a70..e585f296e877 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -130,7 +130,7 @@ let version = "4.8.5"; "--disable-libmpx" # requires libc ] else [ (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot" - else "--with-headers=${getDev libcCross}/include") + else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}") "--enable-__cxa_atexit" "--enable-long-long" ] ++ @@ -148,10 +148,15 @@ let version = "4.8.5"; # In uclibc cases, libgomp needs an additional '-ldl' # and as I don't know how to pass it, I disable libgomp. "--disable-libgomp" - ] ++ [ - "--enable-threads=posix" - "--enable-nls" - "--disable-decimal-float" # No final libdecnumber (it may work only in 386) + ] + ++ optional (targetPlatform.libc == "newlib") "--with-newlib" + ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc" + ++ [ + "--enable-threads=${if targetPlatform.isUnix then "posix" + else if targetPlatform.isWindows then "win32" + else "single"}" + "--enable-nls" + "--disable-decimal-float" # No final libdecnumber (it may work only in 386) ])); stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else ""; @@ -270,7 +275,7 @@ stdenv.mkDerivation ({ }" ] ++ - (if enableMultilib + (if (enableMultilib || targetPlatform.isAvr) then ["--enable-multilib" "--disable-libquadmath"] else ["--disable-multilib"]) ++ optional (!enableShared) "--disable-shared" ++ @@ -360,20 +365,20 @@ stdenv.mkDerivation ({ EXTRA_TARGET_FLAGS = optionals (targetPlatform != hostPlatform && libcCross != null) ([ - "-idirafter ${libcCross.dev}/include" + "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}" ] ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}/lib" + "-B${libcCross.out}${libcCross.libdir or "/lib"}" ]); EXTRA_TARGET_LDFLAGS = optionals (targetPlatform != hostPlatform && libcCross != null) ([ - "-Wl,-L${libcCross.out}/lib" + "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}" ] ++ (if crossStageStatic then [ - "-B${libcCross.out}/lib" + "-B${libcCross.out}${libcCross.libdir or "/lib"}" ] else [ - "-Wl,-rpath,${libcCross.out}/lib" - "-Wl,-rpath-link,${libcCross.out}/lib" + "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}" + "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}" ])); passthru = { diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index c60f54f1560c..9dae061ecbb3 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -135,7 +135,7 @@ let version = "4.9.4"; "--disable-libmpx" # requires libc ] else [ (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot" - else "--with-headers=${getDev libcCross}/include") + else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}") "--enable-__cxa_atexit" "--enable-long-long" ] ++ @@ -156,10 +156,15 @@ let version = "4.9.4"; # In uclibc cases, libgomp needs an additional '-ldl' # and as I don't know how to pass it, I disable libgomp. "--disable-libgomp" - ] ++ [ - "--enable-threads=posix" - "--enable-nls" - "--disable-decimal-float" # No final libdecnumber (it may work only in 386) + ] + ++ optional (targetPlatform.libc == "newlib") "--with-newlib" + ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc" + ++ [ + "--enable-threads=${if targetPlatform.isUnix then "posix" + else if targetPlatform.isWindows then "win32" + else "single"}" + "--enable-nls" + "--disable-decimal-float" # No final libdecnumber (it may work only in 386) ])); stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else ""; @@ -292,7 +297,7 @@ stdenv.mkDerivation ({ }" ] ++ - (if enableMultilib + (if (enableMultilib || targetPlatform.isAvr) then ["--enable-multilib" "--disable-libquadmath"] else ["--disable-multilib"]) ++ optional (!enableShared) "--disable-shared" ++ @@ -381,20 +386,20 @@ stdenv.mkDerivation ({ EXTRA_TARGET_FLAGS = optionals (targetPlatform != hostPlatform && libcCross != null) ([ - "-idirafter ${getDev libcCross}/include" + "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}" ] ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}/lib" + "-B${libcCross.out}${libcCross.libdir or "/lib"}" ]); EXTRA_TARGET_LDFLAGS = optionals (targetPlatform != hostPlatform && libcCross != null) ([ - "-Wl,-L${libcCross.out}/lib" + "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}" ] ++ (if crossStageStatic then [ - "-B${libcCross.out}/lib" + "-B${libcCross.out}${libcCross.libdir or "/lib"}" ] else [ - "-Wl,-rpath,${libcCross.out}/lib" - "-Wl,-rpath-link,${libcCross.out}/lib" + "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}" + "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}" ])); passthru = diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 47c849d2dcc8..fbc192752c72 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -122,7 +122,7 @@ let version = "5.5.0"; "--disable-libmpx" # requires libc ] else [ (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot" - else "--with-headers=${getDev libcCross}/include") + else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}") "--enable-__cxa_atexit" "--enable-long-long" ] ++ @@ -143,10 +143,15 @@ let version = "5.5.0"; # In uclibc cases, libgomp needs an additional '-ldl' # and as I don't know how to pass it, I disable libgomp. "--disable-libgomp" - ] ++ [ - "--enable-threads=posix" - "--enable-nls" - "--disable-decimal-float" # No final libdecnumber (it may work only in 386) + ] + ++ optional (targetPlatform.libc == "newlib") "--with-newlib" + ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc" + ++ [ + "--enable-threads=${if targetPlatform.isUnix then "posix" + else if targetPlatform.isWindows then "win32" + else "single"}" + "--enable-nls" + "--disable-decimal-float" # No final libdecnumber (it may work only in 386) ])); stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else ""; @@ -296,7 +301,7 @@ stdenv.mkDerivation ({ }" ] ++ - (if enableMultilib + (if (enableMultilib || targetPlatform.isAvr) then ["--enable-multilib" "--disable-libquadmath"] else ["--disable-multilib"]) ++ optional (!enableShared) "--disable-shared" ++ @@ -387,20 +392,20 @@ stdenv.mkDerivation ({ EXTRA_TARGET_FLAGS = optionals (targetPlatform != hostPlatform && libcCross != null) ([ - "-idirafter ${getDev libcCross}/include" + "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}" ] ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}/lib" + "-B${libcCross.out}${libcCross.libdir or "/lib"}" ]); EXTRA_TARGET_LDFLAGS = optionals (targetPlatform != hostPlatform && libcCross != null) ([ - "-Wl,-L${libcCross.out}/lib" + "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}" ] ++ (if crossStageStatic then [ - "-B${libcCross.out}/lib" + "-B${libcCross.out}${libcCross.libdir or "/lib"}" ] else [ - "-Wl,-rpath,${libcCross.out}/lib" - "-Wl,-rpath-link,${libcCross.out}/lib" + "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}" + "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}" ])); passthru = diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index eeb57be97157..793752dee19e 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -120,7 +120,7 @@ let version = "6.4.0"; "--disable-libmpx" # requires libc ] else [ (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot" - else "--with-headers=${getDev libcCross}/include") + else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}") "--enable-__cxa_atexit" "--enable-long-long" ] ++ @@ -143,10 +143,15 @@ let version = "6.4.0"; "--disable-libgomp" # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865 "--disable-libmpx" - ] ++ [ - "--enable-threads=posix" - "--enable-nls" - "--disable-decimal-float" # No final libdecnumber (it may work only in 386) + ] + ++ optional (targetPlatform.libc == "newlib") "--with-newlib" + ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc" + ++ [ + "--enable-threads=${if targetPlatform.isUnix then "posix" + else if targetPlatform.isWindows then "win32" + else "single"}" + "--enable-nls" + "--disable-decimal-float" # No final libdecnumber (it may work only in 386) ])); stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else ""; @@ -301,7 +306,7 @@ stdenv.mkDerivation ({ }" ] ++ - (if enableMultilib + (if (enableMultilib || targetPlatform.isAvr) then ["--enable-multilib" "--disable-libquadmath"] else ["--disable-multilib"]) ++ optional (!enableShared) "--disable-shared" ++ @@ -391,20 +396,20 @@ stdenv.mkDerivation ({ EXTRA_TARGET_FLAGS = optionals (targetPlatform != hostPlatform && libcCross != null) ([ - "-idirafter ${getDev libcCross}/include" + "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}" ] ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}/lib" + "-B${libcCross.out}${libcCross.libdir or "/lib"}" ]); EXTRA_TARGET_LDFLAGS = optionals (targetPlatform != hostPlatform && libcCross != null) ([ - "-Wl,-L${libcCross.out}/lib" + "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}" ] ++ (if crossStageStatic then [ - "-B${libcCross.out}/lib" + "-B${libcCross.out}${libcCross.libdir or "/lib"}" ] else [ - "-Wl,-rpath,${libcCross.out}/lib" - "-Wl,-rpath-link,${libcCross.out}/lib" + "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}" + "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}" ])); passthru = diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 59897ccff426..c75a6c6e68f8 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -67,7 +67,7 @@ let version = "7.3.0"; [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++ (if crossMingw && crossStageStatic then [ - "--with-headers=${libcCross}/include" + "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}" "--with-gcc" "--with-gnu-as" "--with-gnu-ld" @@ -92,7 +92,7 @@ let version = "7.3.0"; "--disable-libmpx" # requires libc ] else [ (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot" - else "--with-headers=${getDev libcCross}/include") + else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}") "--enable-__cxa_atexit" "--enable-long-long" ] ++ @@ -115,11 +115,17 @@ let version = "7.3.0"; "--disable-libgomp" # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865 "--disable-libmpx" - ] ++ [ - "--enable-threads=posix" - "--enable-nls" - "--disable-decimal-float" # No final libdecnumber (it may work only in 386) - ])); + ] + ++ optional (targetPlatform.libc == "newlib") "--with-newlib" + ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc" + ++ [ + "--enable-threads=${if targetPlatform.isUnix then "posix" + else if targetPlatform.isWindows then "win32" + else "single"}" + "--enable-nls" + # No final libdecnumber (it may work only in 386) + "--disable-decimal-float" + ])); stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else ""; @@ -188,7 +194,12 @@ stdenv.mkDerivation ({ sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR' '' ) - else ""); + else "") + + stdenv.lib.optionalString targetPlatform.isAvr '' + makeFlagsArray+=( + 'LIMITS_H_TEST=false' + ) + ''; inherit noSysDirs staticCompiler crossStageStatic libcCross crossMingw; @@ -267,7 +278,7 @@ stdenv.mkDerivation ({ }" ] ++ - (if enableMultilib + (if (enableMultilib || targetPlatform.isAvr) then ["--enable-multilib" "--disable-libquadmath"] else ["--disable-multilib"]) ++ optional (!enableShared) "--disable-shared" ++ @@ -334,20 +345,20 @@ stdenv.mkDerivation ({ EXTRA_TARGET_FLAGS = optionals (targetPlatform != hostPlatform && libcCross != null) ([ - "-idirafter ${getDev libcCross}/include" + "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}" ] ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}/lib" + "-B${libcCross.out}${libcCross.libdir or "/lib"}" ]); EXTRA_TARGET_LDFLAGS = optionals (targetPlatform != hostPlatform && libcCross != null) ([ - "-Wl,-L${libcCross.out}/lib" + "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}" ] ++ (if crossStageStatic then [ - "-B${libcCross.out}/lib" + "-B${libcCross.out}${libcCross.libdir or "/lib"}" ] else [ - "-Wl,-rpath,${libcCross.out}/lib" - "-Wl,-rpath-link,${libcCross.out}/lib" + "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}" + "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}" ])); passthru = diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 7842110a2146..bcac577712aa 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -87,7 +87,7 @@ let version = "8.2.0"; "--disable-libmpx" # requires libc ] else [ (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot" - else "--with-headers=${getDev libcCross}/include") + else "--with-headers=${getDev libcCross}${libcCross.incdir or "/include"}") "--enable-__cxa_atexit" "--enable-long-long" ] ++ @@ -110,10 +110,15 @@ let version = "8.2.0"; "--disable-libgomp" # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865 "--disable-libmpx" - ] ++ [ - "--enable-threads=posix" - "--enable-nls" - "--disable-decimal-float" # No final libdecnumber (it may work only in 386) + ] + ++ optional (targetPlatform.libc == "newlib") "--with-newlib" + ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc" + ++ [ + "--enable-threads=${if targetPlatform.isUnix then "posix" + else if targetPlatform.isWindows then "win32" + else "single"}" + "--enable-nls" + "--disable-decimal-float" # No final libdecnumber (it may work only in 386) ])); stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else ""; @@ -261,7 +266,7 @@ stdenv.mkDerivation ({ }" ] ++ - (if enableMultilib + (if (enableMultilib || targetPlatform.isAvr) then ["--enable-multilib" "--disable-libquadmath"] else ["--disable-multilib"]) ++ optional (!enableShared) "--disable-shared" ++ @@ -322,23 +327,16 @@ stdenv.mkDerivation ({ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); - EXTRA_TARGET_FLAGS = optionals - (targetPlatform != hostPlatform && libcCross != null) - ([ - "-idirafter ${getDev libcCross}/include" - ] ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}/lib" - ]); EXTRA_TARGET_LDFLAGS = optionals (targetPlatform != hostPlatform && libcCross != null) ([ - "-Wl,-L${libcCross.out}/lib" + "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}" ] ++ (if crossStageStatic then [ - "-B${libcCross.out}/lib" + "-B${libcCross.out}${libcCross.libdir or "/lib"}" ] else [ - "-Wl,-rpath,${libcCross.out}/lib" - "-Wl,-rpath-link,${libcCross.out}/lib" + "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}" + "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}" ])); passthru = diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index 0de6be36c351..a308abd9c16f 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -104,10 +104,15 @@ let version = "7-20170409"; # In uclibc cases, libgomp needs an additional '-ldl' # and as I don't know how to pass it, I disable libgomp. "--disable-libgomp" - ] ++ [ - "--enable-threads=posix" - "--enable-nls" - "--disable-decimal-float" # No final libdecnumber (it may work only in 386) + ] + ++ optional (targetPlatform.libc == "newlib") "--with-newlib" + ++ optional (targetPlatform.libc == "avrlibc") "--with-avrlibc" + ++ [ + "--enable-threads=${if targetPlatform.isUnix then "posix" + else if targetPlatform.isWindows then "win32" + else "single"}" + "--enable-nls" + "--disable-decimal-float" # No final libdecnumber (it may work only in 386) ])); stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else ""; @@ -290,20 +295,20 @@ stdenv.mkDerivation ({ EXTRA_TARGET_FLAGS = optionals (targetPlatform != hostPlatform && libcCross != null) ([ - "-idirafter ${getDev libcCross}/include" + "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}" ] ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}/lib" + "-B${libcCross.out}${libcCross.libdir or "/lib"}" ]); EXTRA_TARGET_LDFLAGS = optionals (targetPlatform != hostPlatform && libcCross != null) ([ - "-Wl,-L${libcCross.out}/lib" + "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}" ] ++ (if crossStageStatic then [ - "-B${libcCross.out}/lib" + "-B${libcCross.out}${libcCross.libdir or "/lib"}" ] else [ - "-Wl,-rpath,${libcCross.out}/lib" - "-Wl,-rpath-link,${libcCross.out}/lib" + "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}" + "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}" ])); passthru = diff --git a/pkgs/development/compilers/mentor/default.nix b/pkgs/development/compilers/mentor/default.nix deleted file mode 100644 index 4f09df7f2ea0..000000000000 --- a/pkgs/development/compilers/mentor/default.nix +++ /dev/null @@ -1,80 +0,0 @@ -# Sourcery CodeBench Lite toolchain(s) (GCC) from Mentor Graphics - -{ stdenv, fetchurl, patchelf, ncurses }: - -let - - buildToolchain = - { name, src, description }: - - stdenv.mkDerivation rec { - inherit name src; - - nativeBuildInputs = [ patchelf ]; - - buildCommand = '' - # Unpack tarball - mkdir -p "$out" - tar --strip-components=1 -xjf "$src" -C "$out" - - # Patch binaries - interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)" - for file in "$out"/bin/* "$out"/libexec/gcc/*/*/* "$out"/*/bin/*; do - # Skip non-executable files - case "$file" in - *README.txt) echo "skipping $file"; continue;; - *liblto_plugin.so*) echo "skipping $file"; continue;; - esac - - # Skip directories - test -d "$file" && continue - - echo "patchelf'ing $file" - patchelf --set-interpreter "$interpreter" "$file" - - # GDB needs ncurses - case "$file" in - *gdb) patchelf --set-rpath "${ncurses.out}/lib" "$file";; - esac - done - - # Manpages - mkdir -p "$out/share/man" - ln -s "$out"/share/doc/*/man/man1 "$out/share/man/man1" - ln -s "$out"/share/doc/*/man/man7 "$out/share/man/man7" - ''; - - meta = with stdenv.lib; { - inherit description; - homepage = https://www.mentor.com/embedded-software/sourcery-tools/sourcery-codebench/editions/lite-edition/; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; - }; - }; - -in - -{ - - armLinuxGnuEabi = let version = "2013.05-24"; in buildToolchain rec { - name = "sourcery-codebench-lite-arm-linux-gnueabi-${version}"; - description = "Sourcery CodeBench Lite toolchain (GCC) for ARM GNU/Linux, from Mentor Graphics"; - src = fetchurl { - url = "http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-${version}-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2"; - sha256 = "1xb075ia61c59cya2jl8zp4fvqpfnwkkc5330shvgdlg9981qprr"; - }; - }; - - armEabi = let version = "2013.05-23"; in buildToolchain rec { - name = "sourcery-codebench-lite-arm-eabi-${version}"; - description = "Sourcery CodeBench Lite toolchain (GCC) for ARM EABI, from Mentor Graphics"; - src = fetchurl { - url = "http://sourcery.mentor.com/public/gnu_toolchain/arm-none-eabi/arm-${version}-arm-none-eabi-i686-pc-linux-gnu.tar.bz2"; - sha256 = "0nbvdwj3kcv9scx808gniqp0ncdiy2i7afmdvribgkz1lsfin923"; - }; - }; - - # TODO: Sourcery CodeBench is also available for MIPS, Power, SuperH, - # ColdFire (and more). -} diff --git a/pkgs/development/compilers/microscheme/default.nix b/pkgs/development/compilers/microscheme/default.nix index cfee1b0d8639..f15a76243277 100644 --- a/pkgs/development/compilers/microscheme/default.nix +++ b/pkgs/development/compilers/microscheme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, vim, avrdude, avrbinutils, avrgcc, avrlibc, makeWrapper }: +{ stdenv, fetchzip, vim, makeWrapper }: stdenv.mkDerivation rec { name = "microscheme-${version}"; @@ -10,15 +10,10 @@ stdenv.mkDerivation rec { sha256 = "1r3ng4pw1s9yy1h5rafra1rq19d3vmb5pzbpcz1913wz22qdd976"; }; - # Just a guess - propagatedBuildInputs = [ avrlibc ]; buildInputs = [ makeWrapper vim ]; installPhase = '' make install PREFIX=$out - - wrapProgram $out/bin/microscheme \ - --prefix PATH : "${stdenv.lib.makeBinPath [ avrdude avrgcc avrbinutils ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/mono/4.0.nix b/pkgs/development/compilers/mono/4.0.nix deleted file mode 100644 index 892ae99abaf5..000000000000 --- a/pkgs/development/compilers/mono/4.0.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ callPackage, Foundation, libobjc }: -callPackage ./generic.nix (rec { - inherit Foundation libobjc; - version = "4.0.4.1"; - sha256 = "1ydw9l89apc9p7xr5mdzy0h97g2q6v243g82mxswfc2rrqhfs4gd"; - meta = { - knownVulnerabilities = [ "CVE-2009-0689" ]; - }; -}) diff --git a/pkgs/development/compilers/mono/4.4.nix b/pkgs/development/compilers/mono/4.4.nix deleted file mode 100644 index 9a3ccd1fd861..000000000000 --- a/pkgs/development/compilers/mono/4.4.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ callPackage, Foundation, libobjc }: - -callPackage ./generic.nix (rec { - inherit Foundation libobjc; - version = "4.4.2.11"; - sha256 = "0cxnypw1j7s253wr5hy05k42ghgg2s9qibp10kndwnp5bv12q34h"; - enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65565737 -}) diff --git a/pkgs/development/compilers/mono/4.6.nix b/pkgs/development/compilers/mono/4.6.nix index 2bba660b69cd..5ccdadc28787 100644 --- a/pkgs/development/compilers/mono/4.6.nix +++ b/pkgs/development/compilers/mono/4.6.nix @@ -5,4 +5,5 @@ callPackage ./generic.nix (rec { version = "4.6.2.16"; sha256 = "190f7kcrm1y5x61s1xwdmjnwc3czsg50s3mml4xmix7byh3x2rc9"; enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65617511 + meta.knownVulnerabilities = [ "CVE-2018-1002208" ]; }) diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 09677a47ab2a..d90ddcaacfb0 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { name = "ponyc-${version}"; - version = "0.24.4"; + version = "0.25.0"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "1p75h1ldi9iskqkwic5h426cwi45042p3agh9sdl6gld9s7lc9a6"; + sha256 = "0ghmjp03q7k58yzfkvnl05xc2i2gmgnzpj3hs6g7ls4ny8n3i6hv"; }; buildInputs = [ llvm makeWrapper which ]; diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 81c935fc421f..0832d14992d1 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -4,18 +4,20 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-reason-${version}"; - version = "3.3.3"; + version = "3.3.7"; src = fetchFromGitHub { owner = "facebook"; repo = "reason"; - rev = "fefe5e4db3a54a7946c2220ee037dd2f407011c9"; - sha256 = "1x0dbacgq9pa36zgzwrc0gm14wbb6v27y9bf7wcwk55a1ck0am18"; + rev = "4d20e5b535c29c5ef1283e65958b32996e449e5a"; + sha256 = "0f3pb61wg58g8f3wcnp1h4gpmnwmp7bq0cnqdfwldmh9cs0dqyfk"; }; + nativeBuildInputs = [ makeWrapper ]; + propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ]; - buildInputs = [ makeWrapper ocaml findlib dune utop menhir ]; + buildInputs = [ ocaml findlib dune utop menhir ]; buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 3faa4c268ac0..0e092473bd52 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -103,6 +103,7 @@ go.stdenv.mkDerivation ( '') + '' export GOPATH=$NIX_BUILD_TOP/go:$GOPATH + export GOCACHE=$TMPDIR/go-cache runHook postConfigure ''; @@ -193,9 +194,6 @@ go.stdenv.mkDerivation ( find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + || true ''; - # Disable go cache, which is not reused in nix anyway - GOCACHE = "off"; - shellHook = '' d=$(mktemp -d "--suffix=-$name") '' + toString (map (dep: '' diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index 081f1a547d69..85794b09ae0b 100644 --- a/pkgs/development/interpreters/bats/default.nix +++ b/pkgs/development/interpreters/bats/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ stdenv, fetchzip, gnugrep }: stdenv.mkDerivation rec { name = "bats-${version}"; @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1kkh0j2alql3xiyhw9wsvcc3xclv52g0ivgyk8h85q9fn3qdqakz"; }; - patchPhase = "patchShebangs ./install.sh"; + patchPhase = '' + patchShebangs ./install.sh + substituteInPlace ./libexec/bats-core/bats-format-tap-stream --replace grep ${gnugrep}/bin/grep + ''; installPhase = "./install.sh $out"; diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix index 3f08ca8f7c22..02ce07bdf471 100644 --- a/pkgs/development/interpreters/hy/default.nix +++ b/pkgs/development/interpreters/hy/default.nix @@ -2,20 +2,20 @@ pythonPackages.buildPythonApplication rec { name = "hy-${version}"; - version = "0.14.0"; + version = "0.15.0"; src = fetchurl { url = "mirror://pypi/h/hy/${name}.tar.gz"; - sha256 = "0cbdh1q0zm00p4h7i44kir4qhw0p6sid78xf6llrx2p21llsnv98"; + sha256 = "01vzaib1imr00j5d7f7xk44v800h06s3yv9inhlqm6f3b25ywpl1"; }; - propagatedBuildInputs = with pythonPackages; [ appdirs clint astor rply ]; - - # The build generates a .json parser file in the home directory under .cache. - # This is needed to get it to not try and open files in /homeless-shelter - preConfigure = '' - export HOME=$TMP - ''; + propagatedBuildInputs = with pythonPackages; [ + appdirs + astor + clint + funcparserlib + rply + ]; meta = { description = "A LISP dialect embedded in Python"; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 1f2a28cb8fb8..ee7d9dd68136 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "7.0"; # always change at once with ./minimal.nix + version = "7.1"; # always change at once with ./minimal.nix src = (stdenv.lib.makeOverridable ({ name, sha256 }: fetchurl rec { @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { } )) { inherit name; - sha256 = "1glv5amsp9xp480d4yr63hhm9kkyav06yl3a6p489nkr4cln0j9a"; + sha256 = "180z0z6srzyipi9wfnbh61nbvzxr5d1cls7wxapv6fw92y52jwz9"; }; FONTCONFIG_FILE = fontsConf; diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index ba4e94cbf13f..114023defcd4 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec { name = "racket-minimal-${oldAttrs.version}"; src = oldAttrs.src.override { inherit name; - sha256 = "0ivpr1a2w1ln1lx91q11rj9wp3rbfq33acrz2gxxvd80qqaq3zyh"; + sha256 = "11vcqxdgyarv89ijd46wzrdl2wk7xjirg7ynlz7r0smdcqrcl711"; }; meta = oldAttrs.meta // { diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix index 7c6844fdec09..ea96e5ed334a 100644 --- a/pkgs/development/interpreters/spidermonkey/52.nix +++ b/pkgs/development/interpreters/spidermonkey/52.nix @@ -10,6 +10,9 @@ in stdenv.mkDerivation rec { sha256 = "1mlx34fgh1kaqamrkl5isf0npch3mm6s4lz3jsjb7hakiijhj7f0"; }; + outputs = [ "out" "dev" ]; + setOutputFlags = false; # Configure script only understands --includedir + buildInputs = [ readline icu zlib nspr ]; nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ]; @@ -32,6 +35,7 @@ in stdenv.mkDerivation rec { export CXXFLAGS="-fpermissive" export LIBXUL_DIST=$out export PYTHON="${python2.interpreter}" + configureFlagsArray+=("--includedir=$dev/include") cd js/src @@ -49,6 +53,12 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = '' + moveToOutput bin/js52-config "$dev" + # Nuke a static lib. + rm $out/lib/libjs_static.ajs + ''; + meta = with stdenv.lib; { description = "Mozilla's JavaScript engine written in C/C++"; homepage = https://developer.mozilla.org/en/SpiderMonkey; diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix index bca519c76283..f94e0a3ee780 100644 --- a/pkgs/development/libraries/arb/default.nix +++ b/pkgs/development/libraries/arb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "arb"; - version = "2.14.0"; + version = "2.15.1"; src = fetchFromGitHub { owner = "fredrik-johansson"; repo = "${pname}"; rev = "${version}"; - sha256 = "1ndxg7h4xvccjgp5l9z2f8b66dsff6fhf86bn5n7f75a1ksd7554"; + sha256 = "148mn31xy4wgja2cainn2yaw1bjrppf1dxw2ngnvp7x5j7fms1am"; }; buildInputs = [mpir gmp mpfr flint]; configureFlags = [ diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index e5e3c2d662c2..a88b3f1b9b68 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "19.13"; + version = "19.16"; name = "dlib-${version}"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; rev ="v${version}"; - sha256 = "11ia4pd2lm2s9hzwrdvimj3r2qcnvjdp3g4fry2j1a6z9f99zvz3"; + sha256 = "0ix52npsxfm6324jli7y0zkyijl5yirv2yzfncyd4sq0r9fcwb4p"; }; postPatch = '' diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix index dc44c7d8705f..90e3ee9af5b2 100644 --- a/pkgs/development/libraries/editline/default.nix +++ b/pkgs/development/libraries/editline/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - dontDisableStatic = true; + outputs = [ "out" "dev" "man" "doc" ]; meta = with stdenv.lib; { homepage = http://troglobit.com/editline.html; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 7c3b3447d613..d11ef732a01f 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, perl, texinfo, yasm , alsaLib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg -, libssh, libtheora, libva, libvorbis, libvpx, lzma, libpulseaudio, soxr +, libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr , x264, x265, xvidcore, zlib, libopus, speex , openglSupport ? false, libGLU_combined ? null # Build options @@ -130,6 +130,7 @@ stdenv.mkDerivation rec { "--enable-libtheora" (ifMinVer "2.1" "--enable-libssh") (ifMinVer "0.6" (enableFeature vaapiSupport "vaapi")) + (ifMinVer "3.4" (enableFeature vaapiSupport "libdrm")) "--enable-vdpau" "--enable-libvorbis" (ifMinVer "0.6" (enableFeature vpxSupport "libvpx")) @@ -165,6 +166,7 @@ stdenv.mkDerivation rec { ++ optional vpxSupport libvpx ++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM ++ optional ((isLinux || isFreeBSD) && !isAarch32) libva + ++ optional ((isLinux || isFreeBSD) && !isAarch32) libdrm ++ optional isLinux alsaLib ++ optionals isDarwin darwinFrameworks ++ optional vdpauSupport libvdpau diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index c120f7c9b43f..fbe947e3afb1 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -3,29 +3,41 @@ stdenv.mkDerivation rec { version = "5.2.1"; name = "fmt-${version}"; + src = fetchFromGitHub { owner = "fmtlib"; repo = "fmt"; rev = "${version}"; sha256 = "1cd8yq8va457iir1hlf17ksx11fx2hlb8i4jml8gj1875pizm0pk"; }; + + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DFMT_TEST=TRUE" + "-DBUILD_SHARED_LIBS=${if enableShared then "TRUE" else "FALSE"}" + ]; + + enableParallelBuilding = true; + doCheck = true; # preCheckHook ensures the test binaries can find libfmt.so.5 preCheck = if enableShared then "export LD_LIBRARY_PATH=\"$PWD\"" else ""; - cmakeFlags = [ "-DFMT_TEST=yes" - "-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}" ]; + meta = with stdenv.lib; { - homepage = http://fmtlib.net/; description = "Small, safe and fast formatting library"; longDescription = '' fmt (formerly cppformat) is an open-source formatting library. It can be used as a fast and safe alternative to printf and IOStreams. ''; + homepage = http://fmtlib.net/; + downloadPage = https://github.com/fmtlib/fmt/; maintainers = [ maintainers.jdehaas ]; license = licenses.bsd2; - platforms = platforms.unix; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index 65c99610a5c7..63d00f1dd1a7 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, gpgme, libidn, gobjectIntrospection }: +{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobjectIntrospection }: stdenv.mkDerivation rec { - version = "3.2.0"; + version = "3.2.1"; name = "gmime-${version}"; src = fetchurl { url = "mirror://gnome/sources/gmime/3.2/${name}.tar.xz"; - sha256 = "1q6palbpf6lh6bvy9ly26q5apl5k0z0r4mvl6zzqh90rz4rn1v3m"; + sha256 = "0q65nalxzpyjg37gdlpj9v6028wp0qx47z96q0ff6znw217nzzjn"; }; outputs = [ "out" "dev" ]; - buildInputs = [ gobjectIntrospection zlib gpgme libidn ]; + buildInputs = [ gobjectIntrospection zlib gpgme libidn2 libunistring ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib ]; configureFlags = [ "--enable-introspection=yes" ]; @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { checkInputs = [ gnupg ]; + doCheck = true; + enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 769cc1c768c9..cf4069871d1d 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchFromGitHub }: +{ stdenv, cmake, ninja, fetchFromGitHub }: stdenv.mkDerivation rec { name = "gtest-${version}"; version = "1.8.1"; @@ -10,24 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0270msj6n7mggh4xqqjp54kswbl7mkcc8px1p5dqdpmw5ngh9fzk"; }; - buildInputs = [ cmake ]; - - configurePhase = '' - mkdir build - cd build - cmake ../ -DCMAKE_INSTALL_PREFIX=$out - ''; - - installPhase = '' - mkdir -p $out/lib - cp -v googlemock/gtest/libgtest.a googlemock/gtest/libgtest_main.a googlemock/libgmock.a googlemock/libgmock_main.a $out/lib - ln -s $out/lib/libgmock.a $out/lib/libgoogletest.a - mkdir -p $out/include - cp -v -r ../googlemock/include/gmock $out/include - cp -v -r ../googletest/include/gtest $out/include - mkdir -p $out/src - cp -v -r ../googlemock/src/* ../googletest/src/* $out/src - ''; + nativeBuildInputs = [ cmake ninja ]; meta = with stdenv.lib; { description = "Google's framework for writing C++ tests"; diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index e3d5c7d6424e..516702e2afef 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libcouchbase-${version}"; - version = "2.9.5"; + version = "2.10.0"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "18l3579b47l8d6nhv0xls8pybkqdmdkw8jg4inalnx3g7ydqfn00"; + sha256 = "08bvnd0m18qs5akbblf80l54khm1523fdiiajp7fj88vrs86nbi2"; }; cmakeFlags = "-DLCB_NO_MOCK=ON"; diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix index c509fcd2b4f8..c83d2610dbfa 100644 --- a/pkgs/development/libraries/libmikmod/default.nix +++ b/pkgs/development/libraries/libmikmod/default.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ texinfo ] - ++ optionals stdenv.isLinux [ alsaLib libpulseaudio ] + ++ optional stdenv.isLinux alsaLib ++ optional stdenv.isDarwin CoreAudio; propagatedBuildInputs = optional stdenv.isLinux libpulseaudio; diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index 8cca5333d084..2f20150ad164 100644 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libqmatrixclient-${version}"; - version = "0.3.0.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "libqmatrixclient"; rev = "v${version}"; - sha256 = "03pxmr4wa818fgqddkr2fkwz6pda538x3ic9yq7c40x98zqf55w5"; + sha256 = "1llzqjagvp91kcg26q5c4qw9aaz7wna3rh6k06rc3baivrjqf3cn"; }; buildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 1ac4a7185122..154e84cfd0a2 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -46,7 +46,7 @@ in { }; libressl_2_8 = generic { - version = "2.8.1"; - sha256 = "0hnga8j7svdbwcy01mh5pxssk7rxq4g5fc5vxrzhid0x1w2zfjrk"; + version = "2.8.2"; + sha256 = "1mag4lf3lmg2fh2yzkh663l69h4vjriadwl0zixmb50jkzjk3jxq"; }; } diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index ad8120d3591a..51b6cbd4ed52 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - rev = "0.6.35"; + rev = "0.7.0"; name = "libsolv-${rev}"; src = fetchFromGitHub { inherit rev; owner = "openSUSE"; repo = "libsolv"; - sha256 = "0jx1bmwwhjwfidwa0hrarwpcrf4ic068kapd4vb9m5y7xd4l55nq"; + sha256 = "02vz1yp516nh4vv0jdckll37mc373ddd363ip005xfbrbb2jr1xh"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/libversion/default.nix b/pkgs/development/libraries/libversion/default.nix index 6e7005195bf0..6ca7b11321ba 100644 --- a/pkgs/development/libraries/libversion/default.nix +++ b/pkgs/development/libraries/libversion/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: let - version = "2.6.0"; + version = "2.7.0"; in stdenv.mkDerivation { name = "libversion-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { owner = "repology"; repo = "libversion"; rev = version; - sha256 = "0krhfycva3l4rhac5kx6x1a6fad594i9i77vy52rwn37j62bm601"; + sha256 = "0brk2mbazc7yz0h4zsvbybbaymf497dgxnc74qihnvbi4z4rlqpj"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index 573215227369..f28ff1b0a21f 100644 --- a/pkgs/development/libraries/matio/default.nix +++ b/pkgs/development/libraries/matio/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "matio-1.5.12"; + name = "matio-1.5.13"; src = fetchurl { url = "mirror://sourceforge/matio/${name}.tar.gz"; - sha256 = "1afqjhc1wbm7g1vry3w30c7dbrxg6n4i482ybgx6l1b5wj0f75c6"; + sha256 = "1jz5760jn1cifr479znhmzksi8fp07j99jd8xdnxpjd79gsv5bgy"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index d3a4b21b4b61..cc5a115ed71e 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }: -let version = "5.0.0"; in +let version = "6.0.0"; in stdenv.mkDerivation { name = "nix-plugins-${version}"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { owner = "shlevy"; repo = "nix-plugins"; rev = version; - sha256 = "0231j92504vx0f4wax9hwjdni1j4z0g8bx9wbakg6rbghl4svmdv"; + sha256 = "08kxdci0sijj1hfkn3dbr7nbpb9xck0xr3xa3a0j116n4kvwb6qv"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 87751188a03a..2ad4b8d904bf 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -51,6 +51,8 @@ let configureScript = { "x86_64-darwin" = "./Configure darwin64-x86_64-cc"; "x86_64-solaris" = "./Configure solaris64-x86_64-gcc"; + "armv6l-linux" = "./Configure linux-armv4 -march=armv6"; + "armv7l-linux" = "./Configure linux-armv4 -march=armv7-a"; }.${stdenv.hostPlatform.system} or ( if stdenv.hostPlatform == stdenv.buildPlatform then "./config" diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index 04fdeea1fa0b..37cf29c86581 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -16,7 +16,7 @@ ### NixOS - usage: ================== - services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql95; }) ]; + services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql_9_5; }) ]; ### important Postgis implementation details: diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix index 018a57ad0571..b5a01698e5e9 100644 --- a/pkgs/development/libraries/pupnp/default.nix +++ b/pkgs/development/libraries/pupnp/default.nix @@ -2,14 +2,15 @@ stdenv.mkDerivation rec { name = "libupnp-${version}"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "mrjimenez"; repo = "pupnp"; rev = "release-${version}"; - sha256 = "1w0kfq1pg3y2wl6gwkm1w872g0qz29w1z9wj08xxmwnk5mkpvsrl"; + sha256 = "1daml02z4rs9cxls95p2v24jvwcsp43a0gqv06s84ay5yn6r47wx"; }; + outputs = [ "dev" "out" ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix index 29202396c058..a7077c69dd8d 100644 --- a/pkgs/development/libraries/qjson/default.nix +++ b/pkgs/development/libraries/qjson/default.nix @@ -13,8 +13,10 @@ stdenv.mkDerivation rec { buildInputs = [ cmake qt4 ]; - meta = { - maintainers = [ ]; + meta = with stdenv.lib; { + description = "Lightweight data-interchange format"; + homepage = http://qjson.sourceforge.net/; + license = licenses.lgpl21; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix index d09c0d9a6ce0..0d9ae21e87e3 100644 --- a/pkgs/development/libraries/qoauth/default.nix +++ b/pkgs/development/libraries/qoauth/default.nix @@ -21,9 +21,9 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = [ "-I${qca2-qt5}/include/Qca-qt5/QtCrypto" ]; NIX_LDFLAGS = [ "-lqca-qt5" ]; - meta = { + meta = with stdenv.lib; { description = "Qt library for OAuth authentication"; inherit (qt5.qtbase.meta) platforms; - maintainers = [ ]; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix index c8b01c460803..85e45d3fad03 100644 --- a/pkgs/development/libraries/qrupdate/default.nix +++ b/pkgs/development/libraries/qrupdate/default.nix @@ -34,7 +34,10 @@ stdenv.mkDerivation { buildInputs = [ gfortran openblas ]; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Library for fast updating of qr and cholesky decompositions"; + homepage = https://sourceforge.net/projects/qrupdate/; + license = licenses.gpl3; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 0691f26b4712..95b82f8f3cff 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -84,7 +84,8 @@ stdenv.mkDerivation { passthru = {inherit mysqlSupport;}; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + license = with licenses; [ gpl2 qpl ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/qt-mobility/default.nix b/pkgs/development/libraries/qt-mobility/default.nix index 5cf49450422f..ae99035d2267 100644 --- a/pkgs/development/libraries/qt-mobility/default.nix +++ b/pkgs/development/libraries/qt-mobility/default.nix @@ -42,11 +42,12 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 libX11 bluez perl ]; - meta = { + meta = with stdenv.lib; { description = "Qt Mobility"; homepage = http://qt.nokia.com/products/qt-addons/mobility; - maintainers = with stdenv.lib.maintainers; [qknight]; - platforms = with stdenv.lib.platforms; linux; + maintainers = [ maintainers.qknight ]; + platforms = platforms.linux; + license = with licenses; [ bsd3 fdl13 gpl3 lgpl21 ]; }; } diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix index 040072cb463e..88591e880dee 100644 --- a/pkgs/development/libraries/qtscriptgenerator/default.nix +++ b/pkgs/development/libraries/qtscriptgenerator/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation { description = "QtScript bindings generator"; homepage = https://code.qt.io/cgit/qt-labs/qtscriptgenerator.git/; inherit (qt4.meta) platforms; - maintainers = [ ]; + license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/readline/5.x.nix b/pkgs/development/libraries/readline/5.x.nix index 9e7c5c1d4e3b..84062408d45c 100644 --- a/pkgs/development/libraries/readline/5.x.nix +++ b/pkgs/development/libraries/readline/5.x.nix @@ -11,8 +11,10 @@ stdenv.mkDerivation { propagatedBuildInputs = [ncurses]; patches = stdenv.lib.optional stdenv.isDarwin ./shobj-darwin.patch; - meta = { + + meta = with stdenv.lib; { branch = "5"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.gpl2; }; } diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index 03a801a32405..37ef0ce75271 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -1,26 +1,31 @@ -{ stdenv, fetchurl, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis +{ stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis , glew, libXrandr, libXrender, udev, xcbutilimage , IOKit, Foundation, AppKit, OpenAL }: let - version = "2.5.0"; + version = "2.5.1"; in stdenv.mkDerivation rec { name = "sfml-${version}"; - src = fetchurl { + + src = fetchzip { url = "https://github.com/SFML/SFML/archive/${version}.tar.gz"; - sha256 = "1x3yvhdrln5b6h4g5r4mds76gq8zsxw6icxqpwqkmxsqcq5yviab"; + sha256 = "0abr8ri2ssfy9ylpgjrr43m6rhrjy03wbj9bn509zqymifvq5pay"; }; - buildInputs = [ cmake libX11 freetype libjpeg openal flac libvorbis glew + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libX11 freetype libjpeg openal flac libvorbis glew libXrandr libXrender xcbutilimage ] ++ stdenv.lib.optional stdenv.isLinux udev ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ]; + cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes" "-DSFML_MISC_INSTALL_PREFIX=share/SFML" "-DSFML_BUILD_FRAMEWORKS=no" "-DSFML_USE_SYSTEM_DEPS=yes" ]; + meta = with stdenv.lib; { homepage = http://www.sfml-dev.org/; description = "Simple and fast multimedia library"; diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index dc3f4a118f6d..f795dfef9e4c 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -18,9 +18,10 @@ stdenv.mkDerivation rec { checkInputs = [ python ]; doCheck = false; # fails, probably missing something - meta = { + meta = with stdenv.lib; { description = "An advanced font engine"; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.raskin ]; + platforms = platforms.unix; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix index 9fe88b771be7..ca2ff666b7a5 100644 --- a/pkgs/development/libraries/sofia-sip/default.nix +++ b/pkgs/development/libraries/sofia-sip/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { buildInputs = [ glib openssl ]; nativeBuildInputs = [ pkgconfig ]; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "Open-source SIP User-Agent library, compliant with the IETF RFC3261 specification"; + homepage = http://sofia-sip.sourceforge.net/; + platforms = platforms.linux; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix index 8a76e886b4f6..b8e7518cd332 100644 --- a/pkgs/development/libraries/t1lib/default.nix +++ b/pkgs/development/libraries/t1lib/default.nix @@ -30,7 +30,10 @@ stdenv.mkDerivation { postInstall = stdenv.lib.optional (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ?? - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "A type 1 font rasterizer library for UNIX/X11"; + homepage = http://www.t1lib.org/; + license = with licenses; [ gpl2 lgpl2 ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/development/libraries/taglib-extras/default.nix index 0059243890d6..b667e6047400 100644 --- a/pkgs/development/libraries/taglib-extras/default.nix +++ b/pkgs/development/libraries/taglib-extras/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake ''; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + description = "Additional taglib plugins"; + platforms = platforms.unix; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/taglib-sharp/default.nix b/pkgs/development/libraries/taglib-sharp/default.nix index 6da524c23390..86006806baa0 100644 --- a/pkgs/development/libraries/taglib-sharp/default.nix +++ b/pkgs/development/libraries/taglib-sharp/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "mono"; repo = "taglib-sharp"; - rev = "taglib-sharp-${version}"; sha256 = "12pk4z6ag8w7kj6vzplrlasq5lwddxrww1w1ya5ivxrfki15h5cp"; }; @@ -21,6 +20,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for reading and writing metadata in media files"; + homepage = https://github.com/mono/taglib-sharp; platforms = platforms.linux; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/taglib/1.9.nix b/pkgs/development/libraries/taglib/1.9.nix index 1caa8a376fb1..99892a41fa42 100644 --- a/pkgs/development/libraries/taglib/1.9.nix +++ b/pkgs/development/libraries/taglib/1.9.nix @@ -15,9 +15,8 @@ stdenv.mkDerivation rec { meta = { homepage = http://developer.kde.org/~wheeler/taglib.html; repositories.git = git://github.com/taglib/taglib.git; - description = "A library for reading and editing the meta-data of several popular audio formats"; inherit (cmake.meta) platforms; - maintainers = [ ]; + license = with stdenv.lib.licenses; [ lgpl21 mpl11 ]; }; } diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/default.nix index a92c7b74ebf7..293baa492c56 100644 --- a/pkgs/development/libraries/tclap/default.nix +++ b/pkgs/development/libraries/tclap/default.nix @@ -8,9 +8,10 @@ stdenv.mkDerivation rec { sha256 = "0dsqvsgzam3mypj2ladn6v1yjq9zd47p3lg21jx6kz5azkkkn0gm"; }; - meta = { + meta = with stdenv.lib; { homepage = http://tclap.sourceforge.net/; description = "Templatized C++ Command Line Parser Library"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.mit; }; } diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix index fae51aea477e..1247d9ffa843 100644 --- a/pkgs/development/libraries/telepathy/farstream/default.nix +++ b/pkgs/development/libraries/telepathy/farstream/default.nix @@ -12,7 +12,10 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ dbus-glib telepathy-glib farstream ]; nativeBuildInputs = [ pkgconfig ]; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + description = "GObject-based C library that uses Telepathy GLib, Farstream and GStreamer to handle the media streaming part of channels of type Call"; + homepage = https://telepathy.freedesktop.org/wiki/Components/Telepathy-Farstream/; + platforms = platforms.linux; + license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index 9ca2481c3b01..ca6a4997abf4 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -22,8 +22,9 @@ stdenv.mkDerivation rec { passthru.python = python2; - meta = { + meta = with stdenv.lib; { homepage = https://telepathy.freedesktop.org; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = with licenses; [ bsd2 bsd3 lgpl21Plus ]; }; } diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/development/libraries/tidyp/default.nix index ba95da77b72c..51dabbd2beb7 100644 --- a/pkgs/development/libraries/tidyp/default.nix +++ b/pkgs/development/libraries/tidyp/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { homepage = http://tidyp.com/; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; + license = licenses.bsd3; }; } diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index c716ae7f8dbb..03f8e20b38d0 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, cpptest, pkgconfig, doxygen, graphviz }: +{ stdenv, fetchurl, gtest, pkgconfig, doxygen, graphviz }: stdenv.mkDerivation rec { name = "uriparser-${version}"; - version = "0.8.6"; + version = "0.9.0"; # Release tarball differs from source tarball src = fetchurl { url = "https://github.com/uriparser/uriparser/releases/download/${name}/${name}.tar.bz2"; - sha256 = "0m2a5bf5b00ybagxmsa8mdj9mhc62vcm0qimy1ivfza1fbjsf287"; + sha256 = "0b2yagxzhq9ghpszci6a9xlqg0yl7vq9j5r8dwbar3nszqsfnrzc"; }; - nativeBuildInputs = [ pkgconfig cpptest doxygen graphviz ]; + nativeBuildInputs = [ pkgconfig gtest doxygen graphviz ]; doCheck = true; diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index c1f401d0badb..4aff60631834 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -71,11 +71,12 @@ in stdenv.mkDerivation rec { # screenshot output-layout multi-pointer rotation tablet touch pointer # simple mkdir -p $examples/bin - for binary in $(find ./examples -executable -type f | grep -vE '\.so'); do + cd ./examples + for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do patchelf \ --set-rpath "$examples/lib:${stdenv.lib.makeLibraryPath buildInputs}" \ "$binary" - cp "$binary" $examples/bin/ + cp "$binary" "$examples/bin/wlroots-$binary" done ''; diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix index 9c307b2d15ae..040273e28b99 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix @@ -1,60 +1,26 @@ -{ stdenv, fetchurl, fetchpatch, expat, libiconv, libjpeg, libpng, libtiff, zlib +{ stdenv, fetchzip, fetchpatch, expat, libiconv, libjpeg, libpng, libtiff, zlib # darwin only attributes -, derez, rez, setfile +, cf-private, derez, rez, setfile , AGL, Cocoa, Kernel }: -with stdenv.lib; - stdenv.mkDerivation rec { - version = "3.0.2"; + version = "3.0.4"; name = "wxmac-${version}"; - src = fetchurl { - url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2"; - sha256 = "346879dc554f3ab8d6da2704f651ecb504a22e9d31c17ef5449b129ed711585d"; + src = fetchzip { + url = "https://github.com/wxWidgets/wxWidgets/archive/v${version}.tar.gz"; + sha256 = "19mqglghjjqjgz4rbybn3qdgn2cz9xc511nq1pvvli9wx2k8syl1"; }; - patches = - [ # Use std::abs() from instead of abs() from to avoid problems - # with abiguous overloads for clang-3.8 and gcc6. - (fetchpatch { - name = "patch-stc-abs.diff"; - url = https://github.com/wxWidgets/wxWidgets/commit/73e9e18ea09ffffcaac50237def0d9728a213c02.patch; - sha256 = "0w5whmfzm8waw62jmippming0zffa9064m5b3aw5nixph21rlcvq"; - }) - - # Various fixes related to Yosemite. Revisit in next stable release. - # Please keep an eye on http://trac.wxwidgets.org/ticket/16329 as well - # Theoretically the above linked patch should still be needed, but it isn't. - # Try to find out why. - (fetchpatch { - name = "patch-yosemite.diff"; - url = https://raw.githubusercontent.com/Homebrew/formula-patches/bbf4995/wxmac/patch-yosemite.diff; - sha256 = "0ss66z2a79v976mvlrskyj1zmkyaz8hbwm98p29bscfvcx5845jb"; - }) - - # Remove uncenessary includes - # http://trac.wxwidgets.org/changeset/f6a2d1caef5c6d412c84aa900cb0d3990b350938/git-wxWidgets - (fetchpatch { - name = "patch-quicktime-removal.diff"; - url = https://raw.githubusercontent.com/Homebrew/formula-patches/bbf4995/wxmac/patch-quicktime-removal.diff; - sha256 = "0mzvdk8r70p9s1wj7qzdsqmdrlxlf2dalh9gqs8xjkqq2666yp0y"; - }) - - # Patch for wxOSXPrintData, custom paper not applied - # http://trac.wxwidgets.org/ticket/16959 - (fetchpatch { - name = "wxPaperCustomPatch.patch"; - url = http://trac.wxwidgets.org/raw-attachment/ticket/16959/wxPaperCustomPatch.patch; - sha256 = "0xgscv86f8dhggn9n8bhlq9wlj3ydsicgy9v35sraxyma18cbjvl"; - }) - ]; - buildInputs = [ expat libiconv libjpeg libpng libtiff zlib derez rez setfile Cocoa Kernel + + # Needed for CFURLGetFSRef, etc. which have deen deprecated + # since 10.9 and are not part of swift-corelibs CoreFoundation. + cf-private ]; propagatedBuildInputs = [ AGL ]; @@ -98,7 +64,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { platforms = platforms.darwin; license = licenses.wxWindows; maintainers = [ maintainers.lnl7 ]; diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index f93f7ed87460..7b92c1c66cd7 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -11,13 +11,6 @@ let inherit sha256; }; - patches = stdenv.lib.optional (version == "1.4.7") [ - # fix notmuch build, see https://notmuchmail.org/faq/#index12h2 - # cannot fetchpatch this because base directory differs - # TODO: remove on next xapian update - ./fix-notmuch-tagging.patch - ]; - outputs = [ "out" "man" "doc" ]; buildInputs = [ libuuid zlib ]; @@ -43,5 +36,5 @@ let in { # xapian-ruby needs 1.2.22 as of 2017-05-06 xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6"; - xapian_1_4 = generic "1.4.7" "1lxmlds3v5s1gng9nk1rvmln1zcksrw5ds509y0glylwch5qmw0k"; + xapian_1_4 = generic "1.4.8" "0528841hn5lddaa317ax3i3d01zf1izpzh4njiz6s84mxpn06q6s"; } diff --git a/pkgs/development/libraries/xapian/fix-notmuch-tagging.patch b/pkgs/development/libraries/xapian/fix-notmuch-tagging.patch deleted file mode 100644 index 6deae76d2aa7..000000000000 --- a/pkgs/development/libraries/xapian/fix-notmuch-tagging.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f9e6f45b1c8f66bca8a3387f371b20d434b23a7d Mon Sep 17 00:00:00 2001 -From: Olly Betts -Date: Thu, 26 Jul 2018 17:26:52 +1200 -Subject: [PATCH 1/1] Revert "Enable open_nearby_postlist for writable - databases" - -The amended check isn't conservative enough as there may be postlist -changes in the inverter while the table is unmodified. This breaks -testcase T150-tagging.sh in notmuch's testsuite, reported by David -Bremner. - -This reverts commit 5489fb2f838c0f0b0a593b4c17df282a93a1fe5a. ---- - xapian-core/backends/glass/glass_postlist.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xapian-core/backends/glass/glass_postlist.cc b/xapian-core/backends/glass/glass_postlist.cc -index 80e578b85..a47f14a68 100644 ---- a/backends/glass/glass_postlist.cc -+++ b/backends/glass/glass_postlist.cc -@@ -759,7 +759,7 @@ GlassPostList::open_nearby_postlist(const std::string & term_, - (void)need_pos; - if (term_.empty()) - RETURN(NULL); -- if (!this_db.get() || this_db->postlist_table.is_modified()) -+ if (!this_db.get() || this_db->postlist_table.is_writable()) - RETURN(NULL); - RETURN(new GlassPostList(this_db, term_, cursor->clone())); - } --- -2.11.0 diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix index 79f75abfd91c..3dd2cb5b874c 100644 --- a/pkgs/development/libraries/xbase/default.nix +++ b/pkgs/development/libraries/xbase/default.nix @@ -25,10 +25,10 @@ stdenv.mkDerivation { }) ]; - meta = { + meta = with stdenv.lib; { homepage = http://linux.techass.com/projects/xdb/; description = "C++ class library formerly known as XDB"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ ]; + platforms = platforms.linux; + license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 69b5b95e7613..d86dac050731 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -26,9 +26,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = http://www.xine-project.org/; description = "A high-performance, portable and reusable multimedia playback engine"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = with licenses; [ gpl2 lgpl2 ]; }; } diff --git a/pkgs/development/misc/avr/binutils/default.nix b/pkgs/development/misc/avr/binutils/default.nix deleted file mode 100644 index 83ba93e63b76..000000000000 --- a/pkgs/development/misc/avr/binutils/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl }: - -let - version = "2.31.1"; -in -stdenv.mkDerivation { - name = "avr-binutils-${version}"; - - src = fetchurl { - url = "mirror://gnu/binutils/binutils-${version}.tar.bz2"; - sha256 = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z"; - }; - configureFlags = [ "--target=avr" "--enable-languages=c,c++" ]; - - meta = with stdenv.lib; { - description = "the GNU Binutils for AVR microcontrollers"; - homepage = http://www.gnu.org/software/binutils/; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ mguentner ]; - }; -} diff --git a/pkgs/development/misc/avr/gcc/avrbinutils-path.patch b/pkgs/development/misc/avr/gcc/avrbinutils-path.patch deleted file mode 100644 index f0ec21b7589f..000000000000 --- a/pkgs/development/misc/avr/gcc/avrbinutils-path.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/gcc/gcc-ar.c b/gcc/gcc-ar.c -index 838ebc2..3ac4ee7 100644 ---- a/gcc/gcc-ar.c -+++ b/gcc/gcc-ar.c -@@ -118,8 +118,8 @@ setup_prefixes (const char *exec_path) - dir_separator, NULL); - prefix_from_string (self_libexec_prefix, &target_path); - -- /* Add path as a last resort. */ -- prefix_from_env ("PATH", &path); -+ /* Add path to avrbinutils. */ -+ prefix_from_string ("@avrbinutils@/bin", &path); - } - - int diff --git a/pkgs/development/misc/avr/gcc/default.nix b/pkgs/development/misc/avr/gcc/default.nix deleted file mode 100644 index 5c9b56c99183..000000000000 --- a/pkgs/development/misc/avr/gcc/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ stdenv, fetchurl, gmp, mpfr, libmpc, zlib, avrbinutils, texinfo }: - -let - version = "8.2.0"; -in -stdenv.mkDerivation { - - name = "avr-gcc-${version}"; - src = fetchurl { - url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "10007smilswiiv2ymazr3b6x2i933c0ycxrr529zh4r6p823qv0r"; - }; - - patches = [ - ./avrbinutils-path.patch - ]; - - # avrbinutils-path.patch introduces a reference to @avrbinutils@, substitute - # it now. - postPatch = '' - substituteInPlace gcc/gcc-ar.c --subst-var-by avrbinutils ${avrbinutils} - ''; - - buildInputs = [ gmp mpfr libmpc zlib avrbinutils ]; - - nativeBuildInputs = [ texinfo ]; - - hardeningDisable = [ "format" ]; - - stripDebugList= [ "bin" "libexec" ]; - - enableParallelBuilding = true; - - configurePhase = '' - mkdir gcc-build - cd gcc-build - ../configure \ - --prefix=$out \ - --host=$CHOST \ - --build=$CHOST \ - --target=avr \ - --with-as=${avrbinutils}/bin/avr-as \ - --with-gnu-as \ - --with-gnu-ld \ - --with-ld=${avrbinutils}/bin/avr-ld \ - --with-system-zlib \ - --disable-install-libiberty \ - --disable-nls \ - --disable-libssp \ - --with-dwarf2 \ - --enable-languages=c,c++''; - - meta = with stdenv.lib; { - description = "GNU Compiler Collection, version ${version} for AVR microcontrollers"; - homepage = http://gcc.gnu.org; - license = licenses.gpl3Plus; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ mguentner ]; - }; -} diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix index 039846d5fcfb..afe30e4b5eef 100644 --- a/pkgs/development/misc/avr/libc/default.nix +++ b/pkgs/development/misc/avr/libc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, avrgcc, avrbinutils, automake, autoconf }: +{ stdenv, fetchurl, automake, autoconf }: let version = "2.0.0"; @@ -11,28 +11,21 @@ stdenv.mkDerivation { sha256 = "15svr2fx8j6prql2il2fc0ppwlv50rpmyckaxx38d3gxxv97zpdj"; }; - buildInputs = [ avrgcc avrbinutils automake autoconf ]; - configurePhase = '' - unset LD - unset AS - unset AR - unset CC - unset CXX - unset RANLIB - unset STRIP - - ./configure --prefix=$out --build=$(./config.guess) --host=avr - ''; + nativeBuildInputs = [ automake autoconf ]; # Make sure we don't strip the libraries in lib/gcc/avr. - stripDebugList= "bin"; + stripDebugList = "bin"; dontPatchELF = true; + passthru = { + incdir = "/avr/include"; + }; + meta = with stdenv.lib; { description = "a C runtime library for AVR microcontrollers"; homepage = http://savannah.nongnu.org/projects/avr-libc/; license = licenses.bsd3; - platforms = platforms.unix; + platforms = platforms.all; maintainers = with maintainers; [ mguentner ]; }; } diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index b43deeceb867..4cb612523dc5 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -15,12 +15,12 @@ buildRustPackage rec { cargoSha256 = "0y2ww48vh667kkyg9pyjwcbh7fxi41bjnkhwp749crjqn2abimrk"; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/cgag/loc; description = "Count lines of code quickly"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ ]; - platforms = with stdenv.lib.platforms; linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/misc/newlib/default.nix b/pkgs/development/misc/newlib/default.nix new file mode 100644 index 000000000000..693cfa093b08 --- /dev/null +++ b/pkgs/development/misc/newlib/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, buildPackages }: + +let version = "3.0.0"; +in stdenv.mkDerivation { + name = "newlib-${version}"; + src = fetchurl { + url = "ftp://sourceware.org/pub/newlib/newlib-${version}.tar.gz"; + sha256 = "0chka3szh50krcz2dcxcsr1v1i000jylwnsrp2pgrrblxqsn6mn8"; + }; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + # newlib expects CC to build for build platform, not host platform + preConfigure = '' + export CC=cc + ''; + + configurePlatforms = [ "build" "target" ]; + configureFlags = [ + "--host=${stdenv.buildPlatform.config}" + + "--disable-newlib-supplied-syscalls" + "--disable-nls" + "--enable-newlib-io-long-long" + "--enable-newlib-register-fini" + "--enable-newlib-retargetable-locking" + ]; + + dontDisableStatic = true; + + passthru = { + incdir = "/${stdenv.targetPlatform.config}/include"; + libdir = "/${stdenv.targetPlatform.config}/lib"; + }; +} diff --git a/pkgs/development/misc/qmk_firmware/default.nix b/pkgs/development/misc/qmk_firmware/default.nix new file mode 100644 index 000000000000..0a7b4fd9d9a7 --- /dev/null +++ b/pkgs/development/misc/qmk_firmware/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub +, avrgcc, avrbinutils +, gcc-arm-embedded, binutils-arm-embedded +, teensy-loader-cli, dfu-programmer, dfu-util }: + +let version = "0.6.144"; + +in stdenv.mkDerivation { + name = "qmk_firmware-${version}"; + src = fetchFromGitHub { + owner = "qmk"; + repo = "qmk_firmware"; + rev = version; + sha256 = "0m71f9w32ksqjkrwhqwhr74q5v3pr38bihjyb9ks0k5id0inhrjn"; + fetchSubmodules = true; + }; + buildFlags = "all:default"; + NIX_CFLAGS_COMPILE = "-Wno-error"; + nativeBuildInputs = [ + avrgcc + avrbinutils + gcc-arm-embedded + teensy-loader-cli + dfu-programmer + dfu-util + ]; +} diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix index 0c601c7773cc..21230464e747 100644 --- a/pkgs/development/misc/stm32/betaflight/default.nix +++ b/pkgs/development/misc/stm32/betaflight/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, gcc-arm-embedded, python2 +, gcc-arm-embedded, binutils-arm-embedded, python2 , skipTargets ? [ # These targets do not build, for the reasons listed, along with the last version checked. # Probably all of the issues with these targets need to be addressed upstream. @@ -24,8 +24,8 @@ in stdenv.mkDerivation rec { sha256 = "1wyp23p876xbfi9z6gm4xn1nwss3myvrjjjq9pd3s0vf5gkclkg5"; }; - buildInputs = [ - gcc-arm-embedded + nativeBuildInputs = [ + gcc-arm-embedded binutils-arm-embedded python2 ]; @@ -58,7 +58,6 @@ in stdenv.mkDerivation rec { homepage = https://github.com/betaflight/betaflight; license = licenses.gpl3; maintainers = with maintainers; [ elitak ]; - platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix index cb9cc80d3252..9c35ac2ffce1 100644 --- a/pkgs/development/misc/stm32/inav/default.nix +++ b/pkgs/development/misc/stm32/inav/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, gcc-arm-embedded, ruby +, gcc-arm-embedded, binutils-arm-embedded, ruby }: let @@ -17,8 +17,8 @@ in stdenv.mkDerivation rec { sha256 = "15zai8qf43b06fmws1sbkmdgip51zp7gkfj7pp9b6gi8giarzq3y"; }; - buildInputs = [ - gcc-arm-embedded + nativeBuildInputs = [ + gcc-arm-embedded binutils-arm-embedded ruby ]; @@ -50,7 +50,6 @@ in stdenv.mkDerivation rec { homepage = https://inavflight.github.io; license = licenses.gpl3; maintainers = with maintainers; [ elitak ]; - platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix index 020992c86844..be9aafe47415 100644 --- a/pkgs/development/node-packages/default-v8.nix +++ b/pkgs/development/node-packages/default-v8.nix @@ -49,6 +49,10 @@ nodePackages // { buildInputs = [ pkgs.phantomjs2 ]; }; + git-ssb = nodePackages.git-ssb.override { + buildInputs = [ nodePackages.node-gyp-build ]; + }; + node-inspector = nodePackages.node-inspector.override { buildInputs = [ nodePackages.node-pre-gyp ]; }; diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix index 2e7996f55d9d..2aa560e5349b 100644 --- a/pkgs/development/ocaml-modules/fmt/default.nix +++ b/pkgs/development/ocaml-modules/fmt/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner, result, uchar }: stdenv.mkDerivation { - name = "ocaml${ocaml.version}-fmt-0.8.4"; + name = "ocaml${ocaml.version}-fmt-0.8.5"; src = fetchurl { - url = http://erratique.ch/software/fmt/releases/fmt-0.8.4.tbz; - sha256 = "1qilsbisqqhmn8b1ar9lvjbgz8vf4gmqwqjnnjzgld2a3gmh8qvv"; + url = http://erratique.ch/software/fmt/releases/fmt-0.8.5.tbz; + sha256 = "1zj9azcxcn6skmb69ykgmi9z8c50yskwg03wqgh87lypgjdcz060"; }; unpackCmd = "tar xjf $src"; diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index 2a101da74d55..ce9ddeea0c43 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild -, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20170712" else "20140422" +, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20181026" else "20140422" }@args: let - sha256 = - if version == "20140422" then "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d" - else if version == "20170712" then "006hq3bwj81j67f2k9cgzj5wr4hai8j36925p5n3sd2j01ljsj6a" - else throw ("menhir: unknown version " ++ version); + src = fetchurl ( + if version == "20140422" then { url = "http://cristal.inria.fr/~fpottier/menhir/menhir-20140422.tar.gz"; sha256 = "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d"; } + else if version == "20170712" then { url = "http://gallium.inria.fr/~fpottier/menhir/menhir-20170712.tar.gz"; sha256 = "006hq3bwj81j67f2k9cgzj5wr4hai8j36925p5n3sd2j01ljsj6a"; } + else if version == "20181026" then { url = "https://gitlab.inria.fr/fpottier/menhir/repository/20181026/archive.tar.gz"; sha256 = "1zhacw60996i9b88kbnfvrvjk3ps9p9n9syjk9np545jp8l0582g"; } + else throw ("menhir: unknown version " ++ version) + ); in -import ./generic.nix (args // { inherit version sha256; }) +import ./generic.nix (args // { inherit version src; }) diff --git a/pkgs/development/ocaml-modules/menhir/generic.nix b/pkgs/development/ocaml-modules/menhir/generic.nix index d52da82d6d76..bac6cd707940 100644 --- a/pkgs/development/ocaml-modules/menhir/generic.nix +++ b/pkgs/development/ocaml-modules/menhir/generic.nix @@ -1,12 +1,9 @@ -{ version, sha256, stdenv, fetchurl, ocaml, findlib, ocamlbuild }: +{ version, src, stdenv, fetchurl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { name = "menhir-${version}"; - src = fetchurl { - url = "http://pauillac.inria.fr/~fpottier/menhir/menhir-${version}.tar.gz"; - inherit sha256; - }; + inherit src; buildInputs = [ ocaml findlib ocamlbuild ]; diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix index 131f478d32ed..e8074a51e52f 100644 --- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix @@ -6,13 +6,13 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ocaml-migrate-parsetree-${version}"; - version = "1.0.11"; + version = "1.1.0"; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = "ocaml-migrate-parsetree"; rev = "v${version}"; - sha256 = "05kbgs9n1x64fk6g3wbjnwjd17w10k3k8dzglnc45xg4hr7z651n"; + sha256 = "1d2n349d1cqm3dr09mwy5m9rfd4bkkqvri5i94wknpsrr35vnrr1"; }; buildInputs = [ ocaml findlib ocamlbuild dune ]; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index ec76d840a56b..14fca8dfe82f 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.3.2"; + version = "3.4.4"; src = fetchPypi { inherit pname version; - sha256 = "f20deec7a3fbaec7b5eb7ad99878427ad2ee4cc16a46732b705e8121cbb3cc12"; + sha256 = "1ykm6kdjkrg556j0zd7dx2l1rsrbh0d9g27ivr6dmaahz9pyrbsi"; }; disabled = pythonOlder "3.5"; diff --git a/pkgs/development/python-modules/aioprocessing/default.nix b/pkgs/development/python-modules/aioprocessing/default.nix new file mode 100644 index 000000000000..f2f959112688 --- /dev/null +++ b/pkgs/development/python-modules/aioprocessing/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonAtLeast +}: + +buildPythonPackage rec { + pname = "aioprocessing"; + version = "1.0.1"; + disabled = !(pythonAtLeast "3.4"); + + src = fetchPypi { + inherit pname version; + sha256 = "1yq1gfsky2kjimwdmzqk893sp6387vbl4bw0sbha5hl6cm3jp5dn"; + }; + + # Tests aren't included in pypi package + doCheck = false; + + meta = { + description = "A library that integrates the multiprocessing module with asyncio"; + homepage = https://github.com/dano/aioprocessing; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ uskudnik ]; + }; +} diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix index b8ee673e66bb..163e2c9b2099 100644 --- a/pkgs/development/python-modules/aniso8601/default.nix +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "aniso8601"; - version = "3.0.2"; + version = "4.0.1"; meta = with stdenv.lib; { description = "Parses ISO 8601 strings."; @@ -15,6 +15,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "7849749cf00ae0680ad2bdfe4419c7a662bef19c03691a19e008c8b9a5267802"; + sha256 = "15cwnadw2xdczdi13k9grrgqq67hxgys4l155dqsl2zh3glhsmp7"; }; } diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix index ee15be954186..aabf30183d56 100644 --- a/pkgs/development/python-modules/async_timeout/default.nix +++ b/pkgs/development/python-modules/async_timeout/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "async-timeout"; - version = "3.0.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "b3c0ddc416736619bd4a95ca31de8da6920c3b9a140c64dbef2b2fa7bf521287"; + sha256 = "0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f"; }; # Circular dependency on aiohttp diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index 110cd1e0bd5b..c445c21478b0 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { pname = "cassandra-driver"; - version = "3.6.0"; + version = "3.15.1"; src = fetchPypi { inherit pname version; - sha256 = "1aqmy3psn12lxgp659d0zsxkirxzy5lnbnzxf9xjq1a93s3qm704"; + sha256 = "1xcirbvlj00id8269akhk8gy2sv0mlnbgy3nagi32648jwsrcadg"; }; buildInputs = [ pkgs.libev cython ]; diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 47c206fda5e8..7b15d412610a 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -1,18 +1,14 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchPypi , decorator, requests, simplejson , nose, mock }: buildPythonPackage rec { pname = "datadog"; - version = "0.20.0"; + version = "0.23.0"; - # no tests in PyPI tarball - # https://github.com/DataDog/datadogpy/pull/259 - src = fetchFromGitHub { - owner = "DataDog"; - repo = "datadogpy"; - rev = "v${version}"; - sha256 = "1p4p14853yrsl8py4ca7za7a12qzw0xwgz64f5kzx8a6vpv3p3md"; + src = fetchPypi { + inherit pname version; + sha256 = "6ed9aec2b3a26722b74465c2ed36d2efdb9c9fac1a07a84d81fa2fc0cfa66ae4"; }; propagatedBuildInputs = [ decorator requests simplejson ]; diff --git a/pkgs/development/python-modules/django_classytags/default.nix b/pkgs/development/python-modules/django_classytags/default.nix index 022709bacbe0..d3ed0fd18410 100644 --- a/pkgs/development/python-modules/django_classytags/default.nix +++ b/pkgs/development/python-modules/django_classytags/default.nix @@ -6,17 +6,17 @@ buildPythonPackage rec { pname = "django-classy-tags"; - version = "0.6.1"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "0wxvpmjdzk0aajk33y4himn3wqjx7k0aqlka9j8ay3yfav78bdq0"; + sha256 = "1f2dc9rq8v9sc4kv4x9hmbzp5c4amdxjkz5nzas5abg2s1hr2bvr"; }; propagatedBuildInputs = [ django ]; - # tests appear to be broken on 0.6.1 at least - doCheck = ( version != "0.6.1" ); + # pypi version doesn't include runtest.py, needed to run tests + doCheck = false; meta = with stdenv.lib; { description = "Class based template tags for Django"; diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index 18372fc113aa..d75fc90eda77 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, django }: buildPythonPackage rec { - version = "3.8.2"; + version = "3.9.0"; pname = "djangorestframework"; src = fetchPypi { inherit pname version; - sha256 = "b6714c3e4b0f8d524f193c91ecf5f5450092c2145439ac2769711f7eba89a9d9"; + sha256 = "0dk1r2qiifws4bb2pq8xk5dbsrhli0fi14iqg59v360mpfq6ay30"; }; # Test settings are missing diff --git a/pkgs/development/python-modules/dlib/default.nix b/pkgs/development/python-modules/dlib/default.nix new file mode 100644 index 000000000000..90e2c526789f --- /dev/null +++ b/pkgs/development/python-modules/dlib/default.nix @@ -0,0 +1,13 @@ +{ buildPythonPackage, dlib, python, pytest }: + +buildPythonPackage { + inherit (dlib) name src nativeBuildInputs buildInputs meta; + + checkPhase = '' + ${python.interpreter} nix_run_setup test --no USE_AVX_INSTRUCTIONS + ''; + + patches = [ ./build-cores.patch ]; + + checkInputs = [ pytest ]; +} diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index 89cbdf0fbf82..1f9177832c35 100644 --- a/pkgs/development/python-modules/flask-migrate/default.nix +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; buildPythonPackage rec { pname = "Flask-Migrate"; - version = "2.2.1"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "cd1b4e6cb829eeb41c02ad9202d83bef5f4b7a036dd9fad72ce96ad1e22efb07"; + sha256 = "19rxhva9i5n643vm3d11f8p98jwai2pavysa217p5w5h5cnksnx2"; }; checkInputs = optional isPy3k glibcLocales; diff --git a/pkgs/development/python-modules/foolscap/default.nix b/pkgs/development/python-modules/foolscap/default.nix index 94b90a25d137..8680ff2d2aad 100644 --- a/pkgs/development/python-modules/foolscap/default.nix +++ b/pkgs/development/python-modules/foolscap/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "foolscap"; - version = "0.12.6"; + version = "0.13.1"; src = fetchPypi { inherit pname version; - sha256 = "1bpmqq6485mmr5jza9q2c55l9m1bfsvsbd9drsip7p5qcsi22jrz"; + sha256 = "0sqxp4fshnpcv69c2j04v8c22pjak28iwscxv998h2s3054knxz2"; }; propagatedBuildInputs = [ mock twisted pyopenssl service-identity ]; diff --git a/pkgs/development/python-modules/gevent-websocket/default.nix b/pkgs/development/python-modules/gevent-websocket/default.nix index 28dab3a257f0..78986ec7d306 100644 --- a/pkgs/development/python-modules/gevent-websocket/default.nix +++ b/pkgs/development/python-modules/gevent-websocket/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "gevent-websocket"; - version = "0.9.3"; + version = "0.10.1"; # SyntaxError in tests. disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "07rqwfpbv13mk6gg8mf0bmvcf6siyffjpgai1xd8ky7r801j4xb4"; + sha256 = "1c2zv2rahp1gil3cj66hfsqgy0n35hz9fny3ywhr2319d0lz7bky"; }; propagatedBuildInputs = [ gevent ]; diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix index 9780b46fa5a0..4b174468a7ab 100644 --- a/pkgs/development/python-modules/gipc/default.nix +++ b/pkgs/development/python-modules/gipc/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "gipc"; - version = "0.5.0"; + version = "0.6.0"; disabled = isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "08c35xzv7nr12d9xwlywlbyzzz2igy0yy6y52q2nrkmh5d4slbpc"; + sha256 = "0pd9by719qh882hqs6xpby61sn1x5h98hms5p2p8yqnycrf1s0h2"; }; propagatedBuildInputs = [ gevent ]; diff --git a/pkgs/development/python-modules/grip/default.nix b/pkgs/development/python-modules/grip/default.nix index c11bcaa5baa5..d812d58b74ca 100644 --- a/pkgs/development/python-modules/grip/default.nix +++ b/pkgs/development/python-modules/grip/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "grip"; - version = "4.4.0"; + version = "4.5.2"; src = fetchFromGitHub { owner = "joeyespo"; repo = "grip"; rev = "v${version}"; - sha256 = "1768n3w40qg1njkzqjyl5gkva0h31k8h250821v69imj1zimymag"; + sha256 = "0hphplnyi903jx7ghfxplg1qlj2kpcav1frr2js7p45pbh5ib9rm"; }; patches = [ diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index b83785211f88..e2e833f7c476 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "3.9.0"; + version = "4.0.3"; pname = "icalendar"; src = fetchPypi { inherit pname version; - sha256 = "93d0b94eab23d08f62962542309916a9681f16de3d5eca1c75497f30f1b07792"; + sha256 = "0mk3dk1dxkcm46jy48v27j2w2349iv4sbimqj1yb5js43mx49hh7"; }; buildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix index e05dc3f2861f..da74830f8798 100644 --- a/pkgs/development/python-modules/mail-parser/default.nix +++ b/pkgs/development/python-modules/mail-parser/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "mail-parser"; - version = "3.3.1"; + version = "3.4.1"; # no tests in PyPI tarball src = fetchFromGitHub { owner = "SpamScope"; repo = pname; rev = "v${version}"; - sha256 = "1b1v61zwgdx2xjzds3hp6bv53yq424hhlrhf445n4faj1l0c4lkg"; + sha256 = "0nxilshq4gwpicdklja9p275yf8l5kr1lk620c3cx9w4qai4cmbv"; }; LC_ALL = "en_US.utf-8"; diff --git a/pkgs/development/python-modules/memory_profiler/default.nix b/pkgs/development/python-modules/memory_profiler/default.nix index 7587e5f33c95..cf976f06ff08 100644 --- a/pkgs/development/python-modules/memory_profiler/default.nix +++ b/pkgs/development/python-modules/memory_profiler/default.nix @@ -1,32 +1,28 @@ { stdenv -, buildPythonPackage -, fetchPypi -, psutil , python }: -buildPythonPackage rec { +python.pkgs.buildPythonPackage rec { pname = "memory_profiler"; version = "0.54.0"; - src = fetchPypi { + src = python.pkgs.fetchPypi { inherit pname version; - sha256 = "d64342a23f32e105f4929b408a8b89d9222c3ce8afbbb3359817555811448d1a"; + sha256 = "06ld8h8mhm8pk0sv7fxgx0y2q8nri65qlh4vjbs0bq9j7yi44hyn"; }; - propagatedBuildInputs = [ psutil ]; - - checkPhase = '' - make test PYTHON=${python.interpreter} - ''; - - # Tests don't import profile - # doCheck = false; + propagatedBuildInputs = with python.pkgs; [ + psutil # needed to profile child processes + matplotlib # needed for plotting memory usage + ]; meta = with stdenv.lib; { - description = "A module for monitoring memory usage of a python program"; + description = "A module for monitoring memory usage of a process"; + longDescription = '' + This is a python module for monitoring memory consumption of a process as + well as line-by-line analysis of memory consumption for python programs. + ''; homepage = https://pypi.python.org/pypi/memory_profiler; license = licenses.bsd3; }; - } diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix index 4af0c6487b3f..579fc4631f66 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "mysql-connector"; - version = "8.0.12"; + version = "8.0.13"; src = fetchFromGitHub { owner = "mysql"; repo = "mysql-connector-python"; rev = version; - sha256 = "1i3148dka4zfqzz4n4n5k0qaqbc585bdpmjwgx5vp6iiv7pgvrxp"; + sha256 = "1qb6m3cp6zxmr49bp6g5g5b75yszgac1h26i2hza61mrvd235688"; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix index 1e404370284c..036d6f9dea7c 100644 --- a/pkgs/development/python-modules/netdisco/default.nix +++ b/pkgs/development/python-modules/netdisco/default.nix @@ -1,17 +1,14 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, requests, zeroconf, netifaces, pytest }: +{ stdenv, buildPythonPackage, isPy3k, fetchPypi, requests, zeroconf, netifaces, pytest }: buildPythonPackage rec { pname = "netdisco"; - version = "2.0.0"; + version = "2.2.0"; disabled = !isPy3k; - # PyPI is missing tests/ directory - src = fetchFromGitHub { - owner = "home-assistant"; - repo = pname; - rev = version; - sha256 = "08x5ab7v6a20753y9br7pvfm6a054ywn7y7gh6fydqski0gad6l7"; + src = fetchPypi { + inherit pname version; + sha256 = "b5e810721a266660f7f90fc43f12c4635ec95c3db87d9e30ca408bb922cb1007"; }; propagatedBuildInputs = [ requests zeroconf netifaces ]; @@ -26,7 +23,6 @@ buildPythonPackage rec { description = "Python library to scan local network for services and devices"; homepage = https://github.com/home-assistant/netdisco; license = licenses.asl20; - platforms = platforms.unix; maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 01c387928f59..915c48f069a6 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.9.15"; + version = "8.9.16"; src = fetchPypi { inherit pname version; - sha256 = "8e9664ce0a838c81f4fb3e4d271c76859d26bde57242d64fe1632ab636f5319f"; + sha256 = "1camfcbvbl0xljxmd4h8smcfg3ris19jjznjv5zcbrxr28fafq74"; }; meta = { diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 89b0d56a4016..de35a06d6d47 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "2.0.2"; + version = "3.1.0"; name = pname + "-" + version; src = fetchurl { url = "mirror://pypi/p/pip-tools/${name}.tar.gz"; - sha256 = "f11fc3bf1d87a0b4a68d4d595f619814e2396e92d75d7bdd2500edbf002ea6de"; + sha256 = "0w1qdkr5n612nb3b890mbdyjb3cxn2mna1c7ysr4d0x4nh1wmkmi"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index 8f43cbfb4a8c..f8f3d5458a08 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "praw"; - version = "5.4.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "praw-dev"; repo = "praw"; rev = "v${version}"; - sha256 = "13vbh2r952ai2m6sc79psfwaj5fc8cssdg2pqpizg2mwd0l1s6lb"; + sha256 = "0y6nyz8vf98gl1qfmnznv3dbvlbzdl6mz99vk673nyfn3hbs451i"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix index bf863fae57b9..4755bf908fda 100644 --- a/pkgs/development/python-modules/pycares/default.nix +++ b/pkgs/development/python-modules/pycares/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pycares"; - version = "1.0.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "a18341ea030e2cc0743acdf4aa72302bdf6b820938b36ce4bd76e43faa2276a3"; + sha256 = "0h4fxw5drrhfyslzmfpljk0qnnpbhhb20hnnndzahhbwylyw1x1n"; }; propagatedBuildInputs = [ pkgs.c-ares ]; diff --git a/pkgs/development/python-modules/pyramid_multiauth/default.nix b/pkgs/development/python-modules/pyramid_multiauth/default.nix index 7130e8b499f3..7c01e3e093bd 100644 --- a/pkgs/development/python-modules/pyramid_multiauth/default.nix +++ b/pkgs/development/python-modules/pyramid_multiauth/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyramid_multiauth"; - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1lq292qakrm4ixi4vaif8dqywzj08pn6qy0wi4gw28blh39p0msk"; + sha256 = "0lprqjyg3zcji6033p1l3s4nigjigc5423wgivkfhz46vq0jmniy"; }; propagatedBuildInputs = [ pyramid ]; diff --git a/pkgs/development/python-modules/pyro/default.nix b/pkgs/development/python-modules/pyro/default.nix deleted file mode 100644 index 3a74a1fe6fa7..000000000000 --- a/pkgs/development/python-modules/pyro/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, buildPythonPackage, isPy3k }: - -buildPythonPackage rec { - pname = "Pyro"; - version = "3.16"; - name = pname + "-" + version; - - disabled = isPy3k; - - src = fetchurl { - url = "mirror://pypi/P/Pyro/${name}.tar.gz"; - sha256 = "1bed508453ef7a7556b51424a58101af2349b662baab7e7331c5cb85dbe7e578"; - }; - - meta = with stdenv.lib; { - description = "Distributed object middleware for Python (IPC/RPC)"; - homepage = https://pythonhosted.org/Pyro/; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ bjornfor ]; - }; -} diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix new file mode 100644 index 000000000000..df8df2cb93ca --- /dev/null +++ b/pkgs/development/python-modules/pyro4/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, lib +, python +, serpent +, dill +, cloudpickle +, msgpack +, isPy27 +, isPy33 +, selectors34 +}: + +buildPythonPackage rec { + + name = "${pname}-${version}"; + pname = "Pyro4"; + version = "4.74"; + + src = fetchPypi { + inherit pname version; + sha256 = "89ed7b12c162e5124f322f992f9506c44f5e1a379926cf01ee73ef810d3bf75f"; + }; + + propagatedBuildInputs = [ + serpent + ] ++ lib.optionals (isPy27 || isPy33) [ selectors34 ]; + + buildInputs = [ + dill + cloudpickle + msgpack + ]; + + checkPhase = '' + ${python.interpreter} setup.py test + ''; + + meta = with stdenv.lib; { + description = "Distributed object middleware for Python (RPC)"; + homepage = https://github.com/irmen/Pyro4; + license = licenses.mit; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index f004ab1054dd..7d592c7b450b 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyslurm"; - version = "20180908"; + version = "18-08-3"; src = fetchFromGitHub { repo = "pyslurm"; owner = "PySlurm"; - rev = "50dc113e99d82e70e84fc2e812333733708be4ed"; - sha256 = "1j2i4rvhmk2ihhcvsjdlqlxqb5a05jg8k9bqkv3zrvdj71yn4z9k"; + rev = version; + sha256 = "1rymx106xa99wd4n44s7jw0w41spg39y1ji4fgn01yk7wjfrdrwg"; }; buildInputs = [ cython slurm ]; diff --git a/pkgs/development/python-modules/python-packer/default.nix b/pkgs/development/python-modules/python-packer/default.nix index 3f0c1f8138f9..ff3d28b47466 100644 --- a/pkgs/development/python-modules/python-packer/default.nix +++ b/pkgs/development/python-modules/python-packer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, sh }: +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, sh }: buildPythonPackage rec { pname = "python-packer"; @@ -9,6 +9,12 @@ buildPythonPackage rec { sha256 = "fd363dae9bd2efd447739bbf7a4f29c1e4741596ae7b02d252fe525b2b4176e7"; }; + patches = fetchpatch { + url = "${meta.homepage}/commit/de3421bf13bf7c3ec11fe0a381f0944e102b1d97.patch"; + excludes = [ "dev-requirements.txt" ]; + sha256 = "0rgmkyn7i6y1xs8m75dpl8hq7j2ns2s3dvp7kv9j4zwic93rrlsc"; + }; + propagatedBuildInputs = [ sh ]; # Tests requires network connections diff --git a/pkgs/development/python-modules/requests_download/default.nix b/pkgs/development/python-modules/requests_download/default.nix index 6d1264dee67e..8062834e1803 100644 --- a/pkgs/development/python-modules/requests_download/default.nix +++ b/pkgs/development/python-modules/requests_download/default.nix @@ -6,18 +6,18 @@ buildPythonPackage rec { pname = "requests_download"; - version = "0.1.1"; + version = "0.1.2"; format = "wheel"; #src = pkgs.fetchurl { - # url = https://files.pythonhosted.org/packages/60/af/10f899f0574a81cbc511124c08d7c7dc46c20d4f956a6a3c793ad4330bb4/requests_download-0.1.1-py2.py3-none-any.whl; - # sha256 = "07832a93314bcd619aaeb08611ae245728e66672efb930bc2a300a115a47dab7"; + # url = https://files.pythonhosted.org/packages/60/af/10f899f0574a81cbc511124c08d7c7dc46c20d4f956a6a3c793ad4330bb4/requests_download-0.1.2-py2.py3-none-any.whl; + # sha256 = "1ballx1hljpdpyvqzqn79m0dc21z2smrnxk2ylb6dbpg5crrskcr"; #}; src = fetchPypi { inherit pname version format; - sha256 = "07832a93314bcd619aaeb08611ae245728e66672efb930bc2a300a115a47dab7"; + sha256 = "1ballx1hljpdpyvqzqn79m0dc21z2smrnxk2ylb6dbpg5crrskcr"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/selectors34/default.nix b/pkgs/development/python-modules/selectors34/default.nix new file mode 100644 index 000000000000..76f6232bafa7 --- /dev/null +++ b/pkgs/development/python-modules/selectors34/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, lib +, python +, six +}: + +buildPythonPackage rec { + + name = "${pname}-${version}"; + pname = "selectors34"; + version = "1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "09f5066337f8a76fb5233f267873f89a27a17c10bf79575954894bb71686451c"; + }; + + propagatedBuildInputs = [ six ]; + + checkPhase = '' + ${python.interpreter} setup.py test + ''; + + meta = with stdenv.lib; { + description = "A backport of the selectors module from Python 3.4"; + homepage = https://github.com/berkerpeksag/selectors34; + license = licenses.psfl; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/development/python-modules/serpent/default.nix b/pkgs/development/python-modules/serpent/default.nix new file mode 100644 index 000000000000..5ea59eb6a2a3 --- /dev/null +++ b/pkgs/development/python-modules/serpent/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, lib +, python +, isPy27 +, isPy33 +, enum34 +}: + +buildPythonPackage rec { + + name = "${pname}-${version}"; + pname = "serpent"; + version = "1.27"; + + src = fetchPypi { + inherit pname version; + sha256 = "6f8dc4317fb5b5a9629b5e518846bc9fee374b8171533726dc68df52b36ee912"; + }; + + propagatedBuildInputs = lib.optionals (isPy27 || isPy33) [ enum34 ]; + + checkPhase = '' + ${python.interpreter} setup.py test + ''; + + meta = with stdenv.lib; { + description = "A simple serialization library based on ast.literal_eval"; + homepage = https://github.com/irmen/Serpent; + license = licenses.mit; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix new file mode 100644 index 000000000000..37388bf46900 --- /dev/null +++ b/pkgs/development/python-modules/sh/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, coverage }: + +buildPythonPackage rec { + pname = "sh"; + version = "1.12.14"; + + src = fetchPypi { + inherit pname version; + sha256 = "1z2hx357xp3v4cv44xmqp7lli3frndqpyfmpbxf7n76h7s1zaaxm"; + }; + + checkInputs = [ coverage ]; + + # A test needs the HOME directory to be different from $TMPDIR. + preCheck = '' + HOME=$(mktemp -d) + ''; + + meta = { + description = "Python subprocess interface"; + homepage = https://pypi.python.org/pypi/sh/; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index fb702e046a48..1bf7511d2bb9 100644 --- a/pkgs/development/python-modules/sympy/default.nix +++ b/pkgs/development/python-modules/sympy/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "sympy"; - version = "1.2"; # Upgrades may break sage. Please test. + version = "1.3"; # Upgrades may break sage. Please test or ping @timokau. src = fetchPypi { inherit pname version; - sha256 = "0pr2v7dl51ngch1cfs423qsb472l9ys1m8m7vrhhh99fsxqa0v18"; + sha256 = "0m0vhyv15zszn19mk5xq3py4iijjbr7f3fpy1s57b8q7c9arncg1"; }; checkInputs = [ glibcLocales ]; diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index f902ca58c384..415457b86e16 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -19,6 +19,7 @@ , meta ? {} , groups ? ["default"] , ignoreCollisions ? false +, buildInputs ? [] , ... }@args: @@ -96,7 +97,7 @@ let envPaths = lib.attrValues gems ++ lib.optional (!hasBundler) bundler; basicEnv = buildEnv { - inherit ignoreCollisions; + inherit buildInputs ignoreCollisions; name = name'; diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix index c8f61389ad3f..60e3a38517ce 100644 --- a/pkgs/development/ruby-modules/bundler-app/default.nix +++ b/pkgs/development/ruby-modules/bundler-app/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, runCommand, ruby }@defs: +{ lib, stdenv, callPackage, runCommand, makeWrapper, ruby }@defs: # Use for simple installation of Ruby tools shipped in a Gem. # Start with a Gemfile that includes `gem ` @@ -24,7 +24,9 @@ , gemset ? null , preferLocalBuild ? false , allowSubstitutes ? false +, installManpages ? true , meta ? {} +, buildInputs ? [] , postBuild ? "" , gemConfig ? null }@args: @@ -32,18 +34,29 @@ let basicEnv = (callPackage ../bundled-common {}) args; - cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" ] - // { inherit preferLocalBuild allowSubstitutes; }; # pass the defaults + cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" ] // { + inherit preferLocalBuild allowSubstitutes; # pass the defaults + + buildInputs = buildInputs ++ lib.optional (scripts != []) makeWrapper; + }; in - runCommand basicEnv.name cmdArgs '' - mkdir -p $out/bin; - ${(lib.concatMapStrings (x: "ln -s '${basicEnv}/bin/${x}' $out/bin/${x};\n") exes)} - ${(lib.concatMapStrings (s: "makeWrapper $out/bin/$(basename ${s}) $srcdir/${s} " + - "--set BUNDLE_GEMFILE ${basicEnv.confFiles}/Gemfile "+ - "--set BUNDLE_PATH ${basicEnv}/${ruby.gemPath} "+ - "--set BUNDLE_FROZEN 1 "+ - "--set GEM_HOME ${basicEnv}/${ruby.gemPath} "+ - "--set GEM_PATH ${basicEnv}/${ruby.gemPath} "+ - "--run \"cd $srcdir\";\n") scripts)} + runCommand basicEnv.name cmdArgs '' + mkdir -p $out/bin + ${(lib.concatMapStrings (x: "ln -s '${basicEnv}/bin/${x}' $out/bin/${x};\n") exes)} + ${(lib.concatMapStrings (s: "makeWrapper $out/bin/$(basename ${s}) $srcdir/${s} " + + "--set BUNDLE_GEMFILE ${basicEnv.confFiles}/Gemfile "+ + "--set BUNDLE_PATH ${basicEnv}/${ruby.gemPath} "+ + "--set BUNDLE_FROZEN 1 "+ + "--set GEM_HOME ${basicEnv}/${ruby.gemPath} "+ + "--set GEM_PATH ${basicEnv}/${ruby.gemPath} "+ + "--run \"cd $srcdir\";\n") scripts)} + + ${lib.optionalString installManpages '' + for section in {1..9}; do + mandir="$out/share/man/man$section" + find -L ${basicEnv}/${ruby.gemPath}/gems/${basicEnv.name} \( -wholename "*/man/*.$section" -o -wholename "*/man/man$section/*.$section" \) -print -execdir mkdir -p $mandir \; -execdir cp '{}' $mandir \; + done + ''} + ${postBuild} '' diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index d00ce7fccf5c..b0abb2c54fc5 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -44,6 +44,7 @@ lib.makeOverridable ( # git checkout). # If you need to apply patches, make sure to set `dontBuild = false`; , dontBuild ? true +, dontInstallManpages ? false , propagatedBuildInputs ? [] , propagatedUserEnvPkgs ? [] , buildFlags ? [] @@ -206,6 +207,14 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { ruby ${./gem-post-build.rb} "$spec" ''} + ${lib.optionalString (!dontInstallManpages) '' + for section in {1..9}; do + mandir="$out/share/man/man$section" + find $out/lib \( -wholename "*/man/*.$section" -o -wholename "*/man/man$section/*.$section" \) \ + -execdir mkdir -p $mandir \; -execdir cp '{}' $mandir \; + done + ''} + runHook postInstall ''; diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 5a095c8b6a0e..2f82c1ee66ad 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "1.84"; + version = "1.85"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "1rp8j0akxzcpvr2na5zchz8zxq5ldngiwj7f6sibjq5p3dcyn2w5"; + sha256 = "1xjc0gna9hrqc6liyzkzkr2naapj5bldzad8qdxcjgqz5yd6rb7i"; }; buildInputs = [ pcre ]; diff --git a/pkgs/development/tools/analysis/verasco/default.nix b/pkgs/development/tools/analysis/verasco/default.nix deleted file mode 100644 index 7f623e72dc31..000000000000 --- a/pkgs/development/tools/analysis/verasco/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, lib, fetchurl -, coq, ocaml, findlib, menhir, zarith -, tools ? stdenv.cc -}: - -assert lib.versionAtLeast ocaml.version "4.02"; - -stdenv.mkDerivation rec { - name = "verasco-1.3"; - src = fetchurl { - url = "http://compcert.inria.fr/verasco/release/${name}.tgz"; - sha256 = "0zvljrpwnv443k939zlw1f7ijwx18nhnpr8jl3f01jc5v66hr2k8"; - }; - - buildInputs = [ coq 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/go-junit-report/default.nix b/pkgs/development/tools/go-junit-report/default.nix new file mode 100644 index 000000000000..5e1a69a16929 --- /dev/null +++ b/pkgs/development/tools/go-junit-report/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "go-junit-report-unstable-${version}"; + version = "2018-06-14"; + rev = "385fac0ced9acaae6dc5b39144194008ded00697"; + + goPackagePath = "github.com/jstemmer/go-junit-report"; + + src = fetchFromGitHub { + inherit rev; + owner = "jstemmer"; + repo = "go-junit-report"; + sha256 = "109zs8wpdmc2ijc2khyqija8imay88ka6v50xvrpnnwnd3ywckxi"; + }; + + meta = with stdenv.lib; { + description = "Converts go test output to an xml report, suitable for applications that expect junit xml reports (e.g. Jenkins)"; + homepage = "https://${goPackagePath}"; + maintainers = with maintainers; [ cryptix ]; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/gron/default.nix b/pkgs/development/tools/gron/default.nix index 14c8f53a3944..ebe76197ef4e 100644 --- a/pkgs/development/tools/gron/default.nix +++ b/pkgs/development/tools/gron/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "gron-${version}"; - version = "0.5.2"; + version = "0.6.0"; owner = "tomnomnom"; repo = "gron"; @@ -11,7 +11,7 @@ buildGoPackage rec { src = fetchFromGitHub { inherit owner repo; rev = "v${version}"; - sha256 = "0nxcvih8n5a4f0a53dxaipab5ckqxgnsznzymhfw5kv4inr9v6j6"; + sha256 = "05f3w4zr15wd7xk75l12y5kip4gnv719a2x9w2hy23q3pnss9wk0"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/gron/deps.nix b/pkgs/development/tools/gron/deps.nix index c5b1feb888ae..effc255d877e 100644 --- a/pkgs/development/tools/gron/deps.nix +++ b/pkgs/development/tools/gron/deps.nix @@ -6,8 +6,8 @@ fetch = { type = "git"; url = "https://github.com/${owner}/${repo}"; - rev = "v1.6.0"; - sha256 = "0k1v9dkhrxiqhg48yqkwzpd7x40xx38gv2pgknswbsy4r8w644i7"; + rev = "v1.7.0"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; }; } rec { @@ -32,4 +32,26 @@ sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; }; } + rec { + owner = "mattn"; + repo = "go-colorable"; + goPackagePath = "github.com/${owner}/${repo}"; + fetch = { + type = "git"; + url = "https://github.com/${owner}/${repo}"; + rev = "v0.0.9"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + rec { + owner = "mattn"; + repo = "go-isatty"; + goPackagePath = "github.com/${owner}/${repo}"; + fetch = { + type = "git"; + url = "https://github.com/${owner}/${repo}"; + rev = "v0.0.4"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + }; + } ] diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix index c11e6f15ce96..1a421cc47ed6 100644 --- a/pkgs/development/tools/jbake/default.nix +++ b/pkgs/development/tools/jbake/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "2.6.2"; + version = "2.6.3"; name = "jbake-${version}"; src = fetchzip { url = "https://dl.bintray.com/jbake/binary/${name}-bin.zip"; - sha256 = "1q96z0pvkqgb4194m52z89q56cbc0g3faflyfpy55z099f655rx9"; + sha256 = "000ax5vzirrhiykk86fmy4hibhl3pab0gkh5y35hiwhzhw5rwzk8"; }; buildInputs = [ makeWrapper jre ]; diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index 8c210cb93601..59f60d4046ad 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, flex, bison }: let - version = "2.2.0"; + version = "2.2.1"; in stdenv.mkDerivation { name = "minizinc-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { rev = "${version}"; owner = "MiniZinc"; repo = "libminizinc"; - sha256 = "05is1r5y06jfqwvka90dn2ffxnvbgyswaxl00aqz6455hnggnxvm"; + sha256 = "1i11lan7fqs3lg0s6jfr8sflzwn5nk1ln5j6afjrkrdb08291dr7"; }; # meta is all the information about the package.. diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix index 2974c653acdd..281463528354 100644 --- a/pkgs/development/tools/misc/blackmagic/default.nix +++ b/pkgs/development/tools/misc/blackmagic/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, gcc-arm-embedded, libftdi +, gcc-arm-embedded, binutils-arm-embedded, libftdi , python, pythonPackages }: @@ -17,8 +17,11 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + nativeBuildInputs = [ + gcc-arm-embedded binutils-arm-embedded + ]; + buildInputs = [ - gcc-arm-embedded libftdi python pythonPackages.intelhex diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix index 1c0f80e1ddd7..ba95889b5a80 100644 --- a/pkgs/development/tools/misc/dfu-programmer/default.nix +++ b/pkgs/development/tools/misc/dfu-programmer/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { description = "A Device Firmware Update based USB programmer for Atmel chips with a USB bootloader"; homepage = http://dfu-programmer.sourceforge.net/; maintainers = [ maintainers.the-kenny ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix index d6c5256ca84d..91f2a5c58fc2 100644 --- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix +++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1a663bv3lvm7bsf2wcaj2c0vpmniak7w5hwix5qgz608bvm2v781"; }; - buildInputs = [ unzip libusb ]; + buildInputs = [ libusb ]; installPhase = '' install -Dm755 teensy_loader_cli $out/bin/teensy-loader-cli @@ -21,6 +21,6 @@ stdenv.mkDerivation { description = "Firmware uploader for the Teensy microcontroller boards"; homepage = https://www.pjrc.com/teensy/; maintainers = with maintainers; [ the-kenny ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index d74b480c9c5a..c15970d3f3e6 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -3,7 +3,7 @@ assert stdenv.lib.versionAtLeast ocaml.version "4.02"; let - version = "3.2.1"; + version = "3.2.2"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/ocaml/merlin/archive/v${version}.tar.gz"; - sha256 = "1szv2b7d12ll5n6pvnhlv3a6vnlyrkpya4l9fiyyiwyvgd4xzxwf"; + sha256 = "15ssgmwdxylbwhld9p1cq8x6kadxyhll5bfyf11dddj6cldna3hb"; }; buildInputs = [ ocaml findlib dune yojson ]; diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index fe80d0d9dd19..970ace229e20 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform, Security }: rustPlatform.buildRustPackage rec { name = "rust-cbindgen-${version}"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1m1chwmfgj74xrmn4gb9yz5kx8c408a1hlqmpcq780kqj0k927i9"; + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + meta = with stdenv.lib; { description = "A project for generating C bindings from Rust code"; homepage = https://github.com/eqrion/cbindgen; diff --git a/pkgs/development/tools/rust/pyo3-pack/default.nix b/pkgs/development/tools/rust/pyo3-pack/default.nix new file mode 100644 index 000000000000..05c57e46b893 --- /dev/null +++ b/pkgs/development/tools/rust/pyo3-pack/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, rustPlatform, dbus, gmp, openssl, pkgconfig +, darwin }: + +let + inherit (darwin.apple_sdk.frameworks) Security; +in rustPlatform.buildRustPackage rec { + name = "pyo3-pack-${version}"; + version = "0.3.8"; + + src = fetchFromGitHub { + owner = "PyO3"; + repo = "pyo3-pack"; + rev = "v${version}"; + sha256 = "14343209w7wphkqh7pnw08pah09spjbwhk6l548g9ivra057gwaz"; + }; + + cargoSha256 = "0n7z9p3v92ijqc2ix60wi74as5rql61k5qbqi8b1b02b71xmsp7j"; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ gmp openssl ] + ++ stdenv.lib.optional stdenv.isDarwin Security + ++ stdenv.lib.optional stdenv.isLinux dbus; + + # Requires network access, fails in sandbox. + doCheck = false; + + meta = with stdenv.lib; { + description = "Build and publish crates with pyo3 bindings as python packages"; + homepage = https://github.com/PyO3/pyo3-pack; + license = licenses.mit; + maintainers = [ maintainers.danieldk ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/scalafix/default.nix b/pkgs/development/tools/scalafix/default.nix new file mode 100644 index 000000000000..bd8a013fe2d0 --- /dev/null +++ b/pkgs/development/tools/scalafix/default.nix @@ -0,0 +1,43 @@ +{ stdenv, jdk, jre, coursier, makeWrapper }: + +let + baseName = "scalafix"; + version = "0.9.0"; + deps = stdenv.mkDerivation { + name = "${baseName}-deps-${version}"; + buildCommand = '' + export COURSIER_CACHE=$(pwd) + ${coursier}/bin/coursier fetch ch.epfl.scala:scalafix-cli_2.12.7:${version} > deps + mkdir -p $out/share/java + cp $(< deps) $out/share/java/ + ''; + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "19j260prx7k010nxyvc1m9jj1ncxr73m2cym7if39360v5dc05c0"; + }; +in +stdenv.mkDerivation rec { + name = "${baseName}-${version}"; + + buildInputs = [ jdk makeWrapper deps ]; + + doCheck = true; + + phases = [ "installPhase" "checkPhase" ]; + + installPhase = '' + makeWrapper ${jre}/bin/java $out/bin/${baseName} \ + --add-flags "-cp $CLASSPATH scalafix.cli.Cli" + ''; + + checkPhase = '' + $out/bin/${baseName} --version | grep -q "${version}" + ''; + + meta = with stdenv.lib; { + description = "Refactoring and linting tool for Scala"; + homepage = https://scalacenter.github.io/scalafix/; + license = licenses.bsd3; + maintainers = [ maintainers.tomahna ]; + }; +} diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index b009d5ed601b..e28aad40ef47 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, avrbinutils, avrgcc, avrlibc, libelf, which, git, pkgconfig, freeglut +{ stdenv, fetchFromGitHub, libelf, which, git, pkgconfig, freeglut +, avrbinutils, avrgcc, avrlibc , libGLU_combined }: stdenv.mkDerivation rec { @@ -15,14 +16,10 @@ stdenv.mkDerivation rec { # ld: cannot find -lsimavr enableParallelBuilding = false; - preConfigure = '' - substituteInPlace Makefile.common --replace "-I../simavr/sim/avr -I../../simavr/sim/avr" \ - "-I${avrlibc}/avr/include -L${avrlibc}/avr/lib/avr5 -B${avrlibc}/avr/lib -I../simavr/sim/avr -I../../simavr/sim/avr" - ''; buildFlags = "AVR_ROOT=${avrlibc}/avr SIMAVR_VERSION=${version}"; installFlags = buildFlags + " DESTDIR=$(out)"; - + # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" ''; @@ -31,8 +28,8 @@ stdenv.mkDerivation rec { patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target" ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which git avrbinutils avrgcc avrlibc libelf freeglut libGLU_combined ]; + nativeBuildInputs = [ which git pkgconfig avrgcc avrbinutils ]; + buildInputs = [ libelf freeglut libGLU_combined ]; meta = with stdenv.lib; { description = "A lean and mean Atmel AVR simulator"; @@ -43,4 +40,3 @@ stdenv.mkDerivation rec { }; } - diff --git a/pkgs/development/tools/sourcetrail/default.nix b/pkgs/development/tools/sourcetrail/default.nix new file mode 100644 index 000000000000..2182f8697aab --- /dev/null +++ b/pkgs/development/tools/sourcetrail/default.nix @@ -0,0 +1,75 @@ +{ stdenv, fetchurl, autoPatchelfHook +, icu, zlib, expat, dbus, libheimdal, openssl}: + +stdenv.mkDerivation rec { + name = "sourcetrail-${version}"; + version = "2018.3.55"; + + src = fetchurl { + name = "sourtrail.tar.gz"; + url = "https://www.sourcetrail.com/downloads/${version}/linux/64bit"; + sha256 = "6f5fbbecc221e7165ecbf1c4d208e302dade4feea9d43eb3265521efc0a376e2"; + }; + + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ zlib expat dbus stdenv.cc.cc openssl ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/opt + + mv -v setup/share $out + mv -v data/gui/icon/logo_1024_1024.png $out/share/icons/sourcetrail.png + mv -v data/gui/icon/project_256_256.png $out/share/icons/project-sourcetrail.png + + mkdir -p $out/share/sourcetrail/doc + mv -v README EULA.txt $out/share/sourcetrail/doc + mv -v plugin $out/share/sourcetrail + + cp -rv . $out/opt + + rm $out/opt/lib/libssl.so + rm $out/opt/lib/platforms/{libqeglfs.so,libqwebgl.so} + ln -s ${openssl}/lib/libssl.so $out/opt/lib/libssl.so + + substituteInPlace \ + $out/share/applications/sourcetrail.desktop \ + --replace /usr/bin/ $out/bin/ + + cat < $out/bin/sourcetrail + #! ${stdenv.shell} -e + + # XXX: Sourcetrail somehow copies the initial config files into the home + # directory without write permissions. We currently just copy them + # ourselves to work around this problem. + setup_config() { + local src dst + + [ ! -d ~/.config/sourcetrail ] && mkdir -p ~/.config/sourcetrail + for src in $out/opt/data/fallback/*; do + dst=~/.config/sourcetrail/"\$(basename "\$src")" + if [ ! -e "\$dst" ]; then + cp -r "\$src" "\$dst" + fi + done + + chmod -R u+w ~/.config/sourcetrail + } + + [ -d "\$HOME" ] && setup_config + exec "$out/opt/Sourcetrail.sh" "\$@" + EOF + chmod +x $out/bin/sourcetrail + + runHook postInstall + ''; + + meta = with stdenv.lib; { + homepage = https://www.sourcetrail.com; + description = "A cross-platform source explorer for C/C++ and Java"; + platforms = [ "x86_64-linux" ]; + license = licenses.unfree; + maintainers = with maintainers; [ midchildan ]; + }; +} diff --git a/pkgs/games/steam/runtime-generated.nix b/pkgs/games/steam/runtime-generated.nix index 694274053bfe..ac24f0c15a53 100644 --- a/pkgs/games/steam/runtime-generated.nix +++ b/pkgs/games/steam/runtime-generated.nix @@ -4,1746 +4,1737 @@ { amd64 = [ rec { - name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_amd64"; - sha256 = "03yfjxzsyf14zqwxb43piyh78xxap7yxh5f4gx649qv28h7ygfrm"; - url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_amd64.deb"; + name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt5_amd64"; + sha256 = "074vbkdxaylb36ljkxz586jfcn7ghxzfivyiz703li1dw54jaq87"; + url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "dconf-gsettings-backend.deb"; }; } rec { - name = "freeglut3_2.6.0-1ubuntu3+srt4_amd64"; - sha256 = "1wi5fad0f7nqps55isvbb42njqssbhyzmd38q8413afjyhmm6icc"; - url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt4_amd64.deb"; + name = "freeglut3_2.6.0-1ubuntu3+srt5_amd64"; + sha256 = "08mpxxd12c2kwlab47nfz25vpn7ag2xkmxp2zn48ymxab7qhvr5r"; + url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "freeglut3.deb"; }; } rec { - name = "gcc-4.6-base_4.6.3-1ubuntu5+srt4_amd64"; - sha256 = "1za8f7wkwcww4wacydqq3fvi5p1ivgcr2n3npirqir1gr25cbxaj"; - url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+srt4_amd64.deb"; + name = "gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.1+srt1_amd64"; + sha256 = "1iknyb54mn8l1gcm9pg47hlra7y5x9awrgd431hzvig44c34vv9m"; + url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "gcc-4.6-base.deb"; }; } rec { - name = "gtk2-engines_2.20.2-1ubuntu1+srt4_amd64"; - sha256 = "03y4239swznwlgdx6yc58sj6w5irqq7432hxcmcw8608m3w0m29h"; - url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt4_amd64.deb"; + name = "gtk2-engines_2.20.2-1ubuntu1+srt5_amd64"; + sha256 = "1w2aaddcrfg37fw7bl2jcbx14bp7ar8lyaq25j9pi8298wvbikly"; + url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines.deb"; }; } rec { - name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_amd64"; - sha256 = "1iwmgzkdxjvr2q2kz5bjz64r4qjqbcf6ynz3sy5y81dl254pjnmh"; - url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_amd64.deb"; + name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt5_amd64"; + sha256 = "0fqbm6502zqw64lbzywz0cllxkj9n44fxb2gg8q160vcqzyvb8jf"; + url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines-murrine.deb"; }; } rec { - name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_amd64"; - sha256 = "0md5vjz8wnayppcxkl5x7874w2z4w7pjz96gprv24hid4azmyci8"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_amd64.deb"; + name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt5_amd64"; + sha256 = "05d43583lj3ffskvmzcr6yb8a3jz1l8gc12mrmaix8w71bv81nr1"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines-pixbuf.deb"; }; } rec { - name = "libacl1_2.2.51-5ubuntu1+srt6_amd64"; - sha256 = "02xwrfzspf58j9lr6b128jq1klkvd4b69lrclpqzwm9cqddg6mr5"; - url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+srt6_amd64.deb"; + name = "libacl1_2.2.51-5ubuntu1+srt7_amd64"; + sha256 = "199r529wahl2947iwnwf4qazv6jqipsjaj2dqvplacmm197rsvdc"; + url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+srt7_amd64.deb"; source = fetchurl { inherit url sha256; name = "libacl1.deb"; }; } rec { - name = "libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_amd64"; - sha256 = "08m1w5mhzl613gbjg6lvf7wcm7bs00xddaaci8f1944icl8pdibb"; - url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_amd64.deb"; + name = "libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt1_amd64"; + sha256 = "19s3s3fc4vcj5cg7fh40w35vjyhi7097vv83lwjzrzhz5jlgczmp"; + url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libappindicator1.deb"; }; } rec { - name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - sha256 = "0m69ar6w3lzsggn79lyc3614p9rr2dy29vwqvl4w3gmshp6aqhs4"; - url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; + name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; + sha256 = "0mib9hy38mbiz40dr7x7c9c0liqswmnnykij7xpp7kbfqlvlshb8"; + url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libasn1-8-heimdal.deb"; }; } rec { - name = "libasound2_1.1.0-0ubuntu1+steamos1+srt1_amd64"; - sha256 = "1bh911nx5a2abn38h9sa90ji358r6is2n7ymm10v94yibdf63rwg"; - url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt1_amd64.deb"; + name = "libasound2_1.1.0-0ubuntu1+steamos1+srt2_amd64"; + sha256 = "05d4ijlc20ss4rm2jxr5lxkgwbn0qcv5a7pj9aizl66klpbzsgay"; + url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libasound2.deb"; }; } rec { - name = "libasound2-plugins_1.1.0-0ubuntu1+srt1_amd64"; - sha256 = "1l36hxgnml9pglrihm17vkgqp3jpqslicg1mpycixzz9cpgfyxbz"; - url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt1_amd64.deb"; + name = "libasound2-plugins_1.1.0-0ubuntu1+srt2_amd64"; + sha256 = "1dsa9z7ssf39c039a60axh36wgykyapv65gmlxnvxpkhqnw4zywm"; + url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libasound2-plugins.deb"; }; } rec { - name = "libasyncns0_0.8-4+srt4_amd64"; - sha256 = "154bh8mpslr4xwf54h1xds4v2yjf8rbyvv1lc0azl9gnkan1y0an"; - url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt4_amd64.deb"; + name = "libasyncns0_0.8-4+srt5_amd64"; + sha256 = "00nglm7sryy3y1pagjhv1mq6rvqiawmhf3kgwv0g7bqwgxcpia7p"; + url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libasyncns0.deb"; }; } rec { - name = "libatk1.0-0_2.4.0-0ubuntu1+srt4_amd64"; - sha256 = "0kky7mfkx38lj4gafrv886z0vbf17xnpymq6qas59x8f35bzx742"; - url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.4.0-0ubuntu1+srt4_amd64.deb"; + name = "libatk1.0-0_2.18.0-1+steamrt1+srt1_amd64"; + sha256 = "1rs9k9pcxmpwlwbxgalsqhiv7baqylaxpkhy4524a4b8dw1qx0k4"; + url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.18.0-1+steamrt1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libatk1.0-0.deb"; }; } rec { - name = "libattr1_2.4.46-5ubuntu1+srt4_amd64"; - sha256 = "11hn8q45pddm4khq0qp1qj19c1syfawscnvrl6cv1xmahpb3nm3i"; - url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+srt4_amd64.deb"; + name = "libattr1_2.4.46-5ubuntu1+steamrt1+srt1_amd64"; + sha256 = "1d7xlyz5phsgka2psf6hwa393lgmlyjl3cd7a8dbzs9862h5f2v8"; + url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+steamrt1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libattr1.deb"; }; } rec { - name = "libavahi-client3_0.6.30-5ubuntu2+srt4_amd64"; - sha256 = "0yrgvh80i1gpcq2w64hkqnmiymgrn7r2v67wyd1iijc2zyb4x0c3"; - url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2+srt4_amd64.deb"; + name = "libavahi-client3_0.6.30-5ubuntu2.2+srt1_amd64"; + sha256 = "04rkaiapl13rxlr2bwxz2q7z6i0091nm1c49kjnl1yckg64d7548"; + url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavahi-client3.deb"; }; } rec { - name = "libavahi-common3_0.6.30-5ubuntu2+srt4_amd64"; - sha256 = "1r1rqpqdqmqxn3g1iifc77jgrhfkr5275s7d5h3p1hvkmlzyvwd2"; - url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2+srt4_amd64.deb"; + name = "libavahi-common3_0.6.30-5ubuntu2.2+srt1_amd64"; + sha256 = "1a2x57s3072na65gr7ys0wl5cm2f1j2m5kkhlhq4i8ms6hxssgrk"; + url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavahi-common3.deb"; }; } rec { - name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - sha256 = "09fwqr29dxhxkkf1gd9f9sph2jgv0qx3p7k6qxxwq3bg4lh2971n"; - url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; + name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64"; + sha256 = "0wpmnsnq5njv65iwq2g6819m2j5fda7jm8450qs3lmyc963ds0i2"; + url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavcodec53.deb"; }; } rec { - name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - sha256 = "0fynn6g6mc4raj144hg9r7qbiz7b2s4p7aidjpy34xkbxcn2vq45"; - url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; + name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64"; + sha256 = "1xpxmhhhgc7ap7f2ijlsgx9p58qqyvk2lgfn61dhlibq046px816"; + url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavfilter2.deb"; }; } rec { - name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - sha256 = "0qdfr19xfxwab9q5w4bvwgv873cs8zgm4s10hwg6741xr6qifnhg"; - url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; + name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64"; + sha256 = "0b8vx5lhsbynivm58zhxd0w6g7c7bqjvsr891wbqizbi325yja2b"; + url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavformat53.deb"; }; } rec { - name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - sha256 = "0pfgxnrf1jjlb7gvwklwn7m61n591yfzqfzzqb76gyr20r6v6dzw"; - url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; + name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64"; + sha256 = "1g3bdnfs0rgwnzrnwpj5hamynj1z0qs8wmxlfd0iqkah74ymgaaa"; + url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libavutil51.deb"; }; } rec { - name = "libbz2-1.0_1.0.6-1+srt4_amd64"; - sha256 = "13rsp2cyayvnh2755kjbs6g6j85rdpl6cwlx22b97hid5pq5nk60"; - url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt4_amd64.deb"; + name = "libbz2-1.0_1.0.6-1+srt5_amd64"; + sha256 = "046y04ynczpydlrablks51mx4jc1313k89hsi8x4sj2a355819nz"; + url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libbz2-1.0.deb"; }; } rec { - name = "libcairo2_1.10.2-6.1ubuntu3+srt4_amd64"; - sha256 = "0iv16gfc1b8n4p088jbask9i8i56agip8dd5b1r22r52hg28gi9y"; - url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt4_amd64.deb"; + name = "libcairo2_1.10.2-6.1ubuntu3+srt5_amd64"; + sha256 = "1j82gzl9hfxsrk2s3nxx1dpq6jlmkz5y5mkvxw9d166v0mlvxkq4"; + url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcairo2.deb"; }; } rec { - name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_amd64"; - sha256 = "19gl25hjzxw375qqbckmgfr14qd48zaccnny4zbddlz8aj5w4wig"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_amd64.deb"; + name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt5_amd64"; + sha256 = "1x36zmsb7wcmgli75sfqamw5gmsv47if56f1vljjgak3jn2vlmm2"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcanberra-gtk-module.deb"; }; } rec { - name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_amd64"; - sha256 = "1kgq90l6rafqk7zfxafvzkh8msys5mlc95qr3rcv6l0f03w785dy"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_amd64.deb"; + name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt5_amd64"; + sha256 = "0g68j9w3xn0vnjgznq2avmzk8rykas0a6749ldq99yq9afccjfcp"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcanberra-gtk0.deb"; }; } rec { - name = "libcanberra0_0.28-3ubuntu3+steamrt1+srt4_amd64"; - sha256 = "01x6y4gq1ivpdywglx418gr4m56qvm05nicmavwimnafxga3c5sk"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt4_amd64.deb"; + name = "libcanberra0_0.28-3ubuntu3+steamrt1+srt5_amd64"; + sha256 = "0qzyjrr5nmc72pfbalh9s22s51c5c10f0h23viyjrk77kk0ysc3f"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcanberra0.deb"; }; } rec { - name = "libcap2_2.22-1ubuntu3+srt4_amd64"; - sha256 = "1rhfhq1n45fq40p6c2aipkica2dw8w95w7bsdrxfby48gdppgzy7"; - url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt4_amd64.deb"; + name = "libcap2_2.22-1ubuntu3+srt5_amd64"; + sha256 = "0bsjpbv2p7ir6w7dpjvs8y25skha72406mhgjrff9dvdvc9mwwpy"; + url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcap2.deb"; }; } rec { - name = "libcg_3.0.0016-0ubuntu1+srt4_amd64"; - sha256 = "0yifiwr2hc7rvvd6snf530gma05v2qpiyl652drdc9rvcfjrj9zi"; - url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt4_amd64.deb"; + name = "libcg_3.0.0016-0ubuntu1+srt5_amd64"; + sha256 = "1d4lc4krkphvmlvmd4z60l6cg37gd62x9m700s83jxbsz0fhwmrb"; + url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcg.deb"; }; } rec { - name = "libcomerr2_1.42-1ubuntu2.2+srt1_amd64"; - sha256 = "1cll5iwdply1lz211j83n22aidsxfx2jvy09a02qa79a7g1qv6c3"; - url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.2+srt1_amd64.deb"; + name = "libcomerr2_1.42-1ubuntu2.3+srt1_amd64"; + sha256 = "0ar9lzaxlmhqxpp6v2b3jz3lblkqhqwy0ywbwkdq4zs5za69kh1b"; + url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.3+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcomerr2.deb"; }; } rec { - name = "libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_amd64"; - sha256 = "1xaxim0df5713hj4kq141rnf51zvyhvpv015q4q41c3nh4d9bz7w"; - url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_amd64.deb"; + name = "libcups2_1.5.3-0ubuntu8.2+steamrt1+srt4_amd64"; + sha256 = "12ihcwb2qlkms5si1sz7an61ndhxqhd2dxrx9likm07bz2c9mq9b"; + url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.2+steamrt1+srt4_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcups2.deb"; }; } rec { - name = "libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64"; - sha256 = "0vwdpkiisnbrm1j22qzjj2g5vsiv4wdja3j34j16pc30088f4c3i"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64.deb"; + name = "libcurl3_7.22.0-3ubuntu4.17+srt1_amd64"; + sha256 = "1nzbxzrkqnnzhml2fyjzpaifsm3whq78bxjqnhs9ljs3jwhl59p5"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcurl3.deb"; }; } rec { - name = "libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64"; - sha256 = "0rvrjcxpmnbq42aq6x31gxxglwiccm059r2q78hqiw82i86b7j28"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64.deb"; + name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+srt1_amd64"; + sha256 = "0mgxy0vninsv7yi3wiqjkdz8ap52y4zlkzxwyijcvbwkxp33rq68"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcurl3-gnutls.deb"; }; } rec { - name = "libdbus-1-3_1.4.18-1ubuntu1.7+srt1_amd64"; - sha256 = "1nkzsi04m1icwb3b1nky15d0frnc0hpfsyrm3xx1hriv02iqwgvw"; - url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.7+srt1_amd64.deb"; + name = "libdbus-1-3_1.4.18-1ubuntu1.8+srt1_amd64"; + sha256 = "1m1q2q2s6b98x1zbk31hnd80dakfqg2g8yaj662vxrdrr85j6nza"; + url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.8+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libdbus-1-3.deb"; }; } rec { - name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_amd64"; - sha256 = "19xnslykd4y22ff5mfs2rg4rjppmcrmrbwynzx4v2rvxckvvq77f"; - url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_amd64.deb"; + name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt5_amd64"; + sha256 = "1f36vyq505hrfqmhizgplvvk17zhf1230wlrzibdwi04j275sahk"; + url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libdbus-glib-1-2.deb"; }; } rec { - name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_amd64"; - sha256 = "1x1szx7m6y6i0d6ahffnrdhs693rk4wi4hrhbmmn2g1sizr9qhmb"; - url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_amd64.deb"; + name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt5_amd64"; + sha256 = "064wwqbjrdvwkjpyi0k6vj7rrwkwcy49mrlsgrv3q4gckiqhjhbz"; + url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libdbusmenu-glib4.deb"; }; } rec { - name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_amd64"; - sha256 = "0nrydq0mjjsx1v9gk78j5xcgdaay5dhxn5rj9ydkbkw7ih4xm2m1"; - url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_amd64.deb"; + name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt5_amd64"; + sha256 = "0vagal7jh6biarjf9sy219p2njb5k8ycv4v7glni8prli0c1zzxq"; + url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libdbusmenu-gtk4.deb"; }; } rec { - name = "libexif12_0.6.20-2ubuntu0.1+srt4_amd64"; - sha256 = "09pjkyjykvsmddx20ji4wgr5gnqbshj1hpm77129ini9qp61wxig"; - url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt4_amd64.deb"; + name = "libexif12_0.6.20-2ubuntu0.1+srt5_amd64"; + sha256 = "15rk2yfvsy16azpcwl8xsxigmrdhl0pkg6dvyq2pknp08c72r5r7"; + url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libexif12.deb"; }; } rec { - name = "libexpat1_2.0.1-7.2ubuntu1.2+srt1_amd64"; - sha256 = "0axky1v55yalkng9mn22ignmapv100gkcfb0xs82pllzaws32yhb"; - url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.2+srt1_amd64.deb"; + name = "libexpat1_2.0.1-7.2ubuntu1.4+srt2_amd64"; + sha256 = "0pdn5f20pbmklnvsyl83x0rjafsjy8vxn4zd2nl7h0aabzng9vy2"; + url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.4+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libexpat1.deb"; }; } rec { - name = "libffi6_3.0.11~rc1-5+srt4_amd64"; - sha256 = "1brqpwjbf6dd6crvs32b7q73m11anlq1s1r1m0p5cv17sc89q3q4"; - url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt4_amd64.deb"; + name = "libffi6_3.0.11~rc1-5+srt5_amd64"; + sha256 = "0i428a37s9lma09psy0d7vj2amnimwgx4izmmac4dlzyy6qpfn9s"; + url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libffi6.deb"; }; } rec { - name = "libflac8_1.2.1-6+srt4_amd64"; - sha256 = "1sdbbm4gdq0mw103z3nwhywvix1z21gdq6lc5xf4s12zpj1zq2gc"; - url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+srt4_amd64.deb"; + name = "libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt1_amd64"; + sha256 = "13hkikwbxsm3nf91rc1xa98apwx9y4mr9h20cd0206gm43qfyvh2"; + url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libflac8.deb"; }; } rec { - name = "libfltk1.1_1.1.10-10+srt4_amd64"; - sha256 = "0x5xxxkkj7g5wyhxl1rv846irn3r8hh744fqyn8hgmbp4mdgils0"; - url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt4_amd64.deb"; + name = "libfltk1.1_1.1.10-10+srt5_amd64"; + sha256 = "0zrx2mb5rl5hcyh6p0sglark6rh7s993sg26klizkswn2w53rv8j"; + url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libfltk1.1.deb"; }; } rec { - name = "libfontconfig1_2.8.0-3ubuntu9.1+srt4_amd64"; - sha256 = "0mcdd9x8dc153sk2dqixxy4rxvl9hvc7dz0msfwiywrgbilzfbl4"; - url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.1+srt4_amd64.deb"; + name = "libfontconfig1_2.8.0-3ubuntu9.2+srt2_amd64"; + sha256 = "047sq7342mqvc84qx8dayf282yh84zdj4azqp1c0h4hczc73jwv9"; + url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libfontconfig1.deb"; }; } rec { - name = "libfreetype6_2.4.8-1ubuntu2.3+srt1_amd64"; - sha256 = "08x0fg01qbycdwdgqj3xal0fi676pnkkgsk0kbvxfg3i4ln944l1"; - url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.3+srt1_amd64.deb"; + name = "libfreetype6_2.4.8-1ubuntu2.6+srt1_amd64"; + sha256 = "01z4dwib9d7i7187yw1b0vji587hrj354cz6ll2iybrbg25w510w"; + url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.6+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libfreetype6.deb"; }; } rec { - name = "libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64"; - sha256 = "05pg02l16fj7fdv8gkx95jy4j4cikqwmdkyq65a8qf20in3qs04m"; - url = "mirror://steamrt/pool/main/g/gcc-4.8/libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64.deb"; + name = "libgcc1_5.4.0-7.really.6+steamrt1.1+srt1_amd64"; + sha256 = "1300z3mjxxcl718mjdfppv53s42ba88gm0izbfn6wqvrj7wrz5wq"; + url = "mirror://steamrt/pool/main/g/gcc-5/libgcc1_5.4.0-7.really.6+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgcc1.deb"; }; } rec { - name = "libgconf-2-4_3.2.5-0ubuntu2+srt4_amd64"; - sha256 = "0mmgmnzyi9rlk7k6ir3f127brml366bbk7v5aq75y90z6qdp5h62"; - url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt4_amd64.deb"; + name = "libgconf-2-4_3.2.5-0ubuntu2+srt5_amd64"; + sha256 = "163jbgkz66crkkjdqc0axj4sjfmd6kfkglwlk3d52rf3bc7mvimb"; + url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgconf-2-4.deb"; }; } rec { - name = "libgcrypt11_1.5.0-3ubuntu0.5+srt1_amd64"; - sha256 = "0qpxrm37js3pgi8hwcfqyqgkipypb0gw6nvsbz5dd112hmnpkp37"; - url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.5+srt1_amd64.deb"; + name = "libgcrypt11_1.5.0-3ubuntu0.6+srt2_amd64"; + sha256 = "0p1vywfx5l9zhibr8c20by9w646przfjfaci5c6ifi7f4v5nn9hc"; + url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.6+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgcrypt11.deb"; }; } rec { - name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_amd64"; - sha256 = "00kq05jzlrvd4gx8pz54k1i8sm9v8l07vih4if6wanr45ifsjqlp"; - url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_amd64.deb"; + name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt5_amd64"; + sha256 = "1km2w0haybwal9zkhwsrx4i9yi2zkhbbfhh2xljhfw5m5g6s4mq5"; + url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgdk-pixbuf2.0-0.deb"; }; } rec { - name = "libglew1.10_1.10.0-3+srt4_amd64"; - sha256 = "0ybry9jiyp0bgfm9b0bznf5qllyf7jc6avd8rcc20ai7yf719mwc"; - url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt4_amd64.deb"; + name = "libglew1.10_1.10.0-3+srt6_amd64"; + sha256 = "19w95wfzzr909jgjg8w6fqff8x00izawqicw896fqbf44zmsc2l0"; + url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "libglew1.10.deb"; }; } rec { - name = "libglew1.6_1.6.0-4+srt4_amd64"; - sha256 = "1y4ywi4lp5df3nasxz8p5rmybl2vbv8bbww1s8alin5waidl7qav"; - url = "mirror://steamrt/pool/main/g/glew/libglew1.6_1.6.0-4+srt4_amd64.deb"; - source = fetchurl { - inherit url sha256; - name = "libglew1.6.deb"; - }; - } - rec { - name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_amd64"; - sha256 = "1imdb4wyy7qndg8xmlrfnj0x3a6fg7dv0izn2rajp5q77ivry51v"; - url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_amd64.deb"; + name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt2_amd64"; + sha256 = "1zhb0cpyl3vq5hg63j7wgw6bmwrn8xnq1ybnbigw439c0nq4f333"; + url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libglib2.0-0.deb"; }; } rec { - name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt4_amd64"; - sha256 = "1bgks33ck18asizisa5d7wj4wsv8hxccpshl0f2ihdvs6qgxgs76"; - url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt4_amd64.deb"; + name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt5_amd64"; + sha256 = "02fywg8h5jlkrh1qiqd0hpjv4v1hxggm3vjhnfn5rdj3xxmbvr2y"; + url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libglu1-mesa.deb"; }; } rec { - name = "libgmp10_5.0.2+dfsg-2ubuntu1+srt4_amd64"; - sha256 = "1la9938zrqrf8v4bcn5063xxxwwankhzh69m0sy8csixfg480c1a"; - url = "mirror://steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt4_amd64.deb"; + name = "libgmp10_5.0.2+dfsg-2ubuntu1+srt5_amd64"; + sha256 = "0vmx8ybnbf4rilylk1kxhq6c1z5wbxh77garwf79jm0jx3xamzrh"; + url = "mirror://steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgmp10.deb"; }; } rec { - name = "libgnutls26_2.12.14-5ubuntu3.11+srt1_amd64"; - sha256 = "1zrrprip93m9r2c7zd54pz8f5jvdgb0jir6ifvqbl60d521lfbl7"; - url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.11+srt1_amd64.deb"; + name = "libgnutls26_2.12.14-5ubuntu3.14+srt1_amd64"; + sha256 = "19jl1ril1h2r66ilwi45j49g2ag9b4x5090ld0gqp4hbx6f67x9g"; + url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.14+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgnutls26.deb"; }; } rec { - name = "libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64"; - sha256 = "094y3af19hg7s0hklh9slhmb19h2hhbfl4fpfpqcvbagkh6gwxl1"; - url = "mirror://steamrt/pool/main/g/gcc-4.8/libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64.deb"; + name = "libgomp1_5.4.0-7.really.6+steamrt1.1+srt1_amd64"; + sha256 = "06x5j6rvv5g8brsmgpxikjb9fs6gjpd31g2iw3b313k9c6fl7z9x"; + url = "mirror://steamrt/pool/main/g/gcc-5/libgomp1_5.4.0-7.really.6+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgomp1.deb"; }; } rec { - name = "libgpg-error0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "0zw0zrl50y86y292zjcgpxiqjwyw0krnrmi28qvb0ba2ahp18f7v"; - url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libgpg-error0_1.10-2ubuntu1+srt5_amd64"; + sha256 = "1pgv5svrqvsyiakqqnbb1ph6sk5yd6lgk53k2isyyz44vdjch9py"; + url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgpg-error0.deb"; }; } rec { - name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64"; - sha256 = "1mmd16fh58gnyyjwg9ac1br0xia670xc0ag65bfgxwnpfnkr7nyj"; - url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb"; + name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64"; + sha256 = "1nv973s0h9vmnmslxyddd28p4yv8k47d685m8lxv1irc4skqxzzc"; + url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgssapi-krb5-2.deb"; }; } rec { - name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - sha256 = "063k09yyr9mn0lacp29cgwagpiix220p7ahs5shpyigkjk5bp174"; - url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; + name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; + sha256 = "02h7fqwwg7jpz8b86dbjhh067ah34x3ys9n5df1rksbzpvmqcbiy"; + url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgssapi3-heimdal.deb"; }; } rec { - name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_amd64"; - sha256 = "0r60n1xym2alg4jr1icgzvd8x614p7vky0zxfvn8x9qd2hzr8k5q"; - url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_amd64.deb"; + name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt1_amd64"; + sha256 = "186hxj0jvgbxki0v6fx499pp796kcwiz86gqfhkd94k434aaqz1f"; + url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgstreamer-plugins-base0.10-0.deb"; }; } rec { - name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_amd64"; - sha256 = "0xynq7jgb0x8npb6apj58ag5zccl0gh4npyrfvs0ys4hzlv2fkmm"; - url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_amd64.deb"; + name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt5_amd64"; + sha256 = "1ddfd661703jgd8xai2ysh2gdvf0pkbvg46iazlg5jqr17i1b1sx"; + url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgstreamer0.10-0.deb"; }; } rec { - name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_amd64"; - sha256 = "0zbsr09xam3sl5qpnl34hgiir98g3rcfg2nblzwp8yr9kkrsb7zk"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_amd64.deb"; + name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt5_amd64"; + sha256 = "1bb7yf3ld99a9amdb6r8slw7g3xnj72za2nbpsrm6cwlw9nyxli0"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgtk2.0-0.deb"; }; } rec { - name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all"; - sha256 = "0xgh9nrvj1hf3wj9pqm9x3ykw95v9bsh5k2vgr3cr9135rrj0dp5"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all.deb"; + name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt5_all"; + sha256 = "0rw8iy16ij86abh444jk1xw78b5z81qjxm1292jin3sfhck4bd4x"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt5_all.deb"; source = fetchurl { inherit url sha256; name = "libgtk2.0-common.deb"; }; } rec { - name = "libgudev-1.0-0_175-0ubuntu9.2+srt4_amd64"; - sha256 = "1bv962vi9x8m41ss6g73q91xlxhf1pd733wsywflllkxa5qyabpl"; - url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.2+srt4_amd64.deb"; + name = "libgudev-1.0-0_175-0ubuntu9.10+srt1_amd64"; + sha256 = "1i8k7y464zj3vb17kwim69kh57y9hnlx40xfs0hrfvjjlj3ih30w"; + url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.10+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgudev-1.0-0.deb"; }; } rec { - name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - sha256 = "1s67jx924c06arhf18dpqncphlih26a7frshzd4ndwzp8xp87xyc"; - url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; + name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; + sha256 = "1ihzd3ihylrbrwxqx8sam6lwkhkk2c9ys7vxah2yvj43fl8piiz8"; + url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libhcrypto4-heimdal.deb"; }; } rec { - name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - sha256 = "0zchyajpd78rflfh4md3i0cvzd0gbkwf6l8kqcyavvib42mmdga8"; - url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; + name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; + sha256 = "1z4h6zdh5h9yvq4dfizy8ndskny94c86m5b4g9lpypfpzj259kpi"; + url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libheimbase1-heimdal.deb"; }; } rec { - name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - sha256 = "0lz83zkg4f1rjhf0sigk09s4kbksm9j2lalf7k04bci1sxs2wj2y"; - url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; + name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; + sha256 = "13fgm887ycb1l5w1hxvlf906wr4k834drykg36ink6g9fi1smn79"; + url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libheimntlm0-heimdal.deb"; }; } rec { - name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - sha256 = "0bcn57af9g4psxfiqqfsmfv7z3a713z86760lspgl63xfxlsm4d5"; - url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; + name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; + sha256 = "0alagksf7h181r86iiddvb9sil9zwf7d8lhnikq2x1i1ncxnwbj9"; + url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libhx509-5-heimdal.deb"; }; } rec { - name = "libice6_1.0.7-2build1+srt4_amd64"; - sha256 = "0lygkw0my7diasqyw7m5a0rfcpp38pb8jq7iqks195j21sy95h0s"; - url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt4_amd64.deb"; + name = "libice6_1.0.7-2build1+srt5_amd64"; + sha256 = "0v1a4dbs6by8n3yi23xqs4qqvjjdhh1qqmacc2bybjd2qi8dps8y"; + url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libice6.deb"; }; } rec { - name = "libidn11_1.23-2+steamrt1+srt4_amd64"; - sha256 = "0530ygdsq840kmqm1mlqk19a7wxpvwgrbary2dpflzqvclx4gfr1"; - url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt4_amd64.deb"; + name = "libidn11_1.23-2+steamrt1+srt5_amd64"; + sha256 = "19s5pm1w8idc52hcj07fd52hw4fxl8hda9rm5gdbgginrl1naibp"; + url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libidn11.deb"; }; } rec { - name = "libindicator7_0.5.0-0ubuntu1+srt4_amd64"; - sha256 = "0j89i9hgdh93a6m71ji3rrhlnyanjb7dbxy460shn38v4f3ax735"; - url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+srt4_amd64.deb"; + name = "libindicator7_0.5.0-0ubuntu1+steamrt1+srt1_amd64"; + sha256 = "0fcj1fmk70y8j1jcbr9dian2zrwf5m7yis4zpq8cc77838cdx0pg"; + url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+steamrt1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libindicator7.deb"; }; } rec { - name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_amd64"; - sha256 = "0l7h8z8fx0pqkbdh5x3v6azz6ddxdlzchgs97h5babrknkfkiar4"; - url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_amd64.deb"; + name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt4_amd64"; + sha256 = "0qpipr1anfy4y6m1syznmarsh3ni6db9dc7a1w0n11zfhp8lpihg"; + url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt4_amd64.deb"; source = fetchurl { inherit url sha256; name = "libjack-jackd2-0.deb"; }; } rec { - name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_amd64"; - sha256 = "0z2df70v2ggw2la3yr4ll926wj6pc84li1x2bxwz9ysw7xsgalg0"; - url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_amd64.deb"; + name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt5_amd64"; + sha256 = "10r393m5xxqjd6hpvlnfvnba081crhs88x1knhi3s6mhg2xhg35y"; + url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libjpeg-turbo8.deb"; }; } rec { - name = "libjpeg62_6b1-2ubuntu1.1+srt4_amd64"; - sha256 = "0n6qsfk42nhwvg8r9win7a90zvb31ba7cp7jvbbc4bhv7ygxxm7f"; - url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt4_amd64.deb"; + name = "libjpeg62_6b1-2ubuntu1.1+srt5_amd64"; + sha256 = "0wn9lgqc95gvck5k8qds9908j5ip3s3bz85a8l2bdprgg1q4rsrl"; + url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libjpeg62.deb"; }; } rec { - name = "libjson0_0.9-1ubuntu1.1+srt2_amd64"; - sha256 = "10r817kzxcviqvrajmi33pdbqss1qxpkmjxda7cclamnnawbcd17"; - url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt2_amd64.deb"; + name = "libjson0_0.9-1ubuntu1.1+srt3_amd64"; + sha256 = "1pqncc63z9w3jg41xqklappyirajfrchdjp81bldrnmbpbj69xha"; + url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt3_amd64.deb"; source = fetchurl { inherit url sha256; name = "libjson0.deb"; }; } rec { - name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64"; - sha256 = "1xsl1nwsm6r1gjfkl7x71h8p9qkq7gi624277cj3k68b31qh3g4z"; - url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb"; + name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64"; + sha256 = "18xfi5c04s3z9brj1rrmvl9s67apd4d6ax7vfwwjzwh7ygnkp8h8"; + url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libk5crypto3.deb"; }; } rec { - name = "libkeyutils1_1.5.2-2+srt4_amd64"; - sha256 = "0khwz7jqw9yq157r675sjii3bqk2i66dh6wn43b7vhh0wjz6nbdc"; - url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt4_amd64.deb"; + name = "libkeyutils1_1.5.2-2+srt5_amd64"; + sha256 = "14mv4r05r0fzkbl3r4jaa7wwmmaprv3q5w36pyf3xqc3iynxnj2p"; + url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libkeyutils1.deb"; }; } rec { - name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - sha256 = "0lfhwqsxpzaapz71rldi2zhsxkdy55krcmfbli06qs4mqx9mf691"; - url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; + name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; + sha256 = "0xhz42f7lnsc69sfnj2w0917jwm82nbc9i56qq3s1g2sw7z6kb3q"; + url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libkrb5-26-heimdal.deb"; }; } rec { - name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64"; - sha256 = "0aqwf07c818apd5md4gxwzx67xvbvv8s6fm890vibqhsrmymi621"; - url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb"; + name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64"; + sha256 = "1k3d1775ran10y79s7n5lmdlqlr7kscvxmj1887bnn4yxbwlgy73"; + url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libkrb5-3.deb"; }; } rec { - name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64"; - sha256 = "04wacj307jcy8ykyq6w3xw9phmprmfz6cpwv1wyfarxf4gr7nyii"; - url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb"; + name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64"; + sha256 = "1xml3gfn253lydqaqk27209sr1x0vvrbbkmb63z5cyy4i1yfpvmr"; + url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libkrb5support0.deb"; }; } rec { - name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_amd64"; - sha256 = "12kva7qrghlj65khzcmj6xqszij9186ly0iwjjqjs5xl5821aic4"; - url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_amd64.deb"; + name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt5_amd64"; + sha256 = "0wj24yi2ws12lfs0pi0bq9rbr1gyk2nv30rf46bav41mpn2fj9mg"; + url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "liblcms2-2.deb"; }; } rec { - name = "libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_amd64"; - sha256 = "1xnhh3s2cm4vjny964bsznnk2a6zj9n8ygkxfyrraib3wy61lidv"; - url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_amd64.deb"; + name = "libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt5_amd64"; + sha256 = "1pakk71qcjdp28v5cbfvrkbknhjhnbkk7ywr6czarmhldipsyifp"; + url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libldap-2.4-2.deb"; }; } rec { - name = "libltdl7_2.4.2-1ubuntu1+srt4_amd64"; - sha256 = "069s7km994c2z89jndwwrpspq0z7jyxr56ma057hbrilfpp4r7yd"; - url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt4_amd64.deb"; + name = "libltdl7_2.4.2-1ubuntu1+srt5_amd64"; + sha256 = "0ly9p5xilsf0d214mrx96nc3gn1xm1b68dzizsimhqa3bfpckzbb"; + url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libltdl7.deb"; }; } rec { - name = "libmikmod2_3.1.12-2+srt4_amd64"; - sha256 = "11flm0w3vwf66yi9mqf43ma3bc6jwg6xcz71h4a3jgqahsg3skfb"; - url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-2+srt4_amd64.deb"; + name = "libmikmod2_3.1.12-2+srt5_amd64"; + sha256 = "1i6kwzy1dz0a78jm0vpa0hjqahkwnj8yab8aky2srsf07y8bz2r8"; + url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libmikmod2.deb"; }; } rec { - name = "libncurses5_5.9-4+srt4_amd64"; - sha256 = "08wb0y9dizj7ngsivl2rpikjfl246q1jib6r0nqg7c6r05h8k46m"; - url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt4_amd64.deb"; + name = "libncurses5_5.9-4+srt5_amd64"; + sha256 = "1b4j17npqdhj6afcw7cj37k6dr2kmbgpjyv7c0viq82165bjacfp"; + url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libncurses5.deb"; }; } rec { - name = "libncursesw5_5.9-4+srt4_amd64"; - sha256 = "1gv0w7jrx9zd59zg7z38qzlcp48h7yyfj4jrbfsifl54ryn4fgwh"; - url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt4_amd64.deb"; + name = "libncursesw5_5.9-4+srt5_amd64"; + sha256 = "0gavz5rh8hz6ir3x09p57balxl8zprjsglgf2craq340qpgqw4s6"; + url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libncursesw5.deb"; }; } rec { - name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64"; - sha256 = "0f3h1hh4vn0ysr099lgwk8dx3462cpvmz3ig8r6d4vhxyzyh5a9z"; - url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64.deb"; + name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_amd64"; + sha256 = "0dw0mfwia3z6icj01558xgdjmi7g6g4nig4vrjbmlz05f9l2rck3"; + url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libnm-glib4.deb"; }; } rec { - name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64"; - sha256 = "1dlfym38qs8m3g38z776vvpxg77xx2mjab7qipsc0lnppjn8gnss"; - url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64.deb"; + name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt1_amd64"; + sha256 = "1r9qw0mx38zisj6lr9bk8yv9f3yf2l80y4rvgxq6k28ccz5sahvs"; + url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libnm-util2.deb"; }; } rec { - name = "libnotify4_0.7.5-1+srt4_amd64"; - sha256 = "1d61w65qxs93hpn4a8awzhjqcv7yva96n65309630axsm48cqxbd"; - url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt4_amd64.deb"; + name = "libnotify4_0.7.5-1+srt5_amd64"; + sha256 = "15ny5m925wrn0m394gn88288zgdjf99m5jg9pxyfirhvjmpp8pmf"; + url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libnotify4.deb"; }; } rec { - name = "libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_amd64"; - sha256 = "1k08330f3fhr7c6bpm4b5qdyc2kkmz8fa5bgk1a8psxqvfdlsyap"; - url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_amd64.deb"; + name = "libnspr4_4.12-0ubuntu0.12.04.1+srt2_amd64"; + sha256 = "11y0nj7pc94gs3ndxph50whs1yx8lys48c44vj1207m2mkw3xdq7"; + url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.12-0ubuntu0.12.04.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libnspr4.deb"; }; } rec { - name = "libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_amd64"; - sha256 = "1bxg7wk179gwi7s4xrn1bkl2amnbqrf11qsdw384cyq9c2hwfagr"; - url = "mirror://steamrt/pool/main/n/nss/libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_amd64.deb"; + name = "libnss3_3.26.2-0ubuntu0.12.04.1+srt1_amd64"; + sha256 = "0a5mqk6fry96jgpn27fv66mzg7s7mn00jhiayh73q4ddlv52p1r6"; + url = "mirror://steamrt/pool/main/n/nss/libnss3_3.26.2-0ubuntu0.12.04.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libnss3.deb"; }; } rec { - name = "libogg0_1.2.2~dfsg-1ubuntu1+srt4_amd64"; - sha256 = "0829hivgxzmhck0l16lg16qbphkhsrnqb2px4ksrzbspmg6b5rb1"; - url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.2.2~dfsg-1ubuntu1+srt4_amd64.deb"; + name = "libogg0_1.2.2~dfsg-1ubuntu1+srt5_amd64"; + sha256 = "1r06qcfw2hmm1lxgvndzjw24nawxc2qd2qd3lh7w8qmj2zrgp3zd"; + url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.2.2~dfsg-1ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libogg0.deb"; }; } rec { - name = "libopenal1_1.13-4ubuntu3+steamrt1+srt4_amd64"; - sha256 = "08gj208gfh37lfnxz1xksbmm1g78ax812z0rk12ahl4w72jm1yjy"; - url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.13-4ubuntu3+steamrt1+srt4_amd64.deb"; + name = "libopenal1_1.16.0-3+srt1_amd64"; + sha256 = "02dc0xfwh1jmhm0l4wig3ybs2yy48hdarnbfjv69m9aryjpbh6gj"; + url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.16.0-3+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libopenal1.deb"; }; } rec { - name = "liborc-0.4-0_0.4.16-1ubuntu2+srt4_amd64"; - sha256 = "0pgiha65y3rrqm095vmwc27498drqcgadiqyh4zyq2h2zi2ki60j"; - url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt4_amd64.deb"; + name = "liborc-0.4-0_0.4.16-1ubuntu2+srt5_amd64"; + sha256 = "13s7ni24igdkvmcs3d13ncll36clfmm14ggjqd23dsgyzmip5n18"; + url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "liborc-0.4-0.deb"; }; } rec { - name = "libp11-kit0_0.12-2ubuntu1+srt4_amd64"; - sha256 = "1hsncmfp6h3ca5w2bhaxbr6y2ck8fpzp0zhjijgfnyaqvsjc6wwa"; - url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt4_amd64.deb"; + name = "libp11-kit0_0.12-2ubuntu1+srt5_amd64"; + sha256 = "00x01l29gh4zl0nfsyh90ixgvln6kcs2963vmmjaql4h1cgvi27g"; + url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libp11-kit0.deb"; }; } rec { - name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_amd64"; - sha256 = "16hwn8a30ydarlw3rvpda48m0z0k5y1qw5vdg6syjaqcbwx15mll"; - url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_amd64.deb"; + name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt5_amd64"; + sha256 = "0dcimf6vsiv51lkavwbw980fll3vpki86i3rqm8vr37iz59798zf"; + url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpango1.0-0.deb"; }; } rec { - name = "libpci3_3.1.8-2ubuntu5+srt4_amd64"; - sha256 = "041hxfsk0r7rh02h16igcr0141gmci4ljadljcxsa1yiyn41b4rr"; - url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu5+srt4_amd64.deb"; + name = "libpci3_3.1.8-2ubuntu6+srt1_amd64"; + sha256 = "167a5rgzyss746s07fkal7vy89i0m5syjm2vdwfiln3ncil4s86y"; + url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu6+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpci3.deb"; }; } rec { - name = "libpcre3_8.12-4+srt4_amd64"; - sha256 = "1m53qvhqbicybi43zjjblhaqxfnlvq1m61mkvdhwskcxh1y5zpic"; - url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+srt4_amd64.deb"; + name = "libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt1_amd64"; + sha256 = "0x3yzmxvlg2xyy2sm03vvr4c46r7ywbns7gqbshzgn656zqdid00"; + url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpcre3.deb"; }; } rec { - name = "libpcrecpp0_8.12-4+srt4_amd64"; - sha256 = "0dv8a32dsvklrnvw66rxb7xim9ylhr9w4qvns527v6fl98rvg08l"; - url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+srt4_amd64.deb"; + name = "libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt1_amd64"; + sha256 = "1rlkj982w99x0mz008snkyqr1v13h165yj2z4jwdczpd1bsrra9h"; + url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpcrecpp0.deb"; }; } rec { - name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_amd64"; - sha256 = "0bljhrivr6dw181gisvy8dz6y9mjn0g9w3d5s2f5h8772g80mx7f"; - url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_amd64.deb"; + name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt2_amd64"; + sha256 = "15sa863fia26lclp821j0c747dv8a8igz5l86n5ff1m3dmlb5hp3"; + url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpixman-1-0.deb"; }; } rec { - name = "libpng12-0_1.2.46-3ubuntu4.2+srt1_amd64"; - sha256 = "00wis5q2xpdfh5z42rfl95j63lbsz5l3i5hvsyvim8r2h1r2nyn0"; - url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt1_amd64.deb"; + name = "libpng12-0_1.2.46-3ubuntu4.2+srt2_amd64"; + sha256 = "0gnjsh72c9w1229fk5fx753lpmcqzizx7dizrdh3wk1qmivhddl1"; + url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpng12-0.deb"; }; } rec { - name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_amd64"; - sha256 = "150gpmn1gb0ykd3cgggc9zkb070figgwrcdqx89qa2kwvkxlg6vl"; - url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_amd64.deb"; + name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt5_amd64"; + sha256 = "17d3f6gwbdyn058bbd8f0hj4ywp8rmhy9wsf2pnfkh219r5b98h2"; + url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libpulse0.deb"; }; } rec { - name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - sha256 = "07ldw9iyy9akp5zq2h7l85q3x8ggsx2hah51d0j41lfqrysyig63"; - url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; + name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; + sha256 = "16j666k8l85icbgy9ds9hdmcm60axsp8nxjc1n11jd64d9slb792"; + url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libroken18-heimdal.deb"; }; } rec { - name = "librtmp0_2.4~20110711.gitc28f1bab-1+srt4_amd64"; - sha256 = "0lzgsydisj6z7dgjgkmr42mzv11j61r9wny1m31vgm990p5zkh7n"; - url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt4_amd64.deb"; + name = "librtmp0_2.4~20110711.gitc28f1bab-1+srt5_amd64"; + sha256 = "0g07a8vxxglsh7sswqznsi7lmq5ibchhkhrmfywcdinxniwcr7ha"; + url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "librtmp0.deb"; }; } rec { - name = "libsamplerate0_0.1.8-4+srt4_amd64"; - sha256 = "1g6nh8p3q8bsqw9w0ifpl86gql9lqqwxk7zn9bl62pq393h107mg"; - url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt4_amd64.deb"; + name = "libsamplerate0_0.1.8-4+srt5_amd64"; + sha256 = "1xr5k6zyfw8lc5s6sbg57d7v33045hg9l6a1rh5f46v99hi8k1rr"; + url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsamplerate0.deb"; }; } rec { - name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_amd64"; - sha256 = "0sp76gcpw1zgqpyq7bp3gmavlncflkrxiyg738nsf9mb65xy4v94"; - url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_amd64.deb"; + name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt5_amd64"; + sha256 = "1i7hh43fiadg1y35dmjm03s8mcbanv8jfnnjrcccabahsk8fpdj0"; + url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsasl2-2.deb"; }; } rec { - name = "libsdl-image1.2_1.2.10-3+srt4_amd64"; - sha256 = "0jhlbn5jfap15d8nr2fz2hcwlv32ax29gddd5jg08vmfga767sqi"; - url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt4_amd64.deb"; + name = "libsdl-image1.2_1.2.10-3+srt5_amd64"; + sha256 = "180sia6zc48y2f3l1sywp8am0gqzc9swm711fq8b2kdd4rn3wicm"; + url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl-image1.2.deb"; }; } rec { - name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_amd64"; - sha256 = "0cb84d0x3fjsl3w48jmxjzc7xq9c6g73p99baxdg50vhqssr7dmw"; - url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_amd64.deb"; + name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt5_amd64"; + sha256 = "0z3zxvsvlnvzsvprvy5q4y99irjkzm4ilv0znaic5x967k3zpjp0"; + url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl-mixer1.2.deb"; }; } rec { - name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_amd64"; - sha256 = "1dqp16qi413xpv8nmyrbgx2x3dcxsyk2giifz7pa6jyvawcx7ghv"; - url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_amd64.deb"; + name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt5_amd64"; + sha256 = "11ks71izg46k2pjnd5jdk03xkzz7jmxm5k3mkwq8b42grdiadd6a"; + url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl-ttf2.0-0.deb"; }; } rec { - name = "libsdl1.2debian_1.2.15-5+steamrt1+srt4_amd64"; - sha256 = "1zcy3njzkahd5rq4yh7i07q3x1wyfpzl6kzynbsqkx9cnf53342k"; - url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt4_amd64.deb"; + name = "libsdl1.2debian_1.2.15-5+steamrt1+srt5_amd64"; + sha256 = "1i2072wzjmrz97pqxm9mfdqqvx6q6x6w8xqa5f4jxmhm9sb7x7wb"; + url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl1.2debian.deb"; }; } rec { - name = "libsdl2_2.0.4+steamrt2+srt1_amd64"; - sha256 = "04v4znqksg9qj4hnz20czwx4qy4i6p9csqql4yd299wvjl9k61j5"; - url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.4+steamrt2+srt1_amd64.deb"; + name = "libsdl2_2.0.8+steamrt1+srt1_amd64"; + sha256 = "1wm48pdd9sxd581jhwi2b6a4ln16wbz72p74q8l8fypq6gmvifcc"; + url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.8+steamrt1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl2.deb"; }; } rec { - name = "libsdl2-image_2.0.1+steamrt2+srt1_amd64"; - sha256 = "01kwm3yjq275j7hnd52hfjbhj5ijfz5wxmc1vpdp88q89zbkw227"; - url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.1+steamrt2+srt1_amd64.deb"; + name = "libsdl2-image_2.0.3+steamrt1+srt1_amd64"; + sha256 = "0nngj4lvk1r780wpghm9wcg9gmv0yswp56ff53h2jhn6k3gbcqsw"; + url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.3+steamrt1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-image.deb"; }; } rec { - name = "libsdl2-mixer_2.0.1+steamrt1+srt1_amd64"; - sha256 = "0bzv3spjksn504ma7haywyi3dlb5nl35wxp83if9n58i4850j6sd"; - url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.1+steamrt1+srt1_amd64.deb"; + name = "libsdl2-mixer_2.0.2+steamrt1+srt1_amd64"; + sha256 = "0l2l0krldx0yhdqnmj6zfsx13c1zfr8hky48gbs94rlgwl02ym6w"; + url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.2+steamrt1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-mixer.deb"; }; } rec { - name = "libsdl2-net_2.0.1+srt1_amd64"; - sha256 = "16zx9cj56m939x3zrvq1ypxsd26vnc81gmkpkg5j80jl2lwz6b6v"; - url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt1_amd64.deb"; + name = "libsdl2-net_2.0.1+srt2_amd64"; + sha256 = "1850n1zv9cpbnv5n3nk5knk30pm0f4g8x2cx70kyxbprfkq7894v"; + url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-net.deb"; }; } rec { - name = "libsdl2-ttf_2.0.14+srt1_amd64"; - sha256 = "14sfnmb0zz0mhvl3jl45jqc2sci59gmzdn5kif08ai8ri2bk9sza"; - url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt1_amd64.deb"; + name = "libsdl2-ttf_2.0.14+srt2_amd64"; + sha256 = "1bwhm58zqh452szjjj3m3ny2samx19qw3x6q7f18h7164d5vvm4a"; + url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-ttf.deb"; }; } rec { - name = "libselinux1_2.1.0-4.1ubuntu1+srt4_amd64"; - sha256 = "1y2a5f9qsxgdhak7vf72jsd6drjim172qp6m897yx7xbbk8ikpnr"; - url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt4_amd64.deb"; + name = "libselinux1_2.1.0-4.1ubuntu1+srt5_amd64"; + sha256 = "001wfrryd549gh1qd4v8fz3m78vpjwdx1vh34cw0dgi3kxmjxp0q"; + url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libselinux1.deb"; }; } rec { - name = "libsm6_1.2.0-2build1+srt4_amd64"; - sha256 = "0fjb9grh86vz58g6cb5d89hxnppqf7w5apivqb3h6sd5axkg2z1r"; - url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt4_amd64.deb"; + name = "libsm6_1.2.0-2build1+srt5_amd64"; + sha256 = "0k0hyh6b36wvcn8ss24f7lqp2pb0wdvb5zh57y7zfxglgr9vj083"; + url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsm6.deb"; }; } rec { - name = "libsndfile1_1.0.25-4+srt4_amd64"; - sha256 = "0fdv7ca60s23qc5azjsg7aaznqksx5xh0bngzc6sl8bqvnnc8z1g"; - url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+srt4_amd64.deb"; + name = "libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt1_amd64"; + sha256 = "17sds50cyvpfrm6x8hddb0ir5xsch79k8gyghkzi59dav2j4j2f4"; + url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsndfile1.deb"; }; } rec { - name = "libspeex1_1.2~rc1-3ubuntu2+srt4_amd64"; - sha256 = "1as44g6g5li8q6mdxwnwfbqg9f779vyjh2bqygv5xm339viaj510"; - url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt4_amd64.deb"; + name = "libspeex1_1.2~rc1-3ubuntu2+srt5_amd64"; + sha256 = "0b0lrg7arrnszc1hzya04ch3j4lbcrpxqf5hxxz2wm5k5qb9f6rv"; + url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libspeex1.deb"; }; } rec { - name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt4_amd64"; - sha256 = "0rsrl5z379bls6bhb0nqc92ilkd7jkg7bdmxw0xg6vw9l66w78ln"; - url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt4_amd64.deb"; + name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt5_amd64"; + sha256 = "1vks6i3ipggcd2b4ayhkpzj70rdwvlmgh20z7ac8hcnhfnsmvmbc"; + url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libspeexdsp1.deb"; }; } rec { - name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt1_amd64"; - sha256 = "1x1byhdvr0zdfl9dj07qpndifbs9x416vxl7rpmig9g0makxvsmx"; - url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt1_amd64.deb"; + name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt2_amd64"; + sha256 = "0yavzpx56kf27pfjif6s86bg9wmr9078d7p34dpvbzp0aibjifs8"; + url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsqlite3-0.deb"; }; } rec { - name = "libssl1.0.0_1.0.1-4ubuntu5.33+srt1_amd64"; - sha256 = "11n8iwsc562i1glpisjs9xvlmz4a4xibq6axkhi0xnvv0pbfnxiw"; - url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.33+srt1_amd64.deb"; + name = "libssl1.0.0_1.0.1-4ubuntu5.36+steamrt1+srt2_amd64"; + sha256 = "149wrr5k7hx5lbgkyi4rh2sgr15m9k8x075gilab60mj1b6cv439"; + url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.36+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libssl1.0.0.deb"; }; } rec { - name = "libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64"; - sha256 = "0fdmjsyl8a5n14gkwhvkr3xfcfr7q9djapsk8gj56d6r0ydg9yxc"; - url = "mirror://steamrt/pool/main/g/gcc-4.8/libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64.deb"; + name = "libstdc++6_5.4.0-7.really.6+steamrt1.1+srt1_amd64"; + sha256 = "0fnqw21m8byigf4303z7qvficral6ar3lsxrsx4ai9r8d6bmmgdn"; + url = "mirror://steamrt/pool/main/g/gcc-5/libstdc++6_5.4.0-7.really.6+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libstdc++6.deb"; }; } rec { - name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_amd64"; - sha256 = "1yn54vcd5hxx7rxzvshbfidfksl1c0pvl8xv427lkf7xni3jx0xb"; - url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_amd64.deb"; + name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.1+srt1_amd64"; + sha256 = "0km4v33pzknjq0ah7w03s8xny21qggx6pc2q1ah9dlra5dwv4nsm"; + url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libstdc++6-4.6-pic.deb"; }; } rec { - name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - sha256 = "0y0k0glqnmsq69sbp3s47pw37vvf969n3chniv3jmrjkjghkp44h"; - url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; + name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64"; + sha256 = "1shni0sdcv1jqkfsqy5j3kkr73lifb3ip9lqz8cxx23dlvbllly9"; + url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libswscale2.deb"; }; } rec { - name = "libtasn1-3_2.10-1ubuntu1.4+srt1_amd64"; - sha256 = "0kqv3ndnw1lcz5p190bxpq6rglpcxdsz44wyr6yl7w5wpfwcbs61"; - url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.4+srt1_amd64.deb"; + name = "libtasn1-3_2.10-1ubuntu1.5+srt2_amd64"; + sha256 = "1sjklhs977mrvs7qci0hc3w6x3gjrq5c6lfxjma7bjg731xwdivp"; + url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.5+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtasn1-3.deb"; }; } rec { - name = "libtbb2_4.0+r233-1+srt4_amd64"; - sha256 = "1ngm0nkzk8w5s7dp01983lybd256130kdc8f4jmlyikhvyx0khgh"; - url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+srt4_amd64.deb"; + name = "libtbb2_4.0+r233-1+steamrt2+srt1_amd64"; + sha256 = "18rc6jhkpqnqvrw29zffahmjihrdrwmh4ydnx3433j6wc29m8p4v"; + url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+steamrt2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtbb2.deb"; }; } rec { - name = "libtdb1_1.2.9-4+srt4_amd64"; - sha256 = "112dq62phrd3czhi27kdk4ra9is5phxpzbn26x4bis4y3ccm0cfm"; - url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt4_amd64.deb"; + name = "libtdb1_1.2.9-4+srt5_amd64"; + sha256 = "1wq2956jmq9zhd7gcpgvqq7d1rdjk954hgcx540zwgxs57brzkrw"; + url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtdb1.deb"; }; } rec { - name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_amd64"; - sha256 = "01zvb8msi6pkjs85y4j78a110fzlmnjp69m7z7qwr2r7rr05w6r0"; - url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_amd64.deb"; + name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt5_amd64"; + sha256 = "15b6sg3dhamlgaq28w3zlwif5aps0ybi0hc29k3vv2s48f6vqfi8"; + url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtheora0.deb"; }; } rec { - name = "libtiff4_3.9.5-2ubuntu1.8+srt1_amd64"; - sha256 = "13j4pqqba0bf2fq0871s8b4wkw8zyv0q80x0n07lkjiv7bvrrkcw"; - url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.8+srt1_amd64.deb"; + name = "libtiff4_3.9.5-2ubuntu1.9+srt2_amd64"; + sha256 = "038wcp777pj2y3scwkqfdnb6yjsag5dnqajrdiv7pxmvkgn3bc2l"; + url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.9+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtiff4.deb"; }; } rec { - name = "libtinfo5_5.9-4+srt4_amd64"; - sha256 = "07pp7dgp33yjdk0i3s7q73qq0pd0ylfbpvr5jssjap0wsp3aqq66"; - url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt4_amd64.deb"; + name = "libtinfo5_5.9-4+srt5_amd64"; + sha256 = "1w22aqm9zla5cfcvkridgzwnkhj3lyjqf61dl8ppnnbk8rhj07x4"; + url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libtinfo5.deb"; }; } rec { - name = "libudev0_175-0ubuntu9.2+srt4_amd64"; - sha256 = "07jvb8ghflb87f4dvgii5jv5qzz31g9s7c3k8wb9w9jp574y7079"; - url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.2+srt4_amd64.deb"; + name = "libudev0_175-0ubuntu9.10+srt1_amd64"; + sha256 = "146kdj719rkgj5v2g0lzs7qqb59a2xgplkqrrafpkssqangvfmq1"; + url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.10+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libudev0.deb"; }; } rec { - name = "libusb-1.0-0_1.0.19-1+srt1_amd64"; - sha256 = "19f9mhbjm6r4yxdr3fvsn0ad8j7dm07y4bzwqf0n5i715jcc0qaf"; - url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt1_amd64.deb"; + name = "libusb-1.0-0_1.0.19-1+srt2_amd64"; + sha256 = "0vnsr4syd7alas356hv1radm5rb8vlh69h5ljlh24sqs923vgg28"; + url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libusb-1.0-0.deb"; }; } rec { - name = "libuuid1_2.20.1-1ubuntu3+srt4_amd64"; - sha256 = "060wnsbhxl0aqyh1ymbcdma59v10b1vgi3h3xvvilzl869ivwr1p"; - url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3+srt4_amd64.deb"; + name = "libuuid1_2.20.1-1ubuntu3.1+steamrt1.1+srt1_amd64"; + sha256 = "03d2jj9l3k31wb2wrvcjpa79cp7yjsqqms58vqh9pksbnmyrddr2"; + url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3.1+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libuuid1.deb"; }; } rec { - name = "libva-glx1_1.3.1-3+steamrt4+srt1_amd64"; - sha256 = "1v6n0ryr48d8f25vy06d9vh84z2zf3kmg6k8pg89j0s3spdyb44v"; - url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.3.1-3+steamrt4+srt1_amd64.deb"; + name = "libva-glx1_1.7.0-1+steamos1+srt1_amd64"; + sha256 = "15scnb989xybb4l8gspbjvs058kjfw0r7ajqak3gxrx7vgqb3i92"; + url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.7.0-1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libva-glx1.deb"; }; } rec { - name = "libva-x11-1_1.3.1-3+steamrt4+srt1_amd64"; - sha256 = "03s9kbprf6r48y4ycfixx96ga0n8vfjn7v74sv88kl0lrs8xzjy8"; - url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.3.1-3+steamrt4+srt1_amd64.deb"; + name = "libva-x11-1_1.7.0-1+steamos1+srt1_amd64"; + sha256 = "0f1hmz4218isrwx8823sm7v08dlvyjwphvbjqsgg9qgim0f13j8a"; + url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.7.0-1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libva-x11-1.deb"; }; } rec { - name = "libva1_1.3.1-3+steamrt4+srt1_amd64"; - sha256 = "0700lprd2c636dhqs000amw0nkys77h8mb7698bg30j25yd5kqr4"; - url = "mirror://steamrt/pool/main/libv/libva/libva1_1.3.1-3+steamrt4+srt1_amd64.deb"; + name = "libva1_1.7.0-1+steamos1+srt1_amd64"; + sha256 = "0p3548fnf47vj5kxzrqqpdxvip35xyydkxj7d5iiw9f26fz06drd"; + url = "mirror://steamrt/pool/main/libv/libva/libva1_1.7.0-1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libva1.deb"; }; } rec { - name = "libvdpau1_0.4.1-3ubuntu1.2+srt1_amd64"; - sha256 = "0a519njbsdwpvc49pn08sya34z2wcd8hpl0j44plr4bd2df010g2"; - url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt1_amd64.deb"; + name = "libvdpau1_0.4.1-3ubuntu1.2+srt2_amd64"; + sha256 = "1f1h77y6mf7xs8biaz77kfimp98v9cpjrbfg0qyi4wafwn7jmnsr"; + url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvdpau1.deb"; }; } rec { - name = "libvorbis0a_1.3.2-1ubuntu3+srt4_amd64"; - sha256 = "1jdvxgvlwnjcvg6009qfklr8mf3678ydrg855smgv8a0nd7v5qiv"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1ubuntu3+srt4_amd64.deb"; + name = "libvorbis0a_1.3.2-1ubuntu3+srt5_amd64"; + sha256 = "0sn12vpmgk6jwa97cp6m8wx4197mdgh1ggb2r09hr3p5fyk44nmc"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1ubuntu3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvorbis0a.deb"; }; } rec { - name = "libvorbisenc2_1.3.2-1ubuntu3+srt4_amd64"; - sha256 = "1ysm1ika8cymh7gmd3p2hdfsnm3jrzyn4g2r12r4m9m6q3l9knz7"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1ubuntu3+srt4_amd64.deb"; + name = "libvorbisenc2_1.3.2-1ubuntu3+srt5_amd64"; + sha256 = "18zd7njnczr93q7x2dz7x3n9yqwp77bjsp52qcxvy4bm7b3pr0bi"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1ubuntu3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvorbisenc2.deb"; }; } rec { - name = "libvorbisfile3_1.3.2-1ubuntu3+srt4_amd64"; - sha256 = "0y4r9s5cjcjxi6hy0svzfbqlkaxklb883vcsqn1j0kp9li3jpkbx"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.2-1ubuntu3+srt4_amd64.deb"; + name = "libvorbisfile3_1.3.2-1ubuntu3+srt5_amd64"; + sha256 = "12ninaw71p59lazzvyd3yq3sy4g30x9ywwfm760nbiijb9yq48m4"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.2-1ubuntu3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvorbisfile3.deb"; }; } rec { - name = "libvpx1_1.0.0-1+srt4_amd64"; - sha256 = "1275437ph91i67q6naigz4nhmw2a330q72mjv282slk7y187ana5"; - url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-1+srt4_amd64.deb"; + name = "libvpx1_1.0.0-2+srt1_amd64"; + sha256 = "02r8yklax0nd9z9s0c2iv1pdnwaq7h3ys46vf0wcwfc8n1p6jj9j"; + url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvpx1.deb"; }; } rec { - name = "libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_amd64"; - sha256 = "18v5vbrvg6l9m768k4cb4xwbxahqrr7zspx1b5a8fv6bw8h3d9l4"; - url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_amd64.deb"; + name = "libvulkan1_1.1.73+dfsg-1+steamosc2+srt1_amd64"; + sha256 = "1f58xi83frcxpq62yfyqjhxzg2ali4hafv8zinial4ixh5nk2a07"; + url = "mirror://steamrt/pool/main/v/vulkan/libvulkan1_1.1.73+dfsg-1+steamosc2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvulkan1.deb"; }; } rec { - name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - sha256 = "02baqaxcpw306cgr5dvz5pcir7ys08r603m8ahk22bzgxpzl6xk4"; - url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; + name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64"; + sha256 = "0wfs33djnx2k5clhwn6rq17pmqv7d2xyr5mihhylc4fs7q179pg0"; + url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libwind0-heimdal.deb"; }; } rec { - name = "libwrap0_7.6.q-21+srt4_amd64"; - sha256 = "12wq77h9jczq974fh3c8n4fkqa876kbizvai96jizh7c90z94kvk"; - url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt4_amd64.deb"; + name = "libwrap0_7.6.q-21+srt5_amd64"; + sha256 = "1rvgmwh2m633mmz78lccs97sr489bc2qv1vvwl1gf6rd01cmgd99"; + url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libwrap0.deb"; }; } rec { - name = "libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64"; - sha256 = "0qp2q9q1z9sz0pyc7l1n6xa0bc22xsml3vf2yhdls71im3ks7bi9"; - url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64.deb"; + name = "libx11-6_1.6.3-1ubuntu2.1+srt1_amd64"; + sha256 = "0lf1k902i59f3v9jgjav9gzsiq7pnrfnlzmlmyxkcfwkd8pvkign"; + url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.6.3-1ubuntu2.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libx11-6.deb"; }; } rec { - name = "libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all"; - sha256 = "17mygha6q5480ajgv1f4wmgwr3l3zxh92yagh4qfsm6r1j2a5dma"; - url = "mirror://steamrt/pool/main/libx/libx11/libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all.deb"; + name = "libx11-data_1.6.3-1ubuntu2.1+srt1_all"; + sha256 = "1imsbk4mg6n1083gjjv6kssm5g842xlbg40vsc4dw97myxycpncw"; + url = "mirror://steamrt/pool/main/libx/libx11/libx11-data_1.6.3-1ubuntu2.1+srt1_all.deb"; source = fetchurl { inherit url sha256; name = "libx11-data.deb"; }; } rec { - name = "libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64"; - sha256 = "1vsvf6ihz8jbnsarygnfrjb1y7pg44gpk89b8sk449p0c1kmv4yz"; - url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64.deb"; + name = "libx11-xcb1_1.6.3-1ubuntu2.1+srt1_amd64"; + sha256 = "0l9zprciyrgn4aq91ddmmfhffvms8p9258vv109l62bar4mmg9sz"; + url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.6.3-1ubuntu2.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libx11-xcb1.deb"; }; } rec { - name = "libxau6_1.0.6-4+srt4_amd64"; - sha256 = "1bm0jp69kfnirvlsyj7qxf7dg5b1n53875kxr9asdpw4aqmfj3a6"; - url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt4_amd64.deb"; + name = "libxau6_1.0.6-4+srt5_amd64"; + sha256 = "1l4ij8c6gmv54yfv24dw9903zjczasd6z9lvzd07c5zj4rj7gx62"; + url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxau6.deb"; }; } rec { - name = "libxaw7_1.0.9-3ubuntu1+srt4_amd64"; - sha256 = "15r0f6zhjr13pca7mdxfhk0v48923q0kndp23kpxw8rz75nc15s7"; - url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt4_amd64.deb"; + name = "libxaw7_1.0.9-3ubuntu1+srt5_amd64"; + sha256 = "1a15brx602gg6jq708ymngyr3rcbapmk5620wdx094vdclc665g9"; + url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxaw7.deb"; }; } rec { - name = "libxcb-composite0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "072z8vwk4gmbnyf5acn6y4rjiidk7rvi1k05za1j5hlqzlydb6x9"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "0h0yfv4ana590x038lwbz4cxfb3smcqbd394ggir0kv9m1przp78"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-composite0.deb"; }; } rec { - name = "libxcb-damage0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "1062g911skvvlvxr6ihxkb0inyg6xg1j4m4k5rfqs333rw4npc2i"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1431qrr9kg3mdbag9sfdcqy0g84w074k01r2nyr3bq0w5q8px15l"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-damage0.deb"; }; } rec { - name = "libxcb-doc_1.10-2ubuntu1+srt4_all"; - sha256 = "0zq3xcrlr2wjp3386bf5h1z63hapmkpnw45l1fz17chdngcmj358"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-doc_1.10-2ubuntu1+srt4_all.deb"; + name = "libxcb-doc_1.11.1-1ubuntu1+steamos1+srt1_all"; + sha256 = "0aly1y78gdv9vkxqgs6ir7sdifn0bvsbflp05x7jmq0zlgpcg0nz"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-doc_1.11.1-1ubuntu1+steamos1+srt1_all.deb"; source = fetchurl { inherit url sha256; name = "libxcb-doc.deb"; }; } rec { - name = "libxcb-dpms0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "1xq6zh8val8mc7wcry0jwdx11aagm4af383c6vs2z6a8vz97c6sj"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1p2hd14zb1zvqkvgs0apc6m2dwh7kwbxv12py10nr6rzmkr75z1k"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dpms0.deb"; }; } rec { - name = "libxcb-dri2-0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "1kipdyw3wgdywznr5qxbdl85igizc40hwjd3s5f3y5pvd8kprarz"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1ixndxxr7ff48p4sp6rim5bjjvncyc2qcld13az56hjybyq90ka1"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dri2-0.deb"; }; } rec { - name = "libxcb-dri3-0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "04bqidf71j55qp2b83bfjm26sa62gslidzhzg81knynlqi8kk00q"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "0l4j5ydzfnzl5wmabwh8jv2qcdgi5blks8ys06cjri8dq4fqq3gg"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dri3-0.deb"; }; } rec { - name = "libxcb-glx0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "03wndp2gkjw016rl6k4jhkcpbs1njg74flnb0ppk30j7nxnxqcm9"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1shd1g43pq5hqpmxkfp8lykpqzzdn0a0w53m20bkz133jgjwqq1i"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-glx0.deb"; }; } rec { - name = "libxcb-present0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "18f38c275h2y9221mn7x0s8ap5fhlry6rdz34lz0rr3pn83fhpvf"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-present0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1m3xf4vkbk2iwy64y8ak51b8wrd5g8hyfbankvfaf123dyyk8z7x"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-present0.deb"; }; } rec { - name = "libxcb-randr0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "08c7fx2vc35l7s72f2z02j0wh0b728ibn3zf103jc0yri9pgfinz"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "047j08nl310s4m8d2gk555bhf1q0s78pq882dqqla2skhfslg645"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-randr0.deb"; }; } rec { - name = "libxcb-record0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "1ddr52m5x9ah4j313fvq2ira96l13w8dd4qi0z38llarmrhw2p2y"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-record0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "0qfh1wnd11z8r9a7zyrvsa4banisvmi3vj5zvihppz2698ln53rv"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-record0.deb"; }; } rec { - name = "libxcb-render0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "07kyplilgxk0dj9gxk9zdf5l108d8ya9j4j1ji0frn0mk06i45kl"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-render0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1yj9hxmdjqqinkx8a1gm7nwyxpj6adxphl2f3i863m0gp679bvag"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-render0.deb"; }; } rec { - name = "libxcb-res0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "0pxpgam9xjzf0m6hrqhl0679qa10qk91ami0p7k899b5b1573j6d"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-res0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1v8ipbhabg72mc3rf378l0c8x5apndkgjqbvg5qzp4s591w251np"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-res0.deb"; }; } rec { - name = "libxcb-screensaver0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "1i09z5nszbh9ikjpviwcixayicbq0v9rdg7gygxhs54zxxjccw8y"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "04cm77may727miynsqw0937cvs5kjbh85csrdr86yyayvlqygs02"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-screensaver0.deb"; }; } rec { - name = "libxcb-shape0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "02c87qhymk8ncywaw7zrs73spl1x1byklnafk2drfw76gpf2pa26"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1z0jlvv25ya5v4rn7cmpwpdbafjmhrb9b7hp6x9nlwrhbpwjh6q2"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-shape0.deb"; }; } rec { - name = "libxcb-shm0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "0yzk3yx3c20ms7np2g956m1j3y5xf241gnvpsv37z173a4j7hlhn"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "0sdajn0sxkvqpy69ccl3l7f7ky4yhj4z304b19wplqfy0qal2gn7"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-shm0.deb"; }; } rec { - name = "libxcb-sync1_1.10-2ubuntu1+srt4_amd64"; - sha256 = "1lkch9qhzlx8hpv6msvfa2nd7qqkx6xj86akxwgj1wbl10lbqv47"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1dvq7n1jrsj07hikqvbbbc4wmmk5i9vsvgfcg39vaywmx5fdmfw8"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-sync1.deb"; }; } rec { - name = "libxcb-xevie0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "0f4g04lrbyfjgcphv12zcmsvxa6krjk33kjn4lfdfq3440znvkig"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "07qsfdyym47shm3n6m7i9flb339xannxlch2h0i5p9ca2z1a34g2"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xevie0.deb"; }; } rec { - name = "libxcb-xf86dri0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "11c6yh1kax9d5qp17znbvll41q953x4ymx5yvhkjx23z6ra8skbb"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "06ha588as5j1njqga4xamfnw79z6y13i596syl0h34pdmsqd2jll"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xf86dri0.deb"; }; } rec { - name = "libxcb-xfixes0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "0fhprxkv94sgyghcif81dzng5jwyrb6g1y8z78g0wrppjf0k2ixc"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1npk19k2qhqm89hk2jhf49acig330myvksamd3xw2gjxa99xz7lz"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xfixes0.deb"; }; } rec { - name = "libxcb-xinerama0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "0wbs15dy8zr45d1jqnky6kki6slv150hqlylglva5n0cs2ami0si"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "0s117w3a3ql7d6k2bp88hzni3k9cg24qcmbqz50z8b1gqhpw9y6b"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xinerama0.deb"; }; } rec { - name = "libxcb-xkb1_1.10-2ubuntu1+srt4_amd64"; - sha256 = "1y6h2awv9h5h09xzhbfr9cd500928knx38ixc28q9v3r0xbw8i8k"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "0kximpl89ks2simxnz10z836rnvaysys7c2jddhsy1z7z30gpb9h"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xkb1.deb"; }; } rec { - name = "libxcb-xprint0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "0ifmby85fzcazzlw36mliz8ylmbxdxxqbpibzlzn65dj3fmmkmhl"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1l2lxnwp129sa268n3xbrifq8yyfn292nz9arqp95za091zj2rri"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xprint0.deb"; }; } rec { - name = "libxcb-xtest0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "09ia0zfb63wmr7a7hlgyn5dnq2dv78apkd834150pzbz83yr00vz"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1pybcn6rwwg6b4l7a1sn0nxkp2lb5ar9vzwn6ggd8vwrwnppjvq4"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xtest0.deb"; }; } rec { - name = "libxcb-xv0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "0r4yhw2h3clkscpxfg9vpl3x7sh89lxrqmddfvz2mwbqxs64i44q"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "13jyd5jkz8wmbz6n7azxdnbw48c9i5zkwysza50d1c3rlxalpq82"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xv0.deb"; }; } rec { - name = "libxcb-xvmc0_1.10-2ubuntu1+srt4_amd64"; - sha256 = "0fjms3ram2zjg4b6njwqj37dyfw9m39syhw78w0p5q97my4vcrs2"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "0l4wagp619qar8g9yji1sf4schlclyl1zvdmp3w2cp9lnnwx1p1w"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xvmc0.deb"; }; } rec { - name = "libxcb1_1.10-2ubuntu1+srt4_amd64"; - sha256 = "18d9armijpdncqv8crz969dgrana0cw6f81di0clqwhx3sgmm29v"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.10-2ubuntu1+srt4_amd64.deb"; + name = "libxcb1_1.11.1-1ubuntu1+steamos1+srt1_amd64"; + sha256 = "1a8x128bgbz9gy2wsmhijg4di99k18ybs9mwvv37hkpw6mlfaxdx"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.11.1-1ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcb1.deb"; }; } rec { - name = "libxcomposite1_0.4.3-2build1+srt4_amd64"; - sha256 = "0xiqwrgsz6dfa0pd9and19gyvmpha8x2sgh5hg3j6kn04cza8523"; - url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt4_amd64.deb"; + name = "libxcomposite1_0.4.3-2build1+srt5_amd64"; + sha256 = "01kkvnndzkzqx9pacrlirn435z7dky7lkm0clv7yya3xaw5fslv4"; + url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcomposite1.deb"; }; } rec { - name = "libxcursor1_1.1.12-1ubuntu0.1+srt4_amd64"; - sha256 = "0zzj3j8k1ci94y3kydyia61crfw31qg4gqj10lih0m86ci5asyyw"; - url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt4_amd64.deb"; + name = "libxcursor1_1.1.12-1ubuntu0.1+srt5_amd64"; + sha256 = "0n9dgdi8hb1w5dpasi2pmm5ysrckfch930yvx9grs026dgz3s2g7"; + url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxcursor1.deb"; }; } rec { - name = "libxdamage1_1.1.3-2build1+srt4_amd64"; - sha256 = "12bb67z98j857wixl51bjg0mgq59zid69ng5lkdjwl5a7cqjgl0f"; - url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt4_amd64.deb"; + name = "libxdamage1_1.1.3-2build1+srt5_amd64"; + sha256 = "0l088wzpyn15nmy8c6nx3p97qhklxhyaxm8bhafv9sddpr407p4k"; + url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxdamage1.deb"; }; } rec { - name = "libxdmcp6_1.1.0-4+srt4_amd64"; - sha256 = "1sw99jdxdafl57y67nssd0ninmiycfgmd8vbi7q3rpp545vc878p"; - url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt4_amd64.deb"; + name = "libxdmcp6_1.1.0-4+srt5_amd64"; + sha256 = "1jx1i0i6vrm6h2sq99f61dix0v8j1f6nq4d2a1hqaw5f1bsra4q7"; + url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxdmcp6.deb"; }; } rec { - name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_amd64"; - sha256 = "0z9jhx6jplin6fzbj4v11aq3d1wqvy2rb2p3g952kymi9372mnr3"; - url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_amd64.deb"; + name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt2_amd64"; + sha256 = "0ip72ys964g5569rbgsrcv8b1afmwm1mrskgrgiqjs93bhr5i4c4"; + url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxext6.deb"; }; } rec { - name = "libxfixes3_5.0-4ubuntu4.4+srt1_amd64"; - sha256 = "0531x9n6p5b9n8isjwmfnr8kmwxyjp81mxrdkmxf6v0k4j0y9sgg"; - url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt1_amd64.deb"; + name = "libxfixes3_5.0-4ubuntu4.4+srt2_amd64"; + sha256 = "1x2255fch7g2skiz1x94vrm63ahcwf258w2qjkadnbqwivyf8crz"; + url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxfixes3.deb"; }; } rec { - name = "libxft2_2.2.0-3ubuntu2+srt4_amd64"; - sha256 = "1bipk6d6dw57pdcybbyhvszjad68qckg4i8s9hkn3kn89d2s46bc"; - url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt4_amd64.deb"; + name = "libxft2_2.2.0-3ubuntu2+srt5_amd64"; + sha256 = "0ylsvvd28qwz442scylrp9gmmp1y6lvyj1bcjd5d4g0fc9iwm37d"; + url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxft2.deb"; }; } rec { - name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt1_amd64"; - sha256 = "0m9h9k5qbqjiay4003v51vbbm9i24j7g3nx6q901csndjk5aq6ss"; - url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt1_amd64.deb"; + name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt2_amd64"; + sha256 = "0g3nazw6w77q91c0dsn040y79d1rmg4njg2n3cv871630zghz6rs"; + url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxi6.deb"; }; } rec { - name = "libxinerama1_1.1.1-3ubuntu0.1+srt4_amd64"; - sha256 = "03dqvmdvcdraw0p483qrqv6xchr6a96vpmbbni6qcdak1gic2xkb"; - url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt4_amd64.deb"; + name = "libxinerama1_1.1.1-3ubuntu0.1+srt5_amd64"; + sha256 = "1icp7syxhfgwpiabl7503ylw66m7z3sq5pn7wkxb2yriqxfj3nmp"; + url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxinerama1.deb"; }; } rec { - name = "libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_amd64"; - sha256 = "0c5acgsr7as7afjwvl6qbqbgn3wpima2k55awgga6prvhzkas60p"; - url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_amd64.deb"; + name = "libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt1_amd64"; + sha256 = "0k5wagjkf60ys0cg639758c1h0cjmziyxvp5597vavbds32sl2hm"; + url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxml2.deb"; }; } rec { - name = "libxmu6_1.1.0-3+srt4_amd64"; - sha256 = "1l08mkf2kwgskhzh9s43g5vcl4v1qphn68ila8g9gfw05gq7r0j1"; - url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt4_amd64.deb"; + name = "libxmu6_1.1.0-3+srt5_amd64"; + sha256 = "0pabx6pyazssqfs775k4l19frqv20225n7jmr1ncvwfikiw48gsl"; + url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxmu6.deb"; }; } rec { - name = "libxpm4_3.5.9-4+srt4_amd64"; - sha256 = "1z72sbc802sanhagf0w26hkk3yw0zdahw7dk89hjcgp57qmyyb08"; - url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+srt4_amd64.deb"; + name = "libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt1_amd64"; + sha256 = "0nv7v30mh3j53h7lcvqm2ixnsbn8328vcfbd2ysx2r2fac9waw7j"; + url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxpm4.deb"; }; } rec { - name = "libxrandr2_1.3.2-2ubuntu0.3+srt1_amd64"; - sha256 = "1yqfa0nllfqk9rnwj65nx8ni5xy4pn2nfasbkhzs8cfcyfd96y4x"; - url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.3.2-2ubuntu0.3+srt1_amd64.deb"; + name = "libxrandr2_1.5.0-1+srt1_amd64"; + sha256 = "1i55vzgaalxlm0mgi7c52nmpmksyffbf93isg3i2syg5nzain8v2"; + url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.5.0-1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxrandr2.deb"; }; } rec { - name = "libxrender1_0.9.6-2ubuntu0.2+srt1_amd64"; - sha256 = "06v7qfp10gfzx04znksc1mhx5a90za29hi90vinjrzccv096ak99"; - url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt1_amd64.deb"; + name = "libxrender1_0.9.6-2ubuntu0.2+srt2_amd64"; + sha256 = "0zd4kd5235vn575msfgl48j4czfp4fc44y439gcclpadkhvciviz"; + url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt2_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxrender1.deb"; }; } rec { - name = "libxss1_1.2.1-2+srt4_amd64"; - sha256 = "0w0idnk6i94klavy80bv83pvkg2m8qvjaa9w641995r6drm9nag7"; - url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt4_amd64.deb"; + name = "libxss1_1.2.1-2+srt5_amd64"; + sha256 = "1k7248hb63ml79nqzij65rmg8x0ayi41zpl9ls6my87a6gzswyhr"; + url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxss1.deb"; }; } rec { - name = "libxt6_1.1.1-2ubuntu0.1+srt4_amd64"; - sha256 = "1blcs2ngp6k5g87y10f2wgshr7m44943ks1ykpb59ss1w5j6cmx6"; - url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt4_amd64.deb"; + name = "libxt6_1.1.1-2ubuntu0.1+srt5_amd64"; + sha256 = "0gd81vk2bzjc9zcdbgj57hwhs6v9dmzajrmngmaxavyzv2fgamka"; + url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxt6.deb"; }; } rec { - name = "libxtst6_1.2.0-4ubuntu0.1+srt4_amd64"; - sha256 = "0mff4swa68mldsv915hirllccybbgjn3i4j23bj4bf26hasr0m6x"; - url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt4_amd64.deb"; + name = "libxtst6_1.2.0-4ubuntu0.1+srt5_amd64"; + sha256 = "1l1l2073b9cd76ckn5f2d4qb4w1k48s0dlki93bfikph8ms6px8d"; + url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxtst6.deb"; }; } rec { - name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt4_amd64"; - sha256 = "0ahk7z05sshj649vanr2hvarwqp3aphqwbdzf3hjd5rb9cg061fm"; - url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt4_amd64.deb"; + name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt5_amd64"; + sha256 = "1diqhhj91knlz02b6ha940091yjris46d5swy3zi3r389w2b2crm"; + url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "libxxf86vm1.deb"; }; } rec { - name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_amd64"; - sha256 = "1sgjxdgx8fd780imrqwiwqlhwlmgrndam8km9visymcr431yjbnb"; - url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_amd64.deb"; + name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt5_amd64"; + sha256 = "0cr24gybxz7h8s9rijr75dayahy1kx4i6gn5q2q6h4z29v046nc4"; + url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "nvidia-cg-toolkit.deb"; }; } rec { - name = "zenity_3.4.0-0ubuntu4+steamrt2+srt4_amd64"; - sha256 = "12csbx3bzziygw2xa0w4d0i3gh7l2h1sc93npvsmqnjxs6qmwnnz"; - url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt4_amd64.deb"; + name = "zenity_3.4.0-0ubuntu4+steamrt2+srt5_amd64"; + sha256 = "0ajisfqvlajw0m6kq3yv8j6f38dfhlavrmmfdq5yqmb70wmmkk71"; + url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt5_amd64.deb"; source = fetchurl { inherit url sha256; name = "zenity.deb"; }; } rec { - name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_amd64"; - sha256 = "06l2s654sg4z16g2b1whrjkz2gwqd0mjgf9w3jzvwwdbprc71gmg"; - url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_amd64.deb"; + name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt6_amd64"; + sha256 = "0962hhdg3knxnjinkv7m3h510fq8vghjyaxnsnsyijqzfawi4rfj"; + url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt6_amd64.deb"; source = fetchurl { inherit url sha256; name = "zlib1g.deb"; @@ -1752,1746 +1743,1737 @@ ]; i386 = [ rec { - name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_i386"; - sha256 = "0i6phg3gmiqx4in4ym5iv3l15x396d0gkrs57x5p7mw8ahb5fq7q"; - url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_i386.deb"; + name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt5_i386"; + sha256 = "1899b2x8kfallda1i0m1hph7v088q7px0rpxm8w6qwp5mwqy4rip"; + url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "dconf-gsettings-backend.deb"; }; } rec { - name = "freeglut3_2.6.0-1ubuntu3+srt4_i386"; - sha256 = "1vsm25lzylxf4mvqs5p171qrl8aspdi5rvlnpfhc35cx3vhkxg79"; - url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt4_i386.deb"; + name = "freeglut3_2.6.0-1ubuntu3+srt5_i386"; + sha256 = "0jdn9nvjmhphv9iw1h589cy5q1iq0gp9q4ibm0m69lkazi2v1blb"; + url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "freeglut3.deb"; }; } rec { - name = "gcc-4.6-base_4.6.3-1ubuntu5+srt4_i386"; - sha256 = "1s7wvx23xnv3i3mw6a2pk9nr9s9wzpc99cr6rzgq3jxfmph78c4r"; - url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+srt4_i386.deb"; + name = "gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.1+srt1_i386"; + sha256 = "0zsb0kn2kn64hvf33xnp94k5i9c1269qyla8p5q8vzwplcl0qrx9"; + url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "gcc-4.6-base.deb"; }; } rec { - name = "gtk2-engines_2.20.2-1ubuntu1+srt4_i386"; - sha256 = "0rlhcsx8lvnmd6hx4iqh6z49jqxb2wlzl8n74qcbkx8vzg3jyffn"; - url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt4_i386.deb"; + name = "gtk2-engines_2.20.2-1ubuntu1+srt5_i386"; + sha256 = "06h5229y2md6d73imgy5wg4msv6s9vl056p97jq2hrf4di0q6a76"; + url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines.deb"; }; } rec { - name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_i386"; - sha256 = "1jkma0v5z7i7plamg49ljk0mhg3qf92k1disdj8yjjlgjf3d0isl"; - url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_i386.deb"; + name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt5_i386"; + sha256 = "1fyha082h0jr26gjnsxzj1c6rl63c9xc2kgf6cfb86dmsmbvpqqg"; + url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines-murrine.deb"; }; } rec { - name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_i386"; - sha256 = "00p0qi47nnzlh31ajwalfh5kimsmdzjicgl5lnfg4viwb0r07vmd"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_i386.deb"; + name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt5_i386"; + sha256 = "0ix60pix5cnzd807v8q9mqhyhhksqndd7vc6brs1daknhxn5dsi4"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "gtk2-engines-pixbuf.deb"; }; } rec { - name = "libacl1_2.2.51-5ubuntu1+srt6_i386"; - sha256 = "188r323k4y6jvq64qywhglllxfbcpji15zvws1qlicv4nrjh2yk2"; - url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+srt6_i386.deb"; + name = "libacl1_2.2.51-5ubuntu1+srt7_i386"; + sha256 = "0x6959ivq4v8x9yd38c7kfvds9g3h00znim03dm5rvl7xl2k0cxn"; + url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+srt7_i386.deb"; source = fetchurl { inherit url sha256; name = "libacl1.deb"; }; } rec { - name = "libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_i386"; - sha256 = "049qhih0dl0z13ag1kradvwydwz90pllwriwnyjx78726fvcsa56"; - url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_i386.deb"; + name = "libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt1_i386"; + sha256 = "1bbf9k50d3df4sjn2idizk2bcpkcxkg0wz8mczgzkh634753pkld"; + url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1.1+steamrt1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libappindicator1.deb"; }; } rec { - name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - sha256 = "0gp2falswr4hfcrfj7avp1g216mf5sargqflwyxl6ixxy1yxp22w"; - url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; + name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; + sha256 = "1qgap0ha5vlpz1fnf2fppprzh4lyrvy7k9sj0whhb3f48ass8mh5"; + url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libasn1-8-heimdal.deb"; }; } rec { - name = "libasound2_1.1.0-0ubuntu1+steamos1+srt1_i386"; - sha256 = "0cy9s4wpnq2yd08shvip5mzg5a5mk76zmwyq68brqblaf1yqw907"; - url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt1_i386.deb"; + name = "libasound2_1.1.0-0ubuntu1+steamos1+srt2_i386"; + sha256 = "0wa019012di6slf29ambq249fn6w9ldmyxx80k564j9s1k510ivc"; + url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libasound2.deb"; }; } rec { - name = "libasound2-plugins_1.1.0-0ubuntu1+srt1_i386"; - sha256 = "10qhsgcsabp0mrihssj7znw67kjfmw9kv2sbplpwl8bc52pxdz6z"; - url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt1_i386.deb"; + name = "libasound2-plugins_1.1.0-0ubuntu1+srt2_i386"; + sha256 = "0hrrpjp4wg13vfam863hwkhzv7ngcydx0iysmfkxjzhmpf3j4ghd"; + url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libasound2-plugins.deb"; }; } rec { - name = "libasyncns0_0.8-4+srt4_i386"; - sha256 = "1h2fs8azxz9z2wa45igxwvfaarp50pqx26jznyrv35ayxhnzsg8w"; - url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt4_i386.deb"; + name = "libasyncns0_0.8-4+srt5_i386"; + sha256 = "0k8rngiq74b574fc1jqfwf77f57qcflimbs63pa2jx1jqg7gxjx2"; + url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libasyncns0.deb"; }; } rec { - name = "libatk1.0-0_2.4.0-0ubuntu1+srt4_i386"; - sha256 = "08sbk32cv4r0nmhp8ydbmjy8mcnsi4y2wjm606d1hrqqnvhlk1yi"; - url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.4.0-0ubuntu1+srt4_i386.deb"; + name = "libatk1.0-0_2.18.0-1+steamrt1+srt1_i386"; + sha256 = "0ldl3jsmf16mbf1bs94zkmaa1b1p9d9rvajlyp7iqkbqw6qkszlz"; + url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.18.0-1+steamrt1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libatk1.0-0.deb"; }; } rec { - name = "libattr1_2.4.46-5ubuntu1+srt4_i386"; - sha256 = "06ms0pfsb85y53l83fvs2zh39dqzh7bw0jh6zsf5wi9g47y2kzhd"; - url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+srt4_i386.deb"; + name = "libattr1_2.4.46-5ubuntu1+steamrt1+srt1_i386"; + sha256 = "1iyy60mpc6radds5rh9i6m8bmfa168y7dqbnz3jvgps5zndri363"; + url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+steamrt1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libattr1.deb"; }; } rec { - name = "libavahi-client3_0.6.30-5ubuntu2+srt4_i386"; - sha256 = "0gsbwnc5s6hd412djs257fgy50ayjph5gg1jhmvgz0nf0wqqy60g"; - url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2+srt4_i386.deb"; + name = "libavahi-client3_0.6.30-5ubuntu2.2+srt1_i386"; + sha256 = "1yyq436zsx8hbfhhv4l8ji85narl6ws8flhfcbqvxldaxlzv4ls7"; + url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libavahi-client3.deb"; }; } rec { - name = "libavahi-common3_0.6.30-5ubuntu2+srt4_i386"; - sha256 = "0cfn660pngq7ackkcid410g8245grcs0izawwlmkhr6y19nma0jg"; - url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2+srt4_i386.deb"; + name = "libavahi-common3_0.6.30-5ubuntu2.2+srt1_i386"; + sha256 = "0lhvj64i4dqy0lh73kyk32992fqkhxxr7k1cr97a03hdpaa06ycq"; + url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libavahi-common3.deb"; }; } rec { - name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - sha256 = "0dz4d63whrhlsylvd1mqzz5v3xpwf88cgga8qr8vgf2vaz7ns0k1"; - url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; + name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386"; + sha256 = "129g8jgy4va5gszrq9pxd4p51zja9svcm0hqx8g12ryx5lfkjjc5"; + url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libavcodec53.deb"; }; } rec { - name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - sha256 = "1rxbm4n09q4brhklaa5hwzaipv3y34a3jphrc724s29dg178bb6y"; - url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; + name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386"; + sha256 = "1vnj97sl686wlkkxbhvn5s3ck60nzrqr60y4wxg9a2hxxf7ba1gf"; + url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libavfilter2.deb"; }; } rec { - name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - sha256 = "0f38h7h4m1g63jh9lsnq9win2k5zvg8i5khsadwb154y4iragm2f"; - url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; + name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386"; + sha256 = "12zikl29fcq5vc0k5n4l8db8q0f95h13hlqgka3cy13nf31kbk06"; + url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libavformat53.deb"; }; } rec { - name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - sha256 = "05lh422gvhl990yvlp4a0l3mfqn4n0l41fdaq4m4r5i23izcl3s0"; - url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; + name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386"; + sha256 = "1brfvbqwga1hmmyarbwksbrj6kabnfnrk8hv9xrvd99jak3wsipl"; + url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libavutil51.deb"; }; } rec { - name = "libbz2-1.0_1.0.6-1+srt4_i386"; - sha256 = "1hh77sg2pan5qlvxg82my0h1dy53rxrgnl84bggn2kiz9i61ls2m"; - url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt4_i386.deb"; + name = "libbz2-1.0_1.0.6-1+srt5_i386"; + sha256 = "1nngc07hwr96n1k56bi3i2yffad8dhf1zfblqlz8pffi1yl92vjz"; + url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libbz2-1.0.deb"; }; } rec { - name = "libcairo2_1.10.2-6.1ubuntu3+srt4_i386"; - sha256 = "141rbp47gkvzfqzrwg4j80m1ay2l573p4q3x2ym5nxzw3f9jb00a"; - url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt4_i386.deb"; + name = "libcairo2_1.10.2-6.1ubuntu3+srt5_i386"; + sha256 = "0vnz2d66q9pkn8ry2ixbmqcyz0kpqqmimaxnrfq42g1lz8k44cs6"; + url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libcairo2.deb"; }; } rec { - name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_i386"; - sha256 = "1mfv3q731b0sjl2axc5qf1drp4dfwsmg2i0c222bs3ccvk9m7bcr"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_i386.deb"; + name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt5_i386"; + sha256 = "10bw3fha2nc8lb3md5l8yj8c40rx7gm7vg9lk76359p06z3ypvvf"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libcanberra-gtk-module.deb"; }; } rec { - name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_i386"; - sha256 = "0iddn7f56g1lajd1f0s77s06qwh5nk0iv2ai2r5rcanhq693k3jp"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_i386.deb"; + name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt5_i386"; + sha256 = "1yg1hllxp2m5rv6hlgh714yhcb9l5ggg4lfwv33yaw4fnzz387km"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libcanberra-gtk0.deb"; }; } rec { - name = "libcanberra0_0.28-3ubuntu3+steamrt1+srt4_i386"; - sha256 = "0qpil9xifaq1kkmrga6v9sz4sl9dh78rp9kzm8p6c9hq2f4w5j4i"; - url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt4_i386.deb"; + name = "libcanberra0_0.28-3ubuntu3+steamrt1+srt5_i386"; + sha256 = "03b6rk9gkxx4d75cjr27w229nsc1jjp2fy8ln5gxp2bbhywgxl4a"; + url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libcanberra0.deb"; }; } rec { - name = "libcap2_2.22-1ubuntu3+srt4_i386"; - sha256 = "0llaf4hgb4v66hwkc6ibrhpadhjxkiz3frl00f6yagm9g6z2yxvy"; - url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt4_i386.deb"; + name = "libcap2_2.22-1ubuntu3+srt5_i386"; + sha256 = "1qy9ggswl8cbp0zbaryc7cd4bcq17qb4llv8v3zcj08wxr6v2ram"; + url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libcap2.deb"; }; } rec { - name = "libcg_3.0.0016-0ubuntu1+srt4_i386"; - sha256 = "0ka9z2sq315xvdbqmbqg76j3wknfa88hk41jg94svnqf4fbawbrz"; - url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt4_i386.deb"; + name = "libcg_3.0.0016-0ubuntu1+srt5_i386"; + sha256 = "0gs2q5ql7wq28y2qrs9v9gs75r6ycq7c6xghf4s6g5s8q4cq205k"; + url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libcg.deb"; }; } rec { - name = "libcomerr2_1.42-1ubuntu2.2+srt1_i386"; - sha256 = "0d0zpm7qx1p4zpi5xk585hxfirn6i3v53r0br7dlaiqfy0divv5z"; - url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.2+srt1_i386.deb"; + name = "libcomerr2_1.42-1ubuntu2.3+srt1_i386"; + sha256 = "12c8gxi0l0qysbiw81hbysf5hn1kgv956csvrn71yf52zwqwr388"; + url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.3+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libcomerr2.deb"; }; } rec { - name = "libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_i386"; - sha256 = "1l49h8v8dgi4n2j32012zzxkyqgg7b9z7d9lxijj0cqwwjq6fzpx"; - url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_i386.deb"; + name = "libcups2_1.5.3-0ubuntu8.2+steamrt1+srt4_i386"; + sha256 = "03x40p961apv96y59dabvp50s3jryccx2yqrw9i3dbflxvja5rbz"; + url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.2+steamrt1+srt4_i386.deb"; source = fetchurl { inherit url sha256; name = "libcups2.deb"; }; } rec { - name = "libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_i386"; - sha256 = "0z5qnjgmz9c917vm6r1m3856a10brdwx3d0k4qcv9vlv1gj1ln0j"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_i386.deb"; + name = "libcurl3_7.22.0-3ubuntu4.17+srt1_i386"; + sha256 = "14yb0a5cglgqvwa75kb6lbhfpmpj4xjgxz6dm27q27pcxv9xx5km"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libcurl3.deb"; }; } rec { - name = "libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_i386"; - sha256 = "09bx2gxldswb63nql2b7x5mq55miaz7x5gbzscrc1kybnm0vvv75"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_i386.deb"; + name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+srt1_i386"; + sha256 = "027dgd9ik9zxy2ixi1272mskbax10cg0k7flljhcx5zmnwvrhxhx"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libcurl3-gnutls.deb"; }; } rec { - name = "libdbus-1-3_1.4.18-1ubuntu1.7+srt1_i386"; - sha256 = "1lp548l33i3c7wavq9q0n9jhxm44mg0jlrgi89ngfm705141zw4f"; - url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.7+srt1_i386.deb"; + name = "libdbus-1-3_1.4.18-1ubuntu1.8+srt1_i386"; + sha256 = "1m8aqb9hvprl0hbswha0raz6pp3gs84cmqg40fblbfqya8nibdlk"; + url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.8+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libdbus-1-3.deb"; }; } rec { - name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_i386"; - sha256 = "13dcsf3ipayvrzj1ksmxph31gk2zs3m0ghy5jh3aq648s5ql2jj9"; - url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_i386.deb"; + name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt5_i386"; + sha256 = "0slsk7cqdrbnm35zqir21ms0vv1hv44i184x8ip1lg936vrvbxka"; + url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libdbus-glib-1-2.deb"; }; } rec { - name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_i386"; - sha256 = "14glmvc6923djpcn2a9kwhqm4myg1y9mp38n7gkby1wz6y63zvp5"; - url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_i386.deb"; + name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt5_i386"; + sha256 = "0g4zmrwpifl4kxv311spwyia1xrd76m0aizb3jzv6q8cc4hla3ii"; + url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libdbusmenu-glib4.deb"; }; } rec { - name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_i386"; - sha256 = "19ijz82wkk9z8w4yjp628hga6dsv7qr7x37kr8j8fq430gbl5y8s"; - url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_i386.deb"; + name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt5_i386"; + sha256 = "0kj6pfpgybkkb5bjfr9qgczwddx5lkbwhknlcymhhi94jcfbcnbc"; + url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libdbusmenu-gtk4.deb"; }; } rec { - name = "libexif12_0.6.20-2ubuntu0.1+srt4_i386"; - sha256 = "1dh1idpqqh66l2awfim17vk94238wb073d3xj74ci8gxfp0rxkvr"; - url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt4_i386.deb"; + name = "libexif12_0.6.20-2ubuntu0.1+srt5_i386"; + sha256 = "06br49sn30hrxlq479xi3vxw3blkr558kz4d7gym3fxnwfa6im9w"; + url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libexif12.deb"; }; } rec { - name = "libexpat1_2.0.1-7.2ubuntu1.2+srt1_i386"; - sha256 = "0wv8iym5bhwlvnsljxfjwhl8z39wh5nba6li1i7nnzqj365hmdc4"; - url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.2+srt1_i386.deb"; + name = "libexpat1_2.0.1-7.2ubuntu1.4+srt2_i386"; + sha256 = "0av7wcy104jz6pci7lgwpmvb528v9idx660qrrabdqhpd1m4hv8s"; + url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.4+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libexpat1.deb"; }; } rec { - name = "libffi6_3.0.11~rc1-5+srt4_i386"; - sha256 = "1064kf252d1v8asi59m67bz7zg2k7fmgkqzbib872yb6qyrgj7p2"; - url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt4_i386.deb"; + name = "libffi6_3.0.11~rc1-5+srt5_i386"; + sha256 = "0gvhndr5y4zl097h105fr4q60sg38mhkhlw8ha51ypzcm9f8na6d"; + url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libffi6.deb"; }; } rec { - name = "libflac8_1.2.1-6+srt4_i386"; - sha256 = "17hb02f5yapkfkasamx6whxm76p1gpjrz7nq7i59zv0lfxwgjry7"; - url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+srt4_i386.deb"; + name = "libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt1_i386"; + sha256 = "1rdfykm113vps893xdkcrpphb06winv2566yb9myg9m3aybcldrx"; + url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+steamrt1.1ubuntu0.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libflac8.deb"; }; } rec { - name = "libfltk1.1_1.1.10-10+srt4_i386"; - sha256 = "1vz2b02asscpr155v516zclawfi28m4yxf1ya33848ydg067iz35"; - url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt4_i386.deb"; + name = "libfltk1.1_1.1.10-10+srt5_i386"; + sha256 = "1j0bhpgsaw6rphy1wqp40wn8yr6qzrxdmwarc2amryqw7bqslmy5"; + url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libfltk1.1.deb"; }; } rec { - name = "libfontconfig1_2.8.0-3ubuntu9.1+srt4_i386"; - sha256 = "1dm12wk4pj2h4y0ykyvv9fs6s0vix1iy3hkvz2fvqx8wdb8710n6"; - url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.1+srt4_i386.deb"; + name = "libfontconfig1_2.8.0-3ubuntu9.2+srt2_i386"; + sha256 = "1ls25q28jk9znmi0fhm30cqilx9bmm463zfq1jmj5apw96wk64n4"; + url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libfontconfig1.deb"; }; } rec { - name = "libfreetype6_2.4.8-1ubuntu2.3+srt1_i386"; - sha256 = "0661g4ghhynz49kkbr5kds1ms8prqmpm5rz0qv3c7cf62a2lb3x1"; - url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.3+srt1_i386.deb"; + name = "libfreetype6_2.4.8-1ubuntu2.6+srt1_i386"; + sha256 = "1zahvr5h833mppcpg648jv28dywx9jiqdv58wlv1vpsk6d9599bh"; + url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.6+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libfreetype6.deb"; }; } rec { - name = "libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386"; - sha256 = "19qracxc45irfmsbcn668zwdxx37avp1igj1z4c6xq8bmp6w685d"; - url = "mirror://steamrt/pool/main/g/gcc-4.8/libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386.deb"; + name = "libgcc1_5.4.0-7.really.6+steamrt1.1+srt1_i386"; + sha256 = "0bsm95m17f9lxrknl11jmaz9mqrbkd40p29z44497fw8miw736r2"; + url = "mirror://steamrt/pool/main/g/gcc-5/libgcc1_5.4.0-7.really.6+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libgcc1.deb"; }; } rec { - name = "libgconf-2-4_3.2.5-0ubuntu2+srt4_i386"; - sha256 = "1srwysvh165hwiqxyl0aac3j39zzg2v4g3alix51cbvc4s6yzhy3"; - url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt4_i386.deb"; + name = "libgconf-2-4_3.2.5-0ubuntu2+srt5_i386"; + sha256 = "07b1w4ww3xb5r13px85f8rv4nsc08rz8w3741zdk0vacq8scw4pb"; + url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libgconf-2-4.deb"; }; } rec { - name = "libgcrypt11_1.5.0-3ubuntu0.5+srt1_i386"; - sha256 = "1cg2kps7cfmildp9hlijxsj7bc2j71xal6bm57ldz2vjcv6k06hl"; - url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.5+srt1_i386.deb"; + name = "libgcrypt11_1.5.0-3ubuntu0.6+srt2_i386"; + sha256 = "1wbaml6cjdijcaq6c9m0lcdlh350fk9a2prh6z4k7fjhsms60ppc"; + url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.6+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libgcrypt11.deb"; }; } rec { - name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_i386"; - sha256 = "1n5pyqw2v87xw32lj73aywhfgcmnzi2wvxxw2gqv52d56vzj254s"; - url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_i386.deb"; + name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt5_i386"; + sha256 = "0fis055pnc01rb5v9vdqc17w4ijdb6sksf2qjysc4q2j33gvh6d5"; + url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libgdk-pixbuf2.0-0.deb"; }; } rec { - name = "libglew1.10_1.10.0-3+srt4_i386"; - sha256 = "1aswani1ymq52jyr4yhw4vi42gzw6xqk5ygh1d7zycakgrfs179b"; - url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt4_i386.deb"; + name = "libglew1.10_1.10.0-3+srt6_i386"; + sha256 = "17ki8vb4nbg140fg7vdfyb092lcr3hpsjx0z1gz13bvmzxcff3lf"; + url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "libglew1.10.deb"; }; } rec { - name = "libglew1.6_1.6.0-4+srt4_i386"; - sha256 = "0yxnfi8arnp3cphxdviyqslw7nxnd1mx11v9i5i2xnl907iyaxpq"; - url = "mirror://steamrt/pool/main/g/glew/libglew1.6_1.6.0-4+srt4_i386.deb"; - source = fetchurl { - inherit url sha256; - name = "libglew1.6.deb"; - }; - } - rec { - name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_i386"; - sha256 = "1lmxm2gfz0mkjafpw8f98y73f0lj5m5nfdarqlpbb8dqbmpabwvk"; - url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_i386.deb"; + name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt2_i386"; + sha256 = "0l0vjcff86mw1mv5kizg3pcjr8rk9bn2gjf0d22jgljisq47f607"; + url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt3+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libglib2.0-0.deb"; }; } rec { - name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt4_i386"; - sha256 = "11sdfs3zphb8ks2cpb646z4vza6s4zpbfgaq99drn5z9b8d109zi"; - url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt4_i386.deb"; + name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt5_i386"; + sha256 = "1bc2hb2cb05j4iw9lrskrqkdh8iy7wv3d1sknqn1ya847w98h9hr"; + url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libglu1-mesa.deb"; }; } rec { - name = "libgmp10_5.0.2+dfsg-2ubuntu1+srt4_i386"; - sha256 = "1f6ss23vybyqkifjr9nam0y6va34m2vdpaxbwjmwi2z4wwj7pn9k"; - url = "mirror://steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt4_i386.deb"; + name = "libgmp10_5.0.2+dfsg-2ubuntu1+srt5_i386"; + sha256 = "0y6qrw7n41szpi8p2fpilx20wmqk3arw0m7kr35isy0y3icpryka"; + url = "mirror://steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libgmp10.deb"; }; } rec { - name = "libgnutls26_2.12.14-5ubuntu3.11+srt1_i386"; - sha256 = "0580r5n6z9s147q4bkkm75a2pwb1ganz9msbp440rwwh6xahrh56"; - url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.11+srt1_i386.deb"; + name = "libgnutls26_2.12.14-5ubuntu3.14+srt1_i386"; + sha256 = "1f5dv4bk2g9ldqfjm7a2a6mx2ignzgxy42ghl9yny6x9xz39g56h"; + url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.14+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libgnutls26.deb"; }; } rec { - name = "libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386"; - sha256 = "04mywbz2lmxap8nq1rvj7aggkrvrgfz4869q41f0d6dnsmnbsj5k"; - url = "mirror://steamrt/pool/main/g/gcc-4.8/libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386.deb"; + name = "libgomp1_5.4.0-7.really.6+steamrt1.1+srt1_i386"; + sha256 = "0p6gj53jdk3d4nmhkiiqvh8sk3pm2g99iqfmlc7br1gxvmpjjj3s"; + url = "mirror://steamrt/pool/main/g/gcc-5/libgomp1_5.4.0-7.really.6+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libgomp1.deb"; }; } rec { - name = "libgpg-error0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0hjfgcmrjr02xk788chyafg7j8viwmp2vrqyfjdjf79kvpy0354s"; - url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libgpg-error0_1.10-2ubuntu1+srt5_i386"; + sha256 = "19wh8hdp5lcf68w2hwmj8z55j2bcp61ydf37cs796rvzsxbsbamr"; + url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libgpg-error0.deb"; }; } rec { - name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386"; - sha256 = "06sqdxf38qm6cd76gdir6m9rvbg4xv70jhh36zshxxhi50lhpjcx"; - url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb"; + name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386"; + sha256 = "1zkvqbm3i297b6pj0japgs3jcvps8my6icsh2n1ka6nvflvdr87h"; + url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libgssapi-krb5-2.deb"; }; } rec { - name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - sha256 = "015jb2j56ia3zvfmjlx72yjlvfv8z8bg0ff4z5nh1d25cambqcbs"; - url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; + name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; + sha256 = "0q2r4fmpql34hpd061289ijl40y66wp8rlh78b2ysg8dkvycni0k"; + url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libgssapi3-heimdal.deb"; }; } rec { - name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_i386"; - sha256 = "14z4v2j7lc5xnzbfpf8b3b5qg0d2yg917v4ighxy2nydf2zy0mrs"; - url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_i386.deb"; + name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt1_i386"; + sha256 = "0nq6hvv00b3s5fmay2nm4s869y6lws8v2w9lrqlpgs08z6fh6mjp"; + url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libgstreamer-plugins-base0.10-0.deb"; }; } rec { - name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_i386"; - sha256 = "06lp4ajhnczb5salf6njgi1q24zv3yrkqhgvbyq45dvsax76kafj"; - url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_i386.deb"; + name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt5_i386"; + sha256 = "0arypn4k1wvaiqqxc271r5w7bkdk0f4mh88l4np3ngfyzn2w6z61"; + url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libgstreamer0.10-0.deb"; }; } rec { - name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_i386"; - sha256 = "0qhvr5pyjj0vh2c1658gmx9r7h194py8qbcx69qfca2czp9hhacs"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_i386.deb"; + name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt5_i386"; + sha256 = "0swmpdf7872z0nb3rsfixspg11nvf0k7sm4xcdgvcliaqjhyv570"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libgtk2.0-0.deb"; }; } rec { - name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all"; - sha256 = "0xgh9nrvj1hf3wj9pqm9x3ykw95v9bsh5k2vgr3cr9135rrj0dp5"; - url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all.deb"; + name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt5_all"; + sha256 = "0rw8iy16ij86abh444jk1xw78b5z81qjxm1292jin3sfhck4bd4x"; + url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt5_all.deb"; source = fetchurl { inherit url sha256; name = "libgtk2.0-common.deb"; }; } rec { - name = "libgudev-1.0-0_175-0ubuntu9.2+srt4_i386"; - sha256 = "0z8ncxaqxna0ihlp19i7b59k9vbkynak49kim821rwxsxvjqsfcd"; - url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.2+srt4_i386.deb"; + name = "libgudev-1.0-0_175-0ubuntu9.10+srt1_i386"; + sha256 = "09gjla6gsx8whbvhzwvgjnm19md7bgpvb76kjfmxzm54hakcjxla"; + url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.10+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libgudev-1.0-0.deb"; }; } rec { - name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - sha256 = "195yrcwrw8bnai5kkvhdq7nnjv643af5dyc97qcnfnvnvs20az42"; - url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; + name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; + sha256 = "18v3rqaclhdmbh25p48sa6qidi3birnymdfzg2c8z5bpg1giis83"; + url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libhcrypto4-heimdal.deb"; }; } rec { - name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - sha256 = "0g2dml08mw4yy9llnn2149x1niy97mqbz56rphw3g3zv5nivnbp3"; - url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; + name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; + sha256 = "1546i5h5137ysvcgvyi6hplfx54wqya8sr233vgn838xd2bz024r"; + url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libheimbase1-heimdal.deb"; }; } rec { - name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - sha256 = "0dbs4gxbfdhn2sbzfny75fzxiab9k8l1vd3vm7i4zfkbkx3lbr2x"; - url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; + name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; + sha256 = "1yk0ap8wsi5k2wz5i9vcdw332kbhnlbf5hb8la9pckfrxy6bca82"; + url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libheimntlm0-heimdal.deb"; }; } rec { - name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - sha256 = "01z9qr5r7n7vfkkb95apmkcc35va43qxsf0nzxff8x1ll82l3n7a"; - url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; + name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; + sha256 = "0y6awbyl4w56qa8vkn9dzsnb3162x4p5nr1cf7ir119nl05987cp"; + url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libhx509-5-heimdal.deb"; }; } rec { - name = "libice6_1.0.7-2build1+srt4_i386"; - sha256 = "1gmykmbbxk9590snli45dcvj00v77xn2za8v8193v020qa8hvmik"; - url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt4_i386.deb"; + name = "libice6_1.0.7-2build1+srt5_i386"; + sha256 = "02nygw4q330jgrfgbp46fjpa97bmgzk7sg9ikh97k4c743lshija"; + url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libice6.deb"; }; } rec { - name = "libidn11_1.23-2+steamrt1+srt4_i386"; - sha256 = "1xmv6kqn3zpnls7nyqd2bjqzc03y4w2gp0xmq6l8wwi659dkr4vz"; - url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt4_i386.deb"; + name = "libidn11_1.23-2+steamrt1+srt5_i386"; + sha256 = "1wv5rfk5a9y6w5wylvbxj8kbmav61y5w3j413kvf373xnhp79gaf"; + url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libidn11.deb"; }; } rec { - name = "libindicator7_0.5.0-0ubuntu1+srt4_i386"; - sha256 = "0j1v3ljb01wyy5v8a5ad8ar9wmx2hf6qd50k7cl95si60zs79bk6"; - url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+srt4_i386.deb"; + name = "libindicator7_0.5.0-0ubuntu1+steamrt1+srt1_i386"; + sha256 = "1qiyw54y8yra871vzvdlj2cqhf1yvg68h9zckyyv87s753x98kkq"; + url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+steamrt1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libindicator7.deb"; }; } rec { - name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_i386"; - sha256 = "06gz25p9qm0lbxaqzag2y2lhc0wx9cnkxz7zdm2yfdcx1y4vbymx"; - url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_i386.deb"; + name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt4_i386"; + sha256 = "02c4fj82svlkh9whsasclshjlvgbcabsz64ac47hvs2ccaap0gis"; + url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt4_i386.deb"; source = fetchurl { inherit url sha256; name = "libjack-jackd2-0.deb"; }; } rec { - name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_i386"; - sha256 = "1m1986mn0ad5basd8hlby4d6jxpps4v0ib2g2pwqxdlil39gmar5"; - url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_i386.deb"; + name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt5_i386"; + sha256 = "0bcp6bxrgdbcgwrg2qgrax111w6xfwyf3rwrpf8j9mwd91hzm0c8"; + url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libjpeg-turbo8.deb"; }; } rec { - name = "libjpeg62_6b1-2ubuntu1.1+srt4_i386"; - sha256 = "1fjbscq7qp895z5g5aw5l98rfj0qpr66rl5r4m0f1ilrjn83i96y"; - url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt4_i386.deb"; + name = "libjpeg62_6b1-2ubuntu1.1+srt5_i386"; + sha256 = "1l3hm9p30w2kwbjyri452h9v0nprznsl9jh32l9hg4php8kjfidw"; + url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libjpeg62.deb"; }; } rec { - name = "libjson0_0.9-1ubuntu1.1+srt2_i386"; - sha256 = "0nlhsclyxqa1s05hnzid6j8h0986v9viv6dysg22bc16gfdg9i1j"; - url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt2_i386.deb"; + name = "libjson0_0.9-1ubuntu1.1+srt3_i386"; + sha256 = "0jnbwf7j7fmrylav1dck17kajxdyc67gfmpn09wrrqy0zgdbg3zi"; + url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt3_i386.deb"; source = fetchurl { inherit url sha256; name = "libjson0.deb"; }; } rec { - name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386"; - sha256 = "0h2iv7p0w5ydd9nqfwmm4avjhcnki7nl000gpsdnrpfjrbv4rnlb"; - url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb"; + name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386"; + sha256 = "0czc7vf1q84k252wsx9v9na2jn8vqym62dnb100992cpzj2956c1"; + url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libk5crypto3.deb"; }; } rec { - name = "libkeyutils1_1.5.2-2+srt4_i386"; - sha256 = "1v9b3dg1s3ykj5abi4y2392m12dw2n7zrays6sv1n2dw46f2lj4k"; - url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt4_i386.deb"; + name = "libkeyutils1_1.5.2-2+srt5_i386"; + sha256 = "0vmd87b8kk579fi99di79p94nkl0584bsdhgw2gw03czbainq9rx"; + url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libkeyutils1.deb"; }; } rec { - name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - sha256 = "0h4mnxfsf8j12g33lca2nlrcma9d8gdchxckzr916yp4snzjk0bb"; - url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; + name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; + sha256 = "1hjdfsvqzvssxiamjq9dddlzjjz54grzva2a7rsipbmmvnw254yd"; + url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libkrb5-26-heimdal.deb"; }; } rec { - name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386"; - sha256 = "1ay1g283y3y6czm56r7wiibarwv267bg707ncaq4m7a9bxa0fmy2"; - url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb"; + name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386"; + sha256 = "1cr6z0jv6mchs82p6iyskdq6ppbfpyixanxwdbjdg76cpb5as3ii"; + url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libkrb5-3.deb"; }; } rec { - name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386"; - sha256 = "031qjg6aajyrdj7ny9dl2v6p9syyngqfrdy277351814zcclhm1l"; - url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb"; + name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386"; + sha256 = "11v68jp8f24abx7i6b69jimlmv0lvpb5hnlxnj3f281zsz2smpyw"; + url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libkrb5support0.deb"; }; } rec { - name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_i386"; - sha256 = "03ix9r3mxvgq5i5qv7zhjmmg8bki8gvgg4n8r79az5zbp4nxmi4f"; - url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_i386.deb"; + name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt5_i386"; + sha256 = "1bpb8gfach74nibzzd2mk7mkdhlw1j27yrgckpl9pgzq8jd0ch70"; + url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "liblcms2-2.deb"; }; } rec { - name = "libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_i386"; - sha256 = "0aycpf6xkr4fxr72np52jg6y384sy5b2r68kmmnzixqifykgc7jx"; - url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_i386.deb"; + name = "libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt5_i386"; + sha256 = "1147dl2h2k2xhl6xlpnamg95rkmp4nq2k01fcrv09x442hmx34xf"; + url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libldap-2.4-2.deb"; }; } rec { - name = "libltdl7_2.4.2-1ubuntu1+srt4_i386"; - sha256 = "1kjphpfqjr5zsa1z1zq4dibxwhm5861vardc3xic4izqf05vd6nj"; - url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt4_i386.deb"; + name = "libltdl7_2.4.2-1ubuntu1+srt5_i386"; + sha256 = "1jv01xk4bf0sbq8jawa0zm1q0imc7nmzdwcmkhgscld02rzwwffs"; + url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libltdl7.deb"; }; } rec { - name = "libmikmod2_3.1.12-2+srt4_i386"; - sha256 = "1rm18888n955wgh75srgrfhm0zgxz0n5sr030zc4lpp3bx4x2pfd"; - url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-2+srt4_i386.deb"; + name = "libmikmod2_3.1.12-2+srt5_i386"; + sha256 = "12dmbmkv3gmi1cz0bs3fsbhgnhzvf8cjp0b6zj2a2dgplw1h6qdr"; + url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libmikmod2.deb"; }; } rec { - name = "libncurses5_5.9-4+srt4_i386"; - sha256 = "1lc9s9rapyq6ld0xzlagqi5ah07gh59lixg0sh4xxm4sz75z6h21"; - url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt4_i386.deb"; + name = "libncurses5_5.9-4+srt5_i386"; + sha256 = "1jsi7qvwy4h1z1mf9qlhp5pizbn84qgnpgi2y1qjlgym8428k0ga"; + url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libncurses5.deb"; }; } rec { - name = "libncursesw5_5.9-4+srt4_i386"; - sha256 = "1j5r17ph0z43npv4nh5xgz0fdw9magas5ryr6qpi2pcqf5x9pp9r"; - url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt4_i386.deb"; + name = "libncursesw5_5.9-4+srt5_i386"; + sha256 = "17hfrf97qcrw1n7p4nwwwiw3jpqpjphqwnq73pb7p8bsp53qa4h4"; + url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libncursesw5.deb"; }; } rec { - name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386"; - sha256 = "1jr5nysd947lvk39ki1lx1y8csyaw10vlm9db7djrn20b1a6dsns"; - url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386.deb"; + name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_i386"; + sha256 = "0vsd00x0wvqw84zqlqrbmdxfmzshrvwbr2az3ynkaz8azkxj1d6d"; + url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libnm-glib4.deb"; }; } rec { - name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386"; - sha256 = "01gf2wf722mc28hyfh3g45p2qq0v04nrhkhz96xd8mwa7jdx0cb9"; - url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386.deb"; + name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt1_i386"; + sha256 = "1vaqqgxzvixvh8cvdspyr7azfn8dmknvsypz628h2xvbldf0p156"; + url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libnm-util2.deb"; }; } rec { - name = "libnotify4_0.7.5-1+srt4_i386"; - sha256 = "00nfvgckkdfal6qfbj4hcp5jc0rs57ksl48ciy87v46inxgp67z5"; - url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt4_i386.deb"; + name = "libnotify4_0.7.5-1+srt5_i386"; + sha256 = "0420awfss4r2j8ncrvnapdj9gbh68z7qlp1vbq9wiaqraqy7zccw"; + url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libnotify4.deb"; }; } rec { - name = "libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_i386"; - sha256 = "00di7dw9a124ahc04m1rs8w3mdx1kpjhf696zvgxprn8qrwwp84n"; - url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_i386.deb"; + name = "libnspr4_4.12-0ubuntu0.12.04.1+srt2_i386"; + sha256 = "1kfs3afaqrfhajbp6dlwzcbzvl8xsg2c04c6b5l1bby1l4ynmqv2"; + url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.12-0ubuntu0.12.04.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libnspr4.deb"; }; } rec { - name = "libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_i386"; - sha256 = "1n46ln69sny735q75sn8g7sp23ahdav277bp0d0bl62k11xa3fnm"; - url = "mirror://steamrt/pool/main/n/nss/libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_i386.deb"; + name = "libnss3_3.26.2-0ubuntu0.12.04.1+srt1_i386"; + sha256 = "00m55f14ih9xyri197hnslw2mnzgl0dxwqvwiba0hnhfl3qvqi99"; + url = "mirror://steamrt/pool/main/n/nss/libnss3_3.26.2-0ubuntu0.12.04.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libnss3.deb"; }; } rec { - name = "libogg0_1.2.2~dfsg-1ubuntu1+srt4_i386"; - sha256 = "0bnsrk44pwzwjs7yw44kzbr5b10kq3jsvrskzxxr2sv12ljhxmrj"; - url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.2.2~dfsg-1ubuntu1+srt4_i386.deb"; + name = "libogg0_1.2.2~dfsg-1ubuntu1+srt5_i386"; + sha256 = "0b47v6s9x8hvhkgvgmy01rxd81i1c8icb0lpf3mldp5ss1q8fwgj"; + url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.2.2~dfsg-1ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libogg0.deb"; }; } rec { - name = "libopenal1_1.13-4ubuntu3+steamrt1+srt4_i386"; - sha256 = "18g56z1s8yyxhklqmpy6l22zcbzkvws26v6b1xgg4w3k33hbcjng"; - url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.13-4ubuntu3+steamrt1+srt4_i386.deb"; + name = "libopenal1_1.16.0-3+srt1_i386"; + sha256 = "1barqvh4klpdabc1v9kb2q4l8pnmdx97h00hln32zca5z4y5ff9i"; + url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.16.0-3+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libopenal1.deb"; }; } rec { - name = "liborc-0.4-0_0.4.16-1ubuntu2+srt4_i386"; - sha256 = "0yfqakir28jnn873xxqdickf54mnlpp25946fi1malvxadjcqjll"; - url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt4_i386.deb"; + name = "liborc-0.4-0_0.4.16-1ubuntu2+srt5_i386"; + sha256 = "0n9fkxs3qkd4mwhm4cwlnljww1yalwqjcgia420ls3h7i4p7ss4v"; + url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "liborc-0.4-0.deb"; }; } rec { - name = "libp11-kit0_0.12-2ubuntu1+srt4_i386"; - sha256 = "1f97dfd0z1fzk1l4zphdabxq7q02pdql03ifc265chzq4zpaghbh"; - url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt4_i386.deb"; + name = "libp11-kit0_0.12-2ubuntu1+srt5_i386"; + sha256 = "1nfcccnsn7x44wqwgkz0h9b3hzy3a0cknc51syniabsqds5w2i8p"; + url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libp11-kit0.deb"; }; } rec { - name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_i386"; - sha256 = "0xda2k934wpfq01lrc9yw6fy6bispnfyyp5k0iszzh8awfjghrjj"; - url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_i386.deb"; + name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt5_i386"; + sha256 = "0w6m9ycpmlir2wvb7jj0w1p6sh84bjng9i0549bn0afq58f05biw"; + url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libpango1.0-0.deb"; }; } rec { - name = "libpci3_3.1.8-2ubuntu5+srt4_i386"; - sha256 = "1zi4g80r8cgy4zawdddfkklp6q98xm3qlad1a27rfw6zlg66a028"; - url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu5+srt4_i386.deb"; + name = "libpci3_3.1.8-2ubuntu6+srt1_i386"; + sha256 = "1jdakz038hxpkfh0g10acwlaaiqys7c546srdjhmhl9jxizw9ck8"; + url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu6+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libpci3.deb"; }; } rec { - name = "libpcre3_8.12-4+srt4_i386"; - sha256 = "1v1jj9vwsd6k0f6l9a72pbx3idlnjs32zxd1gci2fanma7fsp4vj"; - url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+srt4_i386.deb"; + name = "libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt1_i386"; + sha256 = "12ycdj8pwxlhhqbg89h6smgvnik2pvy6bqyx9szqmpdcjzddagp5"; + url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+steamrt1.1ubuntu0.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libpcre3.deb"; }; } rec { - name = "libpcrecpp0_8.12-4+srt4_i386"; - sha256 = "01qklrzg9mprb45mn0bj9r5p5d3lmrz0mhiqwjxg07w533gycyr6"; - url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+srt4_i386.deb"; + name = "libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt1_i386"; + sha256 = "0ml6bh7banikn75hzy68s2yx6y6924if4zar10lra1akl63by80l"; + url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+steamrt1.1ubuntu0.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libpcrecpp0.deb"; }; } rec { - name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_i386"; - sha256 = "004abdax9r66z0a359rik8dqc9bsx177m8z5ygjsh40yv7fjgc9g"; - url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_i386.deb"; + name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt2_i386"; + sha256 = "06ch7dsjmjx2c67f932930rawn1cil6vxfnc0xcx937iwd3sq8i7"; + url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.3+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libpixman-1-0.deb"; }; } rec { - name = "libpng12-0_1.2.46-3ubuntu4.2+srt1_i386"; - sha256 = "0ahap0mzqdl51ia615j09yaawi36khv9bj9z5bd0wspfyjls0a74"; - url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt1_i386.deb"; + name = "libpng12-0_1.2.46-3ubuntu4.2+srt2_i386"; + sha256 = "0vv10bzxqxnfmp1p4wl9c19kravqa7pcpcc6xar5przgwfv75fd8"; + url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libpng12-0.deb"; }; } rec { - name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_i386"; - sha256 = "1gwsfmr80r59y7ic21shbflf505wl0izsm1mvld3yif80vfz4hdn"; - url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_i386.deb"; + name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt5_i386"; + sha256 = "0frhw8cw2ima5j40grmdk0hjf6hg6b029wr3f2g2252wzbhzx6ac"; + url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libpulse0.deb"; }; } rec { - name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - sha256 = "0lfzgjyp4gxs6ns3v0xx82gpr784b7rwnhh37njq9zmhaq7mxpn6"; - url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; + name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; + sha256 = "1284xglgq9j0dqrgggs6455p0qidq5dxd7axgvi22zhzq3h5adfd"; + url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libroken18-heimdal.deb"; }; } rec { - name = "librtmp0_2.4~20110711.gitc28f1bab-1+srt4_i386"; - sha256 = "0x6dkzfc9bdcjr0sq6dl0vk0sjjm9pwp4hb2m8wjynykpinbzbxi"; - url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt4_i386.deb"; + name = "librtmp0_2.4~20110711.gitc28f1bab-1+srt5_i386"; + sha256 = "04wg1b9i77hv87ra7xbhqzcx6m9xdpx72b6d7pxnkrxxxc8sp35d"; + url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "librtmp0.deb"; }; } rec { - name = "libsamplerate0_0.1.8-4+srt4_i386"; - sha256 = "10dm5k8c6f8q6vgk0ab52kvikbrgiflbmkflbix42rm5l44bz8hd"; - url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt4_i386.deb"; + name = "libsamplerate0_0.1.8-4+srt5_i386"; + sha256 = "070cz870znj9584a9y9npp7zzkkcb049ar2g6m3v1dzf8ijha38x"; + url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libsamplerate0.deb"; }; } rec { - name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_i386"; - sha256 = "19pkr848bjg2zg43z2l5npx97ydx4jgf7c5n33ckj6wbgxvzbn1s"; - url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_i386.deb"; + name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt5_i386"; + sha256 = "10hnrhzfxbg2ka3wlhbvg1qd15k5vdbpfxhdi3ip6yynr00zb9zs"; + url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libsasl2-2.deb"; }; } rec { - name = "libsdl-image1.2_1.2.10-3+srt4_i386"; - sha256 = "1d3m36a58iwpykc442axj4bd6s4h7f9qq269qfv07i6cyfp2j87l"; - url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt4_i386.deb"; + name = "libsdl-image1.2_1.2.10-3+srt5_i386"; + sha256 = "0iam5axnl4is7avn37jc95c3qxb5zacl5kl2zg5mbnm4wgcywr08"; + url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl-image1.2.deb"; }; } rec { - name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_i386"; - sha256 = "0wij7i9d5g9bbjq4xrvrbzqcsdpjn6dhj1pjn997lpgxsfwyl0nd"; - url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_i386.deb"; + name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt5_i386"; + sha256 = "1zv4iq7743y2g0zmycq1aj48s06lcmv60f0xig5s9zj8kj5nbg36"; + url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl-mixer1.2.deb"; }; } rec { - name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_i386"; - sha256 = "1ih95dgbaksgj12x6p7528hywm4zqalv0zyg7k5mp3yfgdxi37xr"; - url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_i386.deb"; + name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt5_i386"; + sha256 = "15rbl3zbmg053ach4d25c988m3kj4gjndj5bz1v1spv46798lya8"; + url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl-ttf2.0-0.deb"; }; } rec { - name = "libsdl1.2debian_1.2.15-5+steamrt1+srt4_i386"; - sha256 = "1qsmhdzs2rr13vgagma0yn39x4njx2gixw82l3zmp6b0rp8x0ff9"; - url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt4_i386.deb"; + name = "libsdl1.2debian_1.2.15-5+steamrt1+srt5_i386"; + sha256 = "1da6gg64n9x86ldxns4dfnixxa4sc6bci34sgy08fa3r05aqh84a"; + url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl1.2debian.deb"; }; } rec { - name = "libsdl2_2.0.4+steamrt2+srt1_i386"; - sha256 = "1xxj20q6kv4n8g1d1f5pbg1qaqdaq4nigqi2sq4lzmnvzkm8nj91"; - url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.4+steamrt2+srt1_i386.deb"; + name = "libsdl2_2.0.8+steamrt1+srt1_i386"; + sha256 = "0ldraz2giwfhgxbc5m0sf4m1xvp21hx5n9cgqj1civa9plhwyrk7"; + url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.8+steamrt1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl2.deb"; }; } rec { - name = "libsdl2-image_2.0.1+steamrt2+srt1_i386"; - sha256 = "0s7gyc3d0acddzipc4pc89k5cdyjl8ik7pk1znrq0292rnmnwbk4"; - url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.1+steamrt2+srt1_i386.deb"; + name = "libsdl2-image_2.0.3+steamrt1+srt1_i386"; + sha256 = "006kbbcrzv4bdgpz2w3s0z2q28h5n37ab3995d1zlrpaxmh03i37"; + url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.3+steamrt1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-image.deb"; }; } rec { - name = "libsdl2-mixer_2.0.1+steamrt1+srt1_i386"; - sha256 = "0hqqxqnh8pyvaqhb9rhk20qnf4plrmh3w0n80sfzcn1vjrdcg8mr"; - url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.1+steamrt1+srt1_i386.deb"; + name = "libsdl2-mixer_2.0.2+steamrt1+srt1_i386"; + sha256 = "0m27snsrpcr1d7yd9kn8z0symw2fgivx8ndvjxif45w3h8qfkmv1"; + url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.2+steamrt1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-mixer.deb"; }; } rec { - name = "libsdl2-net_2.0.1+srt1_i386"; - sha256 = "14cn8v8bnllkbj88qy2chlj44m4qrdd6h1x705plwy10qma18iln"; - url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt1_i386.deb"; + name = "libsdl2-net_2.0.1+srt2_i386"; + sha256 = "0fk45d366021s31b8vlry93crm1c30fqiq2r4a4yvp9gkhlkww4a"; + url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-net.deb"; }; } rec { - name = "libsdl2-ttf_2.0.14+srt1_i386"; - sha256 = "06r8vsji64dcswd7mwy9yyacp6pkza8lsa3dwz07yqyb49md9xrv"; - url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt1_i386.deb"; + name = "libsdl2-ttf_2.0.14+srt2_i386"; + sha256 = "0v9myv9d04h5rs9x216qjg2lf6pwnngsbyylzc0fs5rlzshwdk9s"; + url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libsdl2-ttf.deb"; }; } rec { - name = "libselinux1_2.1.0-4.1ubuntu1+srt4_i386"; - sha256 = "19vfb4zlpv25x5428zfm5mkwqgdc229mc3saq32pas3b2faxfan7"; - url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt4_i386.deb"; + name = "libselinux1_2.1.0-4.1ubuntu1+srt5_i386"; + sha256 = "0s5x224hx0q6j49pvb3bflzyzzi4ryl60sx6sf7y6wi7kplvibvg"; + url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libselinux1.deb"; }; } rec { - name = "libsm6_1.2.0-2build1+srt4_i386"; - sha256 = "0c1rca5w1m1cqi2a5g9k7zpvkvky6da9hkfg1ar5c8xw4ilw304j"; - url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt4_i386.deb"; + name = "libsm6_1.2.0-2build1+srt5_i386"; + sha256 = "07vrs3rarjah3q06yfqqpb38j67s7dv2p30izhjzps7xxj2qfw6d"; + url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libsm6.deb"; }; } rec { - name = "libsndfile1_1.0.25-4+srt4_i386"; - sha256 = "0pbb7yv86am1x1fd2s15s7ybyz3q1xjlxij8in9dal1bkpj6yhsj"; - url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+srt4_i386.deb"; + name = "libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt1_i386"; + sha256 = "0y4hlf67cdlgcfsw03sjsvm2vch8gsasid58y77rzix43saay229"; + url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+steamrt1.1ubuntu0.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libsndfile1.deb"; }; } rec { - name = "libspeex1_1.2~rc1-3ubuntu2+srt4_i386"; - sha256 = "1n2146dh1famhl58i1s4cdp0gyfz89w8vj5msh8hsdjjr8csa83s"; - url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt4_i386.deb"; + name = "libspeex1_1.2~rc1-3ubuntu2+srt5_i386"; + sha256 = "0d662dxr5dh6dvnz49pii1mqd8k2xk0jaw07sgl7nnd01926xa9p"; + url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libspeex1.deb"; }; } rec { - name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt4_i386"; - sha256 = "0gk0b28d9f7zya9vbmg1kj5xm3k3339ky2n16id3w6aks7lc5y8w"; - url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt4_i386.deb"; + name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt5_i386"; + sha256 = "1924dczm2sxlfn9ibmp7yvn0chd3y201zhw0a6dv65fwngmzk725"; + url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libspeexdsp1.deb"; }; } rec { - name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt1_i386"; - sha256 = "160pzj7hmqm5hkixj002q81gcqybkv7xn8z8746dw7h90cvlyvrh"; - url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt1_i386.deb"; + name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt2_i386"; + sha256 = "05cihfj3ap1xwpnlmvl3wdbqrbbm6ic10zbja98c429xxx7y8bgv"; + url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libsqlite3-0.deb"; }; } rec { - name = "libssl1.0.0_1.0.1-4ubuntu5.33+srt1_i386"; - sha256 = "142c6vwq852mra2i2jp802wfsprd5jia80xn09ms0rxxa1aa7xsk"; - url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.33+srt1_i386.deb"; + name = "libssl1.0.0_1.0.1-4ubuntu5.36+steamrt1+srt2_i386"; + sha256 = "06gc6qpm51jx0x1imf5nccc3r9x2d41xvfi0wl3p9wvrx6nsna7d"; + url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.36+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libssl1.0.0.deb"; }; } rec { - name = "libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386"; - sha256 = "187nknssd0x7r0qsw71f3d06pvwbkqanajah4f7a01xk3hc8cxh1"; - url = "mirror://steamrt/pool/main/g/gcc-4.8/libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386.deb"; + name = "libstdc++6_5.4.0-7.really.6+steamrt1.1+srt1_i386"; + sha256 = "13kvxng82xz171y3q0i12bvy8z77cqk6s088bjil4b5fq81aaxns"; + url = "mirror://steamrt/pool/main/g/gcc-5/libstdc++6_5.4.0-7.really.6+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libstdc++6.deb"; }; } rec { - name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_i386"; - sha256 = "1j2wsczzlh5jpqyr8k6j72107kmhxa3hdiqm0s648i0fyrks54wp"; - url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_i386.deb"; + name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.1+srt1_i386"; + sha256 = "1xh0hvgw6rrg6k1fbpblxvfdaslwkjlqbgaqjkavkkvl0xmk5k4b"; + url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libstdc++6-4.6-pic.deb"; }; } rec { - name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - sha256 = "0x3xbbzf643mia8cx9py8vrn9d8c5njxh7x233ylmh8lybac9z5x"; - url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; + name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386"; + sha256 = "1cj7zfhxrb6mvsd8np6q1s1wja2rdd85h2cs9b2pbnlffbr0b9ad"; + url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libswscale2.deb"; }; } rec { - name = "libtasn1-3_2.10-1ubuntu1.4+srt1_i386"; - sha256 = "050w4qc87h9kvniknk62jxpx2i40pl8djbmzbhj2w2lmjbzr7g83"; - url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.4+srt1_i386.deb"; + name = "libtasn1-3_2.10-1ubuntu1.5+srt2_i386"; + sha256 = "12lfinrk76laq7hiddsvi0gskyfgrf7nk2kflqryxwrpf1y34bcl"; + url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.5+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libtasn1-3.deb"; }; } rec { - name = "libtbb2_4.0+r233-1+srt4_i386"; - sha256 = "1ava8m0iv62cb1gi28l486nibd981lsnjbx08b7cg7dd8hjw5lnj"; - url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+srt4_i386.deb"; + name = "libtbb2_4.0+r233-1+steamrt2+srt1_i386"; + sha256 = "0ap5ar8v4ljv138p6kga1vzy96v5ilicxsk8lhp1scvcrcaqfppz"; + url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+steamrt2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libtbb2.deb"; }; } rec { - name = "libtdb1_1.2.9-4+srt4_i386"; - sha256 = "17q687bsc7v2jkcvp1y85mnzdq8kdxwlvxib0h5i6v6qvwrj01hn"; - url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt4_i386.deb"; + name = "libtdb1_1.2.9-4+srt5_i386"; + sha256 = "0snf08x6fsjqxs2gzfa7sdxbznq7h347ndawmras84zi0g0bgj6q"; + url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libtdb1.deb"; }; } rec { - name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_i386"; - sha256 = "0viaqm59q9qbj23s5b4s4mq99imyfv799b6ph78cz2yi6l94qvqx"; - url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_i386.deb"; + name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt5_i386"; + sha256 = "1jjbd6yyyw5v5wnvsdc3s4gywm9q0mq32n2dr444qs030nkfvcrp"; + url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libtheora0.deb"; }; } rec { - name = "libtiff4_3.9.5-2ubuntu1.8+srt1_i386"; - sha256 = "1zyggf4hp7xxd7jn2rahg27vxk1pxpwcvjlrmc3lnp4d2krnf0pq"; - url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.8+srt1_i386.deb"; + name = "libtiff4_3.9.5-2ubuntu1.9+srt2_i386"; + sha256 = "0law24ini5ailgykff6blxqfj6zz0lfx5a2s5fzgf06s4j1n2cjv"; + url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.9+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libtiff4.deb"; }; } rec { - name = "libtinfo5_5.9-4+srt4_i386"; - sha256 = "0iy5lalmyr9lv8vm7mc5zdis70ir3x82aav798s4dvwmhzw7a45a"; - url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt4_i386.deb"; + name = "libtinfo5_5.9-4+srt5_i386"; + sha256 = "1476jzkd5mcipafc8cfb03z9yzkxvdxnfc0qa34xq5rbjwcximmd"; + url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libtinfo5.deb"; }; } rec { - name = "libudev0_175-0ubuntu9.2+srt4_i386"; - sha256 = "1wxkfv34nqch3zi4hyshmwbg9s33q7inlz8zl396p22m1q5m5sfx"; - url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.2+srt4_i386.deb"; + name = "libudev0_175-0ubuntu9.10+srt1_i386"; + sha256 = "089z7vv229w6gnnzwwagixxwn2qcl8gfim1zbagg266vlwqvcyka"; + url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.10+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libudev0.deb"; }; } rec { - name = "libusb-1.0-0_1.0.19-1+srt1_i386"; - sha256 = "0mmn9l99i595l4fd446jjyh301airh17wbc4wfiigsmz4b4mylb0"; - url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt1_i386.deb"; + name = "libusb-1.0-0_1.0.19-1+srt2_i386"; + sha256 = "1rjnir1gm768xhn4lqb4rdai6wabdfysnlzb47qxxzshpfphycmh"; + url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libusb-1.0-0.deb"; }; } rec { - name = "libuuid1_2.20.1-1ubuntu3+srt4_i386"; - sha256 = "1hcrpngalirqbzqfn209akkizqnm4qpkhp42mcys78xx0i0p5kxr"; - url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3+srt4_i386.deb"; + name = "libuuid1_2.20.1-1ubuntu3.1+steamrt1.1+srt1_i386"; + sha256 = "1hi8gq8jws689pacx8m0pzjfhrswh8jng39m7vnx2clj7xzfsk5b"; + url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3.1+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libuuid1.deb"; }; } rec { - name = "libva-glx1_1.3.1-3+steamrt4+srt1_i386"; - sha256 = "0g7vra6wlgrvpn1cqx1xnckfxn7r2lzh8bk2gs32cdxc4qy7w22r"; - url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.3.1-3+steamrt4+srt1_i386.deb"; + name = "libva-glx1_1.7.0-1+steamos1+srt1_i386"; + sha256 = "1q1aasyqlllhj0jhkf7mfcs4n83kj7yddxlsldl77v5x2rhn6ksx"; + url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.7.0-1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libva-glx1.deb"; }; } rec { - name = "libva-x11-1_1.3.1-3+steamrt4+srt1_i386"; - sha256 = "0m5p4ciafgdvm4a29z07bcy8gx5n9vr634bwg1x2fj8z5w1y2bnx"; - url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.3.1-3+steamrt4+srt1_i386.deb"; + name = "libva-x11-1_1.7.0-1+steamos1+srt1_i386"; + sha256 = "1pk78g722w8j2zl0hij59p4v3j70am167mdd7f58d179j34v7y8p"; + url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.7.0-1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libva-x11-1.deb"; }; } rec { - name = "libva1_1.3.1-3+steamrt4+srt1_i386"; - sha256 = "1k44nikbgll3zh94p0zgnajjwkaxc0lzc1ss24frq1pzj76jgg54"; - url = "mirror://steamrt/pool/main/libv/libva/libva1_1.3.1-3+steamrt4+srt1_i386.deb"; + name = "libva1_1.7.0-1+steamos1+srt1_i386"; + sha256 = "17rlsh8sv8qymd17c8k1mlk5gb8fkjlgi2swxiaqnyzw40k52bi5"; + url = "mirror://steamrt/pool/main/libv/libva/libva1_1.7.0-1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libva1.deb"; }; } rec { - name = "libvdpau1_0.4.1-3ubuntu1.2+srt1_i386"; - sha256 = "0yya462g7ar6k54bb8aw9qw6zcnzqlzrqjni9w77pm5vbiy1r0yp"; - url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt1_i386.deb"; + name = "libvdpau1_0.4.1-3ubuntu1.2+srt2_i386"; + sha256 = "1qa6bssw4rnyjxw79pfpbhhlwzkxcxg2cx5i8lns5sxg072as5sj"; + url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libvdpau1.deb"; }; } rec { - name = "libvorbis0a_1.3.2-1ubuntu3+srt4_i386"; - sha256 = "0s2m9sa8gyqk56icsb8y65fhfnmbay56a8gy8znz690l8aq6fcvl"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1ubuntu3+srt4_i386.deb"; + name = "libvorbis0a_1.3.2-1ubuntu3+srt5_i386"; + sha256 = "01hkk2wxqx5fj7qsi00h4al8ddvymhziyzdpzr025bd0ibhgqayg"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1ubuntu3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libvorbis0a.deb"; }; } rec { - name = "libvorbisenc2_1.3.2-1ubuntu3+srt4_i386"; - sha256 = "1848325zzklbdc03a738jvs0jpgypjd11sw80qv47i73zmc0wnfz"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1ubuntu3+srt4_i386.deb"; + name = "libvorbisenc2_1.3.2-1ubuntu3+srt5_i386"; + sha256 = "0v26kx6b98mj2glhmd6nsk2zqh3ra6jln1c9ksrq4abxda4qqril"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1ubuntu3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libvorbisenc2.deb"; }; } rec { - name = "libvorbisfile3_1.3.2-1ubuntu3+srt4_i386"; - sha256 = "0p63wgif2h9q6pd61mfpl63qa1m12344d5nkrd6daq47hmldfibw"; - url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.2-1ubuntu3+srt4_i386.deb"; + name = "libvorbisfile3_1.3.2-1ubuntu3+srt5_i386"; + sha256 = "0l9d7z87fpa8zkfg96709hfpx6jr0zrd5pvjz193jaj5165kamkh"; + url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.2-1ubuntu3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libvorbisfile3.deb"; }; } rec { - name = "libvpx1_1.0.0-1+srt4_i386"; - sha256 = "1dkpqaaclks24kw4wdbzfnkdbsf4yz3j8ygfl6w0y3w2sxwcxldl"; - url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-1+srt4_i386.deb"; + name = "libvpx1_1.0.0-2+srt1_i386"; + sha256 = "08yngwr92m787ycpsc798kgpyw6ixks55kmqmadjp8zx43pjzaai"; + url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libvpx1.deb"; }; } rec { - name = "libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_i386"; - sha256 = "1fir2kw66z14pfs6zqa5i620c9rli075dk9mj9802d723hr78ylh"; - url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_i386.deb"; + name = "libvulkan1_1.1.73+dfsg-1+steamosc2+srt1_i386"; + sha256 = "0g9f3nk2bq8knqqs6qplw39p729zxqnxyyhipnziqy8h38bilj86"; + url = "mirror://steamrt/pool/main/v/vulkan/libvulkan1_1.1.73+dfsg-1+steamosc2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libvulkan1.deb"; }; } rec { - name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - sha256 = "06vhdm7d6h7cihk97v5bf2b8mb5z1ncca1yfahcxmgykm0amq89w"; - url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; + name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386"; + sha256 = "1xzj4q5wk1pjflqqd85cx1788sd89fjdjgwv4qlwyn76magxi7kh"; + url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libwind0-heimdal.deb"; }; } rec { - name = "libwrap0_7.6.q-21+srt4_i386"; - sha256 = "07qszw3j351x9vwz5q6qvzanp291xn27zif1ir5khdwidr5lb58b"; - url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt4_i386.deb"; + name = "libwrap0_7.6.q-21+srt5_i386"; + sha256 = "1lhp9v9cpi5dgk0wdrivr50b0g3l4fy8cjgnjai25hb65w2hj33n"; + url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libwrap0.deb"; }; } rec { - name = "libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386"; - sha256 = "0wsr47fjfvjxz0ks07va0mqs8d6b8prll5512hvivj6hf6x8cngm"; - url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386.deb"; + name = "libx11-6_1.6.3-1ubuntu2.1+srt1_i386"; + sha256 = "0mvg378ja1znf6qf5228bmijrznhhzw3r7lxizk9iwhz5pm6h2pm"; + url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.6.3-1ubuntu2.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libx11-6.deb"; }; } rec { - name = "libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all"; - sha256 = "17mygha6q5480ajgv1f4wmgwr3l3zxh92yagh4qfsm6r1j2a5dma"; - url = "mirror://steamrt/pool/main/libx/libx11/libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all.deb"; + name = "libx11-data_1.6.3-1ubuntu2.1+srt1_all"; + sha256 = "1imsbk4mg6n1083gjjv6kssm5g842xlbg40vsc4dw97myxycpncw"; + url = "mirror://steamrt/pool/main/libx/libx11/libx11-data_1.6.3-1ubuntu2.1+srt1_all.deb"; source = fetchurl { inherit url sha256; name = "libx11-data.deb"; }; } rec { - name = "libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386"; - sha256 = "11fhyqvfbs0jf71cnmld09q23abvnrzgp20zabrvi2r5vk0ai6f9"; - url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386.deb"; + name = "libx11-xcb1_1.6.3-1ubuntu2.1+srt1_i386"; + sha256 = "0vpnnsa4ayvin11c9gl5c8bbaplz1z6pm28k0fhfhla5ggq1kd46"; + url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.6.3-1ubuntu2.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libx11-xcb1.deb"; }; } rec { - name = "libxau6_1.0.6-4+srt4_i386"; - sha256 = "0pw507i7nfr1zqjf8ysjzqgml053bwlac2jxv78b2rp3l3xky4sp"; - url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt4_i386.deb"; + name = "libxau6_1.0.6-4+srt5_i386"; + sha256 = "1q5qryha5ng0cjcalz5qxd38djxd5n7kb2fnz9mnp4cy2vk5jhmq"; + url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxau6.deb"; }; } rec { - name = "libxaw7_1.0.9-3ubuntu1+srt4_i386"; - sha256 = "172kg32mck6v60cy7bxb3wpmhn09jay6lg0mghb65f57bkqb539v"; - url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt4_i386.deb"; + name = "libxaw7_1.0.9-3ubuntu1+srt5_i386"; + sha256 = "17085yj7x9hncbgxw5jsi4inn17f6wzdx2akzv9v3l6hvhy8kmkl"; + url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxaw7.deb"; }; } rec { - name = "libxcb-composite0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0m28k3pwgscxzbp4vhrncv12l0940s22qc8lrgzb0vi5ha4vb1zk"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "00zfy06nf78gs7ji222lcy1cwzsqfbng9119cgkw5c1z25x0q6a5"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-composite0.deb"; }; } rec { - name = "libxcb-damage0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0z180s301vq0bpnv18hqad3n5hsipv6svjgiwacq9c4srryn22af"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "09y48s64kp0maldv9bwwpj8ahrssvrik8xmqzjgvxcxpblb1zfb7"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-damage0.deb"; }; } rec { - name = "libxcb-doc_1.10-2ubuntu1+srt4_all"; - sha256 = "0zq3xcrlr2wjp3386bf5h1z63hapmkpnw45l1fz17chdngcmj358"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-doc_1.10-2ubuntu1+srt4_all.deb"; + name = "libxcb-doc_1.11.1-1ubuntu1+steamos1+srt1_all"; + sha256 = "0aly1y78gdv9vkxqgs6ir7sdifn0bvsbflp05x7jmq0zlgpcg0nz"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-doc_1.11.1-1ubuntu1+steamos1+srt1_all.deb"; source = fetchurl { inherit url sha256; name = "libxcb-doc.deb"; }; } rec { - name = "libxcb-dpms0_1.10-2ubuntu1+srt4_i386"; - sha256 = "1k66jz8ms3mwbmkfdg9xb9wn77igwrkhjrvg6lw847c2f5rrxwp7"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "085b0qhf15kaw9msmsk8jxp4rk7fym506jmiaqxh1i6wgr66ys86"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dpms0.deb"; }; } rec { - name = "libxcb-dri2-0_1.10-2ubuntu1+srt4_i386"; - sha256 = "00r0pcda8hc7sq1nj93621p55743dys424fi3n26hdmdky9j0rks"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "1nwdr550axxca7p438c3g9jb4y2zf8gxyd3756vav4jp1n57i1rq"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dri2-0.deb"; }; } rec { - name = "libxcb-dri3-0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0lgg6b8sxd6s22vn7vwiyb9vz39v124y9w74g6krxqmfvbkfva2x"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "1vjklblpkdrki48dn890920nx8gcj25sxqp24qkpxja8samvl6gr"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-dri3-0.deb"; }; } rec { - name = "libxcb-glx0_1.10-2ubuntu1+srt4_i386"; - sha256 = "142f73f4mkvad2l238kyf0xl4kwzgcpcww33ah3rx4qjz7q3ails"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0zwc8c896bka6wi5jri78q1pq5ppsi5dwih9rwfl5c96p6r4lbr6"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-glx0.deb"; }; } rec { - name = "libxcb-present0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0rlnxwazwrp7kpgh6d6dbfzk5cjvlqp31qxgifd4b8fryjnan91f"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-present0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0cd4jsyj1r6b7nm8g6342f8dafghzd1dc0k61iw3qncwx949j3gy"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-present0.deb"; }; } rec { - name = "libxcb-randr0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0qg20vdidpbl6jar9w4n65jfmg907fkqrk2nwh6qj0l3xd90pm61"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "1vfrbkq1qqjp0278j70jcldls2g9rmkh9ifb6pnqznagqsrrhwy7"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-randr0.deb"; }; } rec { - name = "libxcb-record0_1.10-2ubuntu1+srt4_i386"; - sha256 = "1kyjdazkvykcg76yp3gyy2pgj07nwbjld7q0ci96q1zka3a3m4sz"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-record0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0gy7l161idc59a6q8vhgq1krknwmd1cyh5ss2vhp7qznxwh9bd7j"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-record0.deb"; }; } rec { - name = "libxcb-render0_1.10-2ubuntu1+srt4_i386"; - sha256 = "1r77z60hz0bblg07szl6yir6ll697w0w1y37bd66wv9n4cdlijqd"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-render0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0gl7389h5ppfd3p30v8vmwl4kxvsqjhmhazszs7mdgalfjwkf9rf"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-render0.deb"; }; } rec { - name = "libxcb-res0_1.10-2ubuntu1+srt4_i386"; - sha256 = "1xnnyczipj30kzkyrwngkra2m3xc8jchzd88a3afgy4m6cy6qyyy"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-res0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "1ca5lk12qncrfkjakjb7yl5f5x41b3ynn3d9wk6paqrchhfn7yir"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-res0.deb"; }; } rec { - name = "libxcb-screensaver0_1.10-2ubuntu1+srt4_i386"; - sha256 = "155m47mnjbn9b5p895syyfxk9pk1sh76qj614k554rf77nwdx8rq"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0sz49j0z7zl2mx7cf6kw4ljzsbik92az35yj9i0426p1zaqzx0vs"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-screensaver0.deb"; }; } rec { - name = "libxcb-shape0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0wm9mm8xyh70zdc7iz8j3y89n2c5yhd72kq68nbxqpnwrz3kyzcz"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "1mycsk8ixdn7c8c4ma4vbrilhcdjxqz92nzv9rwxf96vr0dj4bhd"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-shape0.deb"; }; } rec { - name = "libxcb-shm0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0ifvwv0jq4crsgzfpbssa4p9r1jk7mck4wlpfq5j11aiijyw5fq6"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "1w0d53d8hgzr5ql9is7x4dap6ny6bfp041qa6hldmg8jbw3x8wc3"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-shm0.deb"; }; } rec { - name = "libxcb-sync1_1.10-2ubuntu1+srt4_i386"; - sha256 = "0wsf356qiv9frxky8c503bb7nsksrgn9zii7h2yp7v5wsxpi20p5"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "1pd0pw5q7h28p0j6h4889dq7fpvkjwclsmg96m6sl7a3459cp6b0"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-sync1.deb"; }; } rec { - name = "libxcb-xevie0_1.10-2ubuntu1+srt4_i386"; - sha256 = "1qynissbyb4ihyyy61nhlm4nqsm5akyfkdfyw38id6qiyh1hnml9"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0nf3s5jff5psab8mv9avkflgwfj2pmbrvc3pyy743b9cwzv7q85p"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xevie0.deb"; }; } rec { - name = "libxcb-xf86dri0_1.10-2ubuntu1+srt4_i386"; - sha256 = "013mhdbavmaqvw99k52p45lzfri1fhyclg6hdzb3xgswzilq1wn4"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "149dgslf6hhngjjkhdvrsl3hjx3l2llvnwv6jgnc8hqvz7ck1i1h"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xf86dri0.deb"; }; } rec { - name = "libxcb-xfixes0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0szrbzqjks1g77x572r3dvkv791k1c8lckcgk6a7wl4pygsksd3m"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "1rjynbvfxxzm5x07xxfq40qhs7b5pwassn1f7j02q3685swqmk0z"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xfixes0.deb"; }; } rec { - name = "libxcb-xinerama0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0h01rmw1h93xd1vhz06v7ckjzy89ingi6c6b2sl6sxdd7ii9fkni"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0m0v4c50104c2khx9vcsf3v3xyl031xv2yladxfp168gchrczyk9"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xinerama0.deb"; }; } rec { - name = "libxcb-xkb1_1.10-2ubuntu1+srt4_i386"; - sha256 = "07yq1khdrisvgkpbvl39kq1f3kwaqxvyn6jfcib2lcg6w5cbk9n8"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0d56vivs4ykanc1v3pbn9mzgcyw4ffx7c59ck1758g2vxfvi837w"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xkb1.deb"; }; } rec { - name = "libxcb-xprint0_1.10-2ubuntu1+srt4_i386"; - sha256 = "13dxk56nga9imkx07fb1s4fmgki0dnhcbb41pzr1r0ybxg6crnk9"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0gclf7sgd661820bqqj3aabykxp0m38y3wd9m25znqgqqg5bk6im"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xprint0.deb"; }; } rec { - name = "libxcb-xtest0_1.10-2ubuntu1+srt4_i386"; - sha256 = "11ajwd0456dr4nwhkib31zwgk7xpyzir86pvjrgpydnh6yj3dic0"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0swkpx39gd9n553qrc8dhdv4vvnan1byrkvy935zzimzxv8phxfm"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xtest0.deb"; }; } rec { - name = "libxcb-xv0_1.10-2ubuntu1+srt4_i386"; - sha256 = "0xkj414c0svlndqck1ghddc424a7mpxwaw44sdjw25iwsidzqi7i"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0mi49k0xfk34x71ap4q9wy4p7cs31z25pg0p41yr859q4y49461r"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xv0.deb"; }; } rec { - name = "libxcb-xvmc0_1.10-2ubuntu1+srt4_i386"; - sha256 = "109bkl63vbsmhflqw3ivjdas96jamq5jjh67rf4lvpgxnlscxsgw"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "068y30y9ry4hlfc4dsza47z6lakfz2cy0zkdq5rn3nbs59d7f2nh"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb-xvmc0.deb"; }; } rec { - name = "libxcb1_1.10-2ubuntu1+srt4_i386"; - sha256 = "1n3ppygmfjy4hwgi4lq2xlm1ldlp47g67ksafbs3zd06a7lyq2rb"; - url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.10-2ubuntu1+srt4_i386.deb"; + name = "libxcb1_1.11.1-1ubuntu1+steamos1+srt1_i386"; + sha256 = "0sga5mjr5bk5w0mdq0y2hxfdhpfpzv9m9anfy2zkaw60gy6n0qk6"; + url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.11.1-1ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcb1.deb"; }; } rec { - name = "libxcomposite1_0.4.3-2build1+srt4_i386"; - sha256 = "1ga6g4mdz02p4m6l3q7fa8404243qhqfrvvcwinbm9hj8fyshliz"; - url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt4_i386.deb"; + name = "libxcomposite1_0.4.3-2build1+srt5_i386"; + sha256 = "1c23iswcyi5axg5hql3kkfmcvxkzjl1db9klrlsqb2c0455pjlsf"; + url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcomposite1.deb"; }; } rec { - name = "libxcursor1_1.1.12-1ubuntu0.1+srt4_i386"; - sha256 = "0nalkn0hql9v13b48685jrlcx607n5bn6gk5vmhbq0zpcs2ww709"; - url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt4_i386.deb"; + name = "libxcursor1_1.1.12-1ubuntu0.1+srt5_i386"; + sha256 = "18321skl4h2s3izzaaw1jk2blfq93ygk4b2f2g4mnkipn1i9rybx"; + url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxcursor1.deb"; }; } rec { - name = "libxdamage1_1.1.3-2build1+srt4_i386"; - sha256 = "0qysvz8hwcra2kr8sd9iyk1x73wawfnhsq5yspjphq08kg2k5gmq"; - url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt4_i386.deb"; + name = "libxdamage1_1.1.3-2build1+srt5_i386"; + sha256 = "01pam4srj0d3vyrrhlsnfkznpxgil3p674i0armxqfydzh4bww8q"; + url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxdamage1.deb"; }; } rec { - name = "libxdmcp6_1.1.0-4+srt4_i386"; - sha256 = "0hxixf0y2l3wc6flfg2gwlfc3fp40rg570lwkr0r6hwj1z0zwyf8"; - url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt4_i386.deb"; + name = "libxdmcp6_1.1.0-4+srt5_i386"; + sha256 = "0vz6w11yld3ii0b3i68wwzx7qsgd64yj8709h32db08izc1a2wdh"; + url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxdmcp6.deb"; }; } rec { - name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_i386"; - sha256 = "0s6jc1zw6n2m3bmis62pr3mkzd64migzrj5wcl9hmq5yrnc46shs"; - url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_i386.deb"; + name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt2_i386"; + sha256 = "11jjds6qk9wvx446rph5n2qsr9b36jlr99ayw98zr89b3y6y8lyf"; + url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxext6.deb"; }; } rec { - name = "libxfixes3_5.0-4ubuntu4.4+srt1_i386"; - sha256 = "0y5fb7nrnydlxbflhxqw065qz337m2i87sdn4730pd8y693sinyz"; - url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt1_i386.deb"; + name = "libxfixes3_5.0-4ubuntu4.4+srt2_i386"; + sha256 = "19rm8s1dq7vysijlksbac04045x5j4g30s377im4ydljjh2vajh6"; + url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxfixes3.deb"; }; } rec { - name = "libxft2_2.2.0-3ubuntu2+srt4_i386"; - sha256 = "087wclc31napmxc7l09gc73dgjczdkcyrld6zdcq6jq8jm1aq4vk"; - url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt4_i386.deb"; + name = "libxft2_2.2.0-3ubuntu2+srt5_i386"; + sha256 = "0pcd8bvdlh41bixbdkrl0sm6libgns7ndjzyvj86s3qks7k11g97"; + url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxft2.deb"; }; } rec { - name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt1_i386"; - sha256 = "0zx652d5gr6dvviwpn5v0mhd9812pcha7xs9z7il3s01d75qcysk"; - url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt1_i386.deb"; + name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt2_i386"; + sha256 = "0pykpahh9j7cp91mbkqw22drl5npq3pbd712chbrmkdjdqm14x9p"; + url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxi6.deb"; }; } rec { - name = "libxinerama1_1.1.1-3ubuntu0.1+srt4_i386"; - sha256 = "16dci5p6amsj1d474ih3avpjc1kc406wz6ywb9f6m44qrnm96w9m"; - url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt4_i386.deb"; + name = "libxinerama1_1.1.1-3ubuntu0.1+srt5_i386"; + sha256 = "0xd0rfr6h25s3h6n8in5kby4fm88s1ykw2y8clymk79znmgby0av"; + url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxinerama1.deb"; }; } rec { - name = "libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_i386"; - sha256 = "0gld5pbh1qh93nafvw6fx319av0hpfxp54pg3w4svi1cg7hj9rk2"; - url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_i386.deb"; + name = "libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt1_i386"; + sha256 = "1ss7fpdqdgm8hmcgm1d59x5mfr4n7zps8bjg1304nn29a3cck26z"; + url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.17+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxml2.deb"; }; } rec { - name = "libxmu6_1.1.0-3+srt4_i386"; - sha256 = "0vvxp9fr2rykqny2r1qz6h5vqw26zv5lkh9nyw8jvrv9gx01rma0"; - url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt4_i386.deb"; + name = "libxmu6_1.1.0-3+srt5_i386"; + sha256 = "0z39zacqis2cq1gdwam1wk5xmisdhsrly7r1a8g5h8h6hbrri72w"; + url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxmu6.deb"; }; } rec { - name = "libxpm4_3.5.9-4+srt4_i386"; - sha256 = "0s7pxkhfx84axldwpznv1wj9z05zm90fpp11702lm3qic6829sk1"; - url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+srt4_i386.deb"; + name = "libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt1_i386"; + sha256 = "02k70n6v245l0kqf7gjjv4bm12zmxcw8cayjv9xh8cp6svsxdzsq"; + url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+steamrt1.1ubuntu0.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxpm4.deb"; }; } rec { - name = "libxrandr2_1.3.2-2ubuntu0.3+srt1_i386"; - sha256 = "08392ac5sqsdq4r4p8n88c3d2nn0078y510grdrxp9z006f89846"; - url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.3.2-2ubuntu0.3+srt1_i386.deb"; + name = "libxrandr2_1.5.0-1+srt1_i386"; + sha256 = "10nqrxs2dxs06wah8dy48v7v8vdllpg9wwhcn67i7dkgfli27ykj"; + url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.5.0-1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libxrandr2.deb"; }; } rec { - name = "libxrender1_0.9.6-2ubuntu0.2+srt1_i386"; - sha256 = "08dj2kx2kr50jxcyfdj9y9gajkz1lnm6jn9z2pvqf43hzfa4pmp2"; - url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt1_i386.deb"; + name = "libxrender1_0.9.6-2ubuntu0.2+srt2_i386"; + sha256 = "0i48bi4zfv90dgc190mr8wd8hymbhdldrk1q2qag0l9fmn5hkwqv"; + url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt2_i386.deb"; source = fetchurl { inherit url sha256; name = "libxrender1.deb"; }; } rec { - name = "libxss1_1.2.1-2+srt4_i386"; - sha256 = "1zf5ifqq8s6xr3iiwhjk3g2ifrb9srwanffsdjab28jzfpsb4a9h"; - url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt4_i386.deb"; + name = "libxss1_1.2.1-2+srt5_i386"; + sha256 = "015n1l1hl4vvgb53zx6gisl44p2pjj339adabqlfy1fqwjf0ff4z"; + url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxss1.deb"; }; } rec { - name = "libxt6_1.1.1-2ubuntu0.1+srt4_i386"; - sha256 = "1f01dzslhcm0r89p6wzs1pv32gaqxhxs3jim4jbzrkv18d4pyyc6"; - url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt4_i386.deb"; + name = "libxt6_1.1.1-2ubuntu0.1+srt5_i386"; + sha256 = "0yqb6j6rh9y65bfbqv1hrggl1719lsm6yzydbmpnilz15p3f4sa9"; + url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxt6.deb"; }; } rec { - name = "libxtst6_1.2.0-4ubuntu0.1+srt4_i386"; - sha256 = "0w64xxfakharkmh0w9y6pg5446a7zypqhs3wgj6dbsa7clly8ir8"; - url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt4_i386.deb"; + name = "libxtst6_1.2.0-4ubuntu0.1+srt5_i386"; + sha256 = "1h21nyc2bigm3brpzmdaafvry4wszmykbs13vagmibwhb6rls7xd"; + url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxtst6.deb"; }; } rec { - name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt4_i386"; - sha256 = "1xbxlzmhl8j64k2aayrmpdz9bxn7b6jirdk84qibwh96fna4gd2x"; - url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt4_i386.deb"; + name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt5_i386"; + sha256 = "133xi181g1pcd08px9yz7wqz93axy0cq9x5y76qp34dj7i9pscsg"; + url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "libxxf86vm1.deb"; }; } rec { - name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_i386"; - sha256 = "1m4r0mp1i44rlddjjrmmbqi1phg2ksdn5zb4bxjrf55m2zfkgkx3"; - url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_i386.deb"; + name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt5_i386"; + sha256 = "0nvhk0xyi1cc12j2j97x763irk2d9l8n0p3fjyg7s3jgm4va3yjj"; + url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "nvidia-cg-toolkit.deb"; }; } rec { - name = "zenity_3.4.0-0ubuntu4+steamrt2+srt4_i386"; - sha256 = "162554nhfmpjyyf1pzc35gsbawz4f6n1bm4s8n0923g1hmafpf6g"; - url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt4_i386.deb"; + name = "zenity_3.4.0-0ubuntu4+steamrt2+srt5_i386"; + sha256 = "04j0mbdcv8891apw3lak161fbvpyl8qykvqvn6ljl3mimf3qabcd"; + url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt5_i386.deb"; source = fetchurl { inherit url sha256; name = "zenity.deb"; }; } rec { - name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_i386"; - sha256 = "0gcw3qr6w418idwd69i12hjr90ixnab81d1p3wi7d0rwl1227ihv"; - url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_i386.deb"; + name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt6_i386"; + sha256 = "1qbqclnhhwfxj5ajsb05c3pg5iq5imf4pl6yisx5hw5jndgmzch7"; + url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt6_i386.deb"; source = fetchurl { inherit url sha256; name = "zlib1g.deb"; diff --git a/pkgs/games/steam/update-runtime.py b/pkgs/games/steam/update-runtime.py index c225d6bf8adc..aed42cdd5668 100755 --- a/pkgs/games/steam/update-runtime.py +++ b/pkgs/games/steam/update-runtime.py @@ -1,5 +1,6 @@ -#!/usr/bin/env python2 -# +#! /usr/bin/env nix-shell +#! nix-shell -i python2 -p "with python2Packages; [python debian]" + # Script to build a Nix script to actually build a Steam runtime. # Patched version of https://github.com/ValveSoftware/steam-runtime/blob/master/build-runtime.py @@ -20,7 +21,7 @@ REPO="http://repo.steampowered.com/steamrt" DIST="scout" COMPONENT="main" -out = open("runtime-generated.nix", "w"); +out = open("runtime-generated.nix", "w") out.write("# This file is autogenerated! Do not edit it yourself, use update-runtime.py for regeneration.\n") out.write("{ fetchurl }:\n") out.write("\n") diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix index 9cb9aa3ec582..012b37959d8f 100644 --- a/pkgs/misc/cups/drivers/splix/default.nix +++ b/pkgs/misc/cups/drivers/splix/default.nix @@ -31,6 +31,7 @@ in stdenv.mkDerivation { }; postPatch = '' + mv -v *.ppd ppd/ substituteInPlace src/pstoqpdl.cpp \ --replace "RASTERDIR \"/\" RASTERTOQPDL" "\"$out/lib/cups/filter/rastertoqpdl\"" \ --replace "RASTERDIR" "\"${cups-filters}/lib/cups/filter\"" \ diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index 18db78d82ad5..45b2f79146c1 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { meta = { description = "An open-source, cycle-accurate Nintendo multi-system emulator"; longDescription = '' - Higan (formerly bsnes) is a multi-system game console emulator. + higan (formerly bsnes) is a multi-system game console emulator. It currently supports the following systems: - Nintendo's Famicom, Super Famicom (with subsystems: Super Game Boy, BS-X Satellaview, Sufami Turbo); diff --git a/pkgs/misc/gnuk/generic.nix b/pkgs/misc/gnuk/generic.nix index 22aaa2d1cb57..80a4518f3f70 100644 --- a/pkgs/misc/gnuk/generic.nix +++ b/pkgs/misc/gnuk/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, gcc-arm-embedded, makeWrapper +{ stdenv, gcc-arm-embedded, binutils-arm-embedded, makeWrapper , python, pythonPackages # Extra options @@ -14,7 +14,7 @@ stdenv.mkDerivation { inherit src; - nativeBuildInputs = [ gcc-arm-embedded makeWrapper ]; + nativeBuildInputs = [ gcc-arm-embedded binutils-arm-embedded makeWrapper ]; buildInputs = [ python ] ++ (with pythonPackages; [ pyusb colorama ]); configurePhase = '' diff --git a/pkgs/misc/gnuk/git.nix b/pkgs/misc/gnuk/git.nix deleted file mode 100644 index 142c4a0e7e5f..000000000000 --- a/pkgs/misc/gnuk/git.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ callPackage, fetchgit, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "2015-04-22"; - - src = fetchgit { - url = "git://git.gniibe.org/gnuk/gnuk.git"; - rev = "3d5a776ab15a4ae6e17d91341a58eda3db09f700"; - sha256 = "1f9l1rwy630z8cnjd6lfv0zp6ij3c9ifbm3fym245049hh2xds7v"; - }; -}) diff --git a/pkgs/misc/gnuk/unstable.nix b/pkgs/misc/gnuk/unstable.nix deleted file mode 100644 index 16dbe5d21fc8..000000000000 --- a/pkgs/misc/gnuk/unstable.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ callPackage, fetchgit, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "1.1.4"; - - src = fetchgit { - url = "git://git.gniibe.org/gnuk/gnuk.git"; - rev = "e7e8b9f5ca414a5c901f61b0f043c8da42414103"; - sha256 = "0js9dc1iyvrrcb0d8a2irivrli3yb7mxmpxws5a2n53hj5xc4n6l"; - }; -}) diff --git a/pkgs/misc/themes/matcha/default.nix b/pkgs/misc/themes/matcha/default.nix index 9967de786399..6e14d1587a75 100644 --- a/pkgs/misc/themes/matcha/default.nix +++ b/pkgs/misc/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "matcha-${version}"; - version = "2018-10-21"; + version = "2018-10-30"; src = fetchFromGitHub { owner = "vinceliuice"; repo = "matcha"; rev = version; - sha256 = "112xfnwlq9ih72qbfrin78ly7bc4i94my3i6s7yhc46qg1lncl73"; + sha256 = "1ks30xm7jhyxgs0blxxnc9ygmyfwrwc9k8d0y0i6yb7608p8zxzq"; }; buildInputs = [ gdk_pixbuf librsvg ]; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 4c6c577ce6d1..bd3458b98c8b 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -33,12 +33,12 @@ }; agda-vim = buildVimPluginFrom2Nix { - name = "agda-vim-2018-05-23"; + name = "agda-vim-2018-10-29"; src = fetchFromGitHub { owner = "derekelkins"; repo = "agda-vim"; - rev = "24169e70c1dbd784349b1551b6a3753680d9bb87"; - sha256 = "1bn2g89dvwccfl4ki07jb8iydb3d0s4rm7z5gv5q1bv3lccndax6"; + rev = "75853188f15175728e938e1e69da8916148d7f7a"; + sha256 = "1xv3il21fl602hilb3hk1r2bsbnf8brjyv61hprxsj8xd2s36a4d"; }; }; @@ -53,12 +53,12 @@ }; ale = buildVimPluginFrom2Nix { - name = "ale-2018-10-03"; + name = "ale-2018-10-29"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "e984497ec9dc8a465c2873d64c51629c9a559111"; - sha256 = "074s3rgd71nvnanzz1ivd3xpji3qqnsd4ix9ka2xajlscn7i5x6q"; + rev = "cae40e1c347064bd3ab5eb4c04e9e357d3d82105"; + sha256 = "0f7qsp0gpafk7fimcbivx2cm53hpjz6hr6lzdg8wnxcm0gdw7827"; }; }; @@ -103,12 +103,12 @@ }; base16-vim = buildVimPluginFrom2Nix { - name = "base16-vim-2018-05-24"; + name = "base16-vim-2018-10-08"; src = fetchFromGitHub { owner = "chriskempson"; repo = "base16-vim"; - rev = "fcce6bce6a2f4b14eea7ea388031c0aa65e4b67d"; - sha256 = "0wi8k80v2brmxqbkk0lrvl4v2sslkjfwpvflm55b3n0ii8qy39nk"; + rev = "7e9af12d680d81cc1277c07ef5acee8c83828f3f"; + sha256 = "1al00wf0bf61r0bfsfbq8g2qq8sbzj6z8c85787d3qfinvniz0cl"; }; }; @@ -123,12 +123,12 @@ }; calendar-vim = buildVimPluginFrom2Nix { - name = "calendar-vim-2018-08-05"; + name = "calendar-vim-2018-10-23"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "1f20b779171d4d3a20abd47508692fbae32e3188"; - sha256 = "01aiaslaww117kdwf7qxjc647g6bxcqr694mi3l0llblq549ih5l"; + rev = "3c6a7677543824aab0eb9946d376fe5d45a935c5"; + sha256 = "0jnk2hi9n1p7fqclifiyckrcady6fbkag6z29v7n6bbzhvz0qzzs"; }; }; @@ -204,12 +204,12 @@ }; committia-vim = buildVimPluginFrom2Nix { - name = "committia-vim-2018-09-16"; + name = "committia-vim-2018-10-23"; src = fetchFromGitHub { owner = "rhysd"; repo = "committia.vim"; - rev = "7d762c61b3907249cc1f13ec19c72ccd02ed1ade"; - sha256 = "0sq40m748xmjqqwhvkgly9205h1q5c7d70wzahjbnnzqi5mlk4pb"; + rev = "d367190c7ffe95f4ac5d30b2e9da4cd9898579b9"; + sha256 = "1yqsdy1mxc775qcrcl1yi930m2q6364mgjdj06vwnph1rg98w0ql"; }; }; @@ -264,12 +264,12 @@ }; csv-vim = buildVimPluginFrom2Nix { - name = "csv-vim-2018-09-26"; + name = "csv-vim-2018-10-04"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "41e9bd08371c253e7c8d1cb4d16066f8132c5a1c"; - sha256 = "1fvlw39a8vv3vxrpsg6f25is3drp2j83giydp06h3fyzgqgqfsfx"; + rev = "7aa17f00a6cc96b9c9c364c6786c24f97c04605b"; + sha256 = "06mdnpfch0rfhwdwqp4dhg7qx1gwsmkd6dlsd1ypc44r7wdjk38d"; }; }; @@ -304,12 +304,12 @@ }; ctrlp-vim = buildVimPluginFrom2Nix { - name = "ctrlp-vim-2018-09-13"; + name = "ctrlp-vim-2018-10-28"; src = fetchFromGitHub { owner = "ctrlpvim"; repo = "ctrlp.vim"; - rev = "ebc568c3992d9002d1d35b85737dfa0d9ce70d9f"; - sha256 = "0hh4wcyx0smv70axn18gdscmcmhwbbccam9klx0c613qccl5w70i"; + rev = "5e40e555d31d9cce2188d9fa724d1debcad28aa6"; + sha256 = "1skn8p527541w1kynk08dfpai2wlbmylw5sa4z2b7kmmnxa1lq47"; }; }; @@ -334,22 +334,22 @@ }; denite-nvim = buildVimPluginFrom2Nix { - name = "denite-nvim-2018-09-30"; + name = "denite-nvim-2018-10-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "3ffc9a27dd6c2ae4c98f0a153564ee64da2722b2"; - sha256 = "1q1rh1nw90g04jghc4jhaccssv1r7lc69ij00b3v2253ld9bdmlv"; + rev = "0a089bb122eb88e182420334a4f1df0c22917856"; + sha256 = "1virb8lr591jbzmb91dhki32jx9g15a89dsxbh0vy9lcawaikypj"; }; }; deol-nvim = buildVimPluginFrom2Nix { - name = "deol-nvim-2018-10-03"; + name = "deol-nvim-2018-10-12"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "61283778287107a5e2a80b360d6d53610a27774f"; - sha256 = "099dqlrz5baycrgz27m8hk6xy103jrdgph1yg7nmkchavvjp2rz1"; + rev = "04a5295ebad2df1a2141b85dc0b78cc51ea86fb4"; + sha256 = "1v5qip8kzrsq8qmmjrvhm15d9wrn48iz2s62qddcgvc0sdzk1y64"; }; }; @@ -365,23 +365,23 @@ }; deoplete-go = buildVimPluginFrom2Nix { - name = "deoplete-go-2018-09-30"; + name = "deoplete-go-2018-10-20"; src = fetchFromGitHub { owner = "zchee"; repo = "deoplete-go"; - rev = "5b2c70947eaeafabe3d5429527dc0fbd7e1aad64"; - sha256 = "0vwsd5mpyaa4ixqavqvxc0b0515v9iidqzxzv1di73xlxrmaghzi"; + rev = "8bb6d5f51ca825ef88d474c8aa9231692d6c2961"; + sha256 = "15qwhkx24m7drahksrsvvpdzj9wpm0k1722ry6sdwgd40q8d3jrh"; fetchSubmodules = true; }; }; deoplete-jedi = buildVimPluginFrom2Nix { - name = "deoplete-jedi-2018-09-18"; + name = "deoplete-jedi-2018-10-24"; src = fetchFromGitHub { owner = "zchee"; repo = "deoplete-jedi"; - rev = "d49b166458784585dc0cbfb0d7643bc02eba3dd8"; - sha256 = "1dza6bzij0f8bfs7k9j954f8xccjjcrc7wrcgrm1qw0d2jbm4bgq"; + rev = "4ffb3a5ace39143813d63c7f78137bf8478b91e9"; + sha256 = "1fik8snm6f7f337qidlkkhgri756rgyaswk3ndfiqw5vj673r4dw"; fetchSubmodules = true; }; }; @@ -417,42 +417,42 @@ }; deoplete-nvim = buildVimPluginFrom2Nix { - name = "deoplete-nvim-2018-10-03"; + name = "deoplete-nvim-2018-10-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "63fb188c547eb5ccf8cd713a33fbb7c80ac03ec9"; - sha256 = "1f2cfqyc17b8jvd0a2qw0njaw8ac15zbsnjvnwls3wm1f9mmhh6g"; + rev = "aa43a5f03b7b995841b416c40e8bbc8bcbf9b1a2"; + sha256 = "1ixjrf1rrdznfprd9w5fx86k0ni67c9amgvwwbbzhqz3i1zgwc3g"; }; }; dhall-vim = buildVimPluginFrom2Nix { - name = "dhall-vim-2018-07-30"; + name = "dhall-vim-2018-10-25"; src = fetchFromGitHub { owner = "vmchale"; repo = "dhall-vim"; - rev = "2693bfaf9167ac69ee96c1165b4354f03f4d8b24"; - sha256 = "0qm6z8z70cxqqlmxgq497w96nv5sn2gbxnc74balbhpk17bms4m0"; + rev = "aac9deeb695c810fee8a702fc5fca99a26f1d4bd"; + sha256 = "17avn55dixv0rxhc3jzpnadkvldrbq7r81nwgnzi4xlr3fjxjwfc"; }; }; echodoc-vim = buildVimPluginFrom2Nix { - name = "echodoc-vim-2018-09-30"; + name = "echodoc-vim-2018-10-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "4e229bdc8fadf9842ce873665b63149db200adbf"; - sha256 = "0xqh1fdi89nph3f400bxqdsp6j0pcxi7l3ay4wldxlljhpva20zr"; + rev = "3fa121e0a0abee0762867a01b25f4e891594da6e"; + sha256 = "17qckl9x1yd70zxgwvpkh5nwx8zs5f6d8xismd0rbpigd08qd06q"; }; }; editorconfig-vim = buildVimPluginFrom2Nix { - name = "editorconfig-vim-2018-07-25"; + name = "editorconfig-vim-2018-10-14"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "2c3e5323609d97ad7bda6fc22ae1f7746caab3d4"; - sha256 = "0a1nszrhxh9ixp5n47w89ijkvjk3rf29ypiz5blf4pnja39r336x"; + rev = "736451ae203c5e3bcce39f1be11d68009b783d82"; + sha256 = "01j2y02z23ylydkm7yij2m9nimk54m06ik2hyldj99yz8qi5vp18"; fetchSubmodules = true; }; }; @@ -468,12 +468,12 @@ }; ensime-vim = buildVimPluginFrom2Nix { - name = "ensime-vim-2018-04-20"; + name = "ensime-vim-2018-10-10"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-vim"; - rev = "634cce6eae10a31cd6eec259890bdcda326ee3c2"; - sha256 = "03sr53680kcwxaa5xbqzdfbsgday3bkzja33wym49w9gjmlaa320"; + rev = "caa734e84f002b25446c615706283a74edd4ecfe"; + sha256 = "190qq8r2zs7xzmsag7ygk6dvpav3cnzlc40lc3fvwmkfwgci5zg0"; }; }; @@ -498,12 +498,12 @@ }; ferret = buildVimPluginFrom2Nix { - name = "ferret-2018-03-23"; + name = "ferret-2018-10-18"; src = fetchFromGitHub { owner = "wincent"; repo = "ferret"; - rev = "b1ef0cf4af92c3a896821597d0d1a44b9c93dc5a"; - sha256 = "1gpbk396a7pihi6pg2jmxwv6nibprbcr8fg73kxs6kj0d60wgasy"; + rev = "984f0364f8a4ea77c7075e67cd753037ecfdafdf"; + sha256 = "0vis6zgknjmwjhv5vxiv4k5d78971sv61rjc8gh32sq2ksxk07zr"; }; }; @@ -549,12 +549,12 @@ }; fzf-vim = buildVimPluginFrom2Nix { - name = "fzf-vim-2018-10-01"; + name = "fzf-vim-2018-10-22"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "c6275ee1080de4d94bb3f3cfd6e7cc0ccecd9e64"; - sha256 = "1xy7yk4d9p7mbk8s9nj5kqihdgb4a4b004ivbnxwappj52znzw1g"; + rev = "50707b089b1c61fcdb300ec1ecbc4249ead4af11"; + sha256 = "1h0x701jcj2zwyzaxlzzfax3z8jxrn255wawxcjw9fskz9kldd68"; }; }; @@ -648,6 +648,16 @@ }; }; + iceberg-vim = buildVimPluginFrom2Nix { + name = "iceberg-vim-2018-10-17"; + src = fetchFromGitHub { + owner = "cocopon"; + repo = "iceberg.vim"; + rev = "0a18b0fbfdcdace35ee7ff4397ab6932d6dae1da"; + sha256 = "1p5x8kzxs491c2naxqhmqwdk85p3b6qr1aini746qm9ks5afhcgn"; + }; + }; + idris-vim = buildVimPluginFrom2Nix { name = "idris-vim-2017-12-04"; src = fetchFromGitHub { @@ -719,12 +729,12 @@ }; julia-vim = buildVimPluginFrom2Nix { - name = "julia-vim-2018-10-01"; + name = "julia-vim-2018-10-21"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "6e218a18d7b753423c59790105feb33d0388e2d0"; - sha256 = "1wl3djm8fc44da6srvw7g3r1xi5j6742wjbz8i98qalai5fkcibd"; + rev = "934618a71bcf64ff0fb94780dc1aefa58e81470a"; + sha256 = "1pw4snax7ibxhd8xff41lb86vk7a38yrcq85p89sis6nln6larq5"; }; }; @@ -809,12 +819,12 @@ }; ncm2 = buildVimPluginFrom2Nix { - name = "ncm2-2018-09-30"; + name = "ncm2-2018-10-15"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2"; - rev = "02a263f7e38ee9569d8338da2d1cab2708b59150"; - sha256 = "0gz3vyv9a3kl3bd3mq7qlgkfvz1p9gnk7fjjb7bsabayq3854di9"; + rev = "4aaf9e1e313109d32fd2b64a5299416357d901b2"; + sha256 = "09rg3pa0yirhsn1x558k3bzh6fyy4whnfqlm89wvmzxw6rm8xnpw"; }; }; @@ -909,12 +919,12 @@ }; neodark-vim = buildVimPluginFrom2Nix { - name = "neodark-vim-2018-05-26"; + name = "neodark-vim-2018-10-17"; src = fetchFromGitHub { owner = "KeitaNakamura"; repo = "neodark.vim"; - rev = "c966731b54a64b379ca5519c25d3cedb90df1d31"; - sha256 = "0rimpx3569lr4whg7lc0nym0irminwf6r6f2wr320pdhhfx7a0ch"; + rev = "e95e924081f95ec18d9b6d7239a445db982669e8"; + sha256 = "11mib0yf3kq626r9afw1127w2hxbqci3fgvh3lfl36mk06sm1qqb"; }; }; @@ -939,12 +949,12 @@ }; neomake = buildVimPluginFrom2Nix { - name = "neomake-2018-10-01"; + name = "neomake-2018-10-28"; src = fetchFromGitHub { owner = "benekastah"; repo = "neomake"; - rev = "a6715ed7df767ac75166b22305232687f47f5be8"; - sha256 = "0g8rm6y9vvzy1wxrxwjg6y0vw8na727z7mvjf8d20zmscpvmarj0"; + rev = "35f4c002d55d5f722a08eb9acf126f7717072812"; + sha256 = "0ad5dqyjpwn78nadg90jd03n0mkllm0r4jxq72h77dwxsd1prgl9"; }; }; @@ -969,22 +979,22 @@ }; neosnippet-vim = buildVimPluginFrom2Nix { - name = "neosnippet-vim-2018-07-30"; + name = "neosnippet-vim-2018-10-23"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "70700ddef65f8f0639b336d04a0d2dbdc4eb0830"; - sha256 = "0szhmdqqgpfy6shwiw7wnsd06cz8c7v5zmpaa3hzs32gyrx49rza"; + rev = "32583e605ebe96bba805bdf0d526b951345c8b3e"; + sha256 = "105jnnw35ffxwx6zqazh6rizwqdndqc3n656xhljfng33c0lr5mk"; }; }; neoyank-vim = buildVimPluginFrom2Nix { - name = "neoyank-vim-2018-03-26"; + name = "neoyank-vim-2018-10-17"; src = fetchFromGitHub { owner = "Shougo"; repo = "neoyank.vim"; - rev = "ea3cd47ccb40cb2e26cb607d28475aa0fdb26fef"; - sha256 = "1zbf8062rpk56nd1zxqhwa8bdpxl9zp887l9nm4s9hc4ndsk4928"; + rev = "ba337d80769c4f2f19c04df4349a196f52fe5094"; + sha256 = "0sq595xlijz6xsil2z21kf4662cvmzzm6bsvysfz43wgl16dd5s6"; }; }; @@ -999,12 +1009,12 @@ }; nerdtree = buildVimPluginFrom2Nix { - name = "nerdtree-2018-09-17"; + name = "nerdtree-2018-10-25"; src = fetchFromGitHub { owner = "scrooloose"; repo = "nerdtree"; - rev = "599238ad99642e8767c4be6adda75bd84afdfd42"; - sha256 = "1yjx254lmwil42hild0nprxpb26rw84872cnxrzaqfljwsyq7wwv"; + rev = "91e0f2253fbecefa7e14f095950341584877ef19"; + sha256 = "1lkmxplrv211drzmwi93v1fmicdjm146vl471s3h21y77k0hd2f5"; }; }; @@ -1059,22 +1069,22 @@ }; nvimdev-nvim = buildVimPluginFrom2Nix { - name = "nvimdev-nvim-2018-09-08"; + name = "nvimdev-nvim-2018-10-05"; src = fetchFromGitHub { owner = "neovim"; repo = "nvimdev.nvim"; - rev = "cf5acd7712524886881efdba8f2e4cee0f133ed9"; - sha256 = "02jqgbkzn47xljv6kk1lk6gzq3c900lfs2s4dpg1vapd5n0yi4am"; + rev = "ef05db6817d8083f8daf9ddd99b79acc364d57a6"; + sha256 = "1c44pwsjllhcmlabz9pc9qb5p6lgilfzdsx4rcjc8q8ixijc7w99"; }; }; onehalf = buildVimPluginFrom2Nix { - name = "onehalf-2018-09-16"; + name = "onehalf-2018-10-21"; src = fetchFromGitHub { owner = "sonph"; repo = "onehalf"; - rev = "ecc3d8d5691b8d3b39345a4400e631638bc078f7"; - sha256 = "13w5n64wlwp70m74j2k12csm6ajq7jwgg7dq25azwrvxixi3iy9p"; + rev = "9c2afdf4254cb6029c8b57f69b5018ba15c3ad9f"; + sha256 = "0qvf3zjw1c9b7am4imqip5xgdn92rx1dph2q4fi1jwxd23d9jd5d"; }; }; @@ -1219,12 +1229,12 @@ }; riv-vim = buildVimPluginFrom2Nix { - name = "riv-vim-2018-06-20"; + name = "riv-vim-2018-10-17"; src = fetchFromGitHub { owner = "Rykka"; repo = "riv.vim"; - rev = "fb6d6f8c9d85128fd69c74f11bb7413addc002e8"; - sha256 = "1mjp90lz6jf3w9j4h1sidz7kfxhi9hk27pdnvb0hrvxw0q3bj9ch"; + rev = "09ae81f1fcf43d77a36705a7b9201f8cc1c85e23"; + sha256 = "0a3zzyxz2djy8dwmqjvhfqsingll28dnmnqdw0yii8r4xqxg6a8v"; }; }; @@ -1249,12 +1259,12 @@ }; rust-vim = buildVimPluginFrom2Nix { - name = "rust-vim-2018-09-16"; + name = "rust-vim-2018-10-26"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "5e4672c8ba490d2663c34d89616729b36b294594"; - sha256 = "189vjd2v271h4634i1fxi9g1sfxkgsb087454na67jrz1pwd8xvw"; + rev = "039b7c7c4f0b9fec9879027d6700229c33daae3e"; + sha256 = "09g9q91qvbrrb2hrybdw6p8jm3q3v9j9yffpm9q0nz6g8p6zi8xq"; }; }; @@ -1349,12 +1359,12 @@ }; syntastic = buildVimPluginFrom2Nix { - name = "syntastic-2018-10-03"; + name = "syntastic-2018-10-18"; src = fetchFromGitHub { owner = "scrooloose"; repo = "syntastic"; - rev = "df9f7057d18f996b9e40c9c57eea3e016350abdf"; - sha256 = "1yrs2yli39wjvmwnzsxg57i6kldhcmbwr90cqgbf6qi09rba828p"; + rev = "89e485c7f8b1f285b43bb397394f22b79021aac1"; + sha256 = "0xy54pllpr2bn1wp2fhq5nwrjpcclp61mhzls99cbzzpxfiwirlz"; }; }; @@ -1409,12 +1419,12 @@ }; targets-vim = buildVimPluginFrom2Nix { - name = "targets-vim-2018-05-27"; + name = "targets-vim-2018-10-24"; src = fetchFromGitHub { owner = "wellle"; repo = "targets.vim"; - rev = "c3042dc18acc0dfcee479310d3efc6aefe92db75"; - sha256 = "0shnlgwrxzrd0m3k6hnmr66i2l4zknp0pn7f71d2frx937gih34q"; + rev = "19586689fab6f1ff81743a675645f62adf745b0b"; + sha256 = "0bvx3dynbsralywkhsi9yjr188ayczp263di3y00dzwymxh7m1p5"; }; }; @@ -1479,12 +1489,12 @@ }; typescript-vim = buildVimPluginFrom2Nix { - name = "typescript-vim-2018-08-15"; + name = "typescript-vim-2018-10-17"; src = fetchFromGitHub { owner = "leafgarland"; repo = "typescript-vim"; - rev = "db131b8cd42973ed26928e9e445c1a745a98cff8"; - sha256 = "1l7wbwv3xirl9nvjb2f693knxsif5qanjknd9lija8m7gnwagzm4"; + rev = "0e9d92eead2df21abe342c4341c55536dd36b0af"; + sha256 = "1mf8cwkppfnxgjjgy762m1zbxmqxb9fpgxr6kbcjsi8qhzip0cvd"; }; }; @@ -1499,12 +1509,12 @@ }; undotree = buildVimPluginFrom2Nix { - name = "undotree-2018-09-17"; + name = "undotree-2018-10-15"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "c15a0409d9d5a7eacf18d3061a8a37d114532765"; - sha256 = "0iaj69cc7ysylql43ybprsls9liprmg46ak9mmbh1vjgny2c1nf0"; + rev = "9172c17f6d07405f14707ff273e3ca9f35aa9e42"; + sha256 = "12z9y7lljhq3gsxpn1ivyf2cvasc0br3fdkdhnrz305zxib97r5q"; }; }; @@ -1519,32 +1529,32 @@ }; verilog_systemverilog-vim = buildVimPluginFrom2Nix { - name = "verilog_systemverilog-vim-2018-09-29"; + name = "verilog_systemverilog-vim-2018-10-22"; src = fetchFromGitHub { owner = "vhda"; repo = "verilog_systemverilog.vim"; - rev = "b82caf39715d7645bd6229e033bea5bb5144ae8c"; - sha256 = "0i7bqg9aw6c3f0zhs7rq38m44xv7qlhhg0nabnhpk2xkw84cms69"; + rev = "4809e36569363bc3b44c981cda842d5bb31e95ff"; + sha256 = "124ak7596b19rz4vk2f05z6wkfhfrlawlz0y4am8fm4y1mdxsprm"; }; }; vim = buildVimPluginFrom2Nix { - name = "vim-2018-09-20"; + name = "vim-2018-10-27"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "15d0ff9f1a1a5455201dbf62221e8b119cfa9161"; - sha256 = "1cmmx99hs10mnr5x5kmac39kxjf9n3riphirhmijsnym8yijrcz1"; + rev = "854886980635eb70e119d2bd3bb94a0ce46fc71d"; + sha256 = "1ff88clly227cj83ng6bwc8jn3zp20614agg94izqhsxr5bpdp5z"; }; }; vim-abolish = buildVimPluginFrom2Nix { - name = "vim-abolish-2018-08-02"; + name = "vim-abolish-2018-10-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-abolish"; - rev = "40e8b973971beb5da279a499231464ae1d959c8b"; - sha256 = "0ibhd9d57cwb2kls99wmbyl49w7v2niwqrf3pp7191pj46157720"; + rev = "56a76a8c10ca91f3e8f0a2cd9afa2be32d262e24"; + sha256 = "087l7mvb0rzcdfmrmng82s0abli6w2i4cbyiwps9k588sfcj0w7h"; }; }; @@ -1739,22 +1749,22 @@ }; vim-airline = buildVimPluginFrom2Nix { - name = "vim-airline-2018-10-03"; + name = "vim-airline-2018-10-22"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "f045452743736d53c7471bfb4698fd48569dc1e0"; - sha256 = "16wmigvwxxryx1jkpsfbxwmlglrv1jjmmpckgsxwg4j6v4vkgk4g"; + rev = "08e9aa5386eecfd6a6cbde1eff240619cd81beed"; + sha256 = "0g9rlr6067sqyp0l4yacnr14phx1wn2jvjcq2x2zwkc0b28hxyrs"; }; }; vim-airline-themes = buildVimPluginFrom2Nix { - name = "vim-airline-themes-2018-09-05"; + name = "vim-airline-themes-2018-10-25"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "725789c110fbab52f8c18021f9d043839d7e31ed"; - sha256 = "15k5s8yysnvm0swfi27g2yhrnkb8kzvswb58k1jbzb65nwdw139z"; + rev = "65217b41da31f05d305b819f2a42a803dd0db434"; + sha256 = "1pv9plmbmygcnkbkdjp7gr3rp42zdh4qkmv2cfbndhdfx4yd331g"; }; }; @@ -1789,12 +1799,12 @@ }; vim-autoformat = buildVimPluginFrom2Nix { - name = "vim-autoformat-2018-09-08"; + name = "vim-autoformat-2018-10-22"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "98233b8f353fa5d237e89859a8f1b91c14c21397"; - sha256 = "18xb803vx11wx9yhxvp6aq8kh0vbidxmwhwrjfcslrw0k1zis3yl"; + rev = "db17ccbacb55beea82fdaa9a1cde82f6a928d16d"; + sha256 = "0nnykvbz5hm4cpv9jqk0jb4zzywlwgbybbirf1655rqrqfv126pp"; }; }; @@ -1899,12 +1909,12 @@ }; vim-css-color = buildVimPluginFrom2Nix { - name = "vim-css-color-2018-09-12"; + name = "vim-css-color-2018-10-20"; src = fetchFromGitHub { owner = "ap"; repo = "vim-css-color"; - rev = "7ecfc4810f34dbcd5d22a14013f977a9aa699312"; - sha256 = "1hds83biz0wv12rcqcdab1zm6lck1z4bdk67jq30x8siwcjvkwfy"; + rev = "0ee02ec9753c74d356106f0a0c4ddb0dcf9705f0"; + sha256 = "1fqngj2a4ky4z96vjryjfkblnr50jw99cfzc7xsjjpdy8j7wvrfk"; }; }; @@ -2109,22 +2119,22 @@ }; vim-fugitive = buildVimPluginFrom2Nix { - name = "vim-fugitive-2018-09-24"; + name = "vim-fugitive-2018-10-28"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "a9100fafb8c6deb187ee1cfaa37a4a02018d6c9a"; - sha256 = "0p37gywcwbdd2sl09s2c3dhr0cvf2s53jpwyz93jls2dgnlbdri8"; + rev = "6d497b0e63173f89cfabe12ea27a7a5a8b29ac8a"; + sha256 = "1ma9zxqf0ybl6y6qd9wjp97lgrwvgzpqy5zca0c6da29gm03kb02"; }; }; vim-ghost = buildVimPluginFrom2Nix { - name = "vim-ghost-2018-10-02"; + name = "vim-ghost-2018-10-05"; src = fetchFromGitHub { owner = "raghur"; repo = "vim-ghost"; - rev = "306d83c152cd9db54bc45c5a21b92615d07bd4c7"; - sha256 = "1p6fjqlp1w7zy36isb1i3xzmjvlh2ng6iv3mb2ixllmiq4bdk26i"; + rev = "8a3acdde943688d52407b5da08988dfc528ea10c"; + sha256 = "0x7mgziyx8gs5cc37c4rm0hrzgzpg4klnkfviyj2k3h4qqj9hkaj"; }; }; @@ -2149,12 +2159,12 @@ }; vim-gitgutter = buildVimPluginFrom2Nix { - name = "vim-gitgutter-2018-08-15"; + name = "vim-gitgutter-2018-10-18"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "50a7062909d91a290fae04219887b1b45f3138db"; - sha256 = "1bgpy85dxvn40ybzxih25gysy941jvylxm0fmkd5qpwkf7xm26wq"; + rev = "0597380f6b22f43a3ea6ff8364d5c239bb2504ea"; + sha256 = "18v4y616q29al2lx62gkcv5q9ka8042dk8y6i9b5jmyjfwps0q53"; }; }; @@ -2169,12 +2179,12 @@ }; vim-go = buildVimPluginFrom2Nix { - name = "vim-go-2018-10-04"; + name = "vim-go-2018-10-23"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "92b360fca43553b56766aaccaf3d9166575e6061"; - sha256 = "0wq2v9damr8yp3nxxwdl1kd1vkndb456m33yjky7nrmxyshhxgnm"; + rev = "d5ce080c25806d68189be641e19996898138f1a4"; + sha256 = "09kq1zjq98vzy8gjgxiqkb7ibl3wpjz8lkzqjm110axxmx01b317"; }; }; @@ -2189,12 +2199,12 @@ }; vim-grepper = buildVimPluginFrom2Nix { - name = "vim-grepper-2018-09-10"; + name = "vim-grepper-2018-10-29"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-grepper"; - rev = "f61a745c1e19c80427a251f556f28fc31e962f6d"; - sha256 = "0l465qpphyi2c53hfwhc6fvj1s7vs2yc2l2spw387av6yqw83m9g"; + rev = "54cb4c55bd8d80fc046f62b8f6486db2de424399"; + sha256 = "1bzzyh2yav9f54gn17ny8gpi5h70yvjqdyg9lg0b1rglvirjpb1r"; }; }; @@ -2259,12 +2269,12 @@ }; vim-highlightedyank = buildVimPluginFrom2Nix { - name = "vim-highlightedyank-2018-10-02"; + name = "vim-highlightedyank-2018-10-08"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-highlightedyank"; - rev = "26a2ecc1ac08462680074a721c265e42b1c545ba"; - sha256 = "0ak8jws7qxjf52l3a97ks1ylf5ri7x03b90s2v4q3il4sry5h0m7"; + rev = "51e25c9fa3bd2dca500ee0c910a45641d57a57fa"; + sha256 = "1way32pgp0cb74p47g0fa5dqrz804lrypbddy65zcf3nd6rnr5qy"; }; }; @@ -2369,12 +2379,12 @@ }; vim-javacomplete2 = buildVimPluginFrom2Nix { - name = "vim-javacomplete2-2018-09-18"; + name = "vim-javacomplete2-2018-10-09"; src = fetchFromGitHub { owner = "artur-shaik"; repo = "vim-javacomplete2"; - rev = "3436162781c215f638af5ad8e83df9000edfa203"; - sha256 = "1ak1czp7dnz376bvalpnr0n8y1s0x4cpwrhb596phfa2567c4f41"; + rev = "a3af9721afcd3ce8972dd4ab0f40da947245c2fa"; + sha256 = "0pgfgf82dv0dys2d4dq48d0n4gnbmxbqpvsy3fwmqdrw9zn9bw79"; }; }; @@ -2399,12 +2409,12 @@ }; vim-jsbeautify = buildVimPluginFrom2Nix { - name = "vim-jsbeautify-2018-01-31"; + name = "vim-jsbeautify-2018-10-23"; src = fetchFromGitHub { owner = "maksimr"; repo = "vim-jsbeautify"; - rev = "7a55bffa7d87e4f1ed11650e56a1361779b39624"; - sha256 = "01jvc3nkvmhw9n7m9x96ax1ndzw78ryjmgrvkqb7gja1xb8i8jqq"; + rev = "7c586568716263e27449d9b3f2475636bcd1f4dc"; + sha256 = "1v1fcf1gm9p70l5nl9ba3xzdavx0jmz2v7x25v996dnfihaf494v"; fetchSubmodules = true; }; }; @@ -2430,12 +2440,12 @@ }; vim-jsonnet = buildVimPluginFrom2Nix { - name = "vim-jsonnet-2018-04-11"; + name = "vim-jsonnet-2018-10-08"; src = fetchFromGitHub { owner = "google"; repo = "vim-jsonnet"; - rev = "1425166887329363381194adc457b02b663b1354"; - sha256 = "0kkpvp1r06l3glhgw4wv3ihqisjhs5m0x7mxgy388hy4r73fx08j"; + rev = "824dcfe76568dba38135332fc4729e2b2c4d9b3a"; + sha256 = "1i79fc7yww5cpv9ck36smxq2yidj323kliyy5hw4fvsx7b4ahwsg"; }; }; @@ -2470,12 +2480,12 @@ }; vim-leader-guide = buildVimPluginFrom2Nix { - name = "vim-leader-guide-2017-03-18"; + name = "vim-leader-guide-2018-10-06"; src = fetchFromGitHub { owner = "hecal3"; repo = "vim-leader-guide"; - rev = "6ac8c663e65c9c0ded70417b84f66ee59457893e"; - sha256 = "1hqha3ig40ls15bnb10xpbl91swn0gxqnhmz5frkvvdzj4wq55fw"; + rev = "8dff63fcc29811bb30fccb135f31ad488a9a6170"; + sha256 = "1n1qgvr729r28rprjkam0blh4qscs8bxf6ay7v8x732axg9gpyav"; }; }; @@ -2490,12 +2500,12 @@ }; vim-localvimrc = buildVimPluginFrom2Nix { - name = "vim-localvimrc-2018-09-24"; + name = "vim-localvimrc-2018-10-29"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "e0ce126a2a8baf3816ae722b604121951a73e092"; - sha256 = "0wi5gyafzdfwin6bxk369fz59gbw5w4xm4pgq2jpz5hxk7krwkll"; + rev = "109962b3b7359ee2978417264b168ac6842db9cf"; + sha256 = "13jpp5g91bynl91n8i8q8ldicii3ns42fq3hlnjcrhz5ml734wlf"; }; }; @@ -2520,12 +2530,12 @@ }; vim-markdown = buildVimPluginFrom2Nix { - name = "vim-markdown-2018-07-30"; + name = "vim-markdown-2018-10-24"; src = fetchFromGitHub { owner = "plasticboy"; repo = "vim-markdown"; - rev = "f19506b1bfe5e60c39581dd53f6913a09385f5dd"; - sha256 = "0x0lsynmwg41fq8zf7149a2anj2b7fnm0d7b0vqnj3dwdwrjj5a1"; + rev = "52ee2eb68a706972a1840ca036035033046568d6"; + sha256 = "1w186rbnhk1y6sqqrwvgfs4xigf2c1f1xhjlhvmmb174cp5c84v2"; }; }; @@ -2550,12 +2560,12 @@ }; vim-multiple-cursors = buildVimPluginFrom2Nix { - name = "vim-multiple-cursors-2018-08-10"; + name = "vim-multiple-cursors-2018-10-16"; src = fetchFromGitHub { owner = "terryma"; repo = "vim-multiple-cursors"; - rev = "dd9289af03abafa76b28c503e20747ff7d7d89e5"; - sha256 = "082y4xsvsq2psllds7bncshzjsvh48l4200mri9vkv3f5mydz985"; + rev = "f4fd6ad4e4075dd14d208af059063f1f3cfb7d55"; + sha256 = "17fgwvs8qyyl1yywbmhb7wsv0i0nzl40bgaqik7w72zgndvai7ig"; }; }; @@ -2660,12 +2670,12 @@ }; vim-pandoc = buildVimPluginFrom2Nix { - name = "vim-pandoc-2018-08-13"; + name = "vim-pandoc-2018-10-07"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "d0911146c68512defcf9d947542b06d7f7eed37e"; - sha256 = "13qqwpmnzida7bm57r306w3fpb397h6b2gxclq9in0ccq5h92xid"; + rev = "6be5e23d8ab5df9be20e324fffdc2f978cac2077"; + sha256 = "07f91w4z49xgrachra78hnfs9jl2hqx15amhcr4phnpb9f3hmjbg"; }; }; @@ -2740,12 +2750,12 @@ }; vim-polyglot = buildVimPluginFrom2Nix { - name = "vim-polyglot-2018-07-08"; + name = "vim-polyglot-2018-10-10"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "055f7710b65dfa2df52fc0b5be2486ae36ac5751"; - sha256 = "1yyqsy3q1kjvlqffc10zn3kl0k468xj8mycc22xp1hp1zrkxcf5x"; + rev = "ec1c94306953b678bb36572897bd218fe6c76506"; + sha256 = "1n3s52ncmdbhygrdycrnqk9sj42413q0ah1q8a7s6q4z6zdm4scz"; }; }; @@ -2760,12 +2770,12 @@ }; vim-projectionist = buildVimPluginFrom2Nix { - name = "vim-projectionist-2018-09-18"; + name = "vim-projectionist-2018-10-21"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "2f7ccf211326e06b89b5a677b2eee3ddb4b644a2"; - sha256 = "13v9j32p16ak237gwvhk69s6q6maxpg41xd66dqvkj0d7hb21i0v"; + rev = "ea1347bc475bb58a3c6aa8da37e5a4a019efbf17"; + sha256 = "1sw4vnb0w78vjaxgx3w4gx6j8jdcb1146fnf7wv497wa2grmi9n9"; }; }; @@ -2790,12 +2800,12 @@ }; vim-quickrun = buildVimPluginFrom2Nix { - name = "vim-quickrun-2018-09-06"; + name = "vim-quickrun-2018-10-16"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-quickrun"; - rev = "0a78a3fe79b3607e01543cd33d8f2d8aceb35909"; - sha256 = "1alpirkl6gi840ja21wn62gfmcyri6669p8r2c0qyjsajwx8gm8y"; + rev = "9dbda9dcdc8ef3150c414b9b1ea347b04b942665"; + sha256 = "06ssvyk84097vqzyrnrmxsr63diy8mjy8mv8xkhq5cmvqhavz91s"; }; }; @@ -2880,12 +2890,12 @@ }; vim-sensible = buildVimPluginFrom2Nix { - name = "vim-sensible-2018-09-17"; + name = "vim-sensible-2018-10-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sensible"; - rev = "679e53d61558466933fbffc87fab8735eeb8fea8"; - sha256 = "1sq836sy6kn9z092mnwjxs9p3ijka82gm0nhfvlym348yv1s03wn"; + rev = "7f46e82fc7e343be84df6c06bec63dd6494b6712"; + sha256 = "1xizcrxn34fbpdcbs0ydc1s9kma9cmk1llz0xbmrdgdf2yaz2558"; }; }; @@ -2940,12 +2950,12 @@ }; vim-snippets = buildVimPluginFrom2Nix { - name = "vim-snippets-2018-09-25"; + name = "vim-snippets-2018-10-27"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "b51c01137259ac7cd59381001279fa36baefbc5f"; - sha256 = "00ydadqq5nj94ldcd9ld45hkx6micd3mfllvn5csxbg4vw0p5472"; + rev = "06161e65cd238d5f462f21e3f549c61860db85d1"; + sha256 = "10n94s90jjwsg58cm5lrcs553mwsdyvy34rmf6xsa2mq9ql21vy1"; }; }; @@ -3030,12 +3040,12 @@ }; vim-table-mode = buildVimPluginFrom2Nix { - name = "vim-table-mode-2018-05-16"; + name = "vim-table-mode-2018-10-21"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "5483e163bd0a67e729e0e8436315f33f9e126baf"; - sha256 = "0mmpa7zhrj8mqf4931ldf6n9jlpfxc4kg8xdhqlp7srlnq4h8siw"; + rev = "130e835ff73ae16c5827fe37f1d1b09456c5f7dc"; + sha256 = "1dlyszky76z8kj6vy4sfn5zkjdi12hwfn29g8adds04zbaxi61gg"; }; }; @@ -3060,12 +3070,12 @@ }; vim-test = buildVimPluginFrom2Nix { - name = "vim-test-2018-09-23"; + name = "vim-test-2018-10-24"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "5aa77d57d22d453bd53f28a18f80e7bfecccf811"; - sha256 = "1w0x4xfj3fl5zwnk14sh9sp1hkj25grrw1wan0g3y7ar8ygjyl7f"; + rev = "cecb28e55a29ecde7cea926852998c47027bd759"; + sha256 = "1av9fmva2ki180wikfik3yl83hzirj43rwhwwms65bk590cf4h95"; }; }; @@ -3090,12 +3100,12 @@ }; vim-tmux-navigator = buildVimPluginFrom2Nix { - name = "vim-tmux-navigator-2018-07-13"; + name = "vim-tmux-navigator-2018-10-19"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "18b775fbccde5ff02e516c014290650bb40e257d"; - sha256 = "09v8amrdk8h4hsr9va8v9wdgzvj89z04y4j71l94rd7r6smxinbj"; + rev = "7eb75a10e3ab0504673a0e7eb32af6e5521b80ec"; + sha256 = "0kafk2b8zxwx354p8inww0cyrw9w4arbiixbvvhrhxks7cccfxx6"; }; }; @@ -3160,22 +3170,22 @@ }; vim-vue = buildVimPluginFrom2Nix { - name = "vim-vue-2018-09-01"; + name = "vim-vue-2018-10-08"; src = fetchFromGitHub { owner = "posva"; repo = "vim-vue"; - rev = "2df46524311e719af51394726f5f88fc2aa08bd2"; - sha256 = "0bsg8j4871jvmsyi5mmpyhkmjxajf5ss3dx9072wdc21cx8pn185"; + rev = "720ca48e0207f2aca331b9d949ce9d4ff5702737"; + sha256 = "1cqny4vppyaw29g6bx1qlfdjb5fa0avpy41jkidazv76ym4ahi2x"; }; }; vim-wakatime = buildVimPluginFrom2Nix { - name = "vim-wakatime-2018-10-03"; + name = "vim-wakatime-2018-10-27"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "3fe47846572032fc83d8300c596de6ded4f456a2"; - sha256 = "0qgy2chdisym34892kzs3gbvq7bj64mxs4q4475hhwpr46p7lyrn"; + rev = "656853504feb4aab3168e007aab5a1aee355bff5"; + sha256 = "1dpi6dc1gdwq4smsis9nxd2p3cq9jm88yj3kn12gfrsb5w1j9k7q"; }; }; @@ -3220,12 +3230,12 @@ }; vim-yapf = buildVimPluginFrom2Nix { - name = "vim-yapf-2018-06-05"; + name = "vim-yapf-2018-10-04"; src = fetchFromGitHub { owner = "mindriot101"; repo = "vim-yapf"; - rev = "cae79733a1a39732c5305d4a89cd093d17cb917d"; - sha256 = "16bmzvzks6kbqm6dk908k23b9wj7qf3x8bz3kikrzj27s0p7s9cc"; + rev = "b0c31bd73a6d1026765e659bd0a62c625ec057ad"; + sha256 = "0ncv6kjyywljsq5fz71rkmgmqxm7msyscgndnj055bnx5sh9wk80"; }; }; @@ -3260,12 +3270,12 @@ }; vimproc-vim = buildVimPluginFrom2Nix { - name = "vimproc-vim-2018-01-07"; + name = "vimproc-vim-2018-10-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "vimproc.vim"; - rev = "2300224d366642f4f8d6f88861535d4ccbe20143"; - sha256 = "0b8ljqnix8bs667bpymg3s0g5f49fnphgddl6196dj6jvdfn1xia"; + rev = "9136f03680db82c552f4a84e3b461f83c6e232d5"; + sha256 = "0d930qgz049k55xgrgsihqqg1dw22zf3j1vbzyb9c65ys60x2q69"; }; }; @@ -3280,22 +3290,22 @@ }; vimtex = buildVimPluginFrom2Nix { - name = "vimtex-2018-10-03"; + name = "vimtex-2018-10-29"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "10f3304f39ec1b49e77bb351d0972db179cce1b3"; - sha256 = "1yqajhr5q12yfjn9nvw4d8s89pcgkgv5hi1gd9wj7wjxk85wa6xm"; + rev = "8a32372e4fc3c628d36b8215c6d30bd05eeade28"; + sha256 = "1h1fp0jnv4wj96mam9dgnr5y1i4a4bdi4law3y1qh937bx7nk2vd"; }; }; vimwiki = buildVimPluginFrom2Nix { - name = "vimwiki-2018-09-17"; + name = "vimwiki-2018-10-12"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "f882cf01528e471d78d10df28ce407bc1cc23bc9"; - sha256 = "1c6vkz3y168akh0c6a8api4g0nwsh90gkd6l0pyqpr03glwyqg61"; + rev = "7ffc295094debc3d521cecf267d736cc8562c20e"; + sha256 = "0gl2d7xqzisinsgxpcwkkpryva8pklca9x860bqsirajr8mcdbpc"; }; }; @@ -3380,12 +3390,12 @@ }; youcompleteme = buildVimPluginFrom2Nix { - name = "youcompleteme-2018-09-20"; + name = "youcompleteme-2018-10-14"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "e37923a752c7eee184cd6d96ac34e303fb7cfae9"; - sha256 = "1dhh88f1mz7rajxyjbarqf3qiia6n34salknri3a0dffbih5y8rc"; + rev = "f67e5ff27b048d8c55a10ba6a27c6c5b16d0f6ba"; + sha256 = "14v7kqv4d2013imc5qkh22lwl5d9x419jjfj5qinld04n56banmv"; fetchSubmodules = true; }; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index a503f0bedadc..bccb97b72d27 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -32,6 +32,7 @@ chrisgeo/sparkup chriskempson/base16-vim christoomey/vim-sort-motion christoomey/vim-tmux-navigator +cocopon/iceberg.vim ctjhoa/spacevim ctrlpvim/ctrlp.vim dag/vim2hs diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index e3463246ab2c..55e126d64a5d 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -34,8 +34,8 @@ let name = "cpptools-language-component-binaries"; src = fetchzip { - url = https://download.visualstudio.microsoft.com/download/pr/11991016/8a81aa8f89aac452956b0e4c68e6620b/Bin_Linux.zip; - sha256 = "0ma59fxfldbgh6ijlvfbs3hnl4g0cnw5gs6286zdrp065n763sv4"; + url = "https://download.visualstudio.microsoft.com/download/pr/e8bc2ccc-bb10-4d40-8e29-edcd78986e9a/2e86fa29aefdbde2ea2cd1a6fceadeaa/bin_linux.zip"; + sha256 = "1hvrbp3c4733aryslgyh3l5azmqkw398j2wbgr3w788fphg4v6cc"; }; patchPhase = '' @@ -81,7 +81,7 @@ vscode-utils.buildVscodeMarketplaceExtension { # 1. Add activation events so that the extension is functional. This listing is empty when unpacking the extension but is filled at runtime. # 2. Patch `packages.json` so that nix's *gdb* is used as default value for `miDebuggerPath`. cat ./package_ori.json | \ - jq --slurpfile actEvts ${./package-activation-events-0-16-1.json} '(.activationEvents) = $actEvts[0]' | \ + jq --slurpfile actEvts ${./package-activation-events.json} '(.activationEvents) = $actEvts[0]' | \ jq '(.contributes.debuggers[].configurationAttributes | .attach , .launch | .properties.miDebuggerPath | select(. != null) | select(.default == "/usr/bin/gdb") | .default) = "${gdbDefaultsTo}"' > \ ./package.json diff --git a/pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json b/pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json deleted file mode 100644 index 3a12a8bc0474..000000000000 --- a/pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json +++ /dev/null @@ -1,22 +0,0 @@ -[ -"onLanguage:cpp", -"onLanguage:c", -"onCommand:extension.pickNativeProcess", -"onCommand:extension.pickRemoteNativeProcess", -"onCommand:C_Cpp.ConfigurationEdit", -"onCommand:C_Cpp.ConfigurationSelect", -"onCommand:C_Cpp.SwitchHeaderSource", -"onCommand:C_Cpp.Navigate", -"onCommand:C_Cpp.GoToDeclaration", -"onCommand:C_Cpp.PeekDeclaration", -"onCommand:C_Cpp.ToggleErrorSquiggles", -"onCommand:C_Cpp.ToggleIncludeFallback", -"onCommand:C_Cpp.ToggleDimInactiveRegions", -"onCommand:C_Cpp.ShowReleaseNotes", -"onCommand:C_Cpp.ResetDatabase", -"onCommand:C_Cpp.PauseParsing", -"onCommand:C_Cpp.ResumeParsing", -"onCommand:C_Cpp.ShowParsingCommands", -"onCommand:C_Cpp.TakeSurvey", -"onDebug" -] \ No newline at end of file diff --git a/pkgs/misc/vscode-extensions/cpptools/package-activation-events.json b/pkgs/misc/vscode-extensions/cpptools/package-activation-events.json new file mode 100644 index 000000000000..c2d8a10f340a --- /dev/null +++ b/pkgs/misc/vscode-extensions/cpptools/package-activation-events.json @@ -0,0 +1,25 @@ +[ + "onLanguage:cpp", + "onLanguage:c", + "onCommand:extension.pickNativeProcess", + "onCommand:extension.pickRemoteNativeProcess", + "onCommand:C_Cpp.ConfigurationEdit", + "onCommand:C_Cpp.ConfigurationSelect", + "onCommand:C_Cpp.ConfigurationProviderSelect", + "onCommand:C_Cpp.SwitchHeaderSource", + "onCommand:C_Cpp.Navigate", + "onCommand:C_Cpp.GoToDeclaration", + "onCommand:C_Cpp.PeekDeclaration", + "onCommand:C_Cpp.ToggleErrorSquiggles", + "onCommand:C_Cpp.ToggleIncludeFallback", + "onCommand:C_Cpp.ToggleDimInactiveRegions", + "onCommand:C_Cpp.ToggleSnippets", + "onCommand:C_Cpp.ShowReleaseNotes", + "onCommand:C_Cpp.ResetDatabase", + "onCommand:C_Cpp.PauseParsing", + "onCommand:C_Cpp.ResumeParsing", + "onCommand:C_Cpp.ShowParsingCommands", + "onCommand:C_Cpp.TakeSurvey", + "onDebug", + "workspaceContains:/.vscode/c_cpp_properties.json" +] diff --git a/pkgs/os-specific/darwin/cf-private/default.nix b/pkgs/os-specific/darwin/cf-private/default.nix index 3fac20d23c78..dc1b0112a219 100644 --- a/pkgs/os-specific/darwin/cf-private/default.nix +++ b/pkgs/os-specific/darwin/cf-private/default.nix @@ -1,4 +1,4 @@ -{ CF, apple_sdk }: +{ CF, apple_sdk, osx_private_sdk }: # cf-private is a bit weird, but boils down to CF with a weird setup-hook that # makes a build link against the system CoreFoundation rather than our pure one. @@ -13,10 +13,10 @@ # because of their magic "toll-free bridging" support, the symbols for those types # live in CoreFoundation with an ObjC runtime. And because that isn't public, we have # this hack in place to let people link properly anyway. Phew! -# +# # This can be revisited if Apple ever decide to release the ObjC backend in a publicly # buildable form. -# +# # This doesn't really need to rebuild CF, but it's cheap, and adding a setup hook to # an existing package was annoying. We need a buildEnv that knows how to add those CF.overrideAttrs (orig: { @@ -38,22 +38,24 @@ CF.overrideAttrs (orig: { # this is watchman, who can almost certainly switch to the pure CF once the header # and functionality is merged in. installPhase = orig.installPhase + '' + # Copy or overwrite private headers, some of these might already + # exist in CF but the private versions have more information. basepath="Library/Frameworks/CoreFoundation.framework/Headers" - path="$basepath/CFFileDescriptor.h" + cp -Lfv --no-preserve mode ${osx_private_sdk}/include/CoreFoundationPrivateHeaders/* "$out/$basepath" # Append the include at top level or nobody will notice the header we're about to add sed -i '/CFNotificationCenter.h/a #include ' \ "$out/$basepath/CoreFoundation.h" - cp ${apple_sdk.frameworks.CoreFoundation}/$path $out/$path + cp ${apple_sdk.frameworks.CoreFoundation}/$basepath/CFFileDescriptor.h $out/$basepath/CFFileDescriptor.h '' + # This one is less likely to go away, but I'll mention it anyway. The issue is at # https://bugs.swift.org/browse/SR-8744, and the main user I know of is qtbase '' - path="$basepath/CFURLEnumerator.h" + path="$basepath/CFURLEnumerator.h" sed -i '/CFNotificationCenter.h/a #include ' \ "$out/$basepath/CoreFoundation.h" cp ${apple_sdk.frameworks.CoreFoundation}/$path $out/$path ''; -}) \ No newline at end of file +}) diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix new file mode 100644 index 000000000000..190c0ae22131 --- /dev/null +++ b/pkgs/os-specific/darwin/goku/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "goku-${version}"; + version = "0.1.11"; + + src = fetchurl { + url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku.tar.gz"; + sha256 = "49562342be114c2656726c5c697131acd286965ab3903a1a1e157cc689e20b15"; + }; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/bin + cp goku $out/bin + cp gokuw $out/bin + ''; + + meta = with stdenv.lib; { + description = "Karabiner configurator"; + homepage = https://github.com/yqrashawn/GokuRakuJoudo; + license = licenses.gpl3; + maintainers = [ maintainers.nikitavoloboev ]; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index 8faba250fb3e..14b10e6752bb 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "alsa-tools-${version}"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { url = "mirror://alsa/tools/${name}.tar.bz2"; - sha256 = "09rjb6hw1mn9y1jfdfj5djncgc2cr5wfps83k56rf6k4zg14v76n"; + sha256 = "1xjfghr9s0j6n91kgs95cc4r6qrjsgc4yj2w0nir3xpnm0l36950"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix index 60e3b9750d71..c9cf12912670 100644 --- a/pkgs/os-specific/linux/alsa-utils/default.nix +++ b/pkgs/os-specific/linux/alsa-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "alsa-utils-${version}"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { url = "mirror://alsa/utils/${name}.tar.bz2"; - sha256 = "0vnkyymgwj9rfdb11nvab30dnfrylmakdfildxl0y8mj836awp0m"; + sha256 = "02jlw6a22j2rr7inggfgk2hzx3w0fjhvhs0dn1afpzdp9aspzchx"; }; patchPhase = '' diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 52a5f16bc52c..c6c5f8436902 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -14,11 +14,11 @@ let ''; in stdenv.mkDerivation rec { - name = "mdadm-4.0"; + name = "mdadm-4.1"; src = fetchurl { url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.xz"; - sha256 = "1ad3mma641946wn5lsllwf0lifw9lps34fv1nnkhyfpd9krffshx"; + sha256 = "0jjgjgqijpdp7ijh8slzzjjw690kydb1jjadf0x5ilq85628hxmb"; }; # This is to avoid self-references, which causes the initrd to explode @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { description = "Programs for managing RAID arrays under Linux"; homepage = http://neil.brown.name/blog/mdadm; license = licenses.gpl2; + maintainers = with maintainers; [ ekleog ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix index c8b404c6be7f..21d32af3ba83 100644 --- a/pkgs/os-specific/linux/open-isns/default.nix +++ b/pkgs/os-specific/linux/open-isns/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "open-isns-${version}"; - version = "0.98"; + version = "0.99"; src = fetchFromGitHub { owner = "gonzoleeman"; repo = "open-isns"; rev = "v${version}"; - sha256 = "055gjwz5hxaj5jk23bf7dy9wbxk9m8cfgl1msbzjc60gr2mmcbdg"; + sha256 = "0m294aiv80rkihacw5094093pc0kd5bkbxqgs6i32jsglxy33hvf"; }; propagatedBuildInputs = [ openssl ]; diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 629f61bf5b16..6c6e411000ac 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "upower-0.99.7"; + name = "upower-0.99.9"; src = fetchurl { - url = "https://upower.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "00d4830yvg84brdhz4kn60lr3r8rn2y8gdbhmhxm78i5mgvc5g14"; + url = https://gitlab.freedesktop.org/upower/upower/uploads/2282c7c0e53fb31816b824c9d1f547e8/upower-0.99.9.tar.xz; + sha256 = "046ix7j7hmb7ycv8v54668kjsrgjhzwxn299c1d87vdnkd38kfh1"; }; buildInputs = diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index cae06dbd0f38..ed83313e5ddf 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -158,7 +158,7 @@ in { # to be adapted zfsStable = common { # comment/uncomment if breaking kernel versions are known - # incompatibleKernelVersion = null; + incompatibleKernelVersion = "4.19"; # this package should point to the latest release. version = "0.7.11"; @@ -177,7 +177,7 @@ in { zfsUnstable = common rec { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = null; + incompatibleKernelVersion = "4.19"; # this package should point to a version / git revision compatible with the latest kernel release version = "0.8.0-rc1"; diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index 46a78e1c5bd5..b9c5951b0b29 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-jira-${version}"; - version = "7.12.1"; + version = "7.12.3"; src = fetchurl { url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "0qk72dq53kk40m8rz7i3r45cgrka2s1682b8d3kzdmmhclnzbaym"; + sha256 = "0gna0pr8g78pahm4ci14742w40f0nwfn4hpm3iwbsiw2w6vziahv"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 44ae3b894d54..053fadc8af58 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "slurm-${version}"; - version = "18.08.1.1"; + version = "18.08.3.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${builtins.replaceStrings ["."] ["-"] name}"; - sha256 = "1yndxi11vj0di3yf6ky78zcnffk6d3676gf5y7jn7vwxxmzm4h5k"; + sha256 = "1dz5hgnlsld8b8vrbckk3mj7cqrv662wsp0s9z4x8wafygz3zx07"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index f1ee1eda95da..73cc01281493 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.80.3"; + version = "0.81.2"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; @@ -16,6 +16,7 @@ "alarm_control_panel.concord232" = ps: with ps; [ ]; "alarm_control_panel.demo" = ps: with ps; [ ]; "alarm_control_panel.egardia" = ps: with ps; [ ]; + "alarm_control_panel.elkm1" = ps: with ps; [ ]; "alarm_control_panel.envisalink" = ps: with ps; [ ]; "alarm_control_panel.homematicip_cloud" = ps: with ps; [ ]; "alarm_control_panel.ialarm" = ps: with ps; [ ]; @@ -54,6 +55,7 @@ "auth.mfa_setup_flow" = ps: with ps; [ ]; "automation" = ps: with ps; [ ]; "automation.event" = ps: with ps; [ ]; + "automation.geo_location" = ps: with ps; [ ]; "automation.homeassistant" = ps: with ps; [ ]; "automation.litejet" = ps: with ps; [ ]; "automation.mqtt" = ps: with ps; [ paho-mqtt ]; @@ -118,6 +120,7 @@ "binary_sensor.netatmo" = ps: with ps; [ ]; "binary_sensor.nx584" = ps: with ps; [ ]; "binary_sensor.octoprint" = ps: with ps; [ ]; + "binary_sensor.opentherm_gw" = ps: with ps; [ ]; "binary_sensor.openuv" = ps: with ps; [ ]; "binary_sensor.pilight" = ps: with ps; [ ]; "binary_sensor.ping" = ps: with ps; [ ]; @@ -128,6 +131,7 @@ "binary_sensor.random" = ps: with ps; [ ]; "binary_sensor.raspihats" = ps: with ps; [ ]; "binary_sensor.rest" = ps: with ps; [ ]; + "binary_sensor.rflink" = ps: with ps; [ ]; "binary_sensor.rfxtrx" = ps: with ps; [ ]; "binary_sensor.ring" = ps: with ps; [ ]; "binary_sensor.rpi_gpio" = ps: with ps; [ ]; @@ -209,8 +213,9 @@ "climate" = ps: with ps; [ ]; "climate.daikin" = ps: with ps; [ ]; "climate.demo" = ps: with ps; [ ]; + "climate.dyson" = ps: with ps; [ ]; "climate.ecobee" = ps: with ps; [ ]; - "climate.econet" = ps: with ps; [ ]; + "climate.elkm1" = ps: with ps; [ ]; "climate.ephember" = ps: with ps; [ ]; "climate.eq3btsmart" = ps: with ps; [ construct ]; "climate.evohome" = ps: with ps; [ ]; @@ -226,6 +231,7 @@ "climate.knx" = ps: with ps; [ ]; "climate.maxcube" = ps: with ps; [ ]; "climate.melissa" = ps: with ps; [ ]; + "climate.mill" = ps: with ps; [ ]; "climate.modbus" = ps: with ps; [ ]; "climate.mqtt" = ps: with ps; [ paho-mqtt ]; "climate.mysensors" = ps: with ps; [ ]; @@ -295,7 +301,6 @@ "cover.rflink" = ps: with ps; [ ]; "cover.rfxtrx" = ps: with ps; [ ]; "cover.rpi_gpio" = ps: with ps; [ ]; - "cover.ryobi_gdo" = ps: with ps; [ ]; "cover.scsgate" = ps: with ps; [ ]; "cover.tahoma" = ps: with ps; [ ]; "cover.tellduslive" = ps: with ps; [ ]; @@ -351,6 +356,7 @@ "device_tracker.owntracks" = ps: with ps; [ libnacl paho-mqtt ]; "device_tracker.owntracks_http" = ps: with ps; [ aiohttp-cors libnacl ]; "device_tracker.ping" = ps: with ps; [ ]; + "device_tracker.quantum_gateway" = ps: with ps; [ ]; "device_tracker.ritassist" = ps: with ps; [ ]; "device_tracker.sky_hub" = ps: with ps; [ ]; "device_tracker.snmp" = ps: with ps; [ pysnmp ]; @@ -383,6 +389,7 @@ "edp_redy" = ps: with ps; [ ]; "egardia" = ps: with ps; [ ]; "eight_sleep" = ps: with ps; [ ]; + "elkm1" = ps: with ps; [ ]; "emoncms_history" = ps: with ps; [ ]; "emulated_hue" = ps: with ps; [ aiohttp-cors ]; "emulated_hue.hue_api" = ps: with ps; [ ]; @@ -410,11 +417,12 @@ "foursquare" = ps: with ps; [ aiohttp-cors ]; "freedns" = ps: with ps; [ ]; "fritzbox" = ps: with ps; [ ]; - "frontend" = ps: with ps; [ aiohttp-cors ]; + "frontend" = ps: with ps; [ aiohttp-cors ruamel_yaml ]; "gc100" = ps: with ps; [ ]; "geo_location" = ps: with ps; [ ]; "geo_location.demo" = ps: with ps; [ ]; "geo_location.geo_json_events" = ps: with ps; [ ]; + "geo_location.nsw_rural_fire_service_feed" = ps: with ps; [ ]; "goalfeed" = ps: with ps; [ ]; "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ]; "google_assistant" = ps: with ps; [ aiohttp-cors ]; @@ -506,6 +514,7 @@ "knx" = ps: with ps; [ ]; "konnected" = ps: with ps; [ aiohttp-cors netdisco ]; "lametric" = ps: with ps; [ ]; + "lifx" = ps: with ps; [ ]; "light" = ps: with ps; [ ]; "light.abode" = ps: with ps; [ ]; "light.ads" = ps: with ps; [ ]; @@ -516,6 +525,7 @@ "light.decora" = ps: with ps; [ ]; "light.decora_wifi" = ps: with ps; [ ]; "light.demo" = ps: with ps; [ ]; + "light.elkm1" = ps: with ps; [ ]; "light.enocean" = ps: with ps; [ ]; "light.eufy" = ps: with ps; [ ]; "light.flux_led" = ps: with ps; [ ]; @@ -593,6 +603,7 @@ "lock.nello" = ps: with ps; [ ]; "lock.nuki" = ps: with ps; [ ]; "lock.sesame" = ps: with ps; [ ]; + "lock.template" = ps: with ps; [ ]; "lock.tesla" = ps: with ps; [ ]; "lock.vera" = ps: with ps; [ ]; "lock.verisure" = ps: with ps; [ ]; @@ -600,11 +611,11 @@ "lock.wink" = ps: with ps; [ ]; "lock.xiaomi_aqara" = ps: with ps; [ ]; "lock.zwave" = ps: with ps; [ ]; - "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy ]; + "logbook" = ps: with ps; [ aiohttp-cors ruamel_yaml sqlalchemy ]; "logentries" = ps: with ps; [ ]; "logger" = ps: with ps; [ ]; "logi_circle" = ps: with ps; [ ]; - "lovelace" = ps: with ps; [ ]; + "lovelace" = ps: with ps; [ ruamel_yaml ]; "lutron" = ps: with ps; [ ]; "lutron_caseta" = ps: with ps; [ ]; "mailbox" = ps: with ps; [ aiohttp-cors ]; @@ -644,6 +655,7 @@ "media_player.itunes" = ps: with ps; [ ]; "media_player.kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket ]; "media_player.lg_netcast" = ps: with ps; [ ]; + "media_player.lg_soundbar" = ps: with ps; [ ]; "media_player.liveboxplaytv" = ps: with ps; [ ]; "media_player.mediaroom" = ps: with ps; [ ]; "media_player.monoprice" = ps: with ps; [ ]; @@ -727,7 +739,8 @@ "notify.group" = ps: with ps; [ ]; "notify.hangouts" = ps: with ps; [ ]; "notify.hipchat" = ps: with ps; [ ]; - "notify.html5" = ps: with ps; [ aiohttp-cors ]; + "notify.homematic" = ps: with ps; [ pyhomematic ]; + "notify.html5" = ps: with ps; [ aiohttp-cors ruamel_yaml ]; "notify.instapush" = ps: with ps; [ ]; "notify.ios" = ps: with ps; [ aiohttp-cors zeroconf ]; "notify.joaoapps_join" = ps: with ps; [ ]; @@ -764,7 +777,7 @@ "notify.twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; "notify.twitter" = ps: with ps; [ ]; "notify.webostv" = ps: with ps; [ ]; - "notify.xmpp" = ps: with ps; [ pyasn1-modules pyasn1 sleekxmpp ]; + "notify.xmpp" = ps: with ps; [ slixmpp ]; "notify.yessssms" = ps: with ps; [ ]; "nuheat" = ps: with ps; [ ]; "nuimo_controller" = ps: with ps; [ ]; @@ -772,11 +785,12 @@ "onboarding" = ps: with ps; [ aiohttp-cors ]; "onboarding.const" = ps: with ps; [ ]; "onboarding.views" = ps: with ps; [ ]; + "opentherm_gw" = ps: with ps; [ ]; "openuv" = ps: with ps; [ ]; "openuv.config_flow" = ps: with ps; [ ]; "openuv.const" = ps: with ps; [ ]; - "panel_custom" = ps: with ps; [ aiohttp-cors ]; - "panel_iframe" = ps: with ps; [ aiohttp-cors ]; + "panel_custom" = ps: with ps; [ aiohttp-cors ruamel_yaml ]; + "panel_iframe" = ps: with ps; [ aiohttp-cors ruamel_yaml ]; "persistent_notification" = ps: with ps; [ ]; "pilight" = ps: with ps; [ ]; "plant" = ps: with ps; [ ]; @@ -806,6 +820,7 @@ "rflink" = ps: with ps; [ ]; "rfxtrx" = ps: with ps; [ ]; "ring" = ps: with ps; [ ]; + "route53" = ps: with ps; [ boto3 ]; "rpi_gpio" = ps: with ps; [ ]; "rpi_pfio" = ps: with ps; [ ]; "rss_feed_template" = ps: with ps; [ aiohttp-cors ]; @@ -813,6 +828,7 @@ "satel_integra" = ps: with ps; [ ]; "scene" = ps: with ps; [ ]; "scene.deconz" = ps: with ps; [ ]; + "scene.elkm1" = ps: with ps; [ ]; "scene.homeassistant" = ps: with ps; [ ]; "scene.hunterdouglas_powerview" = ps: with ps; [ ]; "scene.knx" = ps: with ps; [ ]; @@ -889,6 +905,7 @@ "sensor.efergy" = ps: with ps; [ ]; "sensor.eight_sleep" = ps: with ps; [ ]; "sensor.eliqonline" = ps: with ps; [ ]; + "sensor.elkm1" = ps: with ps; [ ]; "sensor.emoncms" = ps: with ps; [ ]; "sensor.enocean" = ps: with ps; [ ]; "sensor.enphase_envoy" = ps: with ps; [ ]; @@ -992,6 +1009,7 @@ "sensor.openexchangerates" = ps: with ps; [ ]; "sensor.openhardwaremonitor" = ps: with ps; [ ]; "sensor.opensky" = ps: with ps; [ ]; + "sensor.opentherm_gw" = ps: with ps; [ ]; "sensor.openuv" = ps: with ps; [ ]; "sensor.openweathermap" = ps: with ps; [ pyowm ]; "sensor.otp" = ps: with ps; [ pyotp ]; @@ -1017,6 +1035,7 @@ "sensor.ring" = ps: with ps; [ ]; "sensor.ripple" = ps: with ps; [ ]; "sensor.rmvtransport" = ps: with ps; [ ]; + "sensor.rtorrent" = ps: with ps; [ ]; "sensor.sabnzbd" = ps: with ps; [ ]; "sensor.scrape" = ps: with ps; [ beautifulsoup4 ]; "sensor.season" = ps: with ps; [ ephem ]; @@ -1062,6 +1081,7 @@ "sensor.temper" = ps: with ps; [ ]; "sensor.template" = ps: with ps; [ ]; "sensor.tesla" = ps: with ps; [ ]; + "sensor.thermoworks_smoke" = ps: with ps; [ ]; "sensor.thethingsnetwork" = ps: with ps; [ ]; "sensor.thinkingcleaner" = ps: with ps; [ ]; "sensor.tibber" = ps: with ps; [ ]; @@ -1071,6 +1091,7 @@ "sensor.tradfri" = ps: with ps; [ ]; "sensor.trafikverket_weatherstation" = ps: with ps; [ ]; "sensor.transmission" = ps: with ps; [ transmissionrpc ]; + "sensor.transport_nsw" = ps: with ps; [ ]; "sensor.travisci" = ps: with ps; [ ]; "sensor.twitch" = ps: with ps; [ ]; "sensor.uber" = ps: with ps; [ ]; @@ -1116,10 +1137,16 @@ "shell_command" = ps: with ps; [ ]; "shiftr" = ps: with ps; [ paho-mqtt ]; "shopping_list" = ps: with ps; [ aiohttp-cors ]; + "simplisafe" = ps: with ps; [ ]; + "simplisafe.config_flow" = ps: with ps; [ ]; + "simplisafe.const" = ps: with ps; [ ]; "sisyphus" = ps: with ps; [ ]; "skybell" = ps: with ps; [ ]; "sleepiq" = ps: with ps; [ ]; "smappee" = ps: with ps; [ ]; + "smhi" = ps: with ps; [ ]; + "smhi.config_flow" = ps: with ps; [ ]; + "smhi.const" = ps: with ps; [ ]; "snips" = ps: with ps; [ paho-mqtt ]; "sonos" = ps: with ps; [ ]; "spaceapi" = ps: with ps; [ aiohttp-cors ]; @@ -1150,6 +1177,7 @@ "switch.doorbird" = ps: with ps; [ ]; "switch.edimax" = ps: with ps; [ ]; "switch.edp_redy" = ps: with ps; [ ]; + "switch.elkm1" = ps: with ps; [ ]; "switch.enocean" = ps: with ps; [ ]; "switch.eufy" = ps: with ps; [ ]; "switch.flux" = ps: with ps; [ ]; @@ -1190,6 +1218,7 @@ "switch.raincloud" = ps: with ps; [ ]; "switch.rainmachine" = ps: with ps; [ ]; "switch.raspihats" = ps: with ps; [ ]; + "switch.recswitch" = ps: with ps; [ ]; "switch.rest" = ps: with ps; [ ]; "switch.rflink" = ps: with ps; [ ]; "switch.rfxtrx" = ps: with ps; [ ]; @@ -1215,6 +1244,7 @@ "switch.tradfri" = ps: with ps; [ ]; "switch.transmission" = ps: with ps; [ transmissionrpc ]; "switch.tuya" = ps: with ps; [ ]; + "switch.unifi" = ps: with ps; [ ]; "switch.upcloud" = ps: with ps; [ ]; "switch.velbus" = ps: with ps; [ ]; "switch.vera" = ps: with ps; [ ]; @@ -1262,6 +1292,10 @@ "tts.yandextts" = ps: with ps; [ ]; "tuya" = ps: with ps; [ ]; "twilio" = ps: with ps; [ aiohttp-cors twilio ]; + "unifi" = ps: with ps; [ ]; + "unifi.const" = ps: with ps; [ ]; + "unifi.controller" = ps: with ps; [ ]; + "unifi.errors" = ps: with ps; [ ]; "upcloud" = ps: with ps; [ ]; "updater" = ps: with ps; [ distro ]; "upnp" = ps: with ps; [ aiohttp-cors ]; @@ -1284,6 +1318,10 @@ "volvooncall" = ps: with ps; [ ]; "vultr" = ps: with ps; [ vultr ]; "wake_on_lan" = ps: with ps; [ wakeonlan ]; + "water_heater" = ps: with ps; [ ]; + "water_heater.demo" = ps: with ps; [ ]; + "water_heater.econet" = ps: with ps; [ ]; + "water_heater.wink" = ps: with ps; [ ]; "waterfurnace" = ps: with ps; [ ]; "watson_iot" = ps: with ps; [ ]; "weather" = ps: with ps; [ ]; @@ -1296,6 +1334,7 @@ "weather.met" = ps: with ps; [ ]; "weather.metoffice" = ps: with ps; [ ]; "weather.openweathermap" = ps: with ps; [ pyowm ]; + "weather.smhi" = ps: with ps; [ ]; "weather.yweather" = ps: with ps; [ yahooweather ]; "weather.zamg" = ps: with ps; [ ]; "webhook" = ps: with ps; [ aiohttp-cors ]; @@ -1324,6 +1363,7 @@ "zone.zone" = ps: with ps; [ ]; "zoneminder" = ps: with ps; [ ]; "zwave" = ps: with ps; [ pydispatcher python_openzwave ]; + "zwave.config_flow" = ps: with ps; [ ]; "zwave.const" = ps: with ps; [ ]; "zwave.discovery_schemas" = ps: with ps; [ ]; "zwave.node_entity" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 8503b53033cf..932995513af6 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -22,6 +22,8 @@ let "51afec6ffa50a9da4cdef188971a802beb1ca8e8edb40fa429e5e529db3475fa") (mkOverride "astral" "1.6.1" "ab0c08f2467d35fcaeb7bad15274743d3ac1ad18b5391f64a0058a9cd192d37d") + (mkOverride "async-timeout" "3.0.1" + "0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f") (mkOverride "attrs" "18.2.0" "10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69") (mkOverride "bcrypt" "3.1.4" @@ -32,8 +34,8 @@ let "8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6") (mkOverride "cryptography_vectors" "2.3.1" # required by cryptography==2.3.1 "bf4d9b61dce69c49e830950aa36fad194706463b0b6dfe81425b9e0bc6644d46") - (mkOverride "requests" "2.19.1" - "ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a") + (mkOverride "requests" "2.20.0" + "99dcfdaaeb17caf6e526f32b6a7b780461512ab3f1d992187801694cba42770c") (mkOverride "voluptuous" "0.11.5" "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef") (mkOverride "voluptuous-serialize" "2.0.0" @@ -77,7 +79,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.80.3"; + hassVersion = "0.81.2"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -92,7 +94,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "0fjkw8kg0vsyrkcrx9jhqrh5nzxx5wphj6zglqgai2d635m8j2dg"; + sha256 = "0qg3kh99bqhsraa8jpqqrvaxz9l1gsbh3aazg3v0d6q6ng42y2bq"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 25a63ef71a92..4af2a4ec9220 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20181018.0"; + version = "20181026.1"; src = fetchPypi { inherit pname version; - sha256 = "83f52421056acda8297f174a7c4e3c540109673c2f2c25720638d171c6bc2653"; + sha256 = "ea5e7fb769df2f096e2993c23d1aa3dc8652e0f0aa09a89863af22e095b80aa8"; }; propagatedBuildInputs = [ user-agents ]; diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 65679e4ac86e..9503fd14907c 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -13,11 +13,11 @@ assert enableWebDAV -> sqlite != null; assert enableWebDAV -> libuuid != null; stdenv.mkDerivation rec { - name = "lighttpd-1.4.50"; + name = "lighttpd-1.4.51"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; - sha256 = "1sr9avcnld22a5wl5s8vgrz8r86mybggm9z8zwabqz48v0986dr9"; + sha256 = "10lw9vvivpvf4aw7ajayb2yyq4lp4dq3gq9llszjbw6icnrgvy9a"; }; postPatch = '' diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 60c517230b4f..d55804504442 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -1,43 +1,33 @@ { stdenv, lib, fetchurl, fetchpatch, autoconf, automake, libtool, bison -, libasr, libevent, zlib, openssl, db, pam - -# opensmtpd requires root for no reason to encrypt passwords, this patch fixes it -# see also https://github.com/OpenSMTPD/OpenSMTPD/issues/678 -, unpriviledged_smtpctl_encrypt ? true - -# Deprecated: use the subaddressing-delimiter in the config file going forward -, tag_char ? null +, libasr, libevent, zlib, libressl, db, pam }: -if (tag_char != null) -then throw "opensmtpd: the tag_char argument is deprecated as it can now be specified at runtime via the 'subaddressing-delimiter' option of the configuration file" -else stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "opensmtpd-${version}"; - version = "6.0.3p1"; + version = "6.4.0p1"; nativeBuildInputs = [ autoconf automake libtool bison ]; - buildInputs = [ libasr libevent zlib openssl db pam ]; + buildInputs = [ libasr libevent zlib libressl db pam ]; src = fetchurl { url = "https://www.opensmtpd.org/archives/${name}.tar.gz"; - sha256 = "291881862888655565e8bbe3cfb743310f5dc0edb6fd28a889a9a547ad767a81"; + sha256 = "1qxxhnlsmpfh9v4azgl0634955r085gsic1c66jdll21bd5w2mq8"; }; patches = [ ./proc_path.diff - (fetchpatch { - url = "https://github.com/OpenSMTPD/OpenSMTPD/commit/725ba4fa2ddf23bbcd1ff9ec92e86bbfaa6825c8.diff"; - sha256 = "19rla0b2r53jpdiz25fcza29c2msz6j6paivxhp9jcy1xl457dqa"; - }) + ./fix-build.diff # See https://github.com/OpenSMTPD/OpenSMTPD/pull/884 ]; - postPatch = with builtins; with lib; - optionalString unpriviledged_smtpctl_encrypt '' - substituteInPlace smtpd/smtpctl.c --replace \ - 'if (geteuid())' \ - 'if (geteuid() != 0 && !(argc > 1 && !strcmp(argv[1], "encrypt")))' - substituteInPlace mk/smtpctl/Makefile.in --replace "chmod 2555" "chmod 0555" - ''; + # See https://github.com/OpenSMTPD/OpenSMTPD/issues/885 for the `sh bootstrap` + # requirement + postPatch = '' + substituteInPlace smtpd/parse.y \ + --replace "/usr/libexec/" "$out/libexec/opensmtpd/" + substituteInPlace mk/smtpctl/Makefile.am --replace "chgrp" "true" + substituteInPlace mk/smtpctl/Makefile.am --replace "chmod 2555" "chmod 0555" + sh bootstrap + ''; configureFlags = [ "--sysconfdir=/etc" @@ -54,6 +44,9 @@ else stdenv.mkDerivation rec { "--with-table-db" ]; + # See https://github.com/OpenSMTPD/OpenSMTPD/pull/884 + makeFlags = [ "CFLAGS=-ffunction-sections" "LDFLAGS=-Wl,--gc-sections" ]; + installFlags = [ "sysconfdir=\${out}/etc" "localstatedir=\${TMPDIR}" @@ -67,6 +60,6 @@ else stdenv.mkDerivation rec { ''; license = licenses.isc; platforms = platforms.linux; - maintainers = with maintainers; [ rickynils obadz ]; + maintainers = with maintainers; [ rickynils obadz ekleog ]; }; } diff --git a/pkgs/servers/mail/opensmtpd/fix-build.diff b/pkgs/servers/mail/opensmtpd/fix-build.diff new file mode 100644 index 000000000000..1f995fd4f623 --- /dev/null +++ b/pkgs/servers/mail/opensmtpd/fix-build.diff @@ -0,0 +1,12 @@ +diff --git a/mk/smtpctl/Makefile.am b/mk/smtpctl/Makefile.am +index 5af0b713..f0fce735 100644 +--- a/mk/smtpctl/Makefile.am ++++ b/mk/smtpctl/Makefile.am +@@ -4,6 +4,7 @@ sbin_PROGRAMS= smtpctl + + smtpctl_SOURCES= $(smtpd_srcdir)/enqueue.c + smtpctl_SOURCES+= $(smtpd_srcdir)/parser.c ++smtpctl_SOURCES+= $(smtpd_srcdir)/config.c + smtpctl_SOURCES+= $(smtpd_srcdir)/log.c + smtpctl_SOURCES+= $(smtpd_srcdir)/envelope.c + smtpctl_SOURCES+= $(smtpd_srcdir)/queue_backend.c diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 02e14f3b5aca..b9dd07adde98 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -6,13 +6,13 @@ in stdenv.mkDerivation rec { name = "rspamd-${version}"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "vstakhov"; repo = "rspamd"; rev = version; - sha256 = "02q1id9kv5d6w1b1ifa2m6qrnbsja787dn0ywwi0yrsaqwk63wk7"; + sha256 = "1cgnychv8yz7a6mjg3b12nzs4gl0xqg9agl7m6faihnh7gqx4xld"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix new file mode 100644 index 000000000000..80fb5575e4d4 --- /dev/null +++ b/pkgs/servers/miniflux/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, buildGoPackage +, fetchFromGitHub +}: + +buildGoPackage rec { + name = "miniflux-${version}"; + version = "2.0.12"; + + goPackagePath = "miniflux.app"; + + src = fetchFromGitHub { + owner = "miniflux"; + repo = "miniflux"; + rev = "refs/tags/${version}"; + sha256 = "13d1dwcwig7b5phymgxqm227k5l3zzzvx997cywarbl953ji2y1d"; + }; + + goDeps = ./deps.nix; + + doCheck = true; + + buildFlagsArray = '' + -ldflags=-X ${goPackagePath}/version.Version=${version} + ''; + + postInstall = '' + mv $bin/bin/miniflux.app $bin/bin/miniflux + ''; + + meta = with stdenv.lib; { + description = "Miniflux is a minimalist and opinionated feed reader."; + homepage = https://miniflux.app/; + license = licenses.asl20; + maintainers = with maintainers; [ benpye ]; + }; +} + diff --git a/pkgs/servers/miniflux/deps.nix b/pkgs/servers/miniflux/deps.nix new file mode 100644 index 000000000000..4ef30bec3b8d --- /dev/null +++ b/pkgs/servers/miniflux/deps.nix @@ -0,0 +1,153 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + + { + goPackagePath = "github.com/PuerkitoBio/goquery"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/goquery"; + rev = "v1.4.1"; + sha256 = "11010z9ask21r0dskvm2pbh3z8951bnpcqg8aqa213if4h34gaa2"; + }; + } + + { + goPackagePath = "github.com/andybalholm/cascadia"; + fetch = { + type = "git"; + url = "https://github.com/andybalholm/cascadia"; + rev = "v1.0.0"; + sha256 = "09j8cavbhqqdxjqrkwbc40g8p0i49zf3184rpjm5p2rjbprcghcc"; + }; + } + + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.1.0"; + sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; + }; + } + + { + goPackagePath = "github.com/gorilla/context"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/context"; + rev = "v1.1.1"; + sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; + }; + } + + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "v1.6.2"; + sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; + }; + } + + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "v1.0.0"; + sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i"; + }; + } + + { + goPackagePath = "github.com/tdewolff/minify"; + fetch = { + type = "git"; + url = "https://github.com/tdewolff/minify"; + rev = "v2.3.5"; + sha256 = "0x67kgjhc6mfzjhr4xmw0j3qapzhkgwwahvv5b44rb449ml2qx5m"; + }; + } + + { + goPackagePath = "github.com/tdewolff/parse"; + fetch = { + type = "git"; + url = "https://github.com/tdewolff/parse"; + rev = "v2.3.3"; + sha256 = "190y2jykp8qyp6y58ky1v1fvmaqjnrsr1ksbqrrspf1gpjy69i94"; + }; + } + + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "614d502a4dac"; + sha256 = "1rcyvsl8b8pk7h8lwl0fpiflrx8zs121wi5490ln0qnvkk8d4bwy"; + }; + } + + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "8a410e7b638d"; + sha256 = "0hp0l8f6fir5gmgrjq0mhh5ikc0rlrm72774228800kfwqjrxxny"; + }; + } + + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "d2e6202438be"; + sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; + }; + } + + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "1d60e4601c6f"; + sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; + }; + } + + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "4910a1d54f87"; + sha256 = "0p2pp6mny34gjcvylx3ddzdaxn7hv008hppsr11w1bvyzj7s27by"; + }; + } + + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "v1.1.0"; + sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; + }; + } +] diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 9365612c14ed..0f20128678ce 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "neo4j-${version}"; - version = "3.4.8"; + version = "3.4.9"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; - sha256 = "1mdxqfy5xzc6944lg87975i9bfpqqx28xl8h70m4wn79x0qgby2v"; + sha256 = "0kg0dr42qi8cwg3i1hcgczd4psh97s54q5zd8z2wn1fqf4m2h597"; }; buildInputs = [ makeWrapper jre8 which gawk ]; diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index 04fd2e37b357..97612f656cbc 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "osrm-backend-${version}"; - version = "5.18.0"; + version = "5.19.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "Project-OSRM"; repo = "osrm-backend"; - sha256 = "0ffdw02rgjb4z7xi8fk97c0hl1i7z04csjh3yd18zsb19bk1mkva"; + sha256 = "1y3k2j4c3jparzm9ck1jkw5g12jr6kd9llq50jran2dwikc6hpyz"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 723b4e4d8d3e..b5912dd9ab94 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -7,11 +7,11 @@ let self = stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.7.23"; + version = "5.7.24"; src = fetchurl { url = "mirror://mysql/MySQL-5.7/${name}.tar.gz"; - sha256 = "0rbc3xsc11lq2dm0ip6gxa16c06hi74scb97x5cw7yhbabaz4c07"; + sha256 = "11qz8cc4zyi7sxs66c5zlap6fd3vra1srwgzcxdzhz59qs90rgq5"; }; preConfigure = stdenv.lib.optional stdenv.isDarwin '' diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index bccd54ca4ba8..b81b4340d767 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -99,34 +99,40 @@ let in { - postgresql93 = common { + postgresql_9_3 = common { version = "9.3.24"; psqlSchema = "9.3"; sha256 = "1a8dnv16n2rxnbwhqw7c0kjpj3xqvkpwk50kvimj4d917cxaf542"; }; - postgresql94 = common { + postgresql_9_4 = common { version = "9.4.19"; psqlSchema = "9.4"; sha256 = "12qn9h47rkn4k41gdbxkkvg0pff43k1113jmhc83f19adc1nnxq3"; }; - postgresql95 = common { + postgresql_9_5 = common { version = "9.5.14"; psqlSchema = "9.5"; sha256 = "0k8s62h6qd9p3xlx315j5irniskqsnx1nz4ir5r1yhqp07mdab1y"; }; - postgresql96 = common { + postgresql_9_6 = common { version = "9.6.10"; psqlSchema = "9.6"; sha256 = "09l4zqs74fqnazdsyln9x657mq3wsbgng9wpvq71yh26cv2sq5c6"; }; - postgresql100 = common { + postgresql_10 = common { version = "10.5"; psqlSchema = "10.0"; sha256 = "04a07jkvc5s6zgh6jr78149kcjmsxclizsqabjw44ld4j5n633kc"; }; + postgresql_11 = common { + version = "11.0"; + psqlSchema = "11.0"; + sha256 = "0szk9ssfych1wlpyqxz3z6dllg1l6m5labpii8c2r463s01vm6xz"; + }; + } diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix index 615a199ddb53..aca5eb1f4ee7 100644 --- a/pkgs/servers/sql/postgresql/pgroonga/default.nix +++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pgroonga-${version}"; - version = "2.1.3"; + version = "2.1.6"; src = fetchurl { url = "https://packages.groonga.org/source/pgroonga/${name}.tar.gz"; - sha256 = "0qv82libl4rv6cq9klvzwx4g767mjl4jaap34sxbd3x0wvm364yd"; + sha256 = "1scybfmmlz5p4xgkhfx7pzdiqj5cd60kvbk8m4xa6k3avz0p1sw9"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 1fb8f4b1221b..474a5b65b306 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "matomo-${version}"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { # TODO: As soon as the tarballs are renamed as well on future releases, this should be enabled again # url = "https://builds.matomo.org/${name}.tar.gz"; url = "https://builds.matomo.org/piwik-${version}.tar.gz"; - sha256 = "1bkxa163s420w579ma7sbab1nm8c6ca6r6irn200j7p1r5zjklp8"; + sha256 = "0hddj1gyyriwgsh1mghihck2i7rj6gvb1i0b2ripcdfjnxcs47hz"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 58688590b84e..4772ac7f7ee2 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -2,10 +2,10 @@ stdenv, makeWrapper, lib, fetchurl, fetchpatch, automake, autoconf, libtool, intltool, mtdev, libevdev, libinput, - python, freetype, apple_sdk, tradcpp, fontconfig, mesa_drivers, + python, freetype, apple_sdk, tradcpp, fontconfig, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, mesa_noglu, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, - mcpp, epoxy, openssl, pkgconfig }: + mcpp, epoxy, openssl, pkgconfig, llvm_6 }: let inherit (stdenv) lib isDarwin; @@ -394,7 +394,7 @@ self: super: }); xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ [ mesa_drivers ]; # for libxatracker + buildInputs = attrs.buildInputs ++ [ mesa_noglu llvm_6 ]; # for libxatracker meta = attrs.meta // { platforms = ["i686-linux" "x86_64-linux"]; }; diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix index 4c911e756330..b3495b189a67 100644 --- a/pkgs/tools/X11/virtualgl/lib.nix +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -19,6 +19,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postPatch = '' + # script calls exec, which fails with plain sh + substituteInPlace ./server/vglrun.in \ + --replace '#!/bin/sh' '#!/usr/bin/env bash' + ''; + meta = with stdenv.lib; { homepage = http://www.virtualgl.org/; description = "X11 GL rendering in a remote computer with full 3D hw acceleration"; diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index b96235341401..0c64cbefb3ed 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -1,22 +1,22 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub +{ lib, stdenv, rustPlatform, fetchFromGitLab , xlibsWrapper, xorg, libpulseaudio, pkgconfig, patchelf }: rustPlatform.buildRustPackage rec { name = "xidlehook-${version}"; - version = "0.4.9"; + version = "0.5.0"; doCheck = false; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "jD91mZM2"; repo = "xidlehook"; rev = version; - sha256 = "1l2kmymwxal9v5g3q21i985yc201dpybp85qfws2n5rzw8qpg1dw"; + sha256 = "1qrjwk91i31rww5lwgp84hc4h3b1prm60y45jm1f28g2bbv2qy19"; }; cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"]; - cargoSha256 = "1mrg59flmmqg5wwi2l8lw6p1xpgdw597fdfsmpn8b126rgzqmjl8"; + cargoSha256 = "1pdhbqnkgwp2v5zyin8z8049aq8c3kfk04v9wsbz8qla34rgi99s"; buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ]; nativeBuildInputs = [ pkgconfig patchelf ]; diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 016ea957f6c7..aa8cc12ece85 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -19,18 +19,18 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "1d5z575vw07jk7528bsqgdd875b3zwayrdnidvxpd2n8j4bip654"; + sha256 = "03ymvfhk8azyvdm6j4pbqx2fsh178kw81yqwkycbhmm6mnyc8yv1"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "0ljslvp68ml5mglrl7kakgkqskbzglf3i5jv5d7jld28d0kbzj2c"; + sha256 = "1pw4w3v81mp8alm6vxq10242xxwv8rfs59bjxrmy0pfkjgsr4x4v"; }; }.${system}; in stdenv.mkDerivation rec { name = "google-cloud-sdk-${version}"; - version = "215.0.0"; + version = "222.0.0"; src = fetchurl (sources name stdenv.hostPlatform.system); diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 540779477e35..3b6f3c989a33 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig , vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk_pixbuf, gobjectIntrospection, gtk2 , gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true -, enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null }: +, enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null +, buildPackages }: assert withWayland -> wayland != null && libxkbcommon != null; @@ -76,7 +77,7 @@ stdenv.mkDerivation rec { substituteInPlace data/dconf/Makefile.am --replace "dconf update" true substituteInPlace configure.ac --replace '$python2dir/ibus' $out/${python3.sitePackages}/ibus echo \#!${stdenv.shell} > data/dconf/make-dconf-override-db.sh - cp ${gtk-doc}/share/gtk-doc/data/gtk-doc.make . + cp ${buildPackages.gtk-doc}/share/gtk-doc/data/gtk-doc.make . ''; preAutoreconf = "touch ChangeLog"; diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 48ca8ad65c75..75c7897ac842 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "fd-${version}"; - version = "7.1.0"; + version = "7.2.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "11x9zqhahgyf0icfnl8xzdb2mn35jrmvxmnz5xzh581mmhs355m2"; + sha256 = "1h7ar1m7w3vmakg9rp1nfmz7q5pqwvd8yyxwj335ixb49gph1zi5"; }; - cargoSha256 = "02r0lvfh37y1bij0fqmgyh8rywap714zvxrk0l108y8cqkq2ghnd"; + cargoSha256 = "0y6xp7fdjfmjfqf9avbq9bdvzvwkf3v1dv7a4k03w5279vxafzi4"; preFixup = '' mkdir -p "$out/man/man1" diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index 3f476cfea941..a692933053df 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -25,10 +25,10 @@ in { aggregates = glPlugin rec { name = "graylog-aggregates-${version}"; pluginName = "graylog-plugin-aggregates"; - version = "2.0.0"; + version = "2.3.0"; src = fetchurl { url = "https://github.com/cvtienhoven/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "0crgb49msjkvfpksbfhq2hlkc904j184wm1wp6q0x6lzhn07hm8y"; + sha256 = "0yy455wyr01ci3nqvbhzxs6r4bb3xgac0xcmqaim1wsm1fdfi2ws"; }; meta = { homepage = https://github.com/cvtienhoven/graylog-plugin-aggregates; @@ -38,10 +38,10 @@ in { auth_sso = glPlugin rec { name = "graylog-auth-sso-${version}"; pluginName = "graylog-plugin-auth-sso"; - version = "2.3.0"; + version = "2.4.2"; src = fetchurl { url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "110ag10y0xyf3za6663vf68r5rwdi92315a37vysqvj00y7yak0l"; + sha256 = "0nwzw7ddq2psnvj8jwaxp9i080l7y2daxy198wzb62m7i1srzcp8"; }; meta = { homepage = https://github.com/Graylog2/graylog-plugin-auth-sso; @@ -51,10 +51,10 @@ in { dnsresolver = glPlugin rec { name = "graylog-dnsresolver-${version}"; pluginName = "graylog-plugin-dnsresolver"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "01s7wm6bwcpmdrl35gjp6rrqxixs2s9km2bdgzhv8pn25j5qnw28"; + sha256 = "0djlyd4w4mrrqfbrs20j1xw0fygqsb81snz437v9bf80avmcyzg1"; }; meta = { homepage = https://github.com/graylog-labs/graylog-plugin-dnsresolver; @@ -77,10 +77,10 @@ in { internal-logs = glPlugin rec { name = "graylog-internal-logs-${version}"; pluginName = "graylog-plugin-internal-logs"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "05r4m2gf1hj1b889rmpb6b5a6q2xd0qkl1rpj107yd219j2grzf4"; + sha256 = "1jyy0wkjapv3xv5q957xxv2pcnd4n1yivkvkvg6cx7kv1ip75xwc"; }; meta = { homepage = https://github.com/graylog-labs/graylog-plugin-internal-logs; @@ -103,10 +103,10 @@ in { jabber = glPlugin rec { name = "graylog-jabber-${version}"; pluginName = "graylog-plugin-jabber"; - version = "2.0.0"; + version = "2.4.0"; src = fetchurl { url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "1bqj5g9zjnw08bva7379c2ar3nhmyiilj7kjxd16qvfdn2674r5h"; + sha256 = "0zy27q8y0bv7i5nypsfxad4yiw121sbwzd194jsz2w08jhk3skl5"; }; meta = { homepage = https://github.com/graylog-labs/graylog-plugin-jabber; @@ -168,10 +168,10 @@ in { slack = glPlugin rec { name = "graylog-slack-${version}"; pluginName = "graylog-plugin-slack"; - version = "2.4.0"; + version = "3.1.0"; src = fetchurl { url = "https://github.com/graylog-labs/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar"; - sha256 = "0v8ilfhs8bnx87pjxg1i3p2vxw61rwpg4k3zhga7slavx70y986p"; + sha256 = "067p8g94b007gypwyyi8vb6qhwdanpk8ah57abik54vv14jxg94k"; }; meta = { homepage = https://github.com/graylog-labs/graylog-plugin-slack; diff --git a/pkgs/tools/misc/openopc/default.nix b/pkgs/tools/misc/openopc/default.nix deleted file mode 100644 index 8d3850745f11..000000000000 --- a/pkgs/tools/misc/openopc/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, fetchurl, python }: - -let - pythonEnv = python.withPackages(ps: [ps.Pyro]); -in stdenv.mkDerivation rec { - name = "openopc-${version}"; - version = "1.2.0"; - - src = fetchurl { - url = "mirror://sourceforge/project/openopc/openopc/${version}/OpenOPC-${version}.source.tar.bz2"; - sha256 = "0mm77fiipz5zy82l6pr3wk18bfril81milv2rdxr954c4gw5smyd"; - }; - - # There is no setup.py or any other "build system" file in the source archive. - installPhase = '' - mkdir -p "$out/bin" - mkdir -p "$out/share/doc/openopc" - mkdir -p "$out/${pythonEnv.python.sitePackages}" - mkdir -p "$out/libexec/opc" - - cp src/OpenOPC.py "$out/${pythonEnv.python.sitePackages}" - cp src/opc.py "$out/libexec/opc/" - - cat > "$out/bin/opc" << __EOF__ - #!${stdenv.shell} - export PYTHONPATH="$out/${pythonEnv.python.sitePackages}" - exec ${pythonEnv}/bin/${pythonEnv.python.executable} "$out/libexec/opc/opc.py" "\$@" - __EOF__ - chmod a+x "$out/bin/opc" - - cp -R *.txt doc/* "$out/share/doc/openopc/" - - # Copy these MS Windows tools, for reference. - cp src/OpenOPCService.py src/SystemHealth.py "$out/libexec/opc/" - ''; - - meta = with stdenv.lib; { - description = "OPC (OLE for Process Control) toolkit designed for use with Python"; - homepage = http://openopc.sourceforge.net/; - # """OpenOPC for Python is freely available under the terms of the GNU GPL. - # However, the OpenOPC library module is licensed under the "GPL + linking - # exception" license, which generally means that programs written using the - # OpenOPC library may be licensed under any terms.""" - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix index 67f805988a3e..3de81d3bd052 100644 --- a/pkgs/tools/misc/powerline-rs/default.nix +++ b/pkgs/tools/misc/powerline-rs/default.nix @@ -1,25 +1,29 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, curl, cmake, openssl, libssh2, libgit2, libzip, Security }: +{ stdenv, lib, rustPlatform, fetchFromGitLab, pkgconfig, file, perl, curl, cmake, openssl, libssh2, libgit2, libzip, Security }: rustPlatform.buildRustPackage rec { pname = "powerline-rs"; name = "${pname}-${version}"; - version = "0.1.8"; + version = "0.1.9"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "jD91mZM2"; repo = "powerline-rs"; - rev = version; + #rev = version; - sha256 = "018i9qq98afbgv0nxs1n83zb09lqhqxpdrd95f2maic3rr5ngnj5"; + # Support for $COMPLETION_OUT: + rev = "44679385a95dd9f3ebd9b093f9ef8925610e9a23"; + + sha256 = "1mxkw6ydnqjyplbki2j9pbnlhxmkw9qqw54443a3cjmn2g08jyzp"; }; - cargoSha256 = "184s432a6damzvl0lv6jar1iml9dq60r190aqjy44lcg938981zc"; + cargoSha256 = "1sr9vbfk5bb3n0lv93y19in1clyvbj0w3p1gmp4sbw8lx84zwxhc"; nativeBuildInputs = [ pkgconfig file perl cmake curl ]; buildInputs = [ openssl libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security; + COMPLETION_OUT = "out"; postInstall = '' - install -Dm 755 "${pname}.bash" "$out/etc/bash_completion.d/${pname}" - install -Dm 755 "${pname}.fish" "$out/share/fish/vendor_completions.d/${pname}" + install -Dm 755 "${COMPLETION_OUT}/${pname}.bash" "$out/etc/bash_completion.d/${pname}" + install -Dm 755 "${COMPLETION_OUT}/${pname}.fish" "$out/share/fish/vendor_completions.d/${pname}" ''; meta = with lib; { diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index ac69fd992658..56b7320a1b26 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { - version = "5.6"; - name = "getmail-${version}"; - namePrefix = ""; + pname = "getmail"; + version = "5.7"; src = fetchurl { - url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz"; - sha256 = "16nmvj80szr6yvcxxgmxn2lxqpjqqj4xg5a0b66zhvck6j42q3a6"; + url = "http://pyropus.ca/software/getmail/old-versions/${pname}-${version}.tar.gz"; + sha256 = "1ygv78ihjyrh60657bl8pc17a5dqawdkfh32h8hrd4kwwxlsd5r4"; }; doCheck = false; diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 850a33db58cf..c9de3f8ea574 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urlwatch-${version}"; - version = "2.14"; + version = "2.15"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "1m7qdh2lk5napncmfnk86dj4wqcahq8y24xnylxa4qlx2ivwkr6b"; + sha256 = "1bkd0r5arzdvinpn1n23cw1gf7byxml95hl6qvvf6mnggb1ifcwg"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix new file mode 100644 index 000000000000..d84a85071df7 --- /dev/null +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -0,0 +1,25 @@ +{ stdenv, callPackage, fetchFromGitHub, rustPlatform, darwin }: + +rustPlatform.buildRustPackage rec { + name = "nixdoc-${version}"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "tazjin"; + repo = "nixdoc"; + rev = "v${version}"; + sha256 = "14d4dq06jdqazxvv7fq5872zy0capxyb0fdkp8qg06gxl1iw201s"; + }; + + buildInputs = stdenv.lib.optional stdenv.isDarwin [ darwin.Security ]; + + cargoSha256 = "1bfn1x1jhpyidai4cjwip5r1ibkqp26ivmqq3vjm71l00m6avb94"; + + meta = with stdenv.lib; { + description = "Generate documentation for Nix functions"; + homepage = https://github.com/tazjin/nixdoc; + license = [ licenses.gpl3 ]; + maintainers = [ maintainers.tazjin ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/package-management/nix-review/default.nix b/pkgs/tools/package-management/nix-review/default.nix index 126673ad9cc8..f761c69e0264 100644 --- a/pkgs/tools/package-management/nix-review/default.nix +++ b/pkgs/tools/package-management/nix-review/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nix-review"; - version = "0.5.3"; + version = "0.6.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-review"; rev = version; - sha256 = "14ak0qfc5faamnp4fmrqmb1ikpv656nr830rja89yzc96s73337z"; + sha256 = "1391fs33jlg1pnfxpfhvry4sb4p4hy8gjpipnnxm8483f12b49km"; }; makeWrapperArgs = [ diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 975d36ddf190..ea03570bb3e5 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -159,13 +159,13 @@ in rec { }; }; nixUnstable = (lib.lowPrio (common rec { - name = "nix-2.1${suffix}"; - suffix = "pre6377_954d1f4d"; + name = "nix-2.2${suffix}"; + suffix = "pre6526_9f99d624"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "954d1f4d0a35063ff431b258beebadf753cb9efe"; - sha256 = "0wnljxljvcwmniydgxlsjqmbgghmljs75m6083y2nkjql7dnrm7g"; + rev = "9f99d62480cf7c58c0a110b180f2096b7d25adab"; + sha256 = "0fkmx7gmgg0yij9kw52fkyvib88hj1jsj90vbpy13ccfwknh1044"; }; fromGit = true; })) // { perl-bindings = perl-bindings { diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index f805670a5d5e..9492f2bb6eac 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -12,11 +12,11 @@ let in pythonPackages.buildPythonApplication rec { pname = "truffleHog"; - version = "2.0.91"; + version = "2.0.97"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0r4c9ihy6wjh5cwli7lb6cr2yfvxrh7r6cgznql1src5gzlnkymx"; + sha256 = "034kpv1p4m90286slvc6d4mlrzaf0b5jbd4qaj87hj65wbpcpg8r"; }; # Relax overly restricted version constraint diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index 59ece285676c..4b2ad1f7ef96 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "hwinfo-${version}"; - version = "21.58"; + version = "21.60"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = "${version}"; - sha256 = "15gfgb711cs42nynmql2dyi8hs7f5wj3pcm75snnbz5arp8lx3j2"; + sha256 = "1agjc14m1814x897wkx484qb8llr395xlzn428f86sxgshicwfy3"; }; patchPhase = '' diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 5b8a9cd0aee5..1ce7e766a18e 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -11,11 +11,11 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "3.17.2"; + version = "3.18.1"; src = fetchurl { url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz"; - sha256 = "02y593ar1c4503ww7mhn0p5ajfl3q6769c6m311m6srwl5y1yq3k"; + sha256 = "1y1v16vvyirh0qv4wzczqp8d3llh6dl63lz3irwib1qhh7x56dyn"; }; nativeBuildInputs = [ pkgconfig which ]; diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/tools/text/icdiff/default.nix index 949a9c89e9af..aec238cb4ccc 100644 --- a/pkgs/tools/text/icdiff/default.nix +++ b/pkgs/tools/text/icdiff/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { name = "icdiff-${version}"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "jeffkaufman"; repo = "icdiff"; rev = "release-${version}"; - sha256 = "10hv09sg7m8gzjf1v785kvim9ps81akzyx7ws6ypylyxc0l2fdcl"; + sha256 = "1micpm7kq9swfscmp4mg37fnzgzpsg7704yi33c5sd6cmgbdabxm"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix index a17c348c4cc1..3e0bee3b9b98 100644 --- a/pkgs/tools/text/miller/default.nix +++ b/pkgs/tools/text/miller/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "miller-${version}"; - version = "5.3.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "johnkerl"; repo = "miller"; rev = "${version}"; - sha256 = "0abw2n6mi4wbgwihcv3y2xccqx4sj0gdgwvdrg2jkcgraa78sw8v"; + sha256 = "0158by642frh9x6rrgqxwmk4766wb36kp0rrjg5swdbs9w3is3xg"; }; nativeBuildInputs = [ autoreconfHook flex libtool ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4a8c4f1334d9..c0d322b89d88 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -225,6 +225,11 @@ mapAliases ({ piwik = matomo; # added 2018-01-16 pltScheme = racket; # just to be sure poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 + postgresql93 = postgresql_9_3; + postgresql94 = postgresql_9_4; + postgresql95 = postgresql_9_5; + postgresql96 = postgresql_9_6; + postgresql100 = throw "deprecated 2018-10-21: use postgresql_10 instead"; procps-ng = procps; # added 2018-06-08 prometheus-statsd-bridge = prometheus-statsd-exporter; # added 2017-08-27 pulseaudioLight = pulseaudio; # added 2018-04-25 @@ -250,6 +255,7 @@ mapAliases ({ s6Networking = s6-networking; # added 2018-07-23 s6LinuxUtils = s6-linux-utils; # added 2018-07-23 s6PortableUtils = s6-portable-utils; # added 2018-07-23 + sagemath = sage; # added 2018-10-27 sam = deadpixi-sam; # added 2018-04-25 samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25 saneBackends = sane-backends; # added 2016-01-02 @@ -300,6 +306,7 @@ mapAliases ({ trang = jing-trang; # added 2018-04-25 transmission_gtk = transmission-gtk; # added 2018-01-06 transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 + truecrypt = veracrypt; # added 2018-10-24 tshark = wireshark-cli; # added 2018-04-25 ucsFonts = ucs-fonts; # added 2016-07-15 ultrastardx-beta = ultrastardx; # added 2017-08-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 895162792437..5689301d8be2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -732,6 +732,8 @@ with pkgs; oracle-instantclient = callPackage ../development/libraries/oracle-instantclient { }; + goku = callPackage ../os-specific/darwin/goku { }; + kwakd = callPackage ../servers/kwakd { }; kwm = callPackage ../os-specific/darwin/kwm { }; @@ -828,7 +830,10 @@ with pkgs; libssl = openssl; }; - axoloti = callPackage ../applications/audio/axoloti { }; + axoloti = callPackage ../applications/audio/axoloti { + gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; + binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; + }; dfu-util-axoloti = callPackage ../applications/audio/axoloti/dfu-util.nix { }; libusb1-axoloti = callPackage ../applications/audio/axoloti/libusb1.nix { inherit (darwin) libobjc; @@ -1527,6 +1532,8 @@ with pkgs; patdiff = callPackage ../tools/misc/patdiff { }; + pbpst = callPackage ../applications/misc/pbpst { }; + pbzx = callPackage ../tools/compression/pbzx { }; pev = callPackage ../development/tools/analysis/pev { }; @@ -4500,8 +4507,6 @@ with pkgs; openobex = callPackage ../tools/bluetooth/openobex { }; - openopc = callPackage ../tools/misc/openopc { }; - openresolv = callPackage ../tools/networking/openresolv { }; opensc = callPackage ../tools/security/opensc { @@ -4541,7 +4546,7 @@ with pkgs; opae = callPackage ../development/libraries/opae { }; - opentracing-cpp = callPackages ../development/libraries/opentracing-cpp { }; + opentracing-cpp = callPackage ../development/libraries/opentracing-cpp { }; openvswitch = callPackage ../os-specific/linux/openvswitch { }; @@ -6028,11 +6033,6 @@ with pkgs; libpng = libpng12; }; - truecrypt = callPackage ../applications/misc/truecrypt { - stdenv = overrideInStdenv stdenv [ useOldCXXAbi ]; - wxGUI = config.truecrypt.wxGUI or true; - }; - ttmkfdir = callPackage ../tools/misc/ttmkfdir { }; ttwatch = callPackage ../tools/misc/ttwatch { }; @@ -6137,7 +6137,7 @@ with pkgs; }; veracrypt = callPackage ../applications/misc/veracrypt { - wxGUI = true; + wxGTK = wxGTK30; }; vlan = callPackage ../tools/networking/vlan { }; @@ -6429,6 +6429,23 @@ with pkgs; abcl = callPackage ../development/compilers/abcl {}; + adoptopenjdk-bin-11-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk11-linux.nix; + adoptopenjdk-bin-11-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk11-darwin.nix; + + adoptopenjdk-hotspot-bin-11 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-11-packages-linux.jdk-hotspot {} + else callPackage adoptopenjdk-bin-11-packages-darwin.jdk-hotspot {}; + adoptopenjdk-jre-hotspot-bin-11 = if stdenv.isLinux + then callPackage adoptopenjdk-bin-11-packages-linux.jre-hotspot {} + else callPackage adoptopenjdk-bin-11-packages-darwin.jre-hotspot {}; + + # no OpenJ9 for Darwin + adoptopenjdk-openj9-bin-11 = callPackage adoptopenjdk-bin-11-packages-linux.jdk-openj9 {}; + adoptopenjdk-jre-openj9-bin-11 = callPackage adoptopenjdk-bin-11-packages-linux.jre-openj9 {}; + + adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11; + adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11; + aldor = callPackage ../development/compilers/aldor { }; aliceml = callPackage ../development/compilers/aliceml { }; @@ -6819,36 +6836,6 @@ with pkgs; gcl_2_6_13_pre = callPackage ../development/compilers/gcl/2.6.13-pre.nix { }; - gcc-arm-embedded-4_7 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { - version = "4.7-2013q3-20130916"; - releaseType = "update"; - sha256 = "1bd9bi9q80xn2rpy0rn1vvj70rh15kb7dmah0qs4q2rv78fqj40d"; - ncurses = pkgsi686Linux.ncurses5; - }; - gcc-arm-embedded-4_8 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { - version = "4.8-2014q1-20140314"; - releaseType = "update"; - sha256 = "ce92859550819d4a3d1a6e2672ea64882b30afa2c08cf67fa8e1d93788c2c577"; - ncurses = pkgsi686Linux.ncurses5; - }; - gcc-arm-embedded-4_9 = pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { - version = "4.9-2015q1-20150306"; - releaseType = "update"; - sha256 = "c5e0025b065750bbd76b5357b4fc8606d88afbac9ff55b8a82927b4b96178154"; - ncurses = pkgsi686Linux.ncurses5; - }; - gcc-arm-embedded-5 = pkgs.pkgsi686Linux.callPackage ../development/compilers/gcc-arm-embedded { - dirName = "5.0"; - subdirName = "5-2016-q2-update"; - version = "5.4-2016q2-20160622"; - releaseType = "update"; - sha256 = "1r0rqbnw7rf94f5bsa3gi8bick4xb7qnp1dkvdjfbvqjvysvc44r"; - ncurses = pkgsi686Linux.ncurses5; - }; - gcc-arm-embedded-6 = callPackage ../development/compilers/gcc-arm-embedded/6 {}; - gcc-arm-embedded-7 = callPackage ../development/compilers/gcc-arm-embedded/7 {}; - gcc-arm-embedded = gcc-arm-embedded-7; - gforth = callPackage ../development/compilers/gforth {}; gtk-server = callPackage ../development/interpreters/gtk-server {}; @@ -6935,6 +6922,8 @@ with pkgs; go-repo-root = callPackage ../development/tools/go-repo-root { }; + go-junit-report = callPackage ../development/tools/go-junit-report { }; + gox = callPackage ../development/tools/gox { }; gprolog = callPackage ../development/compilers/gprolog { }; @@ -7186,10 +7175,6 @@ with pkgs; manticore = callPackage ../development/compilers/manticore { }; - mentorToolchains = recurseIntoAttrs ( - pkgsi686Linux.callPackage ../development/compilers/mentor {} - ); - mercury = callPackage ../development/compilers/mercury { }; microscheme = callPackage ../development/compilers/microscheme { }; @@ -7222,16 +7207,6 @@ with pkgs; mono5 = mono58; mono4 = mono48; - mono40 = lowPrio (callPackage ../development/compilers/mono/4.0.nix { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) Foundation; - }); - - mono44 = lowPrio (callPackage ../development/compilers/mono/4.4.nix { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) Foundation; - }); - mono46 = lowPrio (callPackage ../development/compilers/mono/4.6.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Foundation; @@ -7339,8 +7314,9 @@ with pkgs; inherit (rust) cargo rustc; buildRustCrate = callPackage ../build-support/rust/build-rust-crate { }; + buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { }; buildRustCrateTests = recurseIntoAttrs (callPackage ../build-support/rust/build-rust-crate/test { }).tests; - + cratesIO = callPackage ../build-support/rust/crates-io.nix { }; cargo-vendor = callPackage ../build-support/rust/cargo-vendor { }; cargo-web = callPackage ../development/tools/cargo-web { @@ -7377,12 +7353,15 @@ with pkgs; cargo-asm = callPackage ../development/tools/rust/cargo-asm { }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; + pyo3-pack = callPackage ../development/tools/rust/pyo3-pack { }; rainicorn = callPackage ../development/tools/rust/rainicorn { }; rustfmt = callPackage ../development/tools/rust/rustfmt { }; rustracer = callPackage ../development/tools/rust/racer { }; rustracerd = callPackage ../development/tools/rust/racerd { }; rust-bindgen = callPackage ../development/tools/rust/bindgen { }; - rust-cbindgen = callPackage ../development/tools/rust/cbindgen { }; + rust-cbindgen = callPackage ../development/tools/rust/cbindgen { + inherit (darwin.apple_sdk.frameworks) Security; + }; rustup = callPackage ../development/tools/rust/rustup { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -7395,6 +7374,7 @@ with pkgs; scala_2_12 = callPackage ../development/compilers/scala { jre = jre8; }; scala = scala_2_12; + scalafix = callPackage ../development/tools/scalafix { }; scalafmt = callPackage ../development/tools/scalafmt { }; sdcc = callPackage ../development/compilers/sdcc { @@ -7978,17 +7958,17 @@ with pkgs; amtk = callPackage ../development/libraries/amtk { }; - avrgcclibc = throw "avrgcclibs are now separate packages, install avrbinutils, avrgcc and avrlibc"; - - avrbinutils = callPackage ../development/misc/avr/binutils {}; - - avrgcc = callPackage ../development/misc/avr/gcc {}; - - avrlibc = callPackage ../development/misc/avr/libc {}; + avrlibc = callPackage ../development/misc/avr/libc {}; + avrlibcCross = callPackage ../development/misc/avr/libc { + stdenv = crossLibcStdenv; + }; avr8burnomat = callPackage ../development/misc/avr8-burn-omat { }; - betaflight = callPackage ../development/misc/stm32/betaflight { }; + betaflight = callPackage ../development/misc/stm32/betaflight { + gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; + binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; + }; sourceFromHead = callPackage ../build-support/source-from-head-fun.nix {}; @@ -8024,7 +8004,10 @@ with pkgs; guile = guile_2_0; }; - inav = callPackage ../development/misc/stm32/inav { }; + inav = callPackage ../development/misc/stm32/inav { + gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; + binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; + }; pharo-vms = callPackage ../development/pharo/vm { }; pharo = pharo-vms.multi-vm-wrapper; @@ -8182,6 +8165,8 @@ with pkgs; blackmagic = callPackage ../development/tools/misc/blackmagic { stdenv = overrideCC stdenv gcc6; + gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; + binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; bloaty = callPackage ../development/tools/bloaty { }; @@ -8976,10 +8961,6 @@ with pkgs; qcachegrind = libsForQt5.callPackage ../development/tools/analysis/qcachegrind {}; - verasco = ocaml-ng.ocamlPackages_4_02.verasco.override { - coq = coq_8_4; - }; - visualvm = callPackage ../development/tools/java/visualvm { }; vultr = callPackage ../development/tools/vultr { }; @@ -9733,6 +9714,8 @@ with pkgs; /**/ if name == "glibc" then targetPackages.glibcCross or glibcCross else if name == "bionic" then targetPackages.bionic else if name == "uclibc" then targetPackages.uclibcCross + else if name == "avrlibc" then targetPackages.avrlibcCross or avrlibcCross + else if name == "newlib" then targetPackages.newlibCross or newlibCross else if name == "musl" then targetPackages.muslCross or muslCross else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64 else if stdenv.targetPlatform.useiOSPrebuilt then targetPackages.darwin.iosSdkPkgs.libraries @@ -11495,7 +11478,9 @@ with pkgs; }; libnghttp2 = nghttp2.lib; - nix-plugins = callPackage ../development/libraries/nix-plugins {}; + nix-plugins = callPackage ../development/libraries/nix-plugins { + nix = nixUnstable; + }; nlohmann_json = callPackage ../development/libraries/nlohmann_json { }; @@ -12192,7 +12177,11 @@ with pkgs; graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {}; - simavr = callPackage ../development/tools/simavr { }; + simavr = callPackage ../development/tools/simavr { + avrgcc = pkgsCross.avr.buildPackages.gcc; + avrbinutils = pkgsCross.avr.buildPackages.binutils; + avrlibc = pkgsCross.avr.libcCross; + }; simgear = callPackage ../development/libraries/simgear { }; @@ -12714,6 +12703,7 @@ with pkgs; wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix { inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel; inherit (darwin.stubs) setfile rez derez; + inherit (darwin) cf-private; }; wxSVG = callPackage ../development/libraries/wxSVG { @@ -13529,6 +13519,8 @@ with pkgs; mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; + miniflux = callPackage ../servers/miniflux { }; + nagios = callPackage ../servers/monitoring/nagios { }; munin = callPackage ../servers/monitoring/munin { }; @@ -13582,22 +13574,23 @@ with pkgs; pgbouncer = callPackage ../servers/sql/pgbouncer { }; - pgpool93 = pgpool.override { postgresql = postgresql93; }; - pgpool94 = pgpool.override { postgresql = postgresql94; }; + pgpool93 = pgpool.override { postgresql = postgresql_9_3; }; + pgpool94 = pgpool.override { postgresql = postgresql_9_4; }; pgpool = callPackage ../servers/sql/pgpool { pam = if stdenv.isLinux then pam else null; libmemcached = null; # Detection is broken upstream }; - postgresql = postgresql96; + postgresql = postgresql_9_6; inherit (callPackages ../servers/sql/postgresql { }) - postgresql93 - postgresql94 - postgresql95 - postgresql96 - postgresql100; + postgresql_9_3 + postgresql_9_4 + postgresql_9_5 + postgresql_9_6 + postgresql_10 + postgresql_11; postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; @@ -15988,13 +15981,18 @@ with pkgs; bookworm = callPackage ../applications/office/bookworm { }; - chromium = callPackage ../applications/networking/browsers/chromium { + chromium = callPackage ../applications/networking/browsers/chromium ({ channel = "stable"; pulseSupport = config.pulseaudio or true; enablePepperFlash = config.chromium.enablePepperFlash or false; enableWideVine = config.chromium.enableWideVine or false; - gnome = gnome2; - }; + } // (if stdenv.isAarch64 then { + stdenv = gcc8Stdenv; + } else { + llvmPackages = llvmPackages_7; + stdenv = llvmPackages_7.stdenv; + }) + ); chronos = callPackage ../applications/networking/cluster/chronos { }; @@ -17457,6 +17455,8 @@ with pkgs; jwm = callPackage ../applications/window-managers/jwm { }; + jwm-settings-manager = callPackage ../applications/window-managers/jwm/jwm-settings-manager.nix { }; + k3d = callPackage ../applications/graphics/k3d { inherit (pkgs.gnome2) gtkglext; stdenv = overrideCC stdenv gcc6; @@ -18279,7 +18279,10 @@ with pkgs; opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {}; - opentx = callPackage ../applications/misc/opentx { }; + opentx = callPackage ../applications/misc/opentx { + gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; + binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; + }; opera = callPackage ../applications/networking/browsers/opera {}; @@ -19022,6 +19025,8 @@ with pkgs; apiKey = config.libspotify.apiKey or null; }; + sourcetrail = callPackage ../development/tools/sourcetrail { }; + spotifywm = callPackage ../applications/audio/spotifywm { }; squeezelite = callPackage ../applications/audio/squeezelite { }; @@ -19142,6 +19147,8 @@ with pkgs; taskjuggler = callPackage ../applications/misc/taskjuggler { }; + tabula = callPackage ../applications/misc/tabula { }; + tasknc = callPackage ../applications/misc/tasknc { }; taskwarrior = callPackage ../applications/misc/taskwarrior { }; @@ -21344,7 +21351,7 @@ with pkgs; ocamlPackages_4_05 ; }) mkCoqPackages - coq_8_4 coq_8_5 coq_8_6 coq_8_7 coq_8_8 + coq_8_5 coq_8_6 coq_8_7 coq_8_8 coqPackages_8_5 coqPackages_8_6 coqPackages_8_7 coqPackages_8_8 coqPackages coq ; @@ -21958,14 +21965,9 @@ with pkgs; gnome-breeze = callPackage ../misc/themes/gnome-breeze { }; gnuk = callPackage ../misc/gnuk { - gcc-arm-embedded = gcc-arm-embedded-4_9; + gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; + binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; - gnuk-unstable = lowPrio (callPackage ../misc/gnuk/unstable.nix { - gcc-arm-embedded = gcc-arm-embedded-4_9; - }); - gnuk-git = lowPrio (callPackage ../misc/gnuk/git.nix { - gcc-arm-embedded = gcc-arm-embedded-4_9; - }); greybird = callPackage ../misc/themes/greybird { }; @@ -22123,6 +22125,8 @@ with pkgs; nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; }; + nixdoc = callPackage ../tools/nix/nixdoc {}; + nix-bundle = callPackage ../tools/package-management/nix-bundle { }; nix-delegate = haskell.lib.justStaticExecutables haskellPackages.nix-delegate; @@ -22698,9 +22702,7 @@ with pkgs; tomb = callPackage ../os-specific/linux/tomb {}; - tomboy = callPackage ../applications/misc/tomboy { - mono = mono46; - }; + tomboy = callPackage ../applications/misc/tomboy { }; imatix_gsl = callPackage ../development/tools/imatix_gsl {}; @@ -22811,4 +22813,16 @@ with pkgs; }; tsung = callPackage ../applications/networking/tsung {}; + + qmk_firmware = callPackage ../development/misc/qmk_firmware { + avrgcc = pkgsCross.avr.buildPackages.gcc; + avrbinutils = pkgsCross.avr.buildPackages.binutils; + gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; + binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; + }; + + newlib = callPackage ../development/misc/newlib { }; + newlibCross = callPackage ../development/misc/newlib { + stdenv = crossLibcStdenv; + }; } diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 75e9506ac049..a4f44b6fc6f7 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -56,9 +56,6 @@ in rec { let self = mkCoqPackages' self coq; in filterCoqPackages coq self; - coq_8_4 = callPackage ../applications/science/logic/coq/8.4.nix { - inherit (ocamlPackages_4_02) ocaml findlib lablgtk camlp5; - }; coq_8_5 = callPackage ../applications/science/logic/coq { ocamlPackages = ocamlPackages_4_05; version = "8.5pl3"; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 3bf7c31b7008..78ca0d20908d 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -31,7 +31,9 @@ in libcxxabi = pkgs.libcxxabi; }; - cf-private = callPackage ../os-specific/darwin/cf-private { inherit (darwin) CF apple_sdk; }; + cf-private = callPackage ../os-specific/darwin/cf-private { + inherit (darwin) CF apple_sdk osx_private_sdk; + }; DarwinTools = callPackage ../os-specific/darwin/DarwinTools { }; @@ -74,7 +76,7 @@ in CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { }; CF = callPackage ../os-specific/darwin/swift-corelibs/corefoundation.nix { inherit (darwin) objc4 ICU; }; - + # As the name says, this is broken, but I don't want to lose it since it's a direction we want to go in # libdispatch-broken = callPackage ../os-specific/darwin/swift-corelibs/libdispatch.nix { inherit (darwin) apple_sdk_sierra xnu; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 9f9bba933a17..2f6992e1c9a5 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1024,12 +1024,6 @@ let omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { }; - verasco = callPackage ../development/tools/analysis/verasco ( - if system == "x86_64-linux" - then { tools = pkgs.pkgsi686Linux.stdenv.cc; } - else {} - ); - google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 93aee66a567e..b2cff4940c13 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -708,6 +708,8 @@ in { aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { }; + aioprocessing = callPackage ../development/python-modules/aioprocessing { }; + ajpy = callPackage ../development/python-modules/ajpy { }; alabaster = callPackage ../development/python-modules/alabaster {}; @@ -971,12 +973,8 @@ in { cypari2 = callPackage ../development/python-modules/cypari2 { }; - dlib = buildPythonPackage rec { - inherit (pkgs.dlib) name src nativeBuildInputs meta buildInputs; - - patches = [ ../development/python-modules/dlib/build-cores.patch ]; - - checkInputs = with self; [ pytest ]; + dlib = callPackage ../development/python-modules/dlib { + inherit (pkgs) dlib; }; datadog = callPackage ../development/python-modules/datadog {}; @@ -4682,7 +4680,11 @@ in { PyStemmer = callPackage ../development/python-modules/pystemmer {}; - Pyro = callPackage ../development/python-modules/pyro { }; + serpent = callPackage ../development/python-modules/serpent { }; + + selectors34 = callPackage ../development/python-modules/selectors34 { }; + + Pyro4 = callPackage ../development/python-modules/pyro4 { }; pyrsistent = buildPythonPackage (rec { name = "pyrsistent-0.11.12"; @@ -6745,23 +6747,7 @@ in { }; }; - - sh = buildPythonPackage rec { - name = "sh-1.11"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/sh/${name}.tar.gz"; - sha256 = "590fb9b84abf8b1f560df92d73d87965f1e85c6b8330f8a5f6b336b36f0559a4"; - }; - - doCheck = false; - - meta = { - description = "Python subprocess interface"; - homepage = https://pypi.python.org/pypi/sh/; - }; - }; - + sh = callPackage ../development/python-modules/sh { }; sipsimple = buildPythonPackage rec { name = "sipsimple-${version}"; diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 89a8af6794f6..755297264625 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -12,6 +12,12 @@ with import ./release-lib.nix { inherit supportedSystems scrubJobs; }; let nativePlatforms = all; + embedded = { + buildPackages.binutils = nativePlatforms; + buildPackages.gcc = nativePlatforms; + libcCross = nativePlatforms; + }; + common = { buildPackages.binutils = nativePlatforms; gmp = nativePlatforms; @@ -134,6 +140,13 @@ in android64 = mapTestOnCross lib.systems.examples.aarch64-android-prebuilt (linuxCommon // { }); + avr = mapTestOnCross lib.systems.examples.avr embedded; + arm-embedded = mapTestOnCross lib.systems.examples.arm-embedded embedded; + powerpc-embedded = mapTestOnCross lib.systems.examples.powerpc-embedded embedded; + aarch64-embedded = mapTestOnCross lib.systems.examples.aarch64-embedded embedded; + i686-embedded = mapTestOnCross lib.systems.examples.i686-embedded embedded; + x86_64-embedded = mapTestOnCross lib.systems.examples.x86_64-embedded embedded; + /* Cross-built bootstrap tools for every supported platform */ bootstrapTools = let tools = import ../stdenv/linux/make-bootstrap-tools-cross.nix { system = "x86_64-linux"; };