diff --git a/.mention-bot b/.mention-bot index d8529bd9123..33c7e41c1dc 100644 --- a/.mention-bot +++ b/.mention-bot @@ -2,7 +2,8 @@ "userBlacklist": [ "civodul", "jhasse", - "shlevy" + "shlevy", + "bbenoist" ], "alwaysNotifyForPaths": [ { "name": "FRidh", "files": ["pkgs/top-level/python-packages.nix", "pkgs/development/interpreters/python/*", "pkgs/development/python-modules/*" ] }, diff --git a/.travis.yml b/.travis.yml index bed82810d46..2bd784ed30a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,14 @@ language: nix +sudo: true +# 'sudo: false' == containers that start fast, but only get 4G ram; +# 'sudo: true' == VMs that start slow, but with 8G +# ..as per: https://docs.travis-ci.com/user/ci-environment/#Virtualization-environments +# Nixpkgs PR tests OOM with 4G: https://github.com/NixOS/nixpkgs/issues/24200 + matrix: include: - os: linux - sudo: false + sudo: required script: - ./maintainers/scripts/travis-nox-review-pr.sh nixpkgs-verify nixpkgs-manual nixpkgs-tarball nixpkgs-unstable - ./maintainers/scripts/travis-nox-review-pr.sh nixos-options nixos-manual diff --git a/README.md b/README.md index 002caa3a171..1d5fbd218e2 100644 --- a/README.md +++ b/README.md @@ -13,12 +13,12 @@ build daemon as so-called channels. To get channel information via git, add ``` For stability and maximum binary package support, it is recommended to maintain -custom changes on top of one of the channels, e.g. `nixos-16.09` for the latest +custom changes on top of one of the channels, e.g. `nixos-17.03` for the latest release and `nixos-unstable` for the latest successful build of master: ``` % git remote update channels -% git rebase channels/nixos-16.09 +% git rebase channels/nixos-17.03 ``` For pull-requests, please rebase onto nixpkgs `master`. @@ -32,9 +32,9 @@ For pull-requests, please rebase onto nixpkgs `master`. * [Manual (NixOS)](https://nixos.org/nixos/manual/) * [Nix Wiki](https://nixos.org/wiki/) (deprecated, see milestone ["Move the Wiki!"](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22Move+the+wiki%21%22)) * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined) -* [Continuous package builds for 16.09 release](https://hydra.nixos.org/jobset/nixos/release-16.09) +* [Continuous package builds for 17.03 release](https://hydra.nixos.org/jobset/nixos/release-17.03) * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) -* [Tests for 16.09 release](https://hydra.nixos.org/job/nixos/release-16.09/tested#tabs-constituents) +* [Tests for 17.03 release](https://hydra.nixos.org/job/nixos/release-17.03/tested#tabs-constituents) Communication: diff --git a/default.nix b/default.nix index 8171f4149d2..a4896a9bbee 100644 --- a/default.nix +++ b/default.nix @@ -2,7 +2,17 @@ let requiredVersion = import ./lib/minver.nix; in if ! builtins ? nixVersion || builtins.compareVersions requiredVersion builtins.nixVersion == 1 then - abort "This version of Nixpkgs requires Nix >= ${requiredVersion}, please upgrade! See https://nixos.org/wiki/How_to_update_when_Nix_is_too_old_to_evaluate_Nixpkgs" + abort '' + + This version of Nixpkgs requires Nix >= ${requiredVersion}, please upgrade: + + - If you are running NixOS, use `nixos-rebuild' to upgrade your system. + + - If you installed Nix using the install script (https://nixos.org/nix/install), + it is safe to upgrade by running it again: + + curl https://nixos.org/nix/install | sh + '' else diff --git a/doc/default.nix b/doc/default.nix index eaf3bb8d7a8..540a209c2ac 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -68,6 +68,10 @@ pkgs.stdenv.mkDerivation { inputFile = ../pkgs/development/r-modules/README.md; outputFile = "languages-frameworks/r.xml"; } + + toDocbook { + inputFile = ./languages-frameworks/rust.md; + outputFile = "./languages-frameworks/rust.xml"; + } + toDocbook { inputFile = ./languages-frameworks/vim.md; outputFile = "./languages-frameworks/vim.xml"; diff --git a/doc/functions.xml b/doc/functions.xml index efe2590ddfb..4e7159638ca 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -529,7 +529,7 @@ If you see errors similar to getProtocolByName: does not exist (no such protocol name: tcp) - you may need to add pkgs.iana_etc to contents. + you may need to add pkgs.iana-etc to contents. diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 32a89860ec8..fc15d847d15 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -27,6 +27,7 @@ such as Perl or Haskell. These are described in this chapter. + diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index 87b5668740d..da7706726b4 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -3,7 +3,7 @@ ## User Guide Several versions of Python are available on Nix as well as a high amount of -packages. The default interpreter is CPython 3.5. +packages. The default interpreter is CPython 2.7. ### Using Python @@ -131,7 +131,7 @@ specify some (optional) [meta information](http://nixos.org/nixpkgs/manual/#chap The output of the function is a derivation, which is an attribute with the name `toolz` of the set `pythonPackages`. Actually, sets are created for all interpreter versions, -so `python27Packages`, `python34Packages`, `python35Packages` and `pypyPackages`. +so e.g. `python27Packages`, `python35Packages` and `pypyPackages`. The above example works when you're directly working on `pkgs/top-level/python-packages.nix` in the Nixpkgs repository. Often though, @@ -422,8 +422,8 @@ and in this case the `python35` interpreter is automatically used. ### Interpreters -Versions 2.6, 2.7, 3.3, 3.4 and 3.5 of the CPython interpreter are available as respectively -`python26`, `python27`, `python33`, `python34` and `python35`. The PyPy interpreter +Versions 2.7, 3.3, 3.4, 3.5 and 3.6 of the CPython interpreter are available as +respectively `python27`, `python33`, `python34`, `python35` and `python36`. The PyPy interpreter is available as `pypy`. The aliases `python2` and `python3` correspond to respectively `python27` and `python35`. The default interpreter, `python`, maps to `python2`. The Nix expressions for the interpreters can be found in @@ -472,6 +472,7 @@ sets are * `pkgs.python33Packages` * `pkgs.python34Packages` * `pkgs.python35Packages` +* `pkgs.python36Packages` * `pkgs.pypyPackages` and the aliases @@ -674,8 +675,8 @@ deterministic bytecode. This has security implications and is relevant for those using Python in a `nix-shell`. When the environment variable `DETERMINISTIC_BUILD` is set, all bytecode will have timestamp 1. -The `buildPythonPackage` function sets `DETERMINISTIC_BUILD` as well as -[PYTHONHASHSEED](https://docs.python.org/3.5/using/cmdline.html#envvar-PYTHONHASHSEED). +The `buildPythonPackage` function sets `DETERMINISTIC_BUILD=1` and +[PYTHONHASHSEED=0](https://docs.python.org/3.5/using/cmdline.html#envvar-PYTHONHASHSEED). Both are also exported in `nix-shell`. @@ -897,6 +898,27 @@ is executed it will attempt to download the python modules listed in requirements.txt. However these will be cached locally within the `virtualenv` folder and not downloaded again. +### How to override a Python package from `configuration.nix`? + +If you need to change a package's attribute(s) from `configuration.nix` you could do: + +```nix + nixpkgs.config.packageOverrides = superP: { + pythonPackages = superP.pythonPackages.override { + overrides = self: super: { + bepasty-server = super.bepasty-server.overrideAttrs ( oldAttrs: { + src = pkgs.fetchgit { + url = "https://github.com/bepasty/bepasty-server"; + sha256 = "9ziqshmsf0rjvdhhca55sm0x8jz76fsf2q4rwh4m6lpcf8wr0nps"; + rev = "e2516e8cf4f2afb5185337073607eb9e84a61d2d"; + }; + }); + }; + }; + }; +``` + +If you are using the `bepasty-server` package somewhere, for example in `systemPackages` or indirectly from `services.bepasty`, then a `nixos-rebuild switch` will rebuild the system but with the `bepasty-server` package using a different `src` attribute. This way one can modify `python` based software/libraries easily. Using `self` and `super` one can also alter dependencies (`buildInputs`) between the old state (`self`) and new state (`super`). ## Contributing diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.md new file mode 100644 index 00000000000..657e1642d2d --- /dev/null +++ b/doc/languages-frameworks/rust.md @@ -0,0 +1,91 @@ +--- +title: Rust +author: Matthias Beyer +date: 2017-03-05 +--- + +# User's Guide to the Rust Infrastructure + +To install the rust compiler and cargo put + +``` +rustStable.rustc +rustStable.cargo +``` + +into the `environment.systemPackages` or bring them into scope with +`nix-shell -p rustStable.rustc -p rustStable.cargo`. + +There are also `rustBeta` and `rustNightly` package sets available. +These are not updated very regulary. For daily builds see +[Using the Rust nightlies overlay](#using-the-rust-nightlies-overlay) + +## Packaging Rust applications + +Rust applications are packaged by using the `buildRustPackage` helper from `rustPlatform`: + +``` +with rustPlatform; + +buildRustPackage rec { + name = "ripgrep-${version}"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "BurntSushi"; + repo = "ripgrep"; + rev = "${version}"; + sha256 = "0y5d1n6hkw85jb3rblcxqas2fp82h3nghssa4xqrhqnz25l799pj"; + }; + + depsSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx"; + + meta = with stdenv.lib; { + description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep"; + homepage = https://github.com/BurntSushi/ripgrep; + license = with licenses; [ unlicense ]; + maintainers = [ maintainers.tailhook ]; + platforms = platforms.all; + }; +} +``` + +`buildRustPackage` requires a `depsSha256` attribute which is computed over +all crate sources of this package. Currently it is obtained by inserting a +fake checksum into the expression and building the package once. The correct +checksum can be then take from the failed build. + +To install crates with nix there is also an experimental project called +[nixcrates](https://github.com/fractalide/nixcrates). + +## Using the Rust nightlies overlay + +Mozilla provides an overlay for nixpkgs to bring a nightly version of Rust into scope. +This overlay can _also_ be used to install recent unstable or stable versions +of Rust, if desired. + +To use this overlay, clone +[nixpkgs-mozilla](https://github.com/mozilla/nixpkgs-mozilla), +and create a symbolic link to the file +[rust-overlay.nix](https://github.com/mozilla/nixpkgs-mozilla/blob/master/rust-overlay.nix) +in the `~/.config/nixpkgs/overlays` directory. + + $ git clone https://github.com/mozilla/nixpkgs-mozilla.git + $ mkdir -p ~/.config/nixpkgs/overlays + $ ln -s $(pwd)/nixpkgs-mozilla/rust-overlay.nix ~/.config/nixpkgs/overlays/rust-overlay.nix + +The latest version can be installed with the following command: + + $ nix-env -Ai nixos.rustChannels.stable.rust + +Or using the attribute with nix-shell: + + $ nix-shell -p nixos.rustChannels.stable.rust + +To install the beta or nightly channel, "stable" should be substituted by +"nightly" or "beta", or +use the function provided by this overlay to pull a version based on a +build date. + +The overlay automatically updates itself as it uses the same source as +[rustup](https://www.rustup.rs/). diff --git a/doc/overlays.xml b/doc/overlays.xml index 540c83e0a39..4b95f3e7288 100644 --- a/doc/overlays.xml +++ b/doc/overlays.xml @@ -34,7 +34,7 @@ first one present is considered, and all the rest are ignored: - In the directory ~/.nixpkgs/overlays/. + In the directory ~/.config/nixpkgs/overlays/. @@ -50,7 +50,7 @@ the same recipe. In the case where overlays are loaded from a directory, they ar alphabetical order. To install an overlay using the last option, you can clone the overlay's repository and add -a symbolic link to it in ~/.nixpkgs/overlays/ directory. +a symbolic link to it in ~/.config/nixpkgs/overlays/ directory. diff --git a/lib/attrsets.nix b/lib/attrsets.nix index c1bd764c70d..f9e6b7495fc 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -1,12 +1,12 @@ # Operations on attribute sets. -with { +let inherit (builtins) head tail length; inherit (import ./trivial.nix) or; inherit (import ./default.nix) fold; inherit (import ./strings.nix) concatStringsSep; inherit (import ./lists.nix) concatMap concatLists all deepSeqList; -}; +in rec { inherit (builtins) attrNames listToAttrs hasAttr isAttrs getAttr; diff --git a/lib/lists.nix b/lib/lists.nix index 5e224921de8..82d5ba0124c 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -16,17 +16,22 @@ rec { */ singleton = x: [x]; - /* "Fold" a binary function `op' between successive elements of - `list' with `nul' as the starting value, i.e., `fold op nul [x_1 - x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))'. (This is - Haskell's foldr). + /* “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 = fold (a: b: a + b) "z" + concat = foldr (a: b: a + b) "z" concat [ "a" "b" "c" ] => "abcz" + # different types + strange = foldr (int: str: toString (int + 1) + str) "a" + strange [ 1 2 3 4 ] + => "2345a" */ - fold = op: nul: list: + foldr = op: nul: list: let len = length list; fold' = n: @@ -35,13 +40,25 @@ rec { else op (elemAt list n) (fold' (n + 1)); in fold' 0; - /* Left fold: `fold op nul [x_1 x_2 ... x_n] == op (... (op (op nul - x_1) x_2) ... x_n)'. + /* `fold' is an alias of `foldr' for historic reasons */ + # FIXME(Profpatsch): deprecate? + fold = foldr; + + + /* “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 Example: lconcat = foldl (a: b: a + b) "z" lconcat [ "a" "b" "c" ] => "zabc" + # different types + lstrange = foldl (str: int: str + toString (int + 1)) "" + strange [ 1 2 3 4 ] + => "a2345" */ foldl = op: nul: list: let @@ -52,7 +69,7 @@ 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 @@ -140,7 +157,7 @@ rec { any isString [ 1 { } ] => false */ - any = builtins.any or (pred: fold (x: y: if pred x then true else y) false); + 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'. @@ -151,7 +168,7 @@ rec { all (x: x < 3) [ 1 2 3 ] => false */ - all = builtins.all or (pred: fold (x: y: if pred x then y else false) true); + 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'. @@ -219,7 +236,7 @@ rec { => { right = [ 5 3 4 ]; wrong = [ 1 2 ]; } */ partition = builtins.partition or (pred: - fold (h: t: + foldr (h: t: if pred h then { right = [h] ++ t.right; wrong = t.wrong; } else { right = t.right; wrong = [h] ++ t.wrong; } diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 0c90d2cadd2..c3ab790e7c7 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -14,6 +14,7 @@ aboseley = "Adam Boseley "; abuibrahim = "Ruslan Babayev "; acowley = "Anthony Cowley "; + adelbertc = "Adelbert Chang "; adev = "Adrien Devresse "; Adjective-Object = "Maxwell Huang-Hobbs "; adnelson = "Allen Nelson "; @@ -24,6 +25,7 @@ aforemny = "Alexander Foremny "; afranchuk = "Alex Franchuk "; aherrmann = "Andreas Herrmann "; + ahmedtd = "Taahir Ahmed "; ak = "Alexander Kjeldaas "; akaWolf = "Artjom Vejsel "; akc = "Anders Claesson "; @@ -59,7 +61,6 @@ badi = "Badi' Abdul-Wahid "; balajisivaraman = "Balaji Sivaraman"; Baughn = "Svein Ove Aas "; - bbenoist = "Baptist BENOIST "; bcarrell = "Brandon Carrell "; bcdarwin = "Ben Darwin "; bdimcheff = "Brandon Dimcheff "; @@ -82,6 +83,7 @@ bzizou = "Bruno Bzeznik "; c0dehero = "CodeHero "; calrama = "Moritz Maxeiner "; + calvertvl = "Victor Calvert "; campadrenalin = "Philip Horger "; canndrew = "Andrew Cann "; carlsverre = "Carl Sverre "; @@ -134,6 +136,7 @@ dgonyeo = "Derek Gonyeo "; dipinhora = "Dipin Hora "; dmalikov = "Dmitry Malikov "; + DmitryTsygankov = "Dmitry Tsygankov "; dmjio = "David Johnson "; dochang = "Desmond O. Chang "; domenkozar = "Domen Kozar "; @@ -141,6 +144,7 @@ dpaetzel = "David Pätzel "; drets = "Dmytro Rets "; drewkett = "Andrew Burkett "; + dsferruzza = "David Sferruzza "; dtzWill = "Will Dietz "; e-user = "Alexander Kahl "; ebzzry = "Rommel Martinez "; @@ -180,6 +184,7 @@ ftrvxmtrx = "Siarhei Zirukin "; funfunctor = "Edward O'Callaghan "; fuuzetsu = "Mateusz Kowalczyk "; + fuzzy-id = "Thomas Bach "; fxfactorial = "Edgar Aroutiounian "; gal_bolle = "Florent Becker "; garbas = "Rok Garbas "; @@ -215,6 +220,7 @@ ivan-tkatchev = "Ivan Tkatchev "; j-keck = "Jürgen Keck "; jagajaga = "Arseniy Seroka "; + jansol = "Jan Solanti "; javaguirre = "Javier Aguirre "; jb55 = "William Casarin "; jbedo = "Justin Bedő "; @@ -237,6 +243,7 @@ jonafato = "Jon Banafato "; jpbernardy = "Jean-Philippe Bernardy "; jpierre03 = "Jean-Pierre PRUNARET "; + jpotier = "Martin Potier "; jraygauthier = "Raymond Gauthier "; juliendehos = "Julien Dehos "; jwiegley = "John Wiegley "; @@ -314,6 +321,7 @@ michalrus = "Michal Rus "; michelk = "Michel Kuhlmann "; mikefaille = "Michaël Faille "; + miltador = "Vasiliy Solovey "; mimadrid = "Miguel Madrid "; mingchuan = "Ming Chuan "; mirdhyn = "Merlin Gaillard "; @@ -344,6 +352,7 @@ nathan-gs = "Nathan Bijnens "; nckx = "Tobias Geerinckx-Rice "; ndowens = "Nathan Owens "; + neeasade = "Nathan Isom "; nequissimus = "Tim Steinbach "; nfjinjing = "Jinjing Wang "; nhooyr = "Anmol Sethi "; @@ -378,6 +387,7 @@ pashev = "Igor Pashev "; patternspandemic = "Brad Christensen "; pawelpacana = "Paweł Pacana "; + pbogdan = "Piotr Bogdan "; periklis = "theopompos@gmail.com"; pesterhazy = "Paulus Esterhazy "; peterhoeg = "Peter Hoeg "; @@ -394,6 +404,7 @@ pjones = "Peter Jones "; pkmx = "Chih-Mao Chen "; plcplc = "Philip Lykke Carlsen "; + plumps = "Maksim Bronsky a + */ id = x: x; - # Constant function. + /* The constant function + Ignores the second argument. + Or: Construct 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; - # Named versions corresponding to some builtin operators. + + ## Named versions corresponding to some builtin operators. + + /* Concat two strings */ concat = x: y: x ++ y; + + /* boolean “or” */ or = x: y: x || y; + + /* boolean “and” */ and = x: y: x && y; + + /* Merge two attribute sets shallowly, right side trumps left + + Example: + mergeAttrs { a = 1; b = 2; } // { b = 3; c = 4; } + => { a = 1; b = 3; c = 4; } + */ mergeAttrs = x: y: x // y; + # Compute the fixed point of the given function `f`, which is usually an # attribute set that expects its final, non-recursive representation as an # argument: diff --git a/lib/types.nix b/lib/types.nix index 175cb7472bf..c834cc8e653 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -6,7 +6,7 @@ with import ./attrsets.nix; with import ./options.nix; with import ./trivial.nix; with import ./strings.nix; -with {inherit (import ./modules.nix) mergeDefinitions filterOverrides; }; +let inherit (import ./modules.nix) mergeDefinitions filterOverrides; in rec { diff --git a/maintainers/scripts/hydra-eval-failures.py b/maintainers/scripts/hydra-eval-failures.py index 6122dabb1e8..6bbc0a45e44 100755 --- a/maintainers/scripts/hydra-eval-failures.py +++ b/maintainers/scripts/hydra-eval-failures.py @@ -48,8 +48,8 @@ def get_maintainers(attr_name): @click.command() @click.option( '--jobset', - default="nixos/release-16.09", - help='Hydra project like nixos/release-16.09') + default="nixos/release-17.03", + help='Hydra project like nixos/release-17.03') def cli(jobset): """ Given a Hydra project, inspect latest evaluation diff --git a/maintainers/scripts/nix-diff.sh b/maintainers/scripts/nix-diff.sh new file mode 100755 index 00000000000..0c65e29cf43 --- /dev/null +++ b/maintainers/scripts/nix-diff.sh @@ -0,0 +1,277 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p coreutils gnugrep gnused + +################################################################################ +# nix-diff.sh # +################################################################################ +# This script "diffs" Nix profile generations. # +# # +# Example: # +################################################################################ +# > nix-diff.sh 90 92 # +# + gnumake-4.2.1 # +# + gnumake-4.2.1-doc # +# - htmldoc-1.8.29 # +################################################################################ +# The example shows that as of generation 92 and since generation 90, # +# gnumake-4.2.1 and gnumake-4.2.1-doc have been installed, while # +# htmldoc-1.8.29 has been removed. # +# # +# The example above shows the default, minimal output mode of this script. # +# For more features, run `nix-diff.sh -h` for usage instructions. # +################################################################################ + +usage() { + cat < diffs from generation A to generation B + ~N => diffs from the Nth newest generation (older than G) to G + A => diffs from generation A to G + * defaults to ~1 +EOF +} + +usage_tip() { + echo 'run `nix-diff.sh -h` for usage instructions' >&2 + exit 1 +} + +while getopts :hqlp:s opt; do + case $opt in + h) + usage + exit + ;; + q) + opt_query=1 + ;; + l) + opt_log=1 + ;; + p) + opt_profile=$OPTARG + ;; + s) + opt_profile=/nix/var/nix/profiles/system + ;; + \?) + echo "error: invalid option -$OPTARG" >&2 + usage_tip + ;; + esac +done +shift $((OPTIND-1)) + +if [ -n "$opt_profile" ]; then + if ! [ -L "$opt_profile" ]; then + echo "error: expecting \`$opt_profile\` to be a symbolic link" >&2 + usage_tip + fi +else + opt_profile=$(readlink ~/.nix-profile) + if (( $? != 0 )); then + echo 'error: unable to dereference `~/.nix-profile`' >&2 + echo 'specify the profile manually with the `-p` flag' >&2 + usage_tip + fi +fi + +list_gens() { + nix-env -p "$opt_profile" --list-generations \ + | sed -r 's:^\s*::' \ + | cut -d' ' -f1 +} + +current_gen() { + nix-env -p "$opt_profile" --list-generations \ + | grep -E '\(current\)\s*$' \ + | sed -r 's:^\s*::' \ + | cut -d' ' -f1 +} + +neg_gen() { + local i=0 from=$1 n=$2 tmp + for gen in $(list_gens | sort -rn); do + if ((gen < from)); then + tmp=$gen + ((i++)) + ((i == n)) && break + fi + done + if ((i < n)); then + echo -n "error: there aren't $n generation(s) older than" >&2 + echo " generation $from" >&2 + return 1 + fi + echo $tmp +} + +match() { + argv=("$@") + for i in $(seq $(($#-1))); do + if grep -E "^${argv[$i]}\$" <(echo "$1") >/dev/null; then + echo $i + return + fi + done + echo 0 +} + +case $(match "$1" '' '[0-9]+' '[0-9]+\.\.[0-9]+' '~[0-9]+') in + 1) + diffTo=$(current_gen) + diffFrom=$(neg_gen $diffTo 1) + (($? == 1)) && usage_tip + ;; + 2) + diffFrom=$1 + diffTo=$(current_gen) + ;; + 3) + diffFrom=${1%%.*} + diffTo=${1##*.} + ;; + 4) + diffTo=$(current_gen) + diffFrom=$(neg_gen $diffTo ${1#*~}) + (($? == 1)) && usage_tip + ;; + 0) + echo 'error: invalid invocation' >&2 + usage_tip + ;; +esac + +dirA="${opt_profile}-${diffFrom}-link" +dirB="${opt_profile}-${diffTo}-link" + +declare -a temp_files +temp_length() { + echo -n ${#temp_files[@]} +} +temp_make() { + temp_files[$(temp_length)]=$(mktemp) +} +temp_clean() { + rm -f ${temp_files[@]} +} +temp_name() { + echo -n "${temp_files[$(($(temp_length)-1))]}" +} +trap 'temp_clean' EXIT + +temp_make +versA=$(temp_name) +refs=$(nix-store -q --references "$dirA") +(( $? != 0 )) && exit 1 +echo "$refs" \ + | grep -v env-manifest.nix \ + | sort \ + > "$versA" + +print_tag() { + local gen=$1 + nix-env -p "$opt_profile" --list-generations \ + | grep -E "^\s*${gen}" \ + | sed -r 's:^\s*::' \ + | sed -r 's:\s*$::' +} + +if [ -n "$opt_query" ]; then + print_tag $diffFrom + cat "$versA" \ + | sed -r 's:^[^-]+-(.*)$: \1:' + + print_line=1 +fi + +if [ -n "$opt_log" ]; then + gens=$(for gen in $(list_gens); do + ((diffFrom < gen && gen < diffTo)) && echo $gen + done) + # Force the $diffTo generation to be included in this list, instead of using + # `gen <= diffTo` in the preceding loop, so we encounter an error upon the + # event of its nonexistence. + gens=$(echo "$gens" + echo $diffTo) +else + gens=$diffTo +fi + +temp_make +add=$(temp_name) +temp_make +rem=$(temp_name) +temp_make +out=$(temp_name) + +for gen in $gens; do + + [ -n "$print_line" ] && echo + + temp_make + versB=$(temp_name) + + dirB="${opt_profile}-${gen}-link" + refs=$(nix-store -q --references "$dirB") + (( $? != 0 )) && exit 1 + echo "$refs" \ + | grep -v env-manifest.nix \ + | sort \ + > "$versB" + + in=$(comm -3 -1 "$versA" "$versB") + sed -r 's:^[^-]*-(.*)$:\1+:' <(echo "$in") \ + | sort -f \ + > "$add" + + un=$(comm -3 -2 "$versA" "$versB") + sed -r 's:^[^-]*-(.*)$:\1-:' <(echo "$un") \ + | sort -f \ + > "$rem" + + cat "$rem" "$add" \ + | sort -f \ + | sed -r 's:(.*)-$:- \1:' \ + | sed -r 's:(.*)\+$:\+ \1:' \ + | grep -v '^$' \ + > "$out" + + if [ -n "$opt_query" -o -n "$opt_log" ]; then + + lines=$(wc -l "$out" | cut -d' ' -f1) + tag=$(print_tag "$gen") + (( $? != 0 )) && exit 1 + if [ $lines -eq 0 ]; then + echo "$tag (no change)" + else + echo "$tag" + fi + cat "$out" \ + | sed 's:^: :' + + print_line=1 + + else + echo "diffing from generation $diffFrom to $diffTo" + cat "$out" + fi + + versA=$versB + +done + +exit 0 diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml index 7cd5ce0002c..a2896cd7a13 100644 --- a/nixos/doc/manual/development/sources.xml +++ b/nixos/doc/manual/development/sources.xml @@ -8,7 +8,7 @@ By default, NixOS’s nixos-rebuild command uses the NixOS and Nixpkgs sources provided by the -nixos-unstable channel (kept in +nixos channel (kept in /nix/var/nix/profiles/per-user/root/channels/nixos). To modify NixOS, however, you should check out the latest sources from Git. This is as follows: @@ -27,8 +27,8 @@ a subdirectory of the Nixpkgs repository.) The remote channels refers to a read-only repository that tracks the Nixpkgs/NixOS channels (see for more information about channels). Thus, the Git branch -channels/nixos-14.12 will contain the latest built -and tested version available in the nixos-14.12 +channels/nixos-17.03 will contain the latest built +and tested version available in the nixos-17.03 channel. It’s often inconvenient to develop directly on the master @@ -39,9 +39,9 @@ branch based on your current NixOS version: $ nixos-version -14.04.273.ea1952b (Baboon) +17.09pre104379.6e0b727 (Hummingbird) -$ git checkout -b local ea1952b +$ git checkout -b local 6e0b727 Or, to base your local branch on the latest version available in a @@ -49,17 +49,17 @@ NixOS channel: $ git remote update channels -$ git checkout -b local channels/nixos-14.12 +$ git checkout -b local channels/nixos-17.03 -(Replace nixos-14.12 with the name of the channel +(Replace nixos-17.03 with the name of the channel you want to use.) You can use git merge or git rebase to keep your local branch in sync with the channel, e.g. $ git remote update channels -$ git merge channels/nixos-14.12 +$ git merge channels/nixos-17.03 You can use git cherry-pick to copy commits from @@ -87,7 +87,11 @@ $ ln -s /my/sources/nixpkgs ~/.nix-defexpr/nixpkgs You may want to delete the symlink ~/.nix-defexpr/channels_root to prevent root’s -NixOS channel from clashing with your own tree. +NixOS channel from clashing with your own tree (this may break the +command-not-found utility though). If you want to go back to the default +state, you may just remove the ~/.nix-defexpr +directory completely, log out and log in again and it should have been +recreated with a link to the root channels. + ${concatStringsSep "\n" (map (font: "${font}") config.fonts.fonts)} + + ${cache} + ${optionalString (pkgs.stdenv.isx86_64 && cfg.cache32Bit) '' + ${cache32} + ''} + + ''; + + # The configuration to be included in /etc/font/ + penultimateConf = pkgs.runCommand "font-penultimate-conf" {} '' + support_folder=$out/etc/fonts/conf.d + latest_folder=$out/etc/fonts/${latestVersion}/conf.d + + mkdir -p $support_folder + mkdir -p $latest_folder + + ln -s ${supportFontsConf} $support_folder/../fonts.conf + ln -s ${latestPkg.out}/etc/fonts/fonts.conf \ + $latest_folder/../fonts.conf + + # fontconfig-penultimate various configuration files + ln -s ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/*.conf \ + $support_folder + ln -s ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/*.conf \ + $latest_folder + + ln -s ${cacheConfSupport} $support_folder/00-nixos-cache.conf + ln -s ${cacheConfLatest} $latest_folder/00-nixos-cache.conf + + rm $support_folder/10-antialias.conf $latest_folder/10-antialias.conf + ln -s ${antialiasConf} $support_folder/10-antialias.conf + ln -s ${antialiasConf} $latest_folder/10-antialias.conf + + rm $support_folder/10-hinting.conf $latest_folder/10-hinting.conf + ln -s ${hintingConf} $support_folder/10-hinting.conf + ln -s ${hintingConf} $latest_folder/10-hinting.conf + + ${optionalString cfg.useEmbeddedBitmaps '' + rm $support_folder/10-no-embedded-bitmaps.conf + rm $latest_folder/10-no-embedded-bitmaps.conf + ''} + + rm $support_folder/10-subpixel.conf $latest_folder/10-subpixel.conf + ln -s ${subpixelConf} $support_folder/10-subpixel.conf + ln -s ${subpixelConf} $latest_folder/10-subpixel.conf + + ${optionalString (cfg.dpi != 0) '' + ln -s ${dpiConf} $support_folder/11-dpi.conf + ln -s ${dpiConf} $latest_folder/11-dpi.conf + ''} + + ${optionalString (!cfg.includeUserConf) '' + rm $support_folder/50-user.conf + rm $latest_folder/50-user.conf + ''} + + # 51-local.conf + rm $latest_folder/51-local.conf + substitute \ + ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/51-local.conf \ + $latest_folder/51-local.conf \ + --replace local.conf /etc/fonts/${latestVersion}/local.conf + + ln -s ${defaultFontsConf} $support_folder/52-default-fonts.conf + ln -s ${defaultFontsConf} $latest_folder/52-default-fonts.conf + + ${optionalString cfg.allowBitmaps '' + rm $support_folder/53-no-bitmaps.conf + rm $latest_folder/53-no-bitmaps.conf + ''} + + ${optionalString (!cfg.allowType1) '' + ln -s ${rejectType1} $support_folder/53-no-type1.conf + ln -s ${rejectType1} $latest_folder/53-no-type1.conf + ''} + ''; + + hintingConf = pkgs.writeText "fc-10-hinting.conf" '' + + + + + + + + ${fcBool cfg.hinting.enable} + + + ${fcBool cfg.hinting.autohint} + + + hintslight + + + + + ''; + + antialiasConf = pkgs.writeText "fc-10-antialias.conf" '' + + + + + + + + ${fcBool cfg.antialias} + + + + + ''; + + subpixelConf = pkgs.writeText "fc-10-subpixel.conf" '' + + + + + + + + ${cfg.subpixel.rgba} + + + lcd${cfg.subpixel.lcdfilter} + + + + + ''; + + dpiConf = pkgs.writeText "fc-11-dpi.conf" '' + + + + + + + ${toString cfg.dpi} + + + + + ''; + + defaultFontsConf = + let genDefault = fonts: name: + optionalString (fonts != []) '' + + ${name} + + ${concatStringsSep "" + (map (font: '' + ${font} + '') fonts)} + + + ''; + in + pkgs.writeText "fc-52-nixos-default-fonts.conf" '' + + + + + + ${genDefault cfg.defaultFonts.sansSerif "sans-serif"} + + ${genDefault cfg.defaultFonts.serif "serif"} + + ${genDefault cfg.defaultFonts.monospace "monospace"} + + + ''; + + rejectType1 = pkgs.writeText "fc-53-no-type1.conf" '' + + + + + + + + + Type 1 + + + + + + ''; + +in +{ + + options = { + + fonts = { + + fontconfig = { + + penultimate = { + enable = mkOption { + type = types.bool; + default = true; + description = '' + Enable fontconfig-penultimate settings to supplement the + NixOS defaults by providing per-font rendering defaults and + metric aliases. + ''; + }; + }; + + }; + }; + + }; + + config = mkIf (config.fonts.fontconfig.enable && cfg.enable) { + + fonts.fontconfig.confPackages = [ penultimateConf ]; + + }; + +} diff --git a/nixos/modules/config/fonts/fontconfig-ultimate.nix b/nixos/modules/config/fonts/fontconfig-ultimate.nix index ed6429dda08..e412146a039 100644 --- a/nixos/modules/config/fonts/fontconfig-ultimate.nix +++ b/nixos/modules/config/fonts/fontconfig-ultimate.nix @@ -43,7 +43,7 @@ in ultimate = { enable = mkOption { type = types.bool; - default = true; + default = false; description = '' Enable fontconfig-ultimate settings (formerly known as Infinality). Besides the customizable settings in this NixOS @@ -63,15 +63,6 @@ in none disables the substitutions. ''; }; - - preset = mkOption { - type = types.enum ["ultimate1" "ultimate2" "ultimate3" "ultimate4" "ultimate5" "osx" "windowsxp"]; - default = "ultimate3"; - description = '' - FreeType rendering settings preset. Any of the presets may be - customized by setting environment variables. - ''; - }; }; }; }; @@ -81,7 +72,6 @@ in config = mkIf (config.fonts.fontconfig.enable && cfg.enable) { fonts.fontconfig.confPackages = [ confPkg ]; - environment.variables."INFINALITY_FT" = cfg.preset; }; diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 5648b7b1d02..d44b583447a 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -75,23 +75,23 @@ let cfg = config.fonts.fontconfig; - - + + ${fcBool cfg.hinting.enable} - + ${fcBool cfg.hinting.autohint} - - hint${cfg.hinting.style} + + hintslight - + ${fcBool cfg.antialias} - + ${cfg.subpixel.rgba} - + lcd${cfg.subpixel.lcdfilter} @@ -104,13 +104,6 @@ let cfg = config.fonts.fontconfig; ''} - - - - ${fcBool cfg.forceAutohint} - - - ''; @@ -174,13 +167,6 @@ let cfg = config.fonts.fontconfig; - - - - ${fcBool cfg.renderMonoTTFAsBitmap} - - - ''; @@ -304,7 +290,11 @@ in antialias = mkOption { type = types.bool; default = true; - description = "Enable font antialiasing."; + description = '' + Enable font antialiasing. At high resolution (> 200 DPI), + antialiasing has no visible effect; users of such displays may want + to disable this option. + ''; }; dpi = mkOption { @@ -320,7 +310,7 @@ in type = types.lines; default = ""; description = '' - System-wide customization file contents, has higher priority than + System-wide customization file contents, has higher priority than defaultFonts settings. ''; }; @@ -358,26 +348,21 @@ in enable = mkOption { type = types.bool; default = true; - description = "Enable TrueType hinting."; + description = '' + Enable font hinting. Hinting aligns glyphs to pixel boundaries to + improve rendering sharpness at low resolution. At high resolution + (> 200 dpi) hinting will do nothing (at best); users of such + displays may want to disable this option. + ''; }; autohint = mkOption { type = types.bool; - default = true; + default = false; description = '' - Enable the autohinter, which provides hinting for otherwise - un-hinted fonts. The results are usually lower quality than - correctly-hinted fonts. - ''; - }; - - style = mkOption { - type = types.enum ["none" "slight" "medium" "full"]; - default = "full"; - description = '' - TrueType hinting style, one of none, - slight, medium, or - full. + Enable the autohinter in place of the default interpreter. + The results are usually lower quality than correctly-hinted + fonts, but better than unhinted fonts. ''; }; }; @@ -398,7 +383,15 @@ in default = "rgb"; type = types.enum ["rgb" "bgr" "vrgb" "vbgr" "none"]; description = '' - Subpixel order. + Subpixel order. The overwhelming majority of displays are + rgb in their normal orientation. Select + vrgb for mounting such a display 90 degrees + clockwise from its normal orientation or vbgr + for mounting 90 degrees counter-clockwise. Select + bgr in the unlikely event of mounting 180 + degrees from the normal orientation. Reverse these directions in + the improbable event that the display's native subpixel order is + bgr. ''; }; @@ -406,7 +399,9 @@ in default = "default"; type = types.enum ["none" "default" "light" "legacy"]; description = '' - FreeType LCD filter. + FreeType LCD filter. At high resolution (> 200 DPI), LCD filtering + has no visible effect; users of such displays may want to select + none. ''; }; @@ -444,31 +439,19 @@ in description = ''Use embedded bitmaps in fonts like Calibri.''; }; - forceAutohint = mkOption { - type = types.bool; - default = false; - description = '' - Force use of the TrueType Autohinter. Useful for debugging or - free-software purists. - ''; - }; - - renderMonoTTFAsBitmap = mkOption { - type = types.bool; - default = false; - description = ''Render some monospace TTF fonts as bitmaps.''; - }; - }; }; }; - config = mkIf cfg.enable { - fonts.fontconfig.confPackages = [ confPkg ]; - - environment.systemPackages = [ pkgs.fontconfig ]; - environment.etc.fonts.source = "${fontconfigEtc}/etc/fonts/"; - }; + config = mkMerge [ + (mkIf cfg.enable { + environment.systemPackages = [ pkgs.fontconfig ]; + environment.etc.fonts.source = "${fontconfigEtc}/etc/fonts/"; + }) + (mkIf (cfg.enable && !cfg.penultimate.enable) { + fonts.fontconfig.confPackages = [ confPkg ]; + }) + ]; } diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index 4431dfb4085..ae30a710bf6 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -178,10 +178,10 @@ in environment.etc = { # /etc/services: TCP/UDP port assignments. - "services".source = pkgs.iana_etc + "/etc/services"; + "services".source = pkgs.iana-etc + "/etc/services"; # /etc/protocols: IP protocol numbers. - "protocols".source = pkgs.iana_etc + "/etc/protocols"; + "protocols".source = pkgs.iana-etc + "/etc/protocols"; # /etc/rpc: RPC program numbers. "rpc".source = pkgs.glibc.out + "/etc/rpc"; diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix index 61b02c5ffa6..a3f7e8f722f 100644 --- a/nixos/modules/config/sysctl.nix +++ b/nixos/modules/config/sysctl.nix @@ -64,5 +64,9 @@ in # Removed under grsecurity. boot.kernel.sysctl."kernel.kptr_restrict" = if (config.boot.kernelPackages.kernel.features.grsecurity or false) then null else 1; + + # Disable YAMA by default to allow easy debugging. + boot.kernel.sysctl."kernel.yama.ptrace_scope" = mkDefault 0; + }; } diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl index 4ca8a83554a..ef5e6346f02 100644 --- a/nixos/modules/config/update-users-groups.pl +++ b/nixos/modules/config/update-users-groups.pl @@ -6,6 +6,21 @@ use JSON; make_path("/var/lib/nixos", { mode => 0755 }); +# Keep track of deleted uids and gids. +my $uidMapFile = "/var/lib/nixos/uid-map"; +my $uidMap = -e $uidMapFile ? decode_json(read_file($uidMapFile)) : {}; + +my $gidMapFile = "/var/lib/nixos/gid-map"; +my $gidMap = -e $gidMapFile ? decode_json(read_file($gidMapFile)) : {}; + + +sub updateFile { + my ($path, $contents, $perms) = @_; + write_file("$path.tmp", { binmode => ':utf8', perms => $perms // 0644 }, $contents); + rename("$path.tmp", $path) or die; +} + + sub hashPassword { my ($password) = @_; my $salt = ""; @@ -18,10 +33,10 @@ sub hashPassword { # Functions for allocating free GIDs/UIDs. FIXME: respect ID ranges in # /etc/login.defs. sub allocId { - my ($used, $idMin, $idMax, $up, $getid) = @_; + my ($used, $prevUsed, $idMin, $idMax, $up, $getid) = @_; my $id = $up ? $idMin : $idMax; while ($id >= $idMin && $id <= $idMax) { - if (!$used->{$id} && !defined &$getid($id)) { + if (!$used->{$id} && !$prevUsed->{$id} && !defined &$getid($id)) { $used->{$id} = 1; return $id; } @@ -31,23 +46,36 @@ sub allocId { die "$0: out of free UIDs or GIDs\n"; } -my (%gidsUsed, %uidsUsed); +my (%gidsUsed, %uidsUsed, %gidsPrevUsed, %uidsPrevUsed); sub allocGid { - return allocId(\%gidsUsed, 400, 499, 0, sub { my ($gid) = @_; getgrgid($gid) }); + my ($name) = @_; + my $prevGid = $gidMap->{$name}; + if (defined $prevGid && !defined $gidsUsed{$prevGid}) { + print STDERR "reviving group '$name' with GID $prevGid\n"; + $gidsUsed{$prevGid} = 1; + return $prevGid; + } + return allocId(\%gidsUsed, \%gidsPrevUsed, 400, 499, 0, sub { my ($gid) = @_; getgrgid($gid) }); } sub allocUid { - my ($isSystemUser) = @_; + my ($name, $isSystemUser) = @_; my ($min, $max, $up) = $isSystemUser ? (400, 499, 0) : (1000, 29999, 1); - return allocId(\%uidsUsed, $min, $max, $up, sub { my ($uid) = @_; getpwuid($uid) }); + my $prevUid = $uidMap->{$name}; + if (defined $prevUid && $prevUid >= $min && $prevUid <= $max && !defined $uidsUsed{$prevUid}) { + print STDERR "reviving user '$name' with UID $prevUid\n"; + $uidsUsed{$prevUid} = 1; + return $prevUid; + } + return allocId(\%uidsUsed, \%uidsPrevUsed, $min, $max, $up, sub { my ($uid) = @_; getpwuid($uid) }); } # Read the declared users/groups. my $spec = decode_json(read_file($ARGV[0])); -# Don't allocate UIDs/GIDs that are already in use. +# Don't allocate UIDs/GIDs that are manually assigned. foreach my $g (@{$spec->{groups}}) { $gidsUsed{$g->{gid}} = 1 if defined $g->{gid}; } @@ -56,6 +84,11 @@ foreach my $u (@{$spec->{users}}) { $uidsUsed{$u->{uid}} = 1 if defined $u->{uid}; } +# Likewise for previously used but deleted UIDs/GIDs. +$uidsPrevUsed{$_} = 1 foreach values %{$uidMap}; +$gidsPrevUsed{$_} = 1 foreach values %{$gidMap}; + + # Read the current /etc/group. sub parseGroup { chomp; @@ -114,16 +147,18 @@ foreach my $g (@{$spec->{groups}}) { } } } else { - $g->{gid} = allocGid if !defined $g->{gid}; + $g->{gid} = allocGid($name) if !defined $g->{gid}; $g->{password} = "x"; } $g->{members} = join ",", sort(keys(%members)); $groupsOut{$name} = $g; + + $gidMap->{$name} = $g->{gid}; } # Update the persistent list of declarative groups. -write_file($declGroupsFile, { binmode => ':utf8' }, join(" ", sort(keys %groupsOut))); +updateFile($declGroupsFile, join(" ", sort(keys %groupsOut))); # Merge in the existing /etc/group. foreach my $name (keys %groupsCur) { @@ -140,8 +175,8 @@ foreach my $name (keys %groupsCur) { # Rewrite /etc/group. FIXME: acquire lock. my @lines = map { join(":", $_->{name}, $_->{password}, $_->{gid}, $_->{members}) . "\n" } (sort { $a->{gid} <=> $b->{gid} } values(%groupsOut)); -write_file("/etc/group.tmp", { binmode => ':utf8' }, @lines); -rename("/etc/group.tmp", "/etc/group") or die; +updateFile($gidMapFile, encode_json($gidMap)); +updateFile("/etc/group", \@lines); system("nscd --invalidate group"); # Generate a new /etc/passwd containing the declared users. @@ -167,7 +202,7 @@ foreach my $u (@{$spec->{users}}) { $u->{uid} = $existing->{uid}; } } else { - $u->{uid} = allocUid($u->{isSystemUser}) if !defined $u->{uid}; + $u->{uid} = allocUid($name, $u->{isSystemUser}) if !defined $u->{uid}; if (defined $u->{initialPassword}) { $u->{hashedPassword} = hashPassword($u->{initialPassword}); @@ -195,10 +230,12 @@ foreach my $u (@{$spec->{users}}) { $u->{fakePassword} = $existing->{fakePassword} // "x"; $usersOut{$name} = $u; + + $uidMap->{$name} = $u->{uid}; } # Update the persistent list of declarative users. -write_file($declUsersFile, { binmode => ':utf8' }, join(" ", sort(keys %usersOut))); +updateFile($declUsersFile, join(" ", sort(keys %usersOut))); # Merge in the existing /etc/passwd. foreach my $name (keys %usersCur) { @@ -214,8 +251,8 @@ foreach my $name (keys %usersCur) { # Rewrite /etc/passwd. FIXME: acquire lock. @lines = map { join(":", $_->{name}, $_->{fakePassword}, $_->{uid}, $_->{gid}, $_->{description}, $_->{home}, $_->{shell}) . "\n" } (sort { $a->{uid} <=> $b->{uid} } (values %usersOut)); -write_file("/etc/passwd.tmp", { binmode => ':utf8' }, @lines); -rename("/etc/passwd.tmp", "/etc/passwd") or die; +updateFile($uidMapFile, encode_json($uidMap)); +updateFile("/etc/passwd", \@lines); system("nscd --invalidate passwd"); @@ -242,5 +279,4 @@ foreach my $u (values %usersOut) { push @shadowNew, join(":", $u->{name}, $hashedPassword, "1::::::") . "\n"; } -write_file("/etc/shadow.tmp", { binmode => ':utf8', perms => 0600 }, @shadowNew); -rename("/etc/shadow.tmp", "/etc/shadow") or die; +updateFile("/etc/shadow", \@shadowNew, 0600); diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index fb8e1ccab66..bc82bfd066c 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -26,6 +26,7 @@ with lib; firmwareLinuxNonfree intel2200BGFirmware rtl8723bs-firmware + rtl8192su-firmware ]; }; diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix index cd6e72755de..663ff24c81f 100644 --- a/nixos/modules/installer/cd-dvd/channel.nix +++ b/nixos/modules/installer/cd-dvd/channel.nix @@ -6,6 +6,16 @@ with lib; let + # Do not include these things: + # - The '.git' directory + # - Result symlinks from nix-build ('result', 'result-2', 'result-bin', ...) + # - VIM/Emacs swap/backup files ('.swp', '.swo', '.foo.swp', 'foo~', ...) + filterFn = path: type: let basename = baseNameOf (toString path); in + if type == "directory" then basename != ".git" + else if type == "symlink" then builtins.match "^result(|-.*)$" basename == null + else builtins.match "^((|\..*)\.sw[a-z]|.*~)$" basename == null; + + nixpkgs = builtins.filterSource filterFn pkgs.path; # We need a copy of the Nix expressions for Nixpkgs and NixOS on the # CD. These are installed into the "nixos" channel of the root @@ -15,12 +25,11 @@ let { } '' mkdir -p $out - cp -prd ${pkgs.path} $out/nixos + cp -prd ${nixpkgs} $out/nixos chmod -R u+w $out/nixos if [ ! -e $out/nixos/nixpkgs ]; then ln -s . $out/nixos/nixpkgs fi - rm -rf $out/nixos/.git echo -n ${config.system.nixosVersionSuffix} > $out/nixos/.version-suffix ''; diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index 0b858746ff0..118ed20d47f 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -28,7 +28,7 @@ in boot.loader.generic-extlinux-compatible.enable = true; boot.kernelPackages = pkgs.linuxPackages_latest; - boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=ttyO0,115200n8" "console=tty0"]; + boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=ttyO0,115200n8" "console=ttySAC2,115200n8" "console=tty0"]; # FIXME: this probably should be in installation-device.nix users.extraUsers.root.initialHashedPassword = ""; diff --git a/nixos/modules/installer/tools/auto-upgrade.nix b/nixos/modules/installer/tools/auto-upgrade.nix index dfb43d1a1db..a4d4f16d1d9 100644 --- a/nixos/modules/installer/tools/auto-upgrade.nix +++ b/nixos/modules/installer/tools/auto-upgrade.nix @@ -48,7 +48,7 @@ let cfg = config.system.autoUpgrade; in description = '' Specification (in the format described by systemd.time - 5) of the time at + 7) of the time at which the update will occur. ''; }; diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 07623fd591d..0c9981470d7 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,5 +1,5 @@ { - x86_64-linux = "/nix/store/4ssykr786d0wp7y6m4xd4qwqs4nrry1z-nix-1.11.7"; - i686-linux = "/nix/store/61ggxx2072y2g877m01asy0lsn7xpn06-nix-1.11.7"; - x86_64-darwin = "/nix/store/pxf5ri5kdbfqkhd10sw4lpj8sn385ks5-nix-1.11.7"; + x86_64-linux = "/nix/store/j6q3pb75q1sbk0xsa5x6a629ph98ycdl-nix-1.11.8"; + i686-linux = "/nix/store/4m6ps568l988bbr1p2k3w9raq3rblppi-nix-1.11.8"; + x86_64-darwin = "/nix/store/cc5q944yn3j2hrs8k0kxx9r2mk9mni8a-nix-1.11.8"; } diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d1ccb2f15fc..23a1878ba30 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1,8 +1,9 @@ [ ./config/debug-info.nix ./config/fonts/corefonts.nix - ./config/fonts/fontconfig-ultimate.nix ./config/fonts/fontconfig.nix + ./config/fonts/fontconfig-penultimate.nix + ./config/fonts/fontconfig-ultimate.nix ./config/fonts/fontdir.nix ./config/fonts/fonts.nix ./config/fonts/ghostscript.nix @@ -137,7 +138,6 @@ ./services/backup/mysql-backup.nix ./services/backup/postgresql-backup.nix ./services/backup/rsnapshot.nix - ./services/backup/sitecopy-backup.nix ./services/backup/tarsnap.nix ./services/backup/znapzend.nix ./services/cluster/fleet.nix @@ -274,6 +274,7 @@ ./services/misc/gpsd.nix #./services/misc/ihaskell.nix ./services/misc/irkerd.nix + ./services/misc/jackett.nix ./services/misc/leaps.nix ./services/misc/mantisbt.nix ./services/misc/mathics.nix @@ -294,6 +295,7 @@ ./services/misc/parsoid.nix ./services/misc/phd.nix ./services/misc/plex.nix + ./services/misc/radarr.nix ./services/misc/redmine.nix ./services/misc/rippled.nix ./services/misc/ripple-rest.nix @@ -453,7 +455,7 @@ ./services/networking/prayer.nix ./services/networking/privoxy.nix ./services/networking/prosody.nix - ./services/networking/quagga.nix + # ./services/networking/quagga.nix ./services/networking/quassel.nix ./services/networking/racoon.nix ./services/networking/radicale.nix @@ -527,6 +529,7 @@ ./services/system/cgmanager.nix ./services/system/cloud-init.nix ./services/system/dbus.nix + ./services/system/earlyoom.nix ./services/system/kerberos.nix ./services/system/nscd.nix ./services/system/uptimed.nix diff --git a/nixos/modules/programs/venus.nix b/nixos/modules/programs/venus.nix index 731ebed14c7..110570ac3f0 100644 --- a/nixos/modules/programs/venus.nix +++ b/nixos/modules/programs/venus.nix @@ -45,7 +45,7 @@ in description = '' Specification (in the format described by systemd.time - 5) of the time at + 7) of the time at which the Venus will collect feeds. ''; }; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index af8b34b5e5c..0174fe544e3 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -35,6 +35,9 @@ with lib; (mkRemovedOptionModule [ "security" "setuidOwners" ] "Use security.wrappers instead") (mkRemovedOptionModule [ "security" "setuidPrograms" ] "Use security.wrappers instead") + (mkRemovedOptionModule [ "services" "rmilter" "bindInetSockets" ] "Use services.rmilter.bindSocket.* instead") + (mkRemovedOptionModule [ "services" "rmilter" "bindUnixSockets" ] "Use services.rmilter.bindSocket.* instead") + # Old Grub-related options. (mkRenamedOptionModule [ "boot" "initrd" "extraKernelModules" ] [ "boot" "initrd" "kernelModules" ]) (mkRenamedOptionModule [ "boot" "extraKernelParams" ] [ "boot" "kernelParams" ]) @@ -138,9 +141,6 @@ with lib; # Unity3D (mkRenamedOptionModule [ "programs" "unity3d" "enable" ] [ "security" "chromiumSuidSandbox" "enable" ]) - # fontconfig-ultimate - (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "rendering" ] [ "fonts" "fontconfig" "ultimate" "preset" ]) - # murmur (mkRenamedOptionModule [ "services" "murmur" "welcome" ] [ "services" "murmur" "welcometext" ]) @@ -199,5 +199,10 @@ with lib; "See the 16.09 release notes for more information.") (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ] "") (mkRemovedOptionModule [ "services" "dovecot2" "package" ] "") + (mkRemovedOptionModule [ "fonts" "fontconfig" "hinting" "style" ] "") + (mkRemovedOptionModule [ "services" "xserver" "displayManager" "sddm" "themes" ] + "Set the option `services.xserver.displayManager.sddm.package' instead.") + (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "") + (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "") ]; } diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 78bd09441f8..ada198e0e58 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -110,7 +110,7 @@ in description = '' Systemd calendar expression when to check for renewal. See systemd.time - 5. + 7. ''; }; @@ -178,7 +178,7 @@ in path = [ pkgs.simp_le ]; preStart = '' mkdir -p '${cfg.directory}' - chown '${data.user}:${data.group}' '${cfg.directory}' + chown -R '${data.user}:${data.group}' '${cfg.directory}' if [ ! -d '${cpath}' ]; then mkdir '${cpath}' fi diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix index 8d9d5348063..7e59408a5b0 100644 --- a/nixos/modules/security/polkit.nix +++ b/nixos/modules/security/polkit.nix @@ -64,7 +64,7 @@ in systemd.packages = [ pkgs.polkit.out ]; systemd.services.polkit.restartTriggers = [ config.system.path ]; - systemd.services.polkit.unitConfig.X-StopIfChanged = false; + systemd.services.polkit.stopIfChanged = false; # The polkit daemon reads action/rule files environment.pathsToLink = [ "/share/polkit-1" ]; diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index 65d875c3a37..c051b7d49e3 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -179,21 +179,31 @@ in # Remove the old /var/setuid-wrappers path from the system... # - # TODO: this is only necessary for ugprades 16.09 => 17.x; + # TODO: this is only necessary for upgrades 16.09 => 17.x; # this conditional removal block needs to be removed after # the release. if [ -d /var/setuid-wrappers ]; then rm -rf /var/setuid-wrappers + ln -s /run/wrappers/bin /var/setuid-wrappers fi # Remove the old /run/setuid-wrappers-dir path from the # system as well... # - # TODO: this is only necessary for ugprades 16.09 => 17.x; + # TODO: this is only necessary for upgrades 16.09 => 17.x; # this conditional removal block needs to be removed after # the release. if [ -d /run/setuid-wrapper-dirs ]; then rm -rf /run/setuid-wrapper-dirs + ln -s /run/wrappers/bin /run/setuid-wrapper-dirs + fi + + # TODO: this is only necessary for upgrades 16.09 => 17.x; + # this conditional removal block needs to be removed after + # the release. + if readlink -f /run/booted-system | grep nixos-17 > /dev/null; then + rm -rf /run/setuid-wrapper-dirs + rm -rf /var/setuid-wrappers fi # We want to place the tmpdirs for the wrappers to the parent dir. diff --git a/nixos/modules/services/backup/sitecopy-backup.nix b/nixos/modules/services/backup/sitecopy-backup.nix deleted file mode 100644 index 6e4721ded68..00000000000 --- a/nixos/modules/services/backup/sitecopy-backup.nix +++ /dev/null @@ -1,106 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - inherit (pkgs) sitecopy; - - stateDir = "/var/spool/sitecopy"; - - sitecopyCron = backup : '' - ${if backup ? period then backup.period else config.services.sitecopy.period} root ${sitecopy}/bin/sitecopy --storepath=${stateDir} --rcfile=${stateDir}/${backup.name}.conf --update ${backup.name} >> /var/log/sitecopy.log 2>&1 - ''; -in - -{ - - options = { - - services.sitecopy = { - - enable = mkOption { - default = false; - description = '' - Whether to enable sitecopy backups of specified - directories. - ''; - }; - - period = mkOption { - default = "15 04 * * *"; - description = '' - This option defines (in the format used by cron) - when the sitecopy backups are to be run. - The default is to update at 04:15 (at night) every day. - ''; - }; - - backups = mkOption { - example = [ - { name = "test"; - local = "/tmp/backup"; - remote = "/staff-groups/ewi/st/strategoxt/backup/test"; - server = "webdata.tudelft.nl"; - protocol = "webdav"; - https = true ; - symlinks = "maintain" ; - } - ]; - default = []; - description = '' - List of attribute sets describing the backups. - - Username/password are extracted from - ${stateDir}/sitecopy.secrets at activation - time. The secrets file lines should have the following structure: - - server username password - - ''; - }; - - }; - - }; - - config = mkIf config.services.sitecopy.enable { - environment.systemPackages = [ sitecopy ]; - - services.cron.systemCronJobs = map sitecopyCron config.services.sitecopy.backups; - - system.activationScripts.sitecopyBackup = stringAfter [ "stdio" "users" ] - '' - mkdir -m 0700 -p ${stateDir} - chown root ${stateDir} - touch ${stateDir}/sitecopy.secrets - chown root ${stateDir}/sitecopy.secrets - - ${lib.concatStrings (map ( b: '' - unset secrets - unset secret - secrets=`grep '^${b.server}' ${stateDir}/sitecopy.secrets | head -1` - secret=($secrets) - cat > ${stateDir}/${b.name}.conf << EOF - site ${b.name} - server ${b.server} - protocol ${b.protocol} - username ''${secret[1]} - password ''${secret[2]} - local ${b.local} - remote ${b.remote} - symlinks ${b.symlinks} - ${if b.https then "http secure" else ""} - EOF - chmod 0600 ${stateDir}/${b.name}.conf - if ! test -e ${stateDir}/${b.name} ; then - echo " * Initializing sitecopy '${b.name}'" - ${sitecopy}/bin/sitecopy --storepath=${stateDir} --rcfile=${stateDir}/${b.name}.conf --initialize ${b.name} - else - echo " * Sitecopy '${b.name}' already initialized" - fi - '' ) config.services.sitecopy.backups - )} - ''; - }; - -} diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index 1fe4d28f9f3..ba90b1b1a2c 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -20,6 +20,14 @@ in description = "The working directory used"; }; + package = mkOption { + description = "Gitlab Runner package to use"; + default = pkgs.gitlab-runner; + defaultText = "pkgs.gitlab-runner"; + type = types.package; + example = literalExample "pkgs.gitlab-runner_1_11"; + }; + }; config = mkIf cfg.enable { @@ -29,7 +37,7 @@ in requires = [ "docker.service" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = ''${pkgs.gitlab-runner.bin}/bin/gitlab-runner run \ + ExecStart = ''${cfg.package.bin}/bin/gitlab-runner run \ --working-directory ${cfg.workDir} \ --config ${configFile} \ --service gitlab-runner \ @@ -38,6 +46,9 @@ in }; }; + # Make the gitlab-runner command availabe so users can query the runner + environment.systemPackages = [ cfg.package ]; + users.extraUsers.gitlab-runner = { group = "gitlab-runner"; extraGroups = [ "docker" ]; diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix index 205c8dc610a..424e08a6ee3 100644 --- a/nixos/modules/services/databases/neo4j.nix +++ b/nixos/modules/services/databases/neo4j.nix @@ -27,9 +27,7 @@ let ''} dbms.shell.enabled=true ${cfg.extraServerConfig} - ''; - wrapperConfig = pkgs.writeText "neo4j-wrapper.conf" '' # Default JVM parameters from neo4j.conf dbms.jvm.additional=-XX:+UseG1GC dbms.jvm.additional=-XX:-OmitStackTraceInFastThrow @@ -135,12 +133,11 @@ in { preStart = '' mkdir -m 0700 -p ${cfg.dataDir}/{data/graph.db,conf,logs} ln -fs ${serverConfig} ${cfg.dataDir}/conf/neo4j.conf - ln -fs ${wrapperConfig} ${cfg.dataDir}/conf/neo4j-wrapper.conf if [ "$(id -u)" = 0 ]; then chown -R neo4j ${cfg.dataDir}; fi ''; }; - environment.systemPackages = [ pkgs.neo4j ]; + environment.systemPackages = [ cfg.package ]; users.extraUsers = singleton { name = "neo4j"; diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index 89f09ed0844..9d6395ebd74 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -79,10 +79,11 @@ - emacs24Macport + emacsMacport + emacs25Macport - Emacs 24 with the "Mac port" patches, providing a more + Emacs 25 with the "Mac port" patches, providing a more native look and feel under OS X. diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix index 71b3a93a2e0..f1fcb436934 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -14,12 +14,26 @@ in options = { - hardware.bluetooth.enable = mkEnableOption "support for Bluetooth."; + hardware.bluetooth = { + enable = mkEnableOption "support for Bluetooth."; - hardware.bluetooth.powerOnBoot = mkOption { - type = types.bool; - default = true; - description = "Whether to power up the default Bluetooth controller on boot."; + powerOnBoot = mkOption { + type = types.bool; + default = true; + description = "Whether to power up the default Bluetooth controller on boot."; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + example = '' + [General] + ControllerMode = bredr + ''; + description = '' + Set additional configuration for system-wide bluetooth (/etc/bluetooth/main.conf). + ''; + }; }; }; @@ -30,6 +44,11 @@ in environment.systemPackages = [ bluez-bluetooth pkgs.openobex pkgs.obexftp ]; + environment.etc = singleton { + source = pkgs.writeText "main.conf" cfg.extraConfig; + target = "bluetooth/main.conf"; + }; + services.udev.packages = [ bluez-bluetooth ]; services.dbus.packages = [ bluez-bluetooth ]; systemd.packages = [ bluez-bluetooth ]; diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 028907693a5..9f42f9e59ad 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -35,6 +35,7 @@ let udevRules = pkgs.runCommand "udev-rules" { preferLocalBuild = true; allowSubstitutes = false; + packages = unique (map toString cfg.packages); } '' mkdir -p $out @@ -45,7 +46,7 @@ let echo 'ENV{PATH}="${udevPath}/bin:${udevPath}/sbin"' > $out/00-path.rules # Add the udev rules from other packages. - for i in ${toString cfg.packages}; do + for i in $packages; do echo "Adding rules for package $i" for j in $i/{etc,lib}/udev/rules.d/*; do echo "Copying $j to $out/$(basename $j)" @@ -132,10 +133,11 @@ let hwdbBin = pkgs.runCommand "hwdb.bin" { preferLocalBuild = true; allowSubstitutes = false; + packages = unique (map toString ([udev] ++ cfg.packages)); } '' mkdir -p etc/udev/hwdb.d - for i in ${toString ([udev] ++ cfg.packages)}; do + for i in $packages; do echo "Adding hwdb files for package $i" for j in $i/{etc,lib}/udev/hwdb.d/*; do ln -s $j etc/udev/hwdb.d/$(basename $j) diff --git a/nixos/modules/services/logging/awstats.nix b/nixos/modules/services/logging/awstats.nix index 8ab7e6acd98..612ae06d0a7 100644 --- a/nixos/modules/services/logging/awstats.nix +++ b/nixos/modules/services/logging/awstats.nix @@ -38,7 +38,7 @@ in Specification of the time at which awstats will get updated. (in the format described by systemd.time - 5) + 7) ''; }; diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix index 8f18b929c11..e17b7516bff 100644 --- a/nixos/modules/services/mail/rmilter.nix +++ b/nixos/modules/services/mail/rmilter.nix @@ -5,35 +5,38 @@ with lib; let rspamdCfg = config.services.rspamd; + postfixCfg = config.services.postfix; cfg = config.services.rmilter; - inetSockets = map (sock: let s = stringSplit ":" sock; in "inet:${last s}:${head s}") cfg.bindInetSockets; - unixSockets = map (sock: "unix:${sock}") cfg.bindUnixSockets; + inetSocket = addr: port: "inet:[${toString port}@${addr}]"; + unixSocket = sock: "unix:${sock}"; - allSockets = unixSockets ++ inetSockets; + systemdSocket = if cfg.bindSocket.type == "unix" then cfg.bindSocket.path + else "${cfg.bindSocket.address}:${toString cfg.bindSocket.port}"; + rmilterSocket = if cfg.bindSocket.type == "unix" then unixSocket cfg.bindSocket.path + else inetSocket cfg.bindSocket.address cfg.bindSocket.port; rmilterConf = '' -pidfile = /run/rmilter/rmilter.pid; -bind_socket = ${if cfg.socketActivation then "fd:3" else concatStringsSep ", " allSockets}; -tempdir = /tmp; - + pidfile = /run/rmilter/rmilter.pid; + bind_socket = ${if cfg.socketActivation then "fd:3" else rmilterSocket}; + tempdir = /tmp; '' + (with cfg.rspamd; if enable then '' -spamd { - servers = ${concatStringsSep ", " servers}; - connect_timeout = 1s; - results_timeout = 20s; - error_time = 10; - dead_time = 300; - maxerrors = 10; - reject_message = "${rejectMessage}"; - ${optionalString (length whitelist != 0) "whitelist = ${concatStringsSep ", " whitelist};"} + spamd { + servers = ${concatStringsSep ", " servers}; + connect_timeout = 1s; + results_timeout = 20s; + error_time = 10; + dead_time = 300; + maxerrors = 10; + reject_message = "${rejectMessage}"; + ${optionalString (length whitelist != 0) "whitelist = ${concatStringsSep ", " whitelist};"} - # rspamd_metric - metric for using with rspamd - # Default: "default" - rspamd_metric = "default"; - ${extraConfig} -}; - '' else "") + cfg.extraConfig; + # rspamd_metric - metric for using with rspamd + # Default: "default" + rspamd_metric = "default"; + ${extraConfig} + }; + '' else "") + cfg.extraConfig; rmilterConfigFile = pkgs.writeText "rmilter.conf" rmilterConf; @@ -48,11 +51,13 @@ in services.rmilter = { enable = mkOption { + type = types.bool; default = cfg.rspamd.enable; description = "Whether to run the rmilter daemon."; }; debug = mkOption { + type = types.bool; default = false; description = "Whether to run the rmilter daemon in debug mode."; }; @@ -73,25 +78,37 @@ in ''; }; - bindUnixSockets = mkOption { - type = types.listOf types.str; - default = ["/run/rmilter/rmilter.sock"]; + bindSocket.type = mkOption { + type = types.enum [ "unix" "inet" ]; + default = "unix"; description = '' - Unix domain sockets to listen for MTA requests. - ''; - example = '' - [ "/run/rmilter.sock"] + What kind of socket rmilter should listen on. Either "unix" + for an Unix domain socket or "inet" for a TCP socket. ''; }; - bindInetSockets = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Inet addresses to listen (in format accepted by systemd.socket) + bindSocket.path = mkOption { + type = types.str; + default = "/run/rmilter/rmilter.sock"; + description = '' + Path to Unix domain socket to listen on. ''; - example = '' - ["127.0.0.1:11990"] + }; + + bindSocket.address = mkOption { + type = types.str; + default = "::1"; + example = "0.0.0.0"; + description = '' + Inet address to listen on. + ''; + }; + + bindSocket.port = mkOption { + type = types.int; + default = 11990; + description = '' + Inet port to listen on. ''; }; @@ -100,14 +117,16 @@ in default = true; description = '' Enable systemd socket activation for rmilter. - (disabling socket activation not recommended - when unix socket used, and follow to wrong - permissions on unix domain socket.) + + Disabling socket activation is not recommended when a Unix + domain socket is used and could lead to incorrect + permissions. ''; }; rspamd = { enable = mkOption { + type = types.bool; default = rspamdCfg.enable; description = "Whether to use rspamd to filter mails"; }; @@ -157,13 +176,9 @@ in type = types.str; description = "Addon to postfix configuration"; default = '' -smtpd_milters = ${head allSockets} -# or for TCP socket -# # smtpd_milters = inet:localhost:9900 -milter_protocol = 6 -milter_mail_macros = i {mail_addr} {client_addr} {client_name} {auth_authen} -# skip mail without checks if milter will die -milter_default_action = accept + smtpd_milters = ${rmilterSocket} + milter_protocol = 6 + milter_mail_macros = i {mail_addr} {client_addr} {client_name} {auth_authen} ''; }; }; @@ -175,52 +190,60 @@ milter_default_action = accept ###### implementation - config = mkIf cfg.enable { + config = mkMerge [ - users.extraUsers = singleton { - name = cfg.user; - description = "rspamd daemon"; - uid = config.ids.uids.rmilter; - group = cfg.group; - }; + (mkIf cfg.enable { - users.extraGroups = singleton { - name = cfg.group; - gid = config.ids.gids.rmilter; - }; - - systemd.services.rmilter = { - description = "Rmilter Service"; - - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - serviceConfig = { - ExecStart = "${pkgs.rmilter}/bin/rmilter ${optionalString cfg.debug "-d"} -n -c ${rmilterConfigFile}"; - ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID"; - User = cfg.user; - Group = cfg.group; - PermissionsStartOnly = true; - Restart = "always"; - RuntimeDirectory = "rmilter"; - RuntimeDirectoryMode = "0755"; + users.extraUsers = singleton { + name = cfg.user; + description = "rmilter daemon"; + uid = config.ids.uids.rmilter; + group = cfg.group; }; - }; - - systemd.sockets.rmilter = mkIf cfg.socketActivation { - description = "Rmilter service socket"; - wantedBy = [ "sockets.target" ]; - socketConfig = { - ListenStream = cfg.bindUnixSockets ++ cfg.bindInetSockets; - SocketUser = cfg.user; - SocketGroup = cfg.group; - SocketMode = "0666"; + users.extraGroups = singleton { + name = cfg.group; + gid = config.ids.gids.rmilter; }; - }; - services.postfix.extraConfig = optionalString cfg.postfix.enable cfg.postfix.configFragment; - users.users.postfix.extraGroups = [ cfg.group ]; - }; + systemd.services.rmilter = { + description = "Rmilter Service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + ExecStart = "${pkgs.rmilter}/bin/rmilter ${optionalString cfg.debug "-d"} -n -c ${rmilterConfigFile}"; + ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID"; + User = cfg.user; + Group = cfg.group; + PermissionsStartOnly = true; + Restart = "always"; + RuntimeDirectory = "rmilter"; + RuntimeDirectoryMode = "0750"; + }; + + }; + + systemd.sockets.rmilter = mkIf cfg.socketActivation { + description = "Rmilter service socket"; + wantedBy = [ "sockets.target" ]; + socketConfig = { + ListenStream = systemdSocket; + SocketUser = cfg.user; + SocketGroup = cfg.group; + SocketMode = "0660"; + }; + }; + }) + + (mkIf (cfg.enable && cfg.rspamd.enable && rspamdCfg.enable) { + users.extraUsers.${cfg.user}.extraGroups = [ rspamdCfg.group ]; + }) + + (mkIf (cfg.enable && cfg.postfix.enable) { + services.postfix.extraConfig = cfg.postfix.configFragment; + users.extraUsers.${postfixCfg.user}.extraGroups = [ cfg.group ]; + }) + ]; } diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index 98489df7851..6d403e448e0 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -53,8 +53,11 @@ in bindSocket = mkOption { type = types.listOf types.str; default = [ - "/run/rspamd/rspamd.sock mode=0666 owner=${cfg.user}" + "/run/rspamd/rspamd.sock mode=0660 owner=${cfg.user} group=${cfg.group}" ]; + defaultText = ''[ + "/run/rspamd/rspamd.sock mode=0660 owner=${cfg.user} group=${cfg.group}" + ]''; description = '' List of sockets to listen, in format acceptable by rspamd ''; diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 36db4fb9660..ee881edb5ab 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -481,6 +481,7 @@ in { mkdir -p ${cfg.statePath}/repositories mkdir -p ${gitlabConfig.production.shared.path}/artifacts mkdir -p ${gitlabConfig.production.shared.path}/lfs-objects + mkdir -p ${gitlabConfig.production.shared.path}/pages mkdir -p ${cfg.statePath}/log mkdir -p ${cfg.statePath}/shell mkdir -p ${cfg.statePath}/tmp/pids diff --git a/nixos/modules/services/misc/jackett.nix b/nixos/modules/services/misc/jackett.nix new file mode 100644 index 00000000000..e467e7ee85b --- /dev/null +++ b/nixos/modules/services/misc/jackett.nix @@ -0,0 +1,44 @@ +{ config, pkgs, lib, mono, ... }: + +with lib; + +let + cfg = config.services.jackett; +in +{ + options = { + services.jackett = { + enable = mkEnableOption "Jackett"; + }; + }; + + config = mkIf cfg.enable { + systemd.services.jackett = { + description = "Jackett"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + preStart = '' + test -d /var/lib/jackett/ || { + echo "Creating jackett data directory in /var/lib/jackett/" + mkdir -p /var/lib/jackett/ + } + chown -R jackett /var/lib/jackett/ + chmod 0700 /var/lib/jackett/ + ''; + + serviceConfig = { + Type = "simple"; + User = "jackett"; + Group = "nogroup"; + PermissionsStartOnly = "true"; + ExecStart = "${pkgs.jackett}/bin/Jackett"; + Restart = "on-failure"; + }; + }; + + users.extraUsers.jackett = { + home = "/var/lib/jackett"; + }; + + }; +} diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 5088c4e6069..4fe89838e29 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -8,7 +8,7 @@ let nix = cfg.package.out; - isNix112 = versionAtLeast (getVersion nix) "1.12pre4997"; + isNix112 = versionAtLeast (getVersion nix) "1.12pre"; makeNixBuildUser = nr: { name = "nixbld${toString nr}"; @@ -46,6 +46,7 @@ let binary-caches = ${toString cfg.binaryCaches} trusted-binary-caches = ${toString cfg.trustedBinaryCaches} binary-cache-public-keys = ${toString cfg.binaryCachePublicKeys} + auto-optimise-store = ${if cfg.autoOptimiseStore then "true" else "false"} ${optionalString cfg.requireSignedBinaryCaches '' signed-binary-caches = * ''} @@ -86,6 +87,18 @@ in ''; }; + autoOptimiseStore = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + If set to true, Nix automatically detects files in the store that have + identical contents, and replaces them with hard links to a single copy. + This saves disk space. If set to false (the default), you can still run + nix-store --optimise to get rid of duplicate files. + ''; + }; + buildCores = mkOption { type = types.int; default = 1; diff --git a/nixos/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix index 304168c65b0..8b493041b2c 100644 --- a/nixos/modules/services/misc/nix-gc.nix +++ b/nixos/modules/services/misc/nix-gc.nix @@ -26,7 +26,7 @@ in description = '' Specification (in the format described by systemd.time - 5) of the time at + 7) of the time at which the garbage collector will run. ''; }; diff --git a/nixos/modules/services/misc/nix-optimise.nix b/nixos/modules/services/misc/nix-optimise.nix index a76bfd9f1f1..295e7fb0ba0 100644 --- a/nixos/modules/services/misc/nix-optimise.nix +++ b/nixos/modules/services/misc/nix-optimise.nix @@ -26,7 +26,7 @@ in description = '' Specification (in the format described by systemd.time - 5) of the time at + 7) of the time at which the optimiser will run. ''; }; diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index 8faad46a49f..6883993a893 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -117,7 +117,7 @@ in ''; serviceConfig = { - ExecStart = "${pkgs.octoprint}/bin/octoprint -b ${cfg.stateDir}"; + ExecStart = "${pkgs.octoprint}/bin/octoprint serve -b ${cfg.stateDir}"; User = cfg.user; Group = cfg.group; PermissionsStartOnly = true; diff --git a/nixos/modules/services/misc/radarr.nix b/nixos/modules/services/misc/radarr.nix new file mode 100644 index 00000000000..cc5efffca44 --- /dev/null +++ b/nixos/modules/services/misc/radarr.nix @@ -0,0 +1,44 @@ +{ config, pkgs, lib, mono, ... }: + +with lib; + +let + cfg = config.services.radarr; +in +{ + options = { + services.radarr = { + enable = mkEnableOption "Radarr"; + }; + }; + + config = mkIf cfg.enable { + systemd.services.radarr = { + description = "Radarr"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + preStart = '' + test -d /var/lib/radarr/ || { + echo "Creating radarr data directory in /var/lib/radarr/" + mkdir -p /var/lib/radarr/ + } + chown -R radarr /var/lib/radarr/ + chmod 0700 /var/lib/radarr/ + ''; + + serviceConfig = { + Type = "simple"; + User = "radarr"; + Group = "nogroup"; + PermissionsStartOnly = "true"; + ExecStart = "${pkgs.radarr}/bin/Radarr"; + Restart = "on-failure"; + }; + }; + + users.extraUsers.radarr = { + home = "/var/lib/radarr"; + }; + + }; +} diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index 364f18e7543..b8c26a5c89b 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -193,14 +193,26 @@ in }) (mkIf cronCfg.enable { - services.cron.systemCronJobs = [ - "*/5 * * * * munin ${pkgs.munin}/bin/munin-cron --config ${muninConf}" - ]; + systemd.timers.munin-cron = { + description = "batch Munin master programs"; + wantedBy = [ "timers.target" ]; + timerConfig.OnCalendar = "*:0/5"; + }; + + systemd.services.munin-cron = { + description = "batch Munin master programs"; + unitConfig.Documentation = "man:munin-cron(8)"; + + serviceConfig = { + Type = "oneshot"; + User = "munin"; + ExecStart = "${pkgs.munin}/bin/munin-cron --config ${muninConf}"; + }; + }; system.activationScripts.munin-cron = stringAfter [ "users" "groups" ] '' mkdir -p /var/{run,log,www,lib}/munin chown -R munin:munin /var/{run,log,www,lib}/munin ''; - })]; } diff --git a/nixos/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs-client/default.nix index 6f51e287910..f7c58c92863 100644 --- a/nixos/modules/services/network-filesystems/openafs-client/default.nix +++ b/nixos/modules/services/network-filesystems/openafs-client/default.nix @@ -76,6 +76,7 @@ in description = "AFS client"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; + serviceConfig = { RemainAfterExit = true; }; preStart = '' mkdir -p -m 0755 /afs diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index 6a786e75bbc..e7ef68c90b2 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -21,6 +21,7 @@ let use-ipv6=${if ipv6 then "yes" else "no"} ${optionalString (interfaces!=null) "allow-interfaces=${concatStringsSep "," interfaces}"} ${optionalString (domainName!=null) "domain-name=${domainName}"} + allow-point-to-point=${if allowPointToPoint then "yes" else "no"} [wide-area] enable-wide-area=${if wideArea then "yes" else "no"} @@ -98,6 +99,15 @@ in ''; }; + allowPointToPoint = mkOption { + default = false; + description= '' + Whether to use POINTTOPOINT interfaces. Might make mDNS unreliable due to usually large + latencies with such links and opens a potential security hole by allowing mDNS access from Internet + connections. Use with care and YMMV! + ''; + }; + wideArea = mkOption { default = true; description = ''Whether to enable wide-area service discovery.''; diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index d382fa8c9cb..077aeca457e 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -220,6 +220,8 @@ in ${getLib pkgs.attr}/lib/libattr.so.* mr, # */ ${resolverList} r, + + /run/systemd/notify rw, } ''); }) diff --git a/nixos/modules/services/networking/nftables.nix b/nixos/modules/services/networking/nftables.nix index 029c3df8993..56b94205414 100644 --- a/nixos/modules/services/networking/nftables.nix +++ b/nixos/modules/services/networking/nftables.nix @@ -17,6 +17,17 @@ in This conflicts with the standard networking firewall, so make sure to disable it before using nftables. + + Note that if you have Docker enabled you will not be able to use + nftables without intervention. Docker uses iptables internally to + setup NAT for containers. This module disables the ip_tables kernel + module, however Docker automatically loads the module. Please see [1] + for more information. + + There are other programs that use iptables internally too, such as + libvirt. + + [1]: https://github.com/NixOS/nixpkgs/issues/24318#issuecomment-289216273 ''; }; networking.nftables.ruleset = mkOption { diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix index 3520c6d3f7d..e0eef9ed96f 100644 --- a/nixos/modules/services/networking/searx.nix +++ b/nixos/modules/services/networking/searx.nix @@ -18,17 +18,12 @@ in services.searx = { - enable = mkOption { - type = types.bool; - default = false; - description = " - Whether to enable the Searx server. See https://github.com/asciimoo/searx - "; - }; + enable = mkEnableOption + "the searx server. See https://github.com/asciimoo/searx"; configFile = mkOption { - type = types.path; - default = ""; + type = types.nullOr types.path; + default = null; description = " The path of the Searx server configuration file. If no file is specified, a default file is used (default config file has @@ -72,7 +67,7 @@ in User = "searx"; ExecStart = "${cfg.package}/bin/searx-run"; }; - } // (optionalAttrs (configFile != "") { + } // (optionalAttrs (configFile != null) { environment.SEARX_SETTINGS_PATH = configFile; }); diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 80659f19c59..42b50d0426a 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -240,7 +240,7 @@ in systemd = let - sshd-service = + service = { description = "SSH Daemon"; wantedBy = optional (!cfg.startWhenNeeded) "multi-user.target"; @@ -251,8 +251,20 @@ in environment.LD_LIBRARY_PATH = nssModulesPath; - wants = [ "sshd-keygen.service" ]; - after = [ "sshd-keygen.service" ]; + preStart = + '' + # Make sure we don't write to stdout, since in case of + # socket activation, it goes to the remote side (#19589). + exec >&2 + + mkdir -m 0755 -p /etc/ssh + + ${flip concatMapStrings cfg.hostKeys (k: '' + if ! [ -f "${k.path}" ]; then + ssh-keygen -t "${k.type}" ${if k ? bits then "-b ${toString k.bits}" else ""} -f "${k.path}" -N "" + fi + '')} + ''; serviceConfig = { ExecStart = @@ -262,31 +274,12 @@ in KillMode = "process"; } // (if cfg.startWhenNeeded then { StandardInput = "socket"; + StandardError = "journal"; } else { Restart = "always"; Type = "simple"; }); }; - - sshd-keygen-service = - { description = "SSH Host Key Generation"; - path = [ cfgc.package ]; - script = - '' - mkdir -m 0755 -p /etc/ssh - ${flip concatMapStrings cfg.hostKeys (k: '' - if ! [ -f "${k.path}" ]; then - ssh-keygen -t "${k.type}" ${if k ? bits then "-b ${toString k.bits}" else ""} -f "${k.path}" -N "" - fi - '')} - ''; - - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = "yes"; - }; - }; - in if cfg.startWhenNeeded then { @@ -298,13 +291,11 @@ in socketConfig.Accept = true; }; - services.sshd-keygen = sshd-keygen-service; - services."sshd@" = sshd-service; + services."sshd@" = service; } else { - services.sshd-keygen = sshd-keygen-service; - services.sshd = sshd-service; + services.sshd = service; }; diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix index deff645d9bf..6b3d658bd85 100644 --- a/nixos/modules/services/networking/vsftpd.nix +++ b/nixos/modules/services/networking/vsftpd.nix @@ -37,6 +37,9 @@ let (yesNoOption "anonymousUser" "anonymous_enable" false '' Whether to enable the anonymous FTP user. '') + (yesNoOption "anonymousUserNoPassword" "no_anon_password" false '' + Whether to disable the password for the anonymous FTP user. + '') (yesNoOption "localUsers" "local_enable" false '' Whether to enable FTP for local users. '') diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 3b4d77a6f7b..10596d6431d 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -140,6 +140,7 @@ in }; privoxy.enable = mkOption { + type = types.bool; default = true; description = '' Whether to enable and configure the system Privoxy to use Tor's diff --git a/nixos/modules/services/system/earlyoom.nix b/nixos/modules/services/system/earlyoom.nix new file mode 100644 index 00000000000..daa46838bfa --- /dev/null +++ b/nixos/modules/services/system/earlyoom.nix @@ -0,0 +1,96 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + ecfg = config.services.earlyoom; +in +{ + options = { + services.earlyoom = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable early out of memory killing. + ''; + }; + + freeMemThreshold = mkOption { + type = types.int; + default = 10; + description = '' + Minimum of availabe memory (in percent). + If the free memory falls below this threshold and the analog is true for + + the killing begins. + ''; + }; + + freeSwapThreshold = mkOption { + type = types.int; + default = 10; + description = '' + Minimum of availabe swap space (in percent). + If the available swap space falls below this threshold and the analog + is true for + the killing begins. + ''; + }; + + useKernelOOMKiller= mkOption { + type = types.bool; + default = false; + description = '' + Use kernel OOM killer instead of own user-space implementation. + ''; + }; + + ignoreOOMScoreAdjust = mkOption { + type = types.bool; + default = false; + description = '' + Ignore oom_score_adjust values of processes. + User-space implementation only. + ''; + }; + + enableDebugInfo = mkOption { + type = types.bool; + default = false; + description = '' + Enable debugging messages. + ''; + }; + }; + }; + + config = mkIf ecfg.enable { + assertions = [ + { assertion = ecfg.freeMemThreshold > 0 && ecfg.freeMemThreshold <= 100; + message = "Needs to be a positive percentage"; } + { assertion = ecfg.freeSwapThreshold > 0 && ecfg.freeSwapThreshold <= 100; + message = "Needs to be a positive percentage"; } + { assertion = !ecfg.useKernelOOMKiller || !ecfg.ignoreOOMScoreAdjust; + message = "Both options in conjunction do not make sense"; } + ]; + + systemd.services.earlyoom = { + description = "Early OOM Daemon for Linux"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + StandardOutput = "null"; + StandardError = "syslog"; + ExecStart = '' + ${pkgs.earlyoom}/bin/earlyoom \ + -m ${toString ecfg.freeMemThreshold} \ + -s ${toString ecfg.freeSwapThreshold} \ + ${optionalString ecfg.useKernelOOMKiller "-k"} \ + ${optionalString ecfg.ignoreOOMScoreAdjust "-i"} \ + ${optionalString ecfg.enableDebugInfo "-d"} + ''; + }; + }; + }; +} diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix index b94ec14308b..c6f4bcd0f66 100644 --- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix +++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix @@ -9,7 +9,7 @@ let + ''; + }; tablePrefix = mkOption { default = "wp_"; description = '' @@ -251,7 +276,7 @@ in sleep 1 done ${pkgs.mysql}/bin/mysql -e 'CREATE DATABASE ${config.dbName};' - ${pkgs.mysql}/bin/mysql -e 'GRANT ALL ON ${config.dbName}.* TO ${config.dbUser}@localhost IDENTIFIED BY "${config.dbPassword}";' + ${pkgs.mysql}/bin/mysql -e "GRANT ALL ON ${config.dbName}.* TO ${config.dbUser}@localhost IDENTIFIED BY \"$(cat ${config.dbPasswordFile})\";" else echo "Good, no need to do anything database related." fi diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 6bc7192963d..ae14aa28ae3 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -87,6 +87,8 @@ let server_tokens ${if cfg.serverTokens then "on" else "off"}; + ${cfg.commonHttpConfig} + ${vhosts} ${optionalString cfg.statusPage '' @@ -183,6 +185,7 @@ let ${optionalString (config.index != null) "index ${config.index};"} ${optionalString (config.tryFiles != null) "try_files ${config.tryFiles};"} ${optionalString (config.root != null) "root ${config.root};"} + ${optionalString (config.alias != null) "alias ${config.alias};"} ${config.extraConfig} } '') locations); @@ -244,11 +247,13 @@ in }; package = mkOption { - default = pkgs.nginx; - defaultText = "pkgs.nginx"; + default = pkgs.nginxStable; + defaultText = "pkgs.nginxStable"; type = types.package; description = " - Nginx package to use. + Nginx package to use. This defaults to the stable version. Note + that the nginx team recommends to use the mainline version which + available in nixpkgs as nginxMainline. "; }; @@ -275,6 +280,24 @@ in ''; }; + commonHttpConfig = mkOption { + type = types.lines; + default = ""; + example = '' + resolver 127.0.0.1 valid=5s; + + log_format myformat '$remote_addr - $remote_user [$time_local] ' + '"$request" $status $body_bytes_sent ' + '"$http_referer" "$http_user_agent"'; + ''; + description = '' + With nginx you must provide common http context definitions before + they are used, e.g. log_format, resolver, etc. inside of server + or location contexts. Use this attribute to set these definitions + at the appropriate location. + ''; + }; + httpConfig = mkOption { type = types.lines; default = ""; @@ -381,6 +404,13 @@ in config = mkIf cfg.enable { # TODO: test user supplied config file pases syntax test + assertions = let hostOrAliasIsNull = l: l.root == null || l.alias == null; in [ + { + assertion = all (host: all hostOrAliasIsNull (attrValues host.locations)) (attrValues virtualHosts); + message = "Only one of nginx root or alias can be specified on a location."; + } + ]; + systemd.services.nginx = { description = "Nginx Web Server"; after = [ "network.target" ]; diff --git a/nixos/modules/services/web-servers/nginx/location-options.nix b/nixos/modules/services/web-servers/nginx/location-options.nix index e1885b16066..83ce0f71734 100644 --- a/nixos/modules/services/web-servers/nginx/location-options.nix +++ b/nixos/modules/services/web-servers/nginx/location-options.nix @@ -45,6 +45,15 @@ with lib; ''; }; + alias = mkOption { + type = types.nullOr types.path; + default = null; + example = "/your/alias/directory"; + description = '' + Alias directory for requests. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix index efb721c5773..26f54602203 100644 --- a/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/nixos/modules/services/web-servers/phpfpm/default.nix @@ -147,7 +147,6 @@ in { cfgFile = fpmCfgFile pool poolConfig; in { Slice = "phpfpm.slice"; - PrivateTmp = true; PrivateDevices = true; ProtectSystem = "full"; ProtectHome = true; diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 38e24e9b709..b02eaf861a0 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -64,7 +64,7 @@ in security.wrappers.e_freqset.source = "${e.enlightenment.out}/bin/e_freqset"; environment.etc = singleton - { source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; + { source = xcfg.xkbDir; target = "X11/xkb"; }; diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixos/modules/services/x11/desktop-managers/lumina.nix index ed5ad4a2a00..ec5fbb13b32 100644 --- a/nixos/modules/services/x11/desktop-managers/lumina.nix +++ b/nixos/modules/services/x11/desktop-managers/lumina.nix @@ -32,8 +32,8 @@ in environment.systemPackages = [ pkgs.fluxbox - pkgs.qt5.kwindowsystem - pkgs.qt5.oxygen-icons5 + pkgs.libsForQt5.kwindowsystem + pkgs.kdeFrameworks.oxygen-icons5 pkgs.lumina pkgs.numlockx pkgs.qt5.qtsvg diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index bc6e728169b..d981cd5328e 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -176,7 +176,7 @@ in environment.pathsToLink = [ "/share" ]; environment.etc = singleton { - source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; + source = xcfg.xkbDir; target = "X11/xkb"; }; @@ -208,11 +208,7 @@ in services.xserver.displayManager.sddm = { theme = "breeze"; - themes = [ - pkgs.extra-cmake-modules # for the setup-hook - plasma5.plasma-workspace - pkgs.breeze-icons - ]; + package = pkgs.sddmPlasma5; }; security.pam.services.kde = { allowNullPassword = true; }; @@ -225,11 +221,6 @@ in security.pam.services.sddm.enableKwallet = true; security.pam.services.slim.enableKwallet = true; - # use kimpanel as the default IBus panel - i18n.inputMethod.ibus.panel = - lib.mkDefault - "${plasma5.plasma-desktop}/lib/libexec/kimpanel-ibus-panel"; - }) ]; diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index e8b897fb605..4e2c0e01ca0 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -24,7 +24,7 @@ let Xft.lcdfilter: lcd${fontconfig.subpixel.lcdfilter} Xft.hinting: ${if fontconfig.hinting.enable then "1" else "0"} Xft.autohint: ${if fontconfig.hinting.autohint then "1" else "0"} - Xft.hintstyle: hint${fontconfig.hinting.style} + Xft.hintstyle: hintslight ''; # file provided by services.xserver.displayManager.session.script diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index dfda90978b1..1d5dcb2c7cb 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -45,6 +45,7 @@ let theme-name = ${cfg.theme.name} icon-theme-name = ${cfg.iconTheme.name} background = ${ldmcfg.background} + ${cfg.extraConfig} ''; in @@ -103,6 +104,15 @@ in }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra configuration that should be put in the lightdm-gtk-greeter.conf + configuration file. + ''; + }; + }; }; diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index 6630b8257e4..affc1261d19 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -9,7 +9,7 @@ let cfg = dmcfg.sddm; xEnv = config.systemd.services."display-manager".environment; - sddm = pkgs.sddm.override { inherit (cfg) themes; }; + sddm = cfg.package; xserverWrapper = pkgs.writeScript "xserver-wrapper" '' #!/bin/sh @@ -105,11 +105,12 @@ in ''; }; - themes = mkOption { - type = types.listOf types.package; - default = []; + package = mkOption { + type = types.package; + default = pkgs.sddm; description = '' - Extra packages providing themes. + The SDDM package to install. + The default package can be overridden to provide extra themes. ''; }; diff --git a/nixos/modules/services/x11/window-managers/2bwm.nix b/nixos/modules/services/x11/window-managers/2bwm.nix new file mode 100644 index 00000000000..e3f5ec7dbe6 --- /dev/null +++ b/nixos/modules/services/x11/window-managers/2bwm.nix @@ -0,0 +1,37 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.xserver.windowManager."2bwm"; + +in + +{ + + ###### interface + + options = { + services.xserver.windowManager."2bwm".enable = mkEnableOption "2bwm"; + }; + + + ###### implementation + + config = mkIf cfg.enable { + + services.xserver.windowManager.session = singleton + { name = "2bwm"; + start = + '' + ${pkgs."2bwm"}/bin/2bwm & + waitPID=$! + ''; + }; + + environment.systemPackages = [ pkgs."2bwm" ]; + + }; + +} diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index f005decfa33..32ef34bdad2 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -8,12 +8,14 @@ in { imports = [ + ./2bwm.nix ./afterstep.nix ./bspwm.nix ./compiz.nix ./dwm.nix ./exwm.nix ./fluxbox.nix + ./fvwm.nix ./herbstluftwm.nix ./i3.nix ./jwm.nix diff --git a/nixos/modules/services/x11/window-managers/fvwm.nix b/nixos/modules/services/x11/window-managers/fvwm.nix new file mode 100644 index 00000000000..9a51b9cd660 --- /dev/null +++ b/nixos/modules/services/x11/window-managers/fvwm.nix @@ -0,0 +1,41 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.windowManager.fvwm; + fvwm = pkgs.fvwm.override { gestures = cfg.gestures; }; +in + +{ + + ###### interface + + options = { + services.xserver.windowManager.fvwm = { + enable = mkEnableOption "Fvwm window manager"; + + gestures = mkOption { + default = false; + type = types.bool; + description = "Whether or not to enable libstroke for gesture support"; + }; + }; + }; + + + ###### implementation + + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton + { name = "fvwm"; + start = + '' + ${fvwm}/bin/fvwm & + waitPID=$! + ''; + }; + + environment.systemPackages = [ fvwm ]; + }; +} diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 84c23bed3e3..e9897cc01b6 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -53,6 +53,8 @@ let ln -s ${config.system.build.initialRamdisk}/initrd $out/initrd + ln -s ${config.system.build.initialRamdiskSecretAppender}/bin/append-initrd-secrets $out + ln -s ${config.hardware.firmware}/lib/firmware $out/firmware ''} diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index 59ecaf8d5a6..d78775c2758 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -44,9 +44,10 @@ in description = '' RSA SSH private key file in the Dropbear format. - WARNING: This key is contained insecurely in the global Nix store. Do NOT - use your regular SSH host private keys for this purpose or you'll expose - them to regular users! + WARNING: Unless your bootloader supports initrd secrets, this key is + contained insecurely in the global Nix store. Do NOT use your regular + SSH host private keys for this purpose or you'll expose them to + regular users! ''; }; @@ -56,9 +57,10 @@ in description = '' DSS SSH private key file in the Dropbear format. - WARNING: This key is contained insecurely in the global Nix store. Do NOT - use your regular SSH host private keys for this purpose or you'll expose - them to regular users! + WARNING: Unless your bootloader supports initrd secrets, this key is + contained insecurely in the global Nix store. Do NOT use your regular + SSH host private keys for this purpose or you'll expose them to + regular users! ''; }; @@ -68,9 +70,10 @@ in description = '' ECDSA SSH private key file in the Dropbear format. - WARNING: This key is contained insecurely in the global Nix store. Do NOT - use your regular SSH host private keys for this purpose or you'll expose - them to regular users! + WARNING: Unless your bootloader supports initrd secrets, this key is + contained insecurely in the global Nix store. Do NOT use your regular + SSH host private keys for this purpose or you'll expose them to + regular users! ''; }; @@ -97,10 +100,6 @@ in boot.initrd.extraUtilsCommands = '' copy_bin_and_libs ${pkgs.dropbear}/bin/dropbear cp -pv ${pkgs.glibc.out}/lib/libnss_files.so.* $out/lib - - ${optionalString (cfg.hostRSAKey != null) "install -D ${cfg.hostRSAKey} $out/etc/dropbear/dropbear_rsa_host_key"} - ${optionalString (cfg.hostDSSKey != null) "install -D ${cfg.hostDSSKey} $out/etc/dropbear/dropbear_dss_host_key"} - ${optionalString (cfg.hostECDSAKey != null) "install -D ${cfg.hostECDSAKey} $out/etc/dropbear/dropbear_ecdsa_host_key"} ''; boot.initrd.extraUtilsCommandsTest = '' @@ -116,9 +115,6 @@ in touch /var/log/lastlog mkdir -p /etc/dropbear - ${optionalString (cfg.hostRSAKey != null) "ln -s $extraUtils/etc/dropbear/dropbear_rsa_host_key /etc/dropbear/dropbear_rsa_host_key"} - ${optionalString (cfg.hostDSSKey != null) "ln -s $extraUtils/etc/dropbear/dropbear_dss_host_key /etc/dropbear/dropbear_dss_host_key"} - ${optionalString (cfg.hostECDSAKey != null) "ln -s $extraUtils/etc/dropbear/dropbear_ecdsa_host_key /etc/dropbear/dropbear_ecdsa_host_key"} mkdir -p /root/.ssh ${concatStrings (map (key: '' @@ -128,6 +124,11 @@ in dropbear -s -j -k -E -m -p ${toString cfg.port} ''; + boot.initrd.secrets = + (optionalAttrs (cfg.hostRSAKey != null) { "/etc/dropbear/dropbear_rsa_host_key" = cfg.hostRSAKey; }) // + (optionalAttrs (cfg.hostDSSKey != null) { "/etc/dropbear/dropbear_dss_host_key" = cfg.hostDSSKey; }) // + (optionalAttrs (cfg.hostECDSAKey != null) { "/etc/dropbear/dropbear_ecdsa_host_key" = cfg.hostECDSAKey; }); + }; } diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index c7559cd634a..5fcac5c8c6a 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -443,9 +443,40 @@ my $confFile = $grubVersion == 1 ? "$bootPath/grub/menu.lst" : "$bootPath/grub/g my $tmpFile = $confFile . ".tmp"; writeFile($tmpFile, $conf); + +# check whether to install GRUB EFI or not +sub getEfiTarget { + if ($grubVersion == 1) { + return "no" + } elsif (($grub ne "") && ($grubEfi ne "")) { + # EFI can only be installed when target is set; + # A target is also required then for non-EFI grub + if (($grubTarget eq "") || ($grubTargetEfi eq "")) { die } + else { return "both" } + } elsif (($grub ne "") && ($grubEfi eq "")) { + # TODO: It would be safer to disallow non-EFI grub installation if no taget is given. + # If no target is given, then grub auto-detects the target which can lead to errors. + # E.g. it seems as if grub would auto-detect a EFI target based on the availability + # of a EFI partition. + # However, it seems as auto-detection is currently relied on for non-x86_64 and non-i386 + # architectures in NixOS. That would have to be fixed in the nixos modules first. + return "no" + } elsif (($grub eq "") && ($grubEfi ne "")) { + # EFI can only be installed when target is set; + if ($grubTargetEfi eq "") { die } + else {return "only" } + } else { + # prevent an installation if neither grub nor grubEfi is given + return "neither" + } +} + +my $efiTarget = getEfiTarget(); + # Append entries detected by os-prober if (get("useOSProber") eq "true") { - system(get("shell"), "-c", "pkgdatadir=$grub/share/grub $grub/etc/grub.d/30_os-prober >> $tmpFile"); + my $targetpackage = ($efiTarget eq "no") ? $grub : $grubEfi; + system(get("shell"), "-c", "pkgdatadir=$targetpackage/share/grub $targetpackage/etc/grub.d/30_os-prober >> $tmpFile"); } # Atomically switch to the new config @@ -498,36 +529,7 @@ sub getDeviceTargets { } return @devices; } - -# check whether to install GRUB EFI or not -sub getEfiTarget { - if ($grubVersion == 1) { - return "no" - } elsif (($grub ne "") && ($grubEfi ne "")) { - # EFI can only be installed when target is set; - # A target is also required then for non-EFI grub - if (($grubTarget eq "") || ($grubTargetEfi eq "")) { die } - else { return "both" } - } elsif (($grub ne "") && ($grubEfi eq "")) { - # TODO: It would be safer to disallow non-EFI grub installation if no taget is given. - # If no target is given, then grub auto-detects the target which can lead to errors. - # E.g. it seems as if grub would auto-detect a EFI target based on the availability - # of a EFI partition. - # However, it seems as auto-detection is currently relied on for non-x86_64 and non-i386 - # architectures in NixOS. That would have to be fixed in the nixos modules first. - return "no" - } elsif (($grub eq "") && ($grubEfi ne "")) { - # EFI can only be installed when target is set; - if ($grubTargetEfi eq "") { die } - else {return "only" } - } else { - # prevent an installation if neither grub nor grubEfi is given - return "neither" - } -} - my @deviceTargets = getDeviceTargets(); -my $efiTarget = getEfiTarget(); my $prevGrubState = readGrubState(); my @prevDeviceTargets = split/,/, $prevGrubState->devices; diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 04cf17c1b0b..d5e00129a82 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -32,8 +32,11 @@ def write_loader_conf(generation): f.write("editor 0"); os.rename("@efiSysMountPoint@/loader/loader.conf.tmp", "@efiSysMountPoint@/loader/loader.conf") +def profile_path(generation, name): + return os.readlink("%s/%s" % (system_dir(generation), name)) + def copy_from_profile(generation, name, dry_run=False): - store_file_path = os.readlink("%s/%s" % (system_dir(generation), name)) + store_file_path = profile_path(generation, name) suffix = os.path.basename(store_file_path) store_dir = os.path.basename(os.path.dirname(store_file_path)) efi_file_path = "/efi/nixos/%s-%s.efi" % (store_dir, suffix) @@ -44,6 +47,11 @@ def copy_from_profile(generation, name, dry_run=False): def write_entry(generation, machine_id): kernel = copy_from_profile(generation, "kernel") initrd = copy_from_profile(generation, "initrd") + try: + append_initrd_secrets = profile_path(generation, "append-initrd-secrets") + subprocess.check_call([append_initrd_secrets, "@efiSysMountPoint@%s" % (initrd)]) + except FileNotFoundError: + pass entry_file = "@efiSysMountPoint@/loader/entries/nixos-generation-%d.conf" % (generation) generation_dir = os.readlink(system_dir(generation)) tmp_path = "%s.tmp" % (entry_file) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index ec02f73cada..a5a88a99be8 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -65,6 +65,8 @@ in { boot.loader.grub.enable = mkDefault false; + boot.loader.supportsInitrdSecrets = true; + system = { build.installBootLoader = gummibootBuilder; diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 8978b73749b..6e867b67439 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -6,29 +6,38 @@ let luks = config.boot.initrd.luks; openCommand = name': { name, device, header, keyFile, keyFileSize, allowDiscards, yubikey, ... }: assert name' == name; '' - # Wait for luksRoot to appear, e.g. if on a usb drive. - # XXX: copied and adapted from stage-1-init.sh - should be - # available as a function. - if ! test -e ${device}; then - echo -n "waiting 10 seconds for device ${device} to appear..." - for try in $(seq 10); do - sleep 1 - if test -e ${device}; then break; fi - echo -n . - done - echo "ok" - fi + + # Wait for a target (e.g. device, keyFile, header, ...) to appear. + wait_target() { + local name="$1" + local target="$2" + + if [ ! -e $target ]; then + echo -n "Waiting 10 seconds for $name $target to appear" + local success=false; + for try in $(seq 10); do + echo -n "." + sleep 1 + if [ -e $target ]; then success=true break; fi + done + if [ $success = true ]; then + echo " - success"; + else + echo " - failure"; + fi + fi + } + + # Wait for luksRoot (and optionally keyFile and/or header) to appear, e.g. + # if on a USB drive. + wait_target "device" ${device} ${optionalString (keyFile != null) '' - if ! test -e ${keyFile}; then - echo -n "waiting 10 seconds for key file ${keyFile} to appear..." - for try in $(seq 10); do - sleep 1 - if test -e ${keyFile}; then break; fi - echo -n . - done - echo "ok" - fi + wait_target "key file" ${keyFile} + ''} + + ${optionalString (header != null) '' + wait_target "header" ${header} ''} open_normally() { diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index f0699ad9832..c75e637124a 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -8,6 +8,14 @@ export LD_LIBRARY_PATH=@extraUtils@/lib export PATH=@extraUtils@/bin ln -s @extraUtils@/bin /bin +# Copy the secrets to their needed location +if [ -d "@extraUtils@/secrets" ]; then + for secret in $(cd "@extraUtils@/secrets"; find . -type f); do + mkdir -p $(dirname "/$secret") + ln -s "@extraUtils@/secrets/$secret" "$secret" + done +fi + # Stop LVM complaining about fd3 export LVM_SUPPRESS_FD_WARNINGS=true diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 61def24efd8..e3a3b6f88cf 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -82,6 +82,17 @@ let copy_bin_and_libs ${pkgs.e2fsprogs}/sbin/resize2fs ''} + # Copy secrets if needed. + ${optionalString (!config.boot.loader.supportsInitrdSecrets) + (concatStringsSep "\n" (mapAttrsToList (dest: source: + let source' = if source == null then dest else source; in + '' + mkdir -p $(dirname "$out/secrets/${dest}") + cp -a ${source'} "$out/secrets/${dest}" + '' + ) config.boot.initrd.secrets)) + } + ${config.boot.initrd.extraUtilsCommands} # Copy ld manually since it isn't detected correctly @@ -242,6 +253,52 @@ let ]; }; + # Script to add secret files to the initrd at bootloader update time + initialRamdiskSecretAppender = + pkgs.writeScriptBin "append-initrd-secrets" + '' + #!${pkgs.bash}/bin/bash -e + function usage { + echo "USAGE: $0 INITRD_FILE" >&2 + echo "Appends this configuration's secrets to INITRD_FILE" >&2 + } + + if [ $# -ne 1 ]; then + usage + exit 1 + fi + + if [ "$1"x = "--helpx" ]; then + usage + exit 0 + fi + + ${lib.optionalString (config.boot.initrd.secrets == {}) + "exit 0"} + + export PATH=${pkgs.coreutils}/bin:${pkgs.cpio}/bin:${pkgs.gzip}/bin:${pkgs.findutils}/bin + + function cleanup { + if [ -n "$tmp" -a -d "$tmp" ]; then + rm -fR "$tmp" + fi + } + trap cleanup EXIT + + tmp=$(mktemp -d initrd-secrets.XXXXXXXXXX) + + ${lib.concatStringsSep "\n" (mapAttrsToList (dest: source: + let source' = if source == null then dest else toString source; in + '' + mkdir -p $(dirname "$tmp/${dest}") + cp -a ${source'} "$tmp/${dest}" + '' + ) config.boot.initrd.secrets) + } + + (cd "$tmp" && find . | cpio -H newc -o) | gzip >>"$1" + ''; + in { @@ -370,6 +427,25 @@ in example = "xz"; }; + boot.initrd.secrets = mkOption + { internal = true; + default = {}; + type = types.attrsOf (types.nullOr types.path); + description = + '' + Secrets to append to the initrd. The attribute name is the + path the secret should have inside the initrd, the value + is the path it should be copied from (or null for the same + path inside and out). + ''; + example = literalExample + '' + { "/etc/dropbear/dropbear_rsa_host_key" = + ./secret-dropbear-key; + } + ''; + }; + boot.initrd.supportedFilesystems = mkOption { default = [ ]; example = [ "btrfs" ]; @@ -377,6 +453,18 @@ in description = "Names of supported filesystem types in the initial ramdisk."; }; + boot.loader.supportsInitrdSecrets = mkOption + { internal = true; + default = false; + type = types.bool; + description = + '' + Whether the bootloader setup runs append-initrd-secrets. + If not, any needed secrets must be copied into the initrd + and thus added to the store. + ''; + }; + fileSystems = mkOption { options.neededForBoot = mkOption { default = false; @@ -404,9 +492,8 @@ in } ]; - system.build.bootStage1 = bootStage1; - system.build.initialRamdisk = initialRamdisk; - system.build.extraUtils = extraUtils; + system.build = + { inherit bootStage1 initialRamdisk initialRamdiskSecretAppender extraUtils; }; system.requiredKernelConfig = with config.lib.kernelConfig; [ (isYes "TMPFS") diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index 904e41b019f..9be10a8283e 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -328,7 +328,7 @@ in rec { Automatically start this unit at the given date/time, which must be in the format described in systemd.time - 5. This is equivalent + 7. This is equivalent to adding a corresponding timer unit with set to the value given here. ''; @@ -375,9 +375,9 @@ in rec { Each attribute in this set specifies an option in the [Timer] section of the unit. See systemd.timer - 5 and + 7 and systemd.time - 5 for details. + 7 for details. ''; }; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index bff6739db61..f798862513c 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -829,7 +829,8 @@ in # Some overrides to upstream units. systemd.services."systemd-backlight@".restartIfChanged = false; - systemd.services."systemd-rfkill@".restartIfChanged = false; + systemd.services."systemd-fsck@".restartIfChanged = false; + systemd.services."systemd-fsck@".path = [ config.system.path ]; systemd.services."user@".restartIfChanged = false; systemd.services.systemd-journal-flush.restartIfChanged = false; systemd.services.systemd-random-seed.restartIfChanged = false; diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 9f30eb61146..3951d617f6f 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -221,7 +221,7 @@ in environment.etc.fstab.text = let - fsToSkipCheck = [ "none" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" ]; + fsToSkipCheck = [ "none" "bindfs" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" ]; skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck; in '' # This is a generated file. Do not edit! diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index d44209cfa0b..518fe0a97d2 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -234,7 +234,7 @@ in description = '' Systemd calendar expression when to scrub ZFS pools. See systemd.time - 5. + 7. ''; }; diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 3571e00d04e..720891d518a 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -159,35 +159,42 @@ let after = [ "network-pre.target" ] ++ (deviceDependency i.name); serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; + # Restart rather than stop+start this unit to prevent the + # network from dying during switch-to-configuration. + stopIfChanged = false; path = [ pkgs.iproute ]; script = '' + # FIXME: shouldn't this be done in network-link? echo "bringing up interface..." ip link set "${i.name}" up - restart_network_interfaces=false + state="/run/nixos/network/addresses/${i.name}" + + mkdir -p $(dirname "$state") + '' + flip concatMapStrings (ips) (ip: let address = "${ip.address}/${toString ip.prefixLength}"; in '' - echo "checking ip ${address}..." + echo "${address}" >> $state if out=$(ip addr add "${address}" dev "${i.name}" 2>&1); then - echo "added ip ${address}..." + echo "added ip ${address}" elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then echo "failed to add ${address}" exit 1 fi ''); - preStop = flip concatMapStrings (ips) (ip: - let - address = "${ip.address}/${toString ip.prefixLength}"; - in - '' - echo -n "deleting ${address}..." - ip addr del "${address}" dev "${i.name}" >/dev/null 2>&1 || echo -n " Failed" - echo "" - ''); + preStop = '' + state="/run/nixos/network/addresses/${i.name}" + while read address; do + echo -n "deleting $address..." + ip addr del "$address" dev "${i.name}" >/dev/null 2>&1 || echo -n " Failed" + echo "" + done < "$state" + rm -f "$state" + ''; }; createTunDevice = i: nameValuePair "${i.name}-netdev" @@ -239,6 +246,10 @@ let ip link set "${i}" master "${n}" ip link set "${i}" up '')} + # Save list of enslaved interfaces + echo "${flip concatMapStrings v.interfaces (i: '' + ${i} + '')}" > /run/${n}.interfaces # Enable stp on the interface ${optionalString v.rstp '' @@ -250,7 +261,28 @@ let postStop = '' ip link set "${n}" down || true ip link del "${n}" || true + rm -f /run/${n}.interfaces ''; + reload = '' + # Un-enslave child interfaces (old list of interfaces) + for interface in `cat /run/${n}.interfaces`; do + ip link set "$interface" nomaster up + done + + # Enslave child interfaces (new list of interfaces) + ${flip concatMapStrings v.interfaces (i: '' + ip link set "${i}" master "${n}" + ip link set "${i}" up + '')} + # Save list of enslaved interfaces + echo "${flip concatMapStrings v.interfaces (i: '' + ${i} + '')}" > /run/${n}.interfaces + + # (Un-)set stp on the bridge + echo ${if v.rstp then "2" else "0"} > /sys/class/net/${n}/bridge/stp_state + ''; + reloadIfChanged = true; }); createVswitchDevice = n: v: nameValuePair "${n}-netdev" diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 8b85ff0057f..a365a01bfb1 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -59,15 +59,16 @@ in systemd.network = let domains = cfg.search ++ (optional (cfg.domain != null) cfg.domain); - genericNetwork = override: { - DHCP = override (dhcpStr cfg.useDHCP); - } // optionalAttrs (cfg.defaultGateway != null) { - gateway = override [ cfg.defaultGateway.address ]; - } // optionalAttrs (cfg.defaultGateway6 != null) { - gateway = override [ cfg.defaultGateway6.address ]; - } // optionalAttrs (domains != [ ]) { - domains = override domains; - }; + genericNetwork = override: + let gateway = optional (cfg.defaultGateway != null) cfg.defaultGateway.address + ++ optional (cfg.defaultGateway6 != null) cfg.defaultGateway6.address; + in { + DHCP = override (dhcpStr cfg.useDHCP); + } // optionalAttrs (gateway != [ ]) { + gateway = override gateway; + } // optionalAttrs (domains != [ ]) { + domains = override domains; + }; in mkMerge [ { enable = true; networks."99-main" = genericNetwork mkDefault; diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 80e481d79b9..3e47710361a 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -15,6 +15,12 @@ let cfg = config.ec2; in config = { + assertions = [ + { assertion = cfg.hvm; + message = "Paravirtualized EC2 instances are no longer supported."; + } + ]; + virtualisation.growPartition = cfg.hvm; fileSystems."/" = { diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix index 34a50dcab16..349fd3adfc9 100644 --- a/nixos/modules/virtualisation/amazon-options.nix +++ b/nixos/modules/virtualisation/amazon-options.nix @@ -3,7 +3,7 @@ options = { ec2 = { hvm = lib.mkOption { - default = false; + default = lib.versionAtLeast config.system.stateVersion "17.03"; internal = true; description = '' Whether the EC2 instance is a HVM instance. @@ -11,6 +11,4 @@ }; }; }; - - config = {}; } diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index 4b30a38f832..f1101d7ea66 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -126,7 +126,17 @@ in path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs); }; - systemd.sockets.docker.socketConfig.ListenStream = cfg.listenOptions; + + systemd.sockets.docker = { + description = "Docker Socket for the API"; + wantedBy = [ "sockets.target" ]; + socketConfig = { + ListenStream = cfg.listenOptions; + SocketMode = "0660"; + SocketUser = "root"; + SocketGroup = "docker"; + }; + }; } ]); diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index d592a23c303..745518f8597 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -193,5 +193,35 @@ let self = { "16.09".us-west-2.pv-ebs = "ami-6d4af60d"; "16.09".us-west-2.pv-s3 = "ami-de48f4be"; - latest = self."16.09"; + # 17.03.885.6024dd4067 + "17.03".ap-northeast-1.hvm-ebs = "ami-dbd0f7bc"; + "17.03".ap-northeast-1.hvm-s3 = "ami-7cdff81b"; + "17.03".ap-northeast-2.hvm-ebs = "ami-c59a48ab"; + "17.03".ap-northeast-2.hvm-s3 = "ami-0b944665"; + "17.03".ap-south-1.hvm-ebs = "ami-4f413220"; + "17.03".ap-south-1.hvm-s3 = "ami-864033e9"; + "17.03".ap-southeast-1.hvm-ebs = "ami-e08c3383"; + "17.03".ap-southeast-1.hvm-s3 = "ami-c28f30a1"; + "17.03".ap-southeast-2.hvm-ebs = "ami-fca9a69f"; + "17.03".ap-southeast-2.hvm-s3 = "ami-3daaa55e"; + "17.03".ca-central-1.hvm-ebs = "ami-9b00bdff"; + "17.03".ca-central-1.hvm-s3 = "ami-e800bd8c"; + "17.03".eu-central-1.hvm-ebs = "ami-5450803b"; + "17.03".eu-central-1.hvm-s3 = "ami-6e2efe01"; + "17.03".eu-west-1.hvm-ebs = "ami-10754c76"; + "17.03".eu-west-1.hvm-s3 = "ami-11734a77"; + "17.03".eu-west-2.hvm-ebs = "ami-ff1d099b"; + "17.03".eu-west-2.hvm-s3 = "ami-fe1d099a"; + "17.03".sa-east-1.hvm-ebs = "ami-d95d3eb5"; + "17.03".sa-east-1.hvm-s3 = "ami-fca2c190"; + "17.03".us-east-1.hvm-ebs = "ami-0940c61f"; + "17.03".us-east-1.hvm-s3 = "ami-674fc971"; + "17.03".us-east-2.hvm-ebs = "ami-afc2e6ca"; + "17.03".us-east-2.hvm-s3 = "ami-a1cde9c4"; + "17.03".us-west-1.hvm-ebs = "ami-587b2138"; + "17.03".us-west-1.hvm-s3 = "ami-70411b10"; + "17.03".us-west-2.hvm-ebs = "ami-a93daac9"; + "17.03".us-west-2.hvm-s3 = "ami-5139ae31"; + + latest = self."17.03"; }; in self diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 556454c6b5f..a3dd3bd55d1 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -62,7 +62,7 @@ in mkdir -p /mnt/nix/store echo "copying everything (will take a while)..." - cp -prd $storePaths /mnt/nix/store/ + ${pkgs.rsync}/bin/rsync -a $storePaths /mnt/nix/store/ # Register the paths in the Nix database. printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \ @@ -261,7 +261,7 @@ in "kernel.kptr_restrict" = mkDefault "1"; # set ptrace protections - "kernel.yama.ptrace_scope" = mkDefault "1"; + "kernel.yama.ptrace_scope" = mkOverride 500 "1"; # set perf only available to root "kernel.perf_event_paranoid" = mkDefault "2"; diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 101ea9a4f51..c0cebaddec8 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -90,14 +90,16 @@ in { config = mkIf cfg.enable { - environment.systemPackages = - [ pkgs.libvirt pkgs.netcat-openbsd ] - ++ optional cfg.enableKVM pkgs.qemu_kvm; + environment.systemPackages = with pkgs; + [ libvirt netcat-openbsd ] + ++ optional cfg.enableKVM qemu_kvm; boot.kernelModules = [ "tun" ]; users.extraGroups.libvirtd.gid = config.ids.gids.libvirtd; + systemd.packages = [ pkgs.libvirt ]; + systemd.services.libvirtd = { description = "Libvirt Virtual Machine Management Daemon"; @@ -105,13 +107,17 @@ in { after = [ "systemd-udev-settle.service" ] ++ optional vswitch.enable "vswitchd.service"; - path = [ - pkgs.bridge-utils - pkgs.dmidecode - pkgs.dnsmasq - pkgs.ebtables + environment = { + LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}''; + }; + + path = with pkgs; [ + bridge-utils + dmidecode + dnsmasq + ebtables ] - ++ optional cfg.enableKVM pkgs.qemu_kvm + ++ optional cfg.enableKVM qemu_kvm ++ optional vswitch.enable vswitch.package; preStart = '' @@ -153,13 +159,17 @@ in { ''; # */ serviceConfig = { - ExecStart = ''@${pkgs.libvirt}/sbin/libvirtd libvirtd --config "${configFile}" ${concatStringsSep " " cfg.extraOptions}''; Type = "notify"; KillMode = "process"; # when stopping, leave the VMs alone Restart = "on-failure"; }; }; + systemd.services.libvirt-guests = { + wantedBy = [ "multi-user.target" ]; + path = with pkgs; [ coreutils libvirt gawk ]; + }; + systemd.sockets.virtlogd = { description = "Virtual machine log manager socket"; wantedBy = [ "sockets.target" ]; diff --git a/nixos/modules/virtualisation/rkt.nix b/nixos/modules/virtualisation/rkt.nix index c4c5cb3380e..98be4f680c3 100644 --- a/nixos/modules/virtualisation/rkt.nix +++ b/nixos/modules/virtualisation/rkt.nix @@ -22,7 +22,7 @@ in description = '' Specification (in the format described by systemd.time - 5) of the time at + 7) of the time at which the garbage collector will run. ''; }; diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index 57487f70451..1f5b6bd1d80 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -29,7 +29,6 @@ in virtualisation.xen.package = mkOption { type = types.package; - default = pkgs.xen; defaultText = "pkgs.xen"; example = literalExample "pkgs.xen-light"; description = '' @@ -39,7 +38,6 @@ in virtualisation.xen.qemu = mkOption { type = types.path; - default = "${pkgs.xen}/lib/xen/bin/qemu-system-i386"; defaultText = "\${pkgs.xen}/lib/xen/bin/qemu-system-i386"; example = literalExample "''${pkgs.qemu_xen-light}/bin/qemu-system-i386"; description = '' @@ -49,7 +47,6 @@ in virtualisation.xen.qemu-package = mkOption { type = types.package; - default = pkgs.xen; defaultText = "pkgs.xen"; example = literalExample "pkgs.qemu_xen-light"; description = '' @@ -136,6 +133,9 @@ in message = "Xen currently does not support EFI boot"; } ]; + virtualisation.xen.package = mkDefault pkgs.xen; + virtualisation.xen.qemu = mkDefault "${pkgs.xen}/lib/xen/bin/qemu-system-i386"; + virtualisation.xen.qemu-package = mkDefault pkgs.xen; virtualisation.xen.stored = mkDefault "${cfg.package}/bin/oxenstored"; environment.systemPackages = [ cfg.package ]; diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 1953fd1a26a..5c1112a1c6d 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -4,7 +4,7 @@ { nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; } , stableBranch ? false -, supportedSystems ? [ "x86_64-linux" "i686-linux" "aarch64-linux" ] +, supportedSystems ? [ "x86_64-linux" "i686-linux" ] }: let @@ -92,7 +92,7 @@ in rec { (all nixos.tests.openssh) (all nixos.tests.printing) (all nixos.tests.proxy) - (all nixos.tests.sddm) + (all nixos.tests.sddm.default) (all nixos.tests.simple) (all nixos.tests.udisks2) (all nixos.tests.xfce) diff --git a/nixos/release.nix b/nixos/release.nix index 325047ce10c..95b284cb705 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -1,6 +1,6 @@ { nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; } , stableBranch ? false -, supportedSystems ? [ "x86_64-linux" "i686-linux" "aarch64-linux" ] +, supportedSystems ? [ "x86_64-linux" "i686-linux" ] }: with import ../lib; @@ -228,6 +228,7 @@ in rec { tests.containers-imperative = callTest tests/containers-imperative.nix {}; tests.containers-extra_veth = callTest tests/containers-extra_veth.nix {}; tests.containers-physical_interfaces = callTest tests/containers-physical_interfaces.nix {}; + tests.containers-restart_networking = callTest tests/containers-restart_networking.nix {}; tests.containers-tmpfs = callTest tests/containers-tmpfs.nix {}; tests.containers-hosts = callTest tests/containers-hosts.nix {}; tests.containers-macvlans = callTest tests/containers-macvlans.nix {}; @@ -280,22 +281,23 @@ in rec { tests.networkingProxy = callTest tests/networking-proxy.nix {}; tests.nfs3 = callTest tests/nfs.nix { version = 3; }; tests.nfs4 = callTest tests/nfs.nix { version = 4; }; + tests.nginx = callTest tests/nginx.nix { }; tests.leaps = callTest tests/leaps.nix { }; tests.nsd = callTest tests/nsd.nix {}; tests.openssh = callTest tests/openssh.nix {}; tests.pam-oath-login = callTest tests/pam-oath-login.nix {}; #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); tests.peerflix = callTest tests/peerflix.nix {}; + tests.postgresql = callSubTests tests/postgresql.nix {}; tests.pgjwt = callTest tests/pgjwt.nix {}; - tests.postgresql = callTest tests/postgresql.nix {}; tests.printing = callTest tests/printing.nix {}; tests.proxy = callTest tests/proxy.nix {}; tests.pumpio = callTest tests/pump.io.nix {}; - tests.quagga = callTest tests/quagga.nix {}; + # tests.quagga = callTest tests/quagga.nix {}; tests.quake3 = callTest tests/quake3.nix {}; tests.runInMachine = callTest tests/run-in-machine.nix {}; tests.samba = callTest tests/samba.nix {}; - tests.sddm = callTest tests/sddm.nix {}; + tests.sddm = callSubTests tests/sddm.nix {}; tests.simple = callTest tests/simple.nix {}; tests.smokeping = callTest tests/smokeping.nix {}; tests.taskserver = callTest tests/taskserver.nix {}; diff --git a/nixos/tests/containers-restart_networking.nix b/nixos/tests/containers-restart_networking.nix new file mode 100644 index 00000000000..086d056c51c --- /dev/null +++ b/nixos/tests/containers-restart_networking.nix @@ -0,0 +1,114 @@ +# Test for NixOS' container support. + +let + client_base = rec { + networking.firewall.enable = false; + + containers.webserver = { + autoStart = true; + privateNetwork = true; + hostBridge = "br0"; + config = { + networking.firewall.enable = false; + networking.firewall.allowPing = true; + networking.interfaces.eth0.ip4 = [ + { address = "192.168.1.122"; prefixLength = 24; } + ]; + }; + }; + }; +in import ./make-test.nix ({ pkgs, lib, ...} : +{ + name = "containers-restart_networking"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ kampfschlaefer ]; + }; + + nodes = { + client = { lib, pkgs, ... }: client_base // { + virtualisation.vlans = [ 1 ]; + + networking.bridges.br0 = { + interfaces = []; + rstp = false; + }; + networking.interfaces = { + eth1.ip4 = lib.mkOverride 0 [ ]; + br0.ip4 = [{ address = "192.168.1.1"; prefixLength = 24; }]; + }; + + }; + client_eth1 = { lib, pkgs, ... }: client_base // { + networking.bridges.br0 = { + interfaces = [ "eth1" ]; + rstp = false; + }; + networking.interfaces = { + eth1.ip4 = lib.mkOverride 0 [ ]; + br0.ip4 = [{ address = "192.168.1.2"; prefixLength = 24; }]; + }; + }; + client_eth1_rstp = { lib, pkgs, ... }: client_base // { + networking.bridges.br0 = { + interfaces = [ "eth1" ]; + rstp = true; + }; + networking.interfaces = { + eth1.ip4 = lib.mkOverride 0 [ ]; + br0.ip4 = [{ address = "192.168.1.2"; prefixLength = 24; }]; + }; + }; + }; + + testScript = {nodes, ...}: let + originalSystem = nodes.client.config.system.build.toplevel; + eth1_bridged = nodes.client_eth1.config.system.build.toplevel; + eth1_rstp = nodes.client_eth1_rstp.config.system.build.toplevel; + in '' + $client->start(); + + $client->waitForUnit("default.target"); + + subtest "initial state", sub { + $client->succeed("ping 192.168.1.122 -c 1 -n >&2"); + $client->succeed("nixos-container run webserver -- ping -c 1 -n 192.168.1.1 >&2"); + + $client->fail("ip l show eth1 |grep \"master br0\" >&2"); + $client->fail("grep eth1 /run/br0.interfaces >&2"); + }; + + subtest "interfaces without stp", sub { + $client->succeed("${eth1_bridged}/bin/switch-to-configuration test >&2"); + + $client->succeed("ping 192.168.1.122 -c 1 -n >&2"); + $client->succeed("nixos-container run webserver -- ping -c 1 -n 192.168.1.2 >&2"); + + $client->succeed("ip l show eth1 |grep \"master br0\" >&2"); + $client->succeed("grep eth1 /run/br0.interfaces >&2"); + }; + + # activating rstp needs another service, therefor the bridge will restart and the container will loose its connectivity + #subtest "interfaces with rstp", sub { + # $client->succeed("${eth1_rstp}/bin/switch-to-configuration test >&2"); + # $client->execute("ip -4 a >&2"); + # $client->execute("ip l >&2"); + # + # $client->succeed("ping 192.168.1.122 -c 1 -n >&2"); + # $client->succeed("nixos-container run webserver -- ping -c 1 -n 192.168.1.2 >&2"); + # + # $client->succeed("ip l show eth1 |grep \"master br0\" >&2"); + # $client->succeed("grep eth1 /run/br0.interfaces >&2"); + #}; + + subtest "back to no interfaces and no stp", sub { + $client->succeed("${originalSystem}/bin/switch-to-configuration test >&2"); + + $client->succeed("ping 192.168.1.122 -c 1 -n >&2"); + $client->succeed("nixos-container run webserver -- ping -c 1 -n 192.168.1.1 >&2"); + + $client->fail("ip l show eth1 |grep \"master br0\" >&2"); + $client->fail("grep eth1 /run/br0.interfaces >&2"); + }; + ''; + +}) diff --git a/nixos/tests/dnscrypt-proxy.nix b/nixos/tests/dnscrypt-proxy.nix index 26409949ec6..84562336825 100644 --- a/nixos/tests/dnscrypt-proxy.nix +++ b/nixos/tests/dnscrypt-proxy.nix @@ -15,6 +15,7 @@ import ./make-test.nix ({ pkgs, ... }: { services.dnscrypt-proxy.enable = true; services.dnscrypt-proxy.localPort = localProxyPort; + services.dnscrypt-proxy.extraArgs = [ "-X libdcplugin_example.so" ]; services.dnsmasq.enable = true; services.dnsmasq.servers = [ "127.0.0.1#${toString localProxyPort}" ]; diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix index 1b57a94a05d..9096a5868f6 100644 --- a/nixos/tests/docker.nix +++ b/nixos/tests/docker.nix @@ -11,6 +11,21 @@ import ./make-test.nix ({ pkgs, ...} : { { config, pkgs, ... }: { virtualisation.docker.enable = true; + + users.users = { + noprivs = { + isNormalUser = true; + description = "Can't access the docker daemon"; + password = "foobar"; + }; + + hasprivs = { + isNormalUser = true; + description = "Can access the docker daemon"; + password = "foobar"; + extraGroups = [ "docker" ]; + }; + }; }; }; @@ -21,6 +36,8 @@ import ./make-test.nix ({ pkgs, ...} : { $docker->succeed("tar cv --files-from /dev/null | docker import - scratchimg"); $docker->succeed("docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"); $docker->succeed("docker ps | grep sleeping"); + $docker->succeed("sudo -u hasprivs docker ps"); + $docker->fail("sudo -u noprivs docker ps"); $docker->succeed("docker stop sleeping"); ''; }) diff --git a/nixos/tests/gnome3-gdm.nix b/nixos/tests/gnome3-gdm.nix index 42425b57ba3..2c9c745021a 100644 --- a/nixos/tests/gnome3-gdm.nix +++ b/nixos/tests/gnome3-gdm.nix @@ -11,6 +11,7 @@ import ./make-test.nix ({ pkgs, ...} : { services.xserver.enable = true; + services.xserver.displayManager.slim.enable = false; services.xserver.displayManager.gdm = { enable = true; autoLogin = { diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix index 7616a75b021..db58a2f5c85 100644 --- a/nixos/tests/hibernate.nix +++ b/nixos/tests/hibernate.nix @@ -13,7 +13,7 @@ import ./make-test.nix (pkgs: { networking.firewall.allowedTCPPorts = [ 4444 ]; - systemd.services.listener.serviceConfig.ExecStart = "${pkgs.netcat}/bin/nc -l 4444"; + systemd.services.listener.serviceConfig.ExecStart = "${pkgs.netcat}/bin/nc -l 4444 -k"; }; probe = { config, lib, pkgs, ...}: { @@ -32,6 +32,7 @@ import ./make-test.nix (pkgs: { $machine->succeed("mkswap /dev/vdb"); $machine->succeed("swapon -a"); $machine->startJob("listener"); + $machine->waitForOpenPort(4444); $machine->succeed("systemctl hibernate &"); $machine->waitForShutdown; $machine->start; diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix index 50746d17b45..40fafc62514 100644 --- a/nixos/tests/munin.nix +++ b/nixos/tests/munin.nix @@ -29,6 +29,7 @@ import ./make-test.nix ({ pkgs, ...} : { startAll; $one->waitForUnit("munin-node.service"); + $one->succeed('systemctl start munin-cron'); $one->waitForFile("/var/lib/munin/one/one-uptime-uptime-g.rrd"); $one->waitForFile("/var/www/munin/one/index.html"); ''; diff --git a/nixos/tests/nginx.nix b/nixos/tests/nginx.nix new file mode 100644 index 00000000000..c2beb5590ef --- /dev/null +++ b/nixos/tests/nginx.nix @@ -0,0 +1,42 @@ +# verifies: +# 1. nginx generates config file with shared http context definitions above +# generated virtual hosts config. + +import ./make-test.nix ({ pkgs, ...} : { + name = "jenkins"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ mbbx6spp ]; + }; + + nodes = { + webserver = + { config, pkgs, ... }: + { services.nginx.enable = true; + services.nginx.commonHttpConfig = '' + log_format ceeformat '@cee: {"status":"$status",' + '"request_time":$request_time,' + '"upstream_response_time":$upstream_response_time,' + '"pipe":"$pipe","bytes_sent":$bytes_sent,' + '"connection":"$connection",' + '"remote_addr":"$remote_addr",' + '"host":"$host",' + '"timestamp":"$time_iso8601",' + '"request":"$request",' + '"http_referer":"$http_referer",' + '"upstream_addr":"$upstream_addr"}'; + ''; + services.nginx.virtualHosts."0.my.test" = { + extraConfig = '' + access_log syslog:server=unix:/dev/log,facility=user,tag=mytag,severity=info ceeformat; + ''; + }; + }; + }; + + testScript = '' + startAll; + + $webserver->waitForUnit("nginx"); + $webserver->waitForOpenPort("80"); + ''; +}) diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix index ca787e9c7b9..f561fc8c3c4 100644 --- a/nixos/tests/plasma5.nix +++ b/nixos/tests/plasma5.nix @@ -8,25 +8,27 @@ import ./make-test.nix ({ pkgs, ...} : machine = { lib, ... }: { imports = [ ./common/user-account.nix ]; - virtualisation.memorySize = 1024; services.xserver.enable = true; - services.xserver.displayManager.sddm = { - enable = true; - autoLogin = { - enable = true; - user = "alice"; - }; - }; + services.xserver.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; services.xserver.desktopManager.default = "plasma5"; - virtualisation.writableStore = false; # FIXME + virtualisation.memorySize = 1024; }; - testScript = { nodes, ... }: - let xdo = "${pkgs.xdotool}/bin/xdotool"; in - '' + enableOCR = true; + + testScript = { nodes, ... }: let + user = nodes.machine.config.users.extraUsers.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"); $machine->waitForFile("/home/alice/.Xauthority"); $machine->succeed("xauth merge ~alice/.Xauthority"); diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix index f17384b44ba..1f4f43a2666 100644 --- a/nixos/tests/postgresql.nix +++ b/nixos/tests/postgresql.nix @@ -1,26 +1,46 @@ -import ./make-test.nix ({ pkgs, ...} : { - name = "postgresql"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ zagy ]; - }; - - nodes = { - master = - { pkgs, config, ... }: - - { - services.postgresql.enable = true; - services.postgresql.initialScript = pkgs.writeText "postgresql-init.sql" - '' - CREATE ROLE postgres WITH superuser login createdb; - ''; - }; - }; - - testScript = '' - startAll; - $master->waitForUnit("postgresql"); - $master->sleep(10); # Hopefully this is long enough!! - $master->succeed("echo 'select 1' | sudo -u postgres psql"); +{ system ? builtins.currentSystem }: +with import ../lib/testing.nix { inherit system; }; +with pkgs.lib; +let + postgresql-versions = pkgs.callPackages ../../pkgs/servers/sql/postgresql { }; + test-sql = pkgs.writeText "postgresql-test" '' + CREATE EXTENSION pgcrypto; -- just to check if lib loading works + CREATE TABLE sth ( + id int + ); + INSERT INTO sth (id) VALUES (1); + INSERT INTO sth (id) VALUES (1); + INSERT INTO sth (id) VALUES (1); + INSERT INTO sth (id) VALUES (1); + INSERT INTO sth (id) VALUES (1); ''; -}) + make-postgresql-test = postgresql-name: postgresql-package: { + name = postgresql-name; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ zagy ]; + }; + + machine = {pkgs, config, ...}: + { + services.postgresql.package=postgresql-package; + services.postgresql.enable = true; + }; + + testScript = '' + $machine->start; + $machine->waitForUnit("postgresql"); + # postgresql should be available just after unit start + $machine->succeed("cat ${test-sql} | psql postgres"); + $machine->shutdown; # make sure that postgresql survive restart (bug #1735) + sleep(2); + $machine->start; + $machine->waitForUnit("postgresql"); + $machine->fail('test $(psql postgres -tAc "SELECT * FROM sth;"|wc -l) -eq 3'); + $machine->succeed('test $(psql postgres -tAc "SELECT * FROM sth;"|wc -l) -eq 5'); + $machine->fail('test $(psql postgres -tAc "SELECT * FROM sth;"|wc -l) -eq 4'); + $machine->shutdown; + ''; + + }; +in + mapAttrs' (p-name: p-package: {name=p-name; value=make-postgresql-test p-name p-package;}) postgresql-versions diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix index 041d88fbeae..f78a77efbf0 100644 --- a/nixos/tests/sddm.nix +++ b/nixos/tests/sddm.nix @@ -1,28 +1,66 @@ -import ./make-test.nix ({ pkgs, ...} : { - name = "sddm"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ ttuegel ]; - }; +{ system ? builtins.currentSystem }: - machine = { lib, ... }: { - imports = [ ./common/user-account.nix ]; - services.xserver.enable = true; - services.xserver.displayManager.sddm = { - enable = true; - autoLogin = { - enable = true; - user = "alice"; +with import ../lib/testing.nix { inherit system; }; + +let + inherit (pkgs) lib; + + tests = { + default = { + name = "sddm"; + + machine = { lib, ... }: { + imports = [ ./common/user-account.nix ]; + services.xserver.enable = true; + services.xserver.displayManager.sddm.enable = true; + services.xserver.windowManager.default = "icewm"; + services.xserver.windowManager.icewm.enable = true; + services.xserver.desktopManager.default = "none"; }; - }; - services.xserver.windowManager.default = "icewm"; - services.xserver.windowManager.icewm.enable = true; - services.xserver.desktopManager.default = "none"; - }; - testScript = { nodes, ... }: '' - startAll; - $machine->waitForFile("/home/alice/.Xauthority"); - $machine->succeed("xauth merge ~alice/.Xauthority"); - $machine->waitForWindow("^IceWM "); - ''; -}) + enableOCR = true; + + testScript = { nodes, ... }: let + user = nodes.machine.config.users.extraUsers.alice; + in '' + startAll; + $machine->waitForText(qr/BOB/); + $machine->screenshot("sddm"); + $machine->sendChars("${user.password}\n"); + $machine->waitForFile("/home/alice/.Xauthority"); + $machine->succeed("xauth merge ~alice/.Xauthority"); + $machine->waitForWindow("^IceWM "); + ''; + }; + + autoLogin = { + name = "sddm-autologin"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ttuegel ]; + }; + + machine = { lib, ... }: { + imports = [ ./common/user-account.nix ]; + services.xserver.enable = true; + services.xserver.displayManager.sddm = { + enable = true; + autoLogin = { + enable = true; + user = "alice"; + }; + }; + services.xserver.windowManager.default = "icewm"; + services.xserver.windowManager.icewm.enable = true; + services.xserver.desktopManager.default = "none"; + }; + + testScript = { nodes, ... }: '' + startAll; + $machine->waitForFile("/home/alice/.Xauthority"); + $machine->succeed("xauth merge ~alice/.Xauthority"); + $machine->waitForWindow("^IceWM "); + ''; + }; + }; +in + lib.mapAttrs (lib.const makeTest) tests diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 376c4f21dc0..4f7cb176d96 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -65,7 +65,7 @@ let touch /mnt-root/boot-done hostname "${vmName}" mkdir -p /nix/store - unshare -m "@shell@" -c ' + unshare -m ${escapeShellArg pkgs.stdenv.shell} -c ' mount -t vboxsf nixstore /nix/store exec "$stage2Init" ' diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix index 0c875308502..50a011e0057 100644 --- a/pkgs/applications/altcoins/bitcoin-classic.nix +++ b/pkgs/applications/altcoins/bitcoin-classic.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost -, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost +, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent , withGui }: with stdenv.lib; + stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-classic-" + version; - version = "0.11.2.cl1.b1"; + version = "1.2.3"; - src = fetchurl { - url = "https://github.com/bitcoinclassic/bitcoinclassic/archive/v${version}.tar.gz"; - sha256 = "1szsnx5aijk3hx7qkqzbqsr0basg8ydwp20mh3bhnf4ljryy2049"; + src = fetchFromGitHub { + owner = "bitcoinclassic"; + repo = "bitcoinclassic"; + rev = "v${version}"; + sha256 = "0y99c8zv42ps3pxp46p3fqj9sir580v7s5qyi3cxva12mq2z0cql"; }; - buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib - miniupnpc utillinux protobuf ] + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ openssl db48 boost zlib + miniupnpc utillinux protobuf libevent ] ++ optionals withGui [ qt4 qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] @@ -35,7 +39,7 @@ stdenv.mkDerivation rec { continue to release updates that are in line with Satoshi’s whitepaper & vision, and are agreed upon by the community. ''; - homepage = "https://bitcoinclassic.com/"; + homepage = https://bitcoinclassic.com/; maintainers = with maintainers; [ jefdaj ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/altcoins/bitcoin-unlimited.nix new file mode 100644 index 00000000000..b6d0739c6bf --- /dev/null +++ b/pkgs/applications/altcoins/bitcoin-unlimited.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost +, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent +, withGui }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + + name = "bitcoin" + (toString (optional (!withGui) "d")) + "-unlimited-" + version; + version = "1.0.1.3"; + + src = fetchFromGitHub { + owner = "bitcoinunlimited"; + repo = "bitcoinunlimited"; + rev = "${version}"; + sha256 = "177l2jf2yqxh3sgf80dhgyk3wgjdnqszy3hb83clk8q1wyjkfz7y"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ openssl db48 boost zlib + miniupnpc utillinux protobuf libevent ] + ++ optionals withGui [ qt4 qrencode ]; + + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] + ++ optionals withGui [ "--with-gui=qt4" ]; + + meta = { + description = "Peer-to-peer electronic cash system (Unlimited client)"; + longDescription= '' + Bitcoin is a free open source peer-to-peer electronic cash system that is + completely decentralized, without the need for a central server or trusted + parties. Users hold the crypto keys to their own money and transact directly + with each other, with the help of a P2P network to check for double-spending. + + The Bitcoin Unlimited (BU) project seeks to provide a voice to all + stakeholders in the Bitcoin ecosystem. + + Every node operator or miner can currently choose their own blocksize limit + by modifying their client. Bitcoin Unlimited makes the process easier by + providing a configurable option for the accepted and generated blocksize via + a GUI menu. Bitcoin Unlimited further provides a user-configurable failsafe + setting allowing you to accept a block larger than your maximum accepted + blocksize if it reaches a certain number of blocks deep in the chain. + + The Bitcoin Unlimited client is not a competitive block scaling proposal + like BIP-101, BIP-102, etc. Instead it tracks consensus. This means that it + tracks the blockchain that the hash power majority follows, irrespective of + blocksize, and signals its ability to accept larger blocks via protocol and + block versioning fields. + + If you support an increase in the blocksize limit by any means - or just + support Bitcoin conflict resolution as originally envisioned by its founder - + consider running a Bitcoin Unlimited client. + ''; + homepage = https://www.bitcoinunlimited.info/; + maintainers = with maintainers; [ DmitryTsygankov ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix index fd2d2f35bcb..be4ea1fd6b6 100644 --- a/pkgs/applications/altcoins/bitcoin-xt.nix +++ b/pkgs/applications/altcoins/bitcoin-xt.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost , zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, curl , withGui }: @@ -6,14 +6,17 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-xt-" + version; - version = "0.11D"; + version = "0.11F"; - src = fetchurl { - url = "https://github.com/bitcoinxt/bitcoinxt/archive/v${version}.tar.gz"; - sha256 = "09r2i88wzqaj6mh66l3ngyfkm1a0dhwm5ibalj6y55wbxm9bvd36"; + src = fetchFromGitHub { + owner = "bitcoinxt"; + repo = "bitcoinxt"; + rev = "v${version}"; + sha256 = "13s5k9mxmlbf49p5hc546x20y5dslfp6g9hi6nw5yja5bngbwr24"; }; - buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ openssl db48 boost zlib miniupnpc utillinux protobuf curl ] ++ optionals withGui [ qt4 qrencode ]; diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index c6490cf67df..ddbe7104f1d 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -4,19 +4,18 @@ with stdenv.lib; stdenv.mkDerivation rec{ - name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version; - core_version = "0.13.1"; - version = core_version; + version = "0.14.0"; src = fetchurl { - urls = [ "https://bitcoin.org/bin/bitcoin-core-${core_version}/bitcoin-${version}.tar.gz" - "mirror://sourceforge/bitcoin/Bitcoin/bitcoin-${core_version}/bitcoin-${version}.tar.gz" + urls = [ "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" + "mirror://sourceforge/bitcoin/Bitcoin/bitcoin-${version}/bitcoin-${version}.tar.gz" ]; - sha256 = "d8edbd797ff1c8266113e54d851a85def46ab82389abe7d7bd0d2827e74cecd7"; + sha256 = "07k4i9r033dsvkp5ii5g3hykidm8b19c8c0mz1bi8k0dda3d8hyp"; }; - buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ openssl db48 boost zlib miniupnpc protobuf libevent] ++ optionals stdenv.isLinux [ utillinux ] ++ optionals withGui [ qt4 qrencode ]; diff --git a/pkgs/applications/altcoins/dashpay.nix b/pkgs/applications/altcoins/dashpay.nix index ef42560ee9a..ff0f2407cfe 100644 --- a/pkgs/applications/altcoins/dashpay.nix +++ b/pkgs/applications/altcoins/dashpay.nix @@ -1,25 +1,35 @@ -{ fetchzip, stdenv, pkgconfig, autoreconfHook +{ fetchFromGitHub, stdenv, pkgconfig, autoreconfHook , openssl, db48, boost, zlib, miniupnpc -, qt4, qrencode, glib, protobuf, yasm -, utillinux }: +, qrencode, glib, protobuf, yasm, libevent +, utillinux +, enable_Upnp ? false +, disable_Wallet ? false +, disable_Daemon ? false }: with stdenv.lib; stdenv.mkDerivation rec { + name = "dashpay-${version}"; + version = "0.12.1.3"; - name = "dashpay-${meta.version}"; - - src = fetchzip { - url = "https://github.com/dashpay/dash/archive/v${meta.version}.tar.gz"; - sha256 = "19bk7cviy3n2dpj4kr3i6i0i3ac2l5ri8ln1a51nd3n90k016wnx"; + src = fetchFromGitHub { + owner = "dashpay"; + repo= "dash"; + rev = "v${version}"; + sha256 = "0h0fxhh30wy5vp06l1mkswhz565qs6j9y0dm84fmn28rdfvhv2aj"; }; - buildInputs = [ pkgconfig autoreconfHook glib openssl db48 yasm - boost zlib miniupnpc protobuf qt4 qrencode utillinux ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + buildInputs = [ glib openssl db48 yasm boost zlib libevent + miniupnpc protobuf qrencode utillinux ]; + - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; + configureFlags = [ "--with-boost-libdir=${boost.out}/lib --with-gui=no" ] + ++ optional enable_Upnp "--enable-upnp-default" + ++ optional disable_Wallet "--disable-wallet" + ++ optional disable_Daemon "--disable-daemon" + ; - meta = with stdenv.lib; { - version = "0.12.0.55"; + meta = { description = "A decentralized key/value registration and transfer system"; longDescription = '' Dash (DASH) is an open sourced, privacy-centric digital currency diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 1d9b897188d..fbc3d1c36f9 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -5,6 +5,9 @@ rec { bitcoin = callPackage ./bitcoin.nix { withGui = true; }; bitcoind = callPackage ./bitcoin.nix { withGui = false; }; + bitcoin-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = true; }; + bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = false; }; + bitcoin-classic = callPackage ./bitcoin-classic.nix { withGui = true; }; bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; }; @@ -16,6 +19,7 @@ rec { dogecoin = callPackage ./dogecoin.nix { withGui = true; }; dogecoind = callPackage ./dogecoin.nix { withGui = false; }; + freicoin = callPackage ./freicoin.nix { boost = pkgs.boost155; }; go-ethereum = callPackage ./go-ethereum.nix { }; litecoin = callPackage ./litecoin.nix { withGui = true; }; @@ -33,5 +37,4 @@ rec { primecoind = callPackage ./primecoin.nix { withGui = false; }; stellar-core = callPackage ./stellar-core.nix { }; - } diff --git a/pkgs/applications/altcoins/freicoin.nix b/pkgs/applications/altcoins/freicoin.nix new file mode 100644 index 00000000000..f7cd04f1be4 --- /dev/null +++ b/pkgs/applications/altcoins/freicoin.nix @@ -0,0 +1,32 @@ +{ fetchFromGitHub, stdenv, db, boost, gmp, mpfr, miniupnpc, qt4, qmake4Hook, unzip }: + +stdenv.mkDerivation rec { + version = "0.8.6-2"; + name = "freicoin-${version}"; + + src = fetchFromGitHub { + owner = "freicoin"; + repo = "freicoin"; + rev = "v${version}"; + sha256 = "1m5pcnfhwhcj7q00p2sy3h73rkdm3w6grmljgiq53gshcj08cq1z"; + }; + + # I think that openssl and zlib are required, but come through other + # packages + + installPhase = '' + mkdir -p $out/bin + cp freicoin-qt $out/bin + ''; + + nativeBuildInputs = [ qmake4Hook ]; + buildInputs = [ db boost gmp mpfr miniupnpc qt4 ]; + + meta = with stdenv.lib; { + description = "Peer-to-peer currency with demurrage fee"; + homepage = http://freicoi.in/; + license = licenses.mit; + maintainers = [ maintainers.viric ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index eaf02bd2689..a52301c34d7 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "0.9.11"; + version = "0.9.12"; name = "drumgizmo-${version}"; src = fetchurl { url = "http://www.drumgizmo.org/releases/${name}/${name}.tar.gz"; - sha256 = "04hf3nhccwr98n2081rrvfccz50nly6k3gbk9zxccp1522qz5xvf"; + sha256 = "0kqrss9v3vpznmh4jgi3783wmprr645s3i485jlvdscpysjfkh6z"; }; configureFlags = [ "--enable-lv2" ]; diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 0a2e293d90b..064feeb02a3 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "1n2kd468kn71yp2asmamprvblmdlvh0zd8lsh3598dwi4b7aa3ga"; + sha256 = "0l6kjb1q9vslwy56836a0c65mf8z8ycam5vzz3k4qvd8g74bs1zq"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 1fe2c46d236..5a10d1262f4 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages, mygpoclient, intltool +{ stdenv, fetchurl, fetchpatch, python2Packages, mygpoclient, intltool , ipodSupport ? false, libgpod , gnome3 }: @@ -6,13 +6,31 @@ python2Packages.buildPythonApplication rec { name = "gpodder-${version}"; - version = "3.9.1"; + version = "3.9.3"; src = fetchurl { url = "http://gpodder.org/src/${name}.tar.gz"; - sha256 = "036p9vnkr3if0k548xhhjmcwdaimy3yd24s3xd8vzlp0wdzkzrhn"; + sha256 = "1s83m90dic2zphwwv6wrvqx950y12v5sakm7q5nj5bnh5k9l2hgl"; }; + patches = [ + (fetchpatch { + sha256 = "1xkl1wnp46546jrzsnb9p0yj23776byg3nvsqwbblhqbsfipl48w"; + name = "Fix-soundcloud-feeds.patch"; + url = "https://github.com/gpodder/gpodder/commit/e7f34ad090cd276d75c0cd8d92ed97243d75db38.patch"; + }) + (fetchpatch { + sha256 = "1jlldbinlxis1pi9p2lyczgbcv8nmdj66fxll6ph0klln0w8gvg4"; + name = "use-https-urls-for-soundcloud.patch"; + url = "https://github.com/gpodder/gpodder/commit/ef915dd3b6828174bf4f6f0911da410d9aca1b67.patch"; + }) + (fetchpatch { + sha256 = "1l37ihzk7gfqcl5nnphv0sv80psm6fsg4qkxn6abc6v476axyj9b"; + name = "updates-soundcloud-support-to-recognize-https"; + url = "https://github.com/gpodder/gpodder/commit/5c1507671d93096ad0118f908c20dd1f182a72e0.patch"; + }) + ]; + postPatch = with stdenv.lib; '' sed -i -re 's,^( *gpodder_dir *= *).*,\1"'"$out"'",' bin/gpodder @@ -30,22 +48,22 @@ python2Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python2Packages; [ - feedparser dbus-python mygpoclient pygtk eyeD3 + feedparser dbus-python mygpoclient pygtk eyeD3 podcastparser html5lib ] ++ stdenv.lib.optional ipodSupport libgpod; checkPhase = '' LC_ALL=C python -m gpodder.unittests ''; - meta = { + meta = with stdenv.lib; { description = "A podcatcher written in python"; longDescription = '' gPodder downloads and manages free audio and video content (podcasts) for you. Listen directly on your computer or on your mobile devices. ''; homepage = "http://gpodder.org/"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = [ stdenv.lib.maintainers.skeidel ]; + license = licenses.gpl3; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ skeidel mic92 ]; }; } diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 642cbbd23f6..6073008d541 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -12,11 +12,11 @@ in stdenv.mkDerivation rec { name = "guitarix-${version}"; - version = "0.35.2"; + version = "0.35.3"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz"; - sha256 = "1qj3adjhg511jygbjkl9k5v0gcjmg6ifc479rspfyf45m383pp3p"; + sha256 = "0pvw4ijkq6lcn45vrif9b4mqmgzi0qg1dp5b33kb5zan6n1aci4j"; }; nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ]; diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 856da9f742e..7dae614a8f7 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook ]; buildInputs = with gst_all_1; [ - gst-plugins-base gst-plugins-good gst-plugins-ugly + gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad glib_networking gobjectIntrospection ]; diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index c719080c742..463bd64495d 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -56,5 +56,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = [ maintainers.vandenoever ]; repositories.git = https://github.com/musescore/MuseScore; + broken = true; }; } diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix index a7252b9e28a..f4e5998c037 100644 --- a/pkgs/applications/audio/non/default.nix +++ b/pkgs/applications/audio/non/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { name = "non-${version}"; - version = "2016-12-07"; + version = "2017-03-29"; src = fetchFromGitHub { owner = "original-male"; repo = "non"; - rev = "754d113b0e3144a145d50bde8370ff2cae98169c"; - sha256 = "04h67vy966vys6krgjsxd7dph4z46r8c6maw1hascxlasy3bhhk0"; + rev = "10c31e57291b6e42be53371567a722b62b32d220"; + sha256 = "080rha4ffp7qycyg1mqcf4vj0s7z8qfvz6bxm0w29xgg2kkmb3fx"; }; buildInputs = [ pkgconfig python2 cairo libjpeg ntk libjack2 libsndfile diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 6b4d8e33b50..1d1d0d6a6f0 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -8,7 +8,7 @@ let # Please update the stable branch! # Latest version number can be found at: # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/ - version = "1.0.49.125.g72ee7853-111"; + version = "1.0.52.717.g2f08534a-47"; deps = [ alsaLib @@ -42,6 +42,7 @@ let xorg.libXrender xorg.libXScrnSaver xorg.libXtst + xorg.libxcb zlib ]; @@ -53,7 +54,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "0l008x06d257vcw6gq3q90hvv93cq6mxpj11by1np6bzzg61qv8x"; + sha256 = "1xqd4pjb69zmbac5fq3pckgr4khlkzfkx8b029qzjc2hi52zfnj7"; }; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index b3dd9f91ec8..191ec84f87b 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -4,38 +4,39 @@ , withQt5 ? false, qtbase }: +with stdenv.lib; + let - ver_branch = "1.19"; - version = "1.19.5"; + ver_branch = "1.22"; + version = "1.22.0"; in stdenv.mkDerivation rec { name = "lightdm-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz"; - sha256 = "0gbz8jk1ljh8rwgvldkiqma1k61sd27yh008228ahdqd5i2v1r1z"; + sha256 = "0a5bvfl2h7r873al6q7c819h0kg564k9fh51rl6489z6lyvazfg4"; }; - patches = [ ./fix-paths.patch ]; - + nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ - pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt + pam libxcb glib libXdmcp itstool libxml2 libxklavier libgcrypt qt4 libaudit gcc6 - ] ++ stdenv.lib.optional withQt5 qtbase; + ] ++ optional withQt5 qtbase; configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" "--disable-tests" - ] ++ stdenv.lib.optional (qt4 != null) "--enable-liblightdm-qt" - ++ stdenv.lib.optional withQt5 "--enable-liblightdm-qt5"; + ] ++ optional (qt4 != null) "--enable-liblightdm-qt" + ++ optional withQt5 "--enable-liblightdm-qt5"; installFlags = [ "sysconfdir=\${out}/etc" "localstatedir=\${TMPDIR}" ]; - meta = with stdenv.lib; { + meta = { homepage = https://launchpad.net/lightdm; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/applications/display-managers/lightdm/fix-paths.patch b/pkgs/applications/display-managers/lightdm/fix-paths.patch deleted file mode 100644 index 56930418cac..00000000000 --- a/pkgs/applications/display-managers/lightdm/fix-paths.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/common/user-list.c b/common/user-list.c -index 792c6d3..57fbfb7 100644 ---- a/common/user-list.c -+++ b/common/user-list.c -@@ -331,7 +331,7 @@ load_passwd_file (CommonUserList *user_list, gboolean emit_add_signal) - - value = g_key_file_get_string (config, "UserList", "hidden-shells", NULL); - if (!value) -- value = g_strdup ("/bin/false /usr/sbin/nologin"); -+ value = g_strdup ("/run/current-system/sw/bin/nologin"); - hidden_shells = g_strsplit (value, " ", -1); - g_free (value); - -diff --git a/src/seat.c b/src/seat.c -index f9b149d..9029742 100644 ---- a/src/seat.c -+++ b/src/seat.c -@@ -343,7 +343,7 @@ run_script (Seat *seat, DisplayServer *display_server, const gchar *script_name, - - /* Set POSIX variables */ - process_set_clear_environment (script, TRUE); -- process_set_env (script, "SHELL", "/bin/sh"); -+ process_set_env (script, "SHELL", "/run/current-system/sw/bin/sh"); - - /* Variables required for regression tests */ - if (g_getenv ("LIGHTDM_TEST_ROOT")) -@@ -354,7 +354,7 @@ run_script (Seat *seat, DisplayServer *display_server, const gchar *script_name, - process_set_env (script, "PATH", g_getenv ("PATH")); - } - else -- process_set_env (script, "PATH", "/usr/local/bin:/usr/bin:/bin"); -+ process_set_env (script, "PATH", "/run/current-system/sw/bin"); - - if (user) - { -diff --git a/src/session-child.c b/src/session-child.c -index e85f57d..93db0bd 100644 ---- a/src/session-child.c -+++ b/src/session-child.c -@@ -410,7 +410,7 @@ session_child_run (int argc, char **argv) - else - { - /* Set POSIX variables */ -- pam_putenv (pam_handle, "PATH=/usr/local/bin:/usr/bin:/bin"); -+ pam_putenv (pam_handle, "PATH=/run/current-system/sw/bin"); - pam_putenv (pam_handle, g_strdup_printf ("USER=%s", username)); - pam_putenv (pam_handle, g_strdup_printf ("LOGNAME=%s", username)); - pam_putenv (pam_handle, g_strdup_printf ("HOME=%s", user_get_home_directory (user))); -diff --git a/src/shared-data-manager.c b/src/shared-data-manager.c -index 47f1c10..cc82652 100644 ---- a/src/shared-data-manager.c -+++ b/src/shared-data-manager.c -@@ -68,7 +68,7 @@ delete_unused_user (gpointer key, gpointer value, gpointer user_data) - - gchar *path = g_build_filename (USERS_DIR, user, NULL); - gchar *quoted_path = g_shell_quote (path); -- gchar *cmd = g_strdup_printf ("/bin/rm -rf %s", quoted_path); -+ gchar *cmd = g_strdup_printf ("/run/current-system/sw/bin/rm -rf %s", quoted_path); - - g_spawn_command_line_async (cmd, &error); - if (error) diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 9fd56a49b5f..f675febafb5 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeQtWrapper, fetchFromGitHub, fetchpatch +{ stdenv, lib, makeQtWrapper, fetchFromGitHub, fetchpatch , cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd , themes @@ -28,10 +28,12 @@ let nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ]; buildInputs = [ - libxcb libpthreadstubs libXdmcp libXau qtbase pam systemd + libxcb libpthreadstubs libXdmcp libXau pam systemd ]; - propagatedBuildInputs = [ qtdeclarative ]; + propagatedBuildInputs = [ + qtbase qtdeclarative + ]; cmakeFlags = [ "-DCONFIG_FILE=/etc/sddm.conf" @@ -80,6 +82,22 @@ stdenv.mkDerivation { installPhase = '' runHook preInstall + propagated= + for i in $unwrapped $themes; do + findInputs $i propagated propagated-user-env-packages + if [ -z "$crossConfig" ]; then + findInputs $i propagated propagated-native-build-inputs + else + findInputs $i propagated propagated-build-inputs + fi + done + + for pkg in $propagated; do + addToSearchPath RUNTIME_XDG_DATA_DIRS "$pkg/share" + addToSearchPath RUNTIME_XDG_CONFIG_DIRS "$pkg/etc/xdg" + done + + mkdir -p "$out/bin" makeQtWrapper "$unwrapped/bin/sddm" "$out/bin/sddm" mkdir -p "$out/share/sddm" diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 9cab87e9ed2..20c2623e034 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, zip, wxGTK, gtk2 +{ stdenv, fetchurl, autoreconfHook, libtool, pkgconfig, file, zip, wxGTK, gtk2 , contribPlugins ? false, hunspell, gamin, boost }: -with { inherit (stdenv.lib) optionalString optional optionals; }; +with stdenv.lib; stdenv.mkDerivation rec { name = "${pname}-${stdenv.lib.optionalString contribPlugins "full-"}${version}"; - version = "13.12"; + version = "16.01"; pname = "codeblocks"; src = fetchurl { - url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks_${version}-1.tar.gz"; - sha256 = "044njhps4cm1ijfdyr5f9wjyd0vblhrz9b4603ma52wcdq25093p"; + url = "mirror://sourceforge/codeblocks/Sources/${version}/codeblocks_${version}.tar.gz"; + sha256 = "00sskm91r20ywydwqwx6v7z3nwn9lyh5297c5wp3razldlh9vyrh"; }; - buildInputs = [ automake autoconf libtool pkgconfig file zip wxGTK gtk2 ] + nativeBuildInputs = [ autoreconfHook pkgconfig libtool file zip ]; + buildInputs = [ wxGTK gtk2 ] ++ optionals contribPlugins [ hunspell gamin boost ]; enableParallelBuilding = true; patches = [ ./writable-projects.patch ]; @@ -25,9 +26,9 @@ stdenv.mkDerivation rec { # Fix boost 1.59 compat # Try removing in the next version - CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED"; + #CPPFLAGS = "-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED"; - meta = with stdenv.lib; { + meta = { maintainers = [ maintainers.linquize ]; platforms = platforms.all; description = "The open source, cross platform, free C, C++ and Fortran IDE"; diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix index 8774b1b461f..b9bd529930f 100644 --- a/pkgs/applications/editors/elvis/default.nix +++ b/pkgs/applications/editors/elvis/default.nix @@ -1,15 +1,25 @@ -{ fetchurl, stdenv, ncurses }: +{ fetchurl, fetchpatch, stdenv, ncurses }: stdenv.mkDerivation rec { name = "elvis-2.2_0"; src = fetchurl { - url = ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz; + url = "http://www.the-little-red-haired-girl.org/pub/elvis/elvis-2.2_0.tar.gz"; sha256 = "182fj9qzyq6cjq1r849gpam6nq9smwv9f9xwaq84961p56r6d14s"; }; buildInputs = [ ncurses ]; + patches = [ (fetchpatch { + url = "https://github.com/mbert/elvis/commit/076cf4ad5cc993be0c6195ec0d5d57e5ad8ac1eb.patch"; + sha256 = "0yzkc1mxjwg09mfmrk20ksa0vfnb2x83ndybwvawq4xjm1qkcahc"; + }) ]; + + postPatch = '' + substituteInPlace configure \ + --replace '-lcurses' '-lncurses' + ''; + preConfigure = '' mkdir -p $out/share/man/man1 ''; diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 400b1cd4246..868f9619ce2 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -358,15 +358,14 @@ license = lib.licenses.free; }; }) {}; - company = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: - elpaBuild { + company = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "company"; - version = "0.9.2"; + version = "0.9.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/company-0.9.2.tar"; - sha256 = "10divixs06gq9nm8s8x0q12ir07y27d06l52ix2dn84zvj853z4z"; + url = "https://elpa.gnu.org/packages/company-0.9.3.tar"; + sha256 = "1b38najmah4s2smxslik6wbdvb0x77rm6fv45pcq5x5aaiplh5ap"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/company.html"; license = lib.licenses.free; @@ -821,10 +820,10 @@ gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "gnorb"; - version = "1.1.5"; + version = "1.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnorb-1.1.5.tar"; - sha256 = "128ag8zkfxspf6szxfd7dcscm1zzzcibx7p9dpbpk036cr7m5i1p"; + url = "https://elpa.gnu.org/packages/gnorb-1.2.1.tar"; + sha256 = "0mip0czvpdl26xz9wamii5azj9bacjhdg0jgkrxyv17vqqlbag9x"; }; packageRequires = [ cl-lib ]; meta = { @@ -1058,27 +1057,29 @@ license = lib.licenses.free; }; }) {}; - lmc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + lmc = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "lmc"; version = "1.4"; src = fetchurl { url = "https://elpa.gnu.org/packages/lmc-1.4.el"; sha256 = "0fm4sclx9gg0d0615smz105x320sk45y4ivpjk3nbc67c5l0sh2h"; }; - packageRequires = []; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/lmc.html"; license = lib.licenses.free; }; }) {}; - load-dir = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + load-dir = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + elpaBuild { pname = "load-dir"; - version = "0.0.3"; + version = "0.0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/load-dir-0.0.3.el"; - sha256 = "0w5rdc6gr7nm7r0d258mp5sc06n09mmz7kjg8bd3sqnki8iz7s32"; + url = "https://elpa.gnu.org/packages/load-dir-0.0.5.el"; + sha256 = "1575ipn155nzzb5yghblxc7v1vpq4i16w1ff7y56qw2498ligpc5"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://elpa.gnu.org/packages/load-dir.html"; license = lib.licenses.free; diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 844dfa9fcb8..70ea1d58cf8 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -355,12 +355,12 @@ ac-dcd = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, flycheck-dmd-dub, lib, melpaBuild }: melpaBuild { pname = "ac-dcd"; - version = "20160311.617"; + version = "20170323.601"; src = fetchFromGitHub { owner = "atilaneves"; repo = "ac-dcd"; - rev = "bfb4fe768c8bf6fc7b7ee880f54e2052ebb23e3b"; - sha256 = "1hlijh415wgl450ry16a1072jjrkqqqkk862hfhswfr2l6rjfw98"; + rev = "1614aa624252e3445b0392c8a9b7197084f3e422"; + sha256 = "02slswlcjh1rjc9hglvbizhvwp57xcnbhs8cmlcayw0yjwp6mnvb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/64142a4b14531409f45f02a8053ed8948f48221d/recipes/ac-dcd"; @@ -380,8 +380,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "1d35c6a213f439ff0da10359af456cf0ee5fa459"; - sha256 = "189a8na2ymf9is5sr93ilp0r9jj94a7ms5ykjj4ws4w5cd9vx7cx"; + rev = "c13d1e853722bac880e82e6b04158015e7b12f6c"; + sha256 = "18bm0prhnahj0b397hn9nn98d09rrzfhzfg86glxqy4y8k6f0ai6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim"; @@ -737,8 +737,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "1f823b74622b1602c7336991c211b71d3f20b180"; - sha256 = "0wnw1cbxjp0yvkpba01dngvbzplwnq52bll9lryq58wmqi6iwmx6"; + rev = "36e37b21ebcd3d178da4e23a440759bc6b049c7d"; + sha256 = "1rs7v5n5rb6gdyxxadg2p8zabh0qxvdmyq9356qk6drx8mnsvq8k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -754,12 +754,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20170304.704"; + version = "20170327.542"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "1f823b74622b1602c7336991c211b71d3f20b180"; - sha256 = "0wnw1cbxjp0yvkpba01dngvbzplwnq52bll9lryq58wmqi6iwmx6"; + rev = "36e37b21ebcd3d178da4e23a440759bc6b049c7d"; + sha256 = "1rs7v5n5rb6gdyxxadg2p8zabh0qxvdmyq9356qk6drx8mnsvq8k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -985,12 +985,12 @@ ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-link"; - version = "20161203.1059"; + version = "20170319.553"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-link"; - rev = "3691a0ca4d897d1b5f51795a14dc33b4ee48dd4a"; - sha256 = "0yhy6cq19zllc8cycpq5assdgdmhl77ybs7xr3q99m0jqx20g5xx"; + rev = "0b6e06e0b5222a57e5e6f1d9af6436eb12102e3e"; + sha256 = "1h8j1dl9xyybm0pj3j2j6fcq7bryby2h1s64r6ijcsgrqgimq66i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link"; @@ -1299,12 +1299,12 @@ aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aggressive-indent"; - version = "20170310.828"; + version = "20170321.1300"; src = fetchFromGitHub { owner = "Malabarba"; repo = "aggressive-indent-mode"; - rev = "0492172a766971405fb6dea19371a3c97db8dc3c"; - sha256 = "12s14diivykwfmkp5429j1y5ry8is81wmnmw048wy3jlh4zwrxnc"; + rev = "9dfde9ccef6dffbfa68219d91703d779cfe7016a"; + sha256 = "1aslsq5jjvg0hywk4qzk30k6kaics1xslpqd38n24w37872b70jn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent"; @@ -1549,12 +1549,12 @@ all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }: melpaBuild { pname = "all-the-icons"; - version = "20170311.1021"; + version = "20170328.2313"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "7b799f901ceecf1aeb101ebeef5f785c2e4d6d03"; - sha256 = "10sd8m8ym7c47fkdawkiss3cfrm9kwh0ysknrws1g108zpmszsij"; + rev = "e7c8f824d542fd946dfe695ef370dd57a218d03c"; + sha256 = "0y5mf6iwyqsfl6xa00pkv23d52dadk1zgcmkx91i0ls3jb1cvarg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; @@ -1684,12 +1684,12 @@ anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "anaconda-mode"; - version = "20170313.343"; + version = "20170329.836"; src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "b76345e0ba398c03347b6af4fa087f346eb32174"; - sha256 = "105m01hnkm2asq900c8ndcpim6a2dgndcl83669vb5v39alm17g6"; + rev = "14061ecfbde5f58a0f807eafc7c1871ff178cea0"; + sha256 = "05lq97xfdmw34yh1jy4b7ypks5nf3jjcrx12lk0jxhhgcr7j2lv3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -1745,12 +1745,12 @@ android-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "android-mode"; - version = "20170131.2347"; + version = "20170323.115"; src = fetchFromGitHub { owner = "remvee"; repo = "android-mode"; - rev = "76711e73b459de1ee639a49733e4f3f245b8fb41"; - sha256 = "1z0pw5h5yqpszr07jg7hqlfphhy0g6p2hqjyd9ds68p987v35vz0"; + rev = "f274da87429617b0b9c5889d46b36de64d982da4"; + sha256 = "17m4hp2qb54widwadv23amc1lasnbwzh2ipc6180fnajg8zcbvyw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77633aa340803a433570327943fbe31b396f4355/recipes/android-mode"; @@ -2269,12 +2269,12 @@ anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anything-tramp"; - version = "20170313.257"; + version = "20170325.1036"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-anything-tramp"; - rev = "75df15ac263701f921649fefb29f03f6b7d49b9f"; - sha256 = "0al2k5az5x6idnhkhckjxr4vh52f0n9fi20ranwid9ac8k6kspvz"; + rev = "4e5f2ceb4624a633b809cb7ac671425fa061586b"; + sha256 = "1jzyxxk8c9dfr5d3i89cq7apjlrwc3278nn1fr7hlcg05nv2lfwl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5be5351cb187dff8388865ac424f8e5be71639/recipes/anything-tramp"; @@ -2513,12 +2513,12 @@ apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apropospriate-theme"; - version = "20170212.1229"; + version = "20170321.907"; src = fetchFromGitHub { owner = "waymondo"; repo = "apropospriate-theme"; - rev = "f5ffcabf7f079bd899d95ffa11a78ccca7eb8c8e"; - sha256 = "1vrpg0fjshqcfhj4iwkgrqw052rvx9kf2l217mg2z94rjm1y9g55"; + rev = "09f2f184445f179c3c888a4a9b6cafea82a0ca99"; + sha256 = "000bihb4i07d5djf2b1hdyxm2yynnq5sirry1qgvn5wmrvny586l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme"; @@ -3527,6 +3527,27 @@ license = lib.licenses.free; }; }) {}; + auto-read-only = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "auto-read-only"; + version = "20170305.2043"; + src = fetchFromGitHub { + owner = "zonuexe"; + repo = "auto-read-only.el"; + rev = "79654f8fc024f383ae7af05487c1345738236500"; + sha256 = "123822s9xkzw25swn1h1szxmmajnn9rq85vasygvy5cn2l6lar3l"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/189e394eb9fac09783c75ff1b64facdd745a0454/recipes/auto-read-only"; + sha256 = "1cvh2c7pgdxgnl0fr1lymz9pf573hj6dn8cjcb64wdczkrci7yk5"; + name = "auto-read-only"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/auto-read-only"; + license = lib.licenses.free; + }; + }) {}; auto-save-buffers-enhanced = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-save-buffers-enhanced"; @@ -3597,8 +3618,8 @@ src = fetchFromGitHub { owner = "robert-zaremba"; repo = "auto-virtualenvwrapper.el"; - rev = "bfe512270cd6471346f149d46e9f724569dd10a9"; - sha256 = "1mw61d29z8p847qmlyjqpl1lmnpla40xh5sxgqg5hjp9scwwwp8w"; + rev = "114a096561ac3a3b10165d05a6e763cb3c39a9b3"; + sha256 = "0j392l0kb6h5ckmpvhd71blw7ad9i2r7fc6laqq6vsibnw899wy5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02a209ae8f9fc68feb3bb64d32d129fedef2b80b/recipes/auto-virtualenvwrapper"; @@ -3885,12 +3906,12 @@ avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy"; - version = "20170208.148"; + version = "20170326.1157"; src = fetchFromGitHub { owner = "abo-abo"; repo = "avy"; - rev = "b8d71639158b44a2a700b84cb02fc8518ad7d542"; - sha256 = "1yddpl78krl2y5l3w6f1h53f5qsc09ad4qcwv31k549ziwiz1vd4"; + rev = "0c30cdba9e601c9e719b8b00101d2af9f93d2042"; + sha256 = "18sklj4hc8qybcrqymm6144dz6y8hf34s6szxis3flnnhx1x6a06"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy"; @@ -4263,12 +4284,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20170307.143"; + version = "20170326.1839"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "f6d3d45a88d8fa2d70eaa26d8ebcef741b370dd1"; - sha256 = "19jbvz07qc325mqdzk0q1ycvpibndw0mb7s7bpr0f0nblla0l0sv"; + rev = "87b91379661f627cb1cecabfd648d6a3838cd448"; + sha256 = "1fb4mhz17x235lasqqwzb0jacvl96h3lsjf7mkhdwzxp3p26l4gf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -4678,12 +4699,12 @@ beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "beginend"; - version = "20150607.1001"; + version = "20170324.728"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "beginend"; - rev = "05ed9428b3f09221da0e05fdd918cc5a0b643197"; - sha256 = "1vsid87pmls565bqknbgr7z907v7bb7115v70vzbw4z6lc4falry"; + rev = "2d8908922fadc1e29938703593a77da6456dc276"; + sha256 = "0h6i56pa92x89rilgb7kgfpnsx57d157r284q0icm4xj990svg21"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend"; @@ -4973,8 +4994,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "53bf803f1d3efc61653f94fe56ff30a72304861e"; - sha256 = "1knyd7gf975akjkzn3dh3jckvk377x3n1b6b1d425rw9clwnginp"; + rev = "a354568ec2af8444b741f595a3a7183e3f67ad58"; + sha256 = "19aaqcaycq1msfgvvnlqkzqqijbzqzc015k69pbg41l5bvrwnqcq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -5427,10 +5448,10 @@ }) {}; bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "bookmark-plus"; - version = "20170312.1134"; + version = "20170312.1135"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/bookmark+.el"; - sha256 = "14xkhc0x5ac2b0np5hvb0f4d1rap4yysbvm3fnmaaq4kylriysad"; + sha256 = "0vr5v6laav6hhx8g9v4pjdmfjcc2bylvvjwzfby9a4s838dakgkr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/bookmark+"; @@ -5467,12 +5488,12 @@ boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; - version = "20170214.1228"; + version = "20170318.1312"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "bb751855aa099ea3d6f4573534e0d3fa010aaea8"; - sha256 = "09bfmds8xfjafcqpn6fc5qjaixd0pvjn42jyr4kkgb8pi5c4vkvv"; + rev = "d9f0545708bbbbe3df23b2b91cdd2824beb0df56"; + sha256 = "0crqwyhzkwpi7c0rqcgmgqx6g4f8fw9gd9nh0ii6p5agiw140yj8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; @@ -5527,22 +5548,22 @@ license = lib.licenses.free; }; }) {}; - boxquote = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + boxquote = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "boxquote"; - version = "20081011.1326"; + version = "20170329.406"; src = fetchFromGitHub { owner = "davep"; repo = "boxquote.el"; - rev = "4c49b2046647ed187920c885e175ed388f4833dc"; - sha256 = "0235l4f1cxj7nysfnay4fz52mg0c13pzqxbhw65vdpfzz1gl1p73"; + rev = "b0239fb7b7a9d75d4ac3c66f9b96abd911dbf4e0"; + sha256 = "0agnsghxf35b6g49radxigw81bmvw1ggljzzmy771nmwl44q2dbb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2148f8f17b16154bfc337df69a5ad31e25a9b05/recipes/boxquote"; sha256 = "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s"; name = "boxquote"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/boxquote"; license = lib.licenses.free; @@ -6088,12 +6109,12 @@ build-status = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "build-status"; - version = "20170226.655"; + version = "20170323.1621"; src = fetchFromGitHub { owner = "sshaw"; repo = "build-status"; - rev = "25c61f445502699d18fda7eb2010a38cbf8085a2"; - sha256 = "04siqz69c5dp762c118b1b7iwdz8x3gavc3bncacgnx4ybyb1crf"; + rev = "01bb9cc1776e8eaab68147175aee9879d9541c4b"; + sha256 = "1c6q6rk6rvip5xv2zdpqamprx9kqh0c6v3r939fn7m4fnyyz15fn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23bbe012f313cf0cf4c45a66eb0bee9361ced564/recipes/build-status"; @@ -6235,12 +6256,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "20161209.154"; + version = "20170316.1516"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "07c525eaf9c1a9f1b48928b64e1802b1f1b25be3"; - sha256 = "1l4hjb21283mrb9v67k2xl83plq18ri7pqcp2kgs2ygbfnbwwqcs"; + rev = "677d6d3c253e69bee9e310911605833e79253ee3"; + sha256 = "0h8kq3p2ksyiqn4f6z7flq15q3dxps2fp5a8zzfpxbs67k13nrf3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -6505,22 +6526,22 @@ license = lib.licenses.free; }; }) {}; - calfw = callPackage ({ fetchFromGitHub, fetchurl, google-maps, lib, melpaBuild }: + calfw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "calfw"; - version = "20160302.1858"; + version = "20170320.506"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-calfw"; - rev = "e03ae470788778e7714b73520014eadc03a88abd"; - sha256 = "0rhasr818qijd2pcgifi0j3q4fkbiw2ck1nivajk7m810p53bxbj"; + rev = "136dce009a26e7d8a8064af422c2cf8170e852c5"; + sha256 = "1hiip8hfl7myimgba7ggs1ki1pk3ag7nyfa8j2zzm87n93g5xia4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d1aaab9844413a5fff992509935b399b5154c3d/recipes/calfw"; sha256 = "1lyb0jzpx19mx50d8xjv9sx201518vkvskxbglykaqpjm9ik2ai8"; name = "calfw"; }; - packageRequires = [ google-maps ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/calfw"; license = lib.licenses.free; @@ -6804,8 +6825,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "0cffdc4f3aa11634088b7ceac51a93b32f0501bd"; - sha256 = "1fwz12j86izrp9dfqsb6cw6007rdsaisps0c67div1szf11plhna"; + rev = "aa9dba05f7a971c530ef9da3d5dffc764df3bcfd"; + sha256 = "0iasvz1rvb4bk8pa0q298mc1lywdvddvsnh2rv3m10zar9z9xlrr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc"; @@ -6846,8 +6867,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "0cffdc4f3aa11634088b7ceac51a93b32f0501bd"; - sha256 = "1fwz12j86izrp9dfqsb6cw6007rdsaisps0c67div1szf11plhna"; + rev = "aa9dba05f7a971c530ef9da3d5dffc764df3bcfd"; + sha256 = "0iasvz1rvb4bk8pa0q298mc1lywdvddvsnh2rv3m10zar9z9xlrr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb"; @@ -7073,7 +7094,7 @@ version = "20170201.347"; src = fetchsvn { url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "12051"; + rev = "12088"; sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k"; }; recipeFile = fetchurl { @@ -7654,12 +7675,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20170310.735"; + version = "20170322.155"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "f5a1ade83c0299df9ae99bbb5a2bb843e0168452"; - sha256 = "14zdnvjjlqgw6y23lgs5mjf3b0g5z04xqzvn3fyjgbjzw77pa9ya"; + rev = "0816372ff483dd92eb8775c76929835b0955ae70"; + sha256 = "0jh7wv2h6xxm7h3pmabcx30m16j2lz11z5pzv73p3miyqpvkh6mn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -7780,12 +7801,12 @@ ciel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ciel"; - version = "20161230.2212"; + version = "20170323.2203"; src = fetchFromGitHub { owner = "cs14095"; repo = "ciel.el"; - rev = "ea047b6c097255ea3709b56007d0d1a3b3d5c9bc"; - sha256 = "1f0f2l3na49964wlyv8w99q2qqv5dsr880i6n1xin0q6yqms61yw"; + rev = "2cc6a4a338e6b1e477f37e8a2fa3c661209c0804"; + sha256 = "148g1wl9f2bbgpqnyl6qppmzs61z771d1l64643vwvrh3xn4q4vg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c70c007a557ea9fb9eb4d3f8b7adbe4dac39c8a/recipes/ciel"; @@ -7930,7 +7951,7 @@ version = "20170120.137"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "297625"; + rev = "299036"; sha256 = "0011wlqjkr1x58y0v5nf600nn7dj44cllp2m1dyj90aixjx4saq2"; }; recipeFile = fetchurl { @@ -8404,8 +8425,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clomacs"; - rev = "d35f139dfff1f0a7aafbc8ade36a97f894c29922"; - sha256 = "19zsz8yabs77zk0b2509g7rkgv3a1lkzgqyc7b80rqlpsrlki3d0"; + rev = "0c7793b52166730a563c3318cdcb9f2b423bc675"; + sha256 = "1sj4awcz6xdk1lq7yz69d8v0d97alipc3avzmnby6lpm2pw1n45a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs"; @@ -8547,12 +8568,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }: melpaBuild { pname = "cmake-ide"; - version = "20170202.1402"; + version = "20170316.643"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "916f35e775c721a97fca8e11565c12207448c2f1"; - sha256 = "1c7y2zyk8ihzn2za9mlpvjv5fp559rd2a5b42jz7lm2zkyn5a8b8"; + rev = "66059dabe9eb8aea24a56ef7e8d0b457cd814663"; + sha256 = "1vlrp1an7p61xzmsk5w48yjd5m89yg52jcbxfckmi40rz22j81lh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -8572,8 +8593,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "ccec62c6aa8ac44aaa9908ca5d72c396c5f068c0"; - sha256 = "1wdhyrx7ddqrj0fwqpdqrgnbdmcbk0z83jsn9lkqqv5bnw0l5k5r"; + rev = "6a5a214f43cccc83fbe3dd6de4747aba43088701"; + sha256 = "09xkv6b83b8wv043zq287azsjvqgl0nsmfprq3lsk5hqc82l6006"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -8737,8 +8758,8 @@ src = fetchFromGitHub { owner = "lujun9972"; repo = "code-library"; - rev = "3c79338eae5c892bfb4e4882298422d9fd65d2d7"; - sha256 = "0gc56pdyzcnv3q1a82c79i8w58q9r6ccfix9s1s6msjxzxkznap5"; + rev = "32d59c5c845d6dbdda18f9bd1c03a58d55417fc5"; + sha256 = "1n00bb39jgx02zdgla85zx0a338xir0zh0af6xca14kg5bx07vsv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/197bdc508c4fd9712125553a108ca6c9fedcaefc/recipes/code-library"; @@ -8779,8 +8800,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "codesearch.el"; - rev = "7f5ea7d653d01071ff9ce3c3281dc2bed4f96c5c"; - sha256 = "0ch3naqp3ji0q4blpjfr1xbzgzxhw10h08y2akik96kk1pnkwism"; + rev = "7013d933cd9d3c04f19a6572176483b48a311807"; + sha256 = "0g5w6p0hpsz5x4f3ic6q38ba5j5jfbx9nl77cxj6h1wpqdk49dhp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5aee771432c63fe2f0ec719ef000f2c5971947b5/recipes/codesearch"; @@ -8838,12 +8859,12 @@ coffee-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "coffee-mode"; - version = "20161124.832"; + version = "20170324.240"; src = fetchFromGitHub { owner = "defunkt"; repo = "coffee-mode"; - rev = "231eccd8cf662516159359ed24d1b27d068ec7f8"; - sha256 = "1anidih1kbwqifrb7v90ga172alqhxizwz1vrf87cnj5ns1h1hx8"; + rev = "86ab8aae8662e8eff54d3013010b9c693b16eac5"; + sha256 = "0hf06wp6cpsm7fivwkph6xvc2r39xww8q3aibp4nprlrwcmmv2al"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/coffee-mode"; @@ -9165,6 +9186,27 @@ license = lib.licenses.free; }; }) {}; + comint-intercept = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "comint-intercept"; + version = "20170317.528"; + src = fetchFromGitHub { + owner = "hying-caritas"; + repo = "comint-intercept"; + rev = "a329abf01fa8e0c6b02b46b29bcb421a21120dc5"; + sha256 = "0qswlafav415fh1dwqjsjmqlbnsjdl9gl3nzzya76ql5f0gb7svb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7d38188ec2d6e16714de9bb24ebd1ea89c7df3da/recipes/comint-intercept"; + sha256 = "1m2fn02n7aphlqmiaxgwp8jqg60sq4001cnkdxn5wb3w1hxy5qvq"; + name = "comint-intercept"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/comint-intercept"; + license = lib.licenses.free; + }; + }) {}; command-log-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "command-log-mode"; @@ -9315,12 +9357,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20170218.1913"; + version = "20170328.1748"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "bc2ce4e23ff2a3bd4a8ffa766acc5efb0643a7d1"; - sha256 = "0s246gaa85g6mmvzrk6293qni39rg43lmdgkfn5hwz2zrbp9blfx"; + rev = "f1499404163d8148e7a6303a8598f9c0f696d1cb"; + sha256 = "1ncfvf6ndqnn95m02ij66l7674h7chzgwg2r9biymqadzxjxim9i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -9491,12 +9533,12 @@ company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "company-coq"; - version = "20170227.644"; + version = "20170327.827"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "company-coq"; - rev = "202f38a11d8b14b8f3a84c8261816dbcf0dbff8f"; - sha256 = "0zs3n1nycpahx5qmlfpkb4nc1g7kjr0q9pc5lwgpasi54bcp3371"; + rev = "daec3ad0f3119f04108574ce48cd77068a850392"; + sha256 = "04fv3713sgy8c5y9blgx2xyjdg5qvg5idhvsf2p5lk9gjxbslp29"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq"; @@ -9607,8 +9649,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "1d35c6a213f439ff0da10359af456cf0ee5fa459"; - sha256 = "189a8na2ymf9is5sr93ilp0r9jj94a7ms5ykjj4ws4w5cd9vx7cx"; + rev = "c13d1e853722bac880e82e6b04158015e7b12f6c"; + sha256 = "18bm0prhnahj0b397hn9nn98d09rrzfhzfg86glxqy4y8k6f0ai6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim"; @@ -9666,12 +9708,12 @@ company-flow = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-flow"; - version = "20170226.1930"; + version = "20170325.810"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "company-flow"; - rev = "e2183e247720c1e252e04300313f386749997f5b"; - sha256 = "0gsdcm84k2j6753r44r2qxaq62264xj8cxqayynxvjsawzv3ljav"; + rev = "339f502e46e7d9214b61498d539b17f8f0322d17"; + sha256 = "0w2b3fk0q3ia5fjxk8gxj4161rxg43jw0hxpihidl5aak4i6dxb9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63d346c14af1c5c138d14591a4d6dbc44d9bc429/recipes/company-flow"; @@ -9754,8 +9796,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "d09cef6327ed848a446636a857cd851dc7e63d19"; - sha256 = "1izc2f136v82zi9b8w606302xgvaf4jn6dqg2s3yq0pqabydl8zw"; + rev = "007b034ad7b6d5b70bd18348fc7609a9fdcbad18"; + sha256 = "1cy7fjbip8c9pmv91bk4kcjcl5qdz3an2i78ywlb3b2qhsac21kc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go"; @@ -9960,12 +10002,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "20170308.1819"; + version = "20170314.2141"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "1f823b74622b1602c7336991c211b71d3f20b180"; - sha256 = "0wnw1cbxjp0yvkpba01dngvbzplwnq52bll9lryq58wmqi6iwmx6"; + rev = "36e37b21ebcd3d178da4e23a440759bc6b049c7d"; + sha256 = "1rs7v5n5rb6gdyxxadg2p8zabh0qxvdmyq9356qk6drx8mnsvq8k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -10243,8 +10285,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "0e6c93a6e2f3646b35ae860d50f2ca1777d8bd8a"; - sha256 = "0ms2q4sbr1m02ifqr9792ab36icg1481332dz7mkpfcz4x0l2k8c"; + rev = "8fbdaeaec7704155a047ac17c11d4cf4208f5f79"; + sha256 = "0hvvyficrdxwwg9gyyzmvdsx7v1dh07qrzcvcdn1lq1q1shwcng9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd"; @@ -10260,12 +10302,12 @@ composable = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "composable"; - version = "20160519.1057"; + version = "20170319.644"; src = fetchFromGitHub { owner = "paldepind"; repo = "composable.el"; - rev = "73f46689cc298f87d2986fe634dadc930581addd"; - sha256 = "0phqphcgygy2amwy6lm96mxxhwac03p177lyklksy71gwlr3zxb5"; + rev = "30bdd343f846d71c280189a1236324591b10d9ce"; + sha256 = "1pnawyjr6r80nlbh8mncvr42kwr9kha18sslnzx6agm0zzil36ib"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1fc0f076198e4be46a33a26eea9f2d273dda12b8/recipes/composable"; @@ -10595,12 +10637,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20170225.356"; + version = "20170328.737"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "1ac1cc1378eeaec2eb47a21dabbb1f6d775e7823"; - sha256 = "0024zry02vwzhdip5s5g55wlicakj4815yy8s617jzmj840x97mc"; + rev = "3fbeaa563916c0e23c6cafa82716e9f2eba44073"; + sha256 = "14z8f0lx5s63dy7h0x5m6lkhpfbmlq0p64g2r6y3dhswb8zn1pjl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -10658,12 +10700,12 @@ counsel-gtags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "counsel-gtags"; - version = "20170310.536"; + version = "20170326.559"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-counsel-gtags"; - rev = "4ef27b1cf1075097e11c3bcfee43e0710950dbcb"; - sha256 = "14rnccz8sm8zyghkh93id4iv65qwdix75rb5f6i2y23k94h2483f"; + rev = "220ebb48419ee6891ecbf9ea8fe130b494b17ee2"; + sha256 = "12ml45gwfh0lyvmf24pvryylrjx5g60yqpbjfcak7zvy7x5wmc1s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ccc35632219dbec5fdad7401545e7c071b910c/recipes/counsel-gtags"; @@ -11635,8 +11677,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "af4737d709a90cc867ed93447e5354ee250ad6ec"; - sha256 = "0pz99wc7karlj4bvb6j6d1drfxmkb5f22pg27v4qqayl1hig0m14"; + rev = "bd0bd943792530194e9bea86e4cf6fe9f8261182"; + sha256 = "1z5li1h376978iby273ynvx52phdnsgsil8vlpj98izf19qnsmmq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -11736,12 +11778,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20170227.251"; + version = "20170322.1007"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "5a52c5eca997655b7db349962d056daba64219cb"; - sha256 = "17kfv071zg0v3hcmlzk5yb88xpyknxig2fl2mj2cw3xjcshbxaa0"; + rev = "2ea398532e8229e329f6ea9b264ffd42068b16b9"; + sha256 = "1zxj81dqci73zf01h9rz3gkd0qfd7n8238jzkjsmyhyvq7l644hz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -11757,12 +11799,12 @@ dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "dante"; - version = "20170207.234"; + version = "20170328.232"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "7acaefbf36fe53e9af9f812957eea404e11f8a61"; - sha256 = "0ascjab014sbv9fvkswyxwhg50f0siwa9v6s67k5g58n9f7r7bls"; + rev = "0fe8c8243e5ce1aa6c241d4e5d51e489b1fbd512"; + sha256 = "15r1bczfxbp7rgxh0gq1516kypgnkm4wsf9svl0fxzdcayaawl3k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -11946,12 +11988,12 @@ darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darktooth-theme"; - version = "20170313.317"; + version = "20170328.1604"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "dde50661210d8610cd03526a6c9a922bb0e494a6"; - sha256 = "1mab28rm175ylg17ziha2kndcqb9a23f8wrpydypa8k7iirhadp6"; + rev = "419746ab4c06bd2146ff6ddf68aa74dfd73d8c96"; + sha256 = "0gxvz617np99x5ynh7y0cammxmwxp42kcnnqxl5ljknn4lwbapar"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; @@ -12114,12 +12156,12 @@ datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "datetime"; - version = "20161007.1137"; + version = "20170318.254"; src = fetchFromGitHub { owner = "doublep"; repo = "datetime"; - rev = "6585b2dcb0b3871a2a63656d01baa0c9a300d457"; - sha256 = "07rb8r3j8293h0ffpwhf7mxnshqi08pb63swhmdzb34hn57cx4jg"; + rev = "3ecf9985250ecd441e91614b44cf12323af907c0"; + sha256 = "1x8kj6d9p42lffk15m0c955ibwxxvfxhihij43alwq5xab2l16bv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime"; @@ -12240,12 +12282,12 @@ ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ddskk"; - version = "20170311.1248"; + version = "20170322.401"; src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "0cffdc4f3aa11634088b7ceac51a93b32f0501bd"; - sha256 = "1fwz12j86izrp9dfqsb6cw6007rdsaisps0c67div1szf11plhna"; + rev = "aa9dba05f7a971c530ef9da3d5dffc764df3bcfd"; + sha256 = "0iasvz1rvb4bk8pa0q298mc1lywdvddvsnh2rv3m10zar9z9xlrr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk"; @@ -12364,12 +12406,12 @@ decl = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "decl"; - version = "20170310.632"; + version = "20170314.23"; src = fetchFromGitHub { owner = "preetpalS"; repo = "decl.el"; - rev = "c2b5ea44b77516b50e917ddc897f88dbf2a58894"; - sha256 = "1y40cyb61ghjhxn03ipbsx08b5d5qa909zp27g8r9nck4i3ni5gq"; + rev = "500ae2da41c65f4e35abf5cd352411ce7ed3f9df"; + sha256 = "1slfh4sjvprmg0pa4pq1h5jiwiszak7l8hakbvjy1ycbh97gnd17"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c2ecd46180643a0c493e05ec86fe50bc1e55146/recipes/decl"; @@ -12698,11 +12740,11 @@ dic-lookup-w3m = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild, stem, w3m }: melpaBuild { pname = "dic-lookup-w3m"; - version = "20160722.2319"; + version = "20170315.709"; src = fetchsvn { url = "http://svn.osdn.jp/svnroot/dic-lookup-w3m/"; - rev = "95"; - sha256 = "1lr236vz38mlzgqdcfx3adrnbfv55f1a6r2xgfkla0m2vq09v3bn"; + rev = "96"; + sha256 = "17g0bl94qmzalh3m6r6q10q06864d1h1nx5i7fddsamakmg89ziw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6627b66fff02513ee467ed0f4436fb5cd400a81d/recipes/dic-lookup-w3m"; @@ -12718,12 +12760,12 @@ dictcc = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "dictcc"; - version = "20170207.835"; + version = "20170318.1232"; src = fetchFromGitHub { owner = "cqql"; repo = "dictcc.el"; - rev = "a1e87dad68faee956e4614c4f0f0bb98ba81ab6a"; - sha256 = "086nq9ngn06n605s21733456knna2py5dfymm8824zslzz39i8fy"; + rev = "24fb40d0822f97c3d796ae81cb6684cd97263248"; + sha256 = "1faj9c4x306s3ml430s01c9zcg9xgj9p34v630046y4lh4i25qc8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e867df96915a0c4f22fdccd4e2096878895bda6/recipes/dictcc"; @@ -13195,12 +13237,12 @@ dired-hide-dotfiles = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-hide-dotfiles"; - version = "20170312.1017"; + version = "20170314.1339"; src = fetchFromGitHub { owner = "mattiasb"; repo = "dired-hide-dotfiles"; - rev = "32cf3b6f90dc56f6ff271c28d827aab303bc6221"; - sha256 = "1fpzgmvbgfgl6wdrynlpvvdlbm8npgrmnzfz2133zvf5x3zfzq6r"; + rev = "b715f643ec805b3b8aca334595e6589320f04a49"; + sha256 = "1n6l25lrhp1x8nhc54kqal96wq96kkfyvz5yzvlw1qd3yk4s567i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba64a50f85fdb0ad54149dfed4051b4c1a719cbb/recipes/dired-hide-dotfiles"; @@ -13279,12 +13321,12 @@ dired-launch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-launch"; - version = "20170227.1532"; + version = "20170328.809"; src = fetchFromGitHub { owner = "thomp"; repo = "dired-launch"; - rev = "58cf696c396c12d143387f4bf446ccb8398837b6"; - sha256 = "1i7a3rjf62ksyfd161jw4x1zx3apjmra42vas7xpllkkhrk0cz08"; + rev = "036204d3b86d4fbbd479f65d9af243cca079a47f"; + sha256 = "1g7kn9c2w165rchjbrkllvykj4952f7zgrhlr3lnfnf5dampy20k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c9a4945d65aa6afc371c447a572284d38d4d71/recipes/dired-launch"; @@ -13341,10 +13383,10 @@ }) {}; dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-plus"; - version = "20170221.1620"; + version = "20170324.1112"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dired+.el"; - sha256 = "0jfv0m3w3vqafaqcxp4n53msvjp83zczxc7drgng1amksr82xi63"; + sha256 = "00w4d3zw789cl0ch7h0nk4mzlb88806cbq6mcslwf82732vxzkv0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+"; @@ -13587,8 +13629,8 @@ src = fetchFromGitHub { owner = "wbolster"; repo = "emacs-direnv"; - rev = "120d6e15cfef64b10ed599a5f748e7580eacaeac"; - sha256 = "0vma9ar82841gwlgx3x2qywqwdm9ydx28di7k6c56v9z500jf9ra"; + rev = "72340994841db19083eb1226cd09abe75d1c1e13"; + sha256 = "0dx63z3cmpcbn1lr9baqhh78j5xfyv1n5yp6fs210hmrbhlfpr8d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv"; @@ -14274,8 +14316,8 @@ src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "2c2f3c68f8136caeef67c4e74cc84d52a7664535"; - sha256 = "0qyksf5svcpz263ah197bcmpnfn2rfq8x049wbalxi638bmbvzfg"; + rev = "b565a66d7fb8b41363fb90172b9882d4768ddd47"; + sha256 = "185mw8yaxpq7327nyyqjbc4bipx6shhmbl1dzdl3bfhc11vp1xfn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -14446,12 +14488,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20170222.1412"; + version = "20170316.1237"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-theme"; - rev = "f6a5a148851183b2e3a92d21bc179cc637b5fcdd"; - sha256 = "0w53gar82avmwx6rlhnn2p2vlmpghrn7hy83lggiawgr4h3yw4dw"; + rev = "2266ef462d3c0a4b79887d71447a45cf57b6a1d7"; + sha256 = "0p3f364f5p5wgma5c5iyknm73bvqvkfakndrn2r0k7phn29vw9fb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes"; @@ -14689,8 +14731,8 @@ src = fetchFromGitHub { owner = "dracula"; repo = "emacs"; - rev = "3c9efcc81ecb18c2ebd71aeb8da691a47a1fd49a"; - sha256 = "10gz1pmpdxk2c7r47ac4vxc57bs703l9yqa9jp6q6wnldi2k0snd"; + rev = "3ba76624318944cbadd95865dc3f50af01cb6241"; + sha256 = "1x74nxxdv87sw0prd20nz2i0mxna29spy9dwm5qp6skl09bjwrfn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d63cb8906726f106e65f7d9895b49a38ffebf8d5/recipes/dracula-theme"; @@ -14752,8 +14794,8 @@ src = fetchFromGitHub { owner = "sshbio"; repo = "drawille"; - rev = "d582b455c01432bc80933650c52a1f586bd1b5ad"; - sha256 = "1z3akh0ywzihr0ghk6f8x9z38mwqy3zg29p0q69h4i6yzhxpdmxa"; + rev = "d914845725719d8293e2f0dea3c9c7e0a1e0e62a"; + sha256 = "1ynjxfvx8b6rq6d4gm1sl96rmlk5pi8j5s1rd1y0p8x2lwqcfv77"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e0920232421bf177f2ab8595fab7e203f40b1a34/recipes/drawille"; @@ -14894,7 +14936,7 @@ version = "20130120.1257"; src = fetchsvn { url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1786710"; + rev = "1789422"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -14995,12 +15037,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20170312.1831"; + version = "20170328.2013"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "c5e81e4ef8baa92b4e7a0b5d91fb18cde1907923"; - sha256 = "01fih3i17s8ih8n79bxgpknfh7z0wgrb6asvvp32bxmmkhwrppkr"; + rev = "1df89e837d4c28c941db879b028f92b3378745d8"; + sha256 = "19n18a057ngvfqhaancji06abpp3qlqymsygchv0s9v9q6nzfi49"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump"; @@ -15058,11 +15100,11 @@ dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dyalog-mode"; - version = "20170215.333"; + version = "20170324.419"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "c4f10d72febc"; - sha256 = "0x9h38vs5vnvswp3dm3i2pdzw8rvqwxpsfpsjx7r84bww9nr9dyd"; + rev = "6f4b44fb1966"; + sha256 = "10d69aah8kq5ln3rcd2vcdck1vvqq5x47kk0bk4vpphh26j14jjp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -15369,6 +15411,27 @@ license = lib.licenses.free; }; }) {}; + easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "easy-hugo"; + version = "20170328.2015"; + src = fetchFromGitHub { + owner = "masasam"; + repo = "emacs-easy-hugo"; + rev = "544b6ef850c10e6bb15d0ac9a6474d471044309a"; + sha256 = "1j0ffs9517ba29lwd92sk30ih6sxlx2ychrr6lzc0a3lzdlzfaqz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/544fa512dc3e6379f451fd9b596d74a5849c87d2/recipes/easy-hugo"; + sha256 = "07pa48rv5aqpz7fwkbc48scvnvnvg1v3qkapn2h1qllfc0h2nn5i"; + name = "easy-hugo"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/easy-hugo"; + license = lib.licenses.free; + }; + }) {}; easy-kill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-kill"; @@ -15456,12 +15519,12 @@ ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ebal"; - version = "20161231.1559"; + version = "20170327.2229"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "ebal"; - rev = "c0df139972c52200db417cc18e65f8748969fb79"; - sha256 = "19yxfc6lbd4311w291lxsw1v3hp0ha4inlp5fcakszd76bc69c4w"; + rev = "e47c9eb6b8d6d2bc16c17f9d1dfa9fa2fc00124f"; + sha256 = "00d4i1y9z3gaw01cgccsk6q4qcbn9sg8lzs0im4dh6hzg27w12qm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal"; @@ -15498,12 +15561,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "20170222.1459"; + version = "20170327.141"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "36d9d19abacaeade54a043701c5b2e4e58b8a61b"; - sha256 = "1fiwgdlykgnyi93lrnh0ifd4c5jlbs1kg69r2q2fyyfcwwvvq3ck"; + rev = "1eea156ea6f1376d474274ce76b1d6864223c47e"; + sha256 = "0lhpwa4rgxb480gzfp55infr9672fv3b3my72f6wkwhh1k5i5xjb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -15558,12 +15621,12 @@ eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }: melpaBuild { pname = "eclim"; - version = "20170310.900"; + version = "20170328.1807"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "1d35c6a213f439ff0da10359af456cf0ee5fa459"; - sha256 = "189a8na2ymf9is5sr93ilp0r9jj94a7ms5ykjj4ws4w5cd9vx7cx"; + rev = "c13d1e853722bac880e82e6b04158015e7b12f6c"; + sha256 = "18bm0prhnahj0b397hn9nn98d09rrzfhzfg86glxqy4y8k6f0ai6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim"; @@ -15751,8 +15814,8 @@ src = fetchFromGitHub { owner = "stevenremot"; repo = "ede-php-autoload"; - rev = "dfabfc775ab3288ac91aac855de4b64e5279f0a2"; - sha256 = "0nb2yfbw3zsxpygy8ksz55k720lymy2fbfszh1qfd4yi0hkmbm5i"; + rev = "8ab5c333ded9110ed2dce90ca7fd89dcb3912dd4"; + sha256 = "127a5rf21ynw96lw1ydzdvpjpxzccn3dhvc6f24s96sg8r04hpbw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload"; @@ -15789,12 +15852,12 @@ ede-php-autoload-drupal = callPackage ({ ede-php-autoload, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ede-php-autoload-drupal"; - version = "20170225.1448"; + version = "20170316.1458"; src = fetchFromGitHub { owner = "xendk"; repo = "ede-php-autoload-drupal"; - rev = "2989b39067d5b556abb2977e52f1f0775fff3bbc"; - sha256 = "0j9nz2w3mg895nvfqnmxhl41xr6ijfrpqrf044mrz5h97hgk3g7w"; + rev = "54a04241d94fabc4f4d16ae4dc8ba4f0c6e3b435"; + sha256 = "1ckfja95zk4f7fgvycia7nxhxjgz4byrz30ic63f6kcq4dx78scs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/532fec4788350cc11893c32e3895f06510a39d35/recipes/ede-php-autoload-drupal"; @@ -16138,8 +16201,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "d44a906db46f6708f3e02e5ae460c2b698593492"; - sha256 = "0dw1jxzcxs47cq5sza28kz198zk0nhf0dv5ily262i5p0wl2kcjc"; + rev = "b196db4ca284abfbc63416582fe17cc357551fc2"; + sha256 = "0sw0cf69yswhgnyp10qjirrb2w2p9y6pc7ni8wbw8l16pmc7vgg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -16216,12 +16279,12 @@ ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "20170224.1115"; + version = "20170322.650"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "4578772ff1a64fa50f225646a9f4cd2c3070bffb"; - sha256 = "0dcn3wkb1hvmk9jy5s28nyfw7hrxslzjlylxxrf8g454swkmx0i8"; + rev = "2547226f2ee32726809a3a603e6797492896f170"; + sha256 = "1rkva6lmss32vd96wvgh0r5phdr54xs1hjmwpkcr4x2h1dm1w7a6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -16276,22 +16339,30 @@ license = lib.licenses.free; }; }) {}; - ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: + ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: melpaBuild { pname = "ejc-sql"; - version = "20170221.33"; + version = "20170328.706"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "4663cd80af74d8e29001adc696568de5d3d8717c"; - sha256 = "1r6b4dgk1scy1fwsri96gjldcx4q60vdgqb29k5g9sljsw00xzfy"; + rev = "9595e72e85e7edef0d9df5accf166d232824cd3d"; + sha256 = "0h0ryi027f4vqv9m6dz8dgf9scqmcabcgin692yysxp9b5jkg8d3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql"; sha256 = "0v9mmwc2gm58nky81q7fibj93zi7zbxq1jzjw55dg6cb6qb87vnx"; name = "ejc-sql"; }; - packageRequires = [ auto-complete cider clomacs dash emacs spinner ]; + packageRequires = [ + auto-complete + cider + clomacs + dash + direx + emacs + spinner + ]; meta = { homepage = "https://melpa.org/#/ejc-sql"; license = lib.licenses.free; @@ -16405,12 +16476,12 @@ el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-patch"; - version = "20170227.2208"; + version = "20170310.2128"; src = fetchFromGitHub { owner = "raxod502"; repo = "el-patch"; - rev = "0cbcbc0ddf2f65ce02a4b0b027990d7131828a9b"; - sha256 = "1nzzjb5q58f5p0jpa3rg9mmnkmnlbs19ws993sn5fcb1161hhg7r"; + rev = "26d1b4f7920ca32e0e76a3ffa23784a80253c9f4"; + sha256 = "0rk1qvgdnx1xn7pmb2713i68xm05kp3cfkwvd5smbkzjj2nvbi20"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch"; @@ -16588,6 +16659,27 @@ license = lib.licenses.free; }; }) {}; + el2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "el2org"; + version = "20170320.1534"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "el2org"; + rev = "1b2f01585bce80b2bb503e8b21e373ad5e946eed"; + sha256 = "0jinjrl2fgxixdkkayvajd7pzqz8vmqdkni8pm4shn781n660b2g"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/dcbeff073f03d03b306f1d96ba2dcf140b57a634/recipes/el2org"; + sha256 = "1fshlq06psmfnp1gcmkqiw0hrm25dgl67ijb9sb3m6q1z9wml674"; + name = "el2org"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/el2org"; + license = lib.licenses.free; + }; + }) {}; eldoc-eval = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eldoc-eval"; @@ -17057,12 +17149,12 @@ elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "elm-mode"; - version = "20161210.49"; + version = "20170322.1347"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "29f50a940113d793a21998f3bb414fdd9b0c5daa"; - sha256 = "02c7xl9w81140l7p9kywr5qwsdyv92nxdhzqcxjk0r09x7s0cvsk"; + rev = "3d36c16bbe1cebc285341452a60da578afbb2804"; + sha256 = "1aywgkf5505hx7qd0r4b8k89xmskkrz9imlmhp6xnwj31qs7ix63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -17103,8 +17195,8 @@ src = fetchFromGitHub { owner = "Silex"; repo = "elmacro"; - rev = "9ed19a362b63d9c7436a78feb91bc694194cfefe"; - sha256 = "00qqa9p9z50gxna4qrsvph4nj41gldl1qj210ywk3lgwn0jjm0k9"; + rev = "97c8ca4041e5082df243ad6371a091759c30d0f7"; + sha256 = "0kqnnp7kfdgizs18zhsaxci210bgpr73w39dhb2y09yj40ja3yx4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/566cc5bc0f71c5a4191ad93b917dc268f6e1a2da/recipes/elmacro"; @@ -17288,12 +17380,12 @@ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20170303.621"; + version = "20170324.227"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "2c8792e6e379c565e8dbfb5d3486988ab49c6b4e"; - sha256 = "1zrr7gmfpxjk0psvi3gf87qxf8nzh29n92f5f14xb75kjn2ji9l6"; + rev = "c793c9d048f16b74bddf7aff5b3e3cf32d90f71f"; + sha256 = "0cmn8j2hbh5qzwwskhjmpilgcdf0h3lm9jj0vx1fwwagxg369gw2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -17986,12 +18078,12 @@ emms-player-mpv-jp-radios = callPackage ({ cl-lib ? null, emacs, emms, emms-player-simple-mpv, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-mpv-jp-radios"; - version = "20170213.655"; + version = "20170322.830"; src = fetchFromGitHub { owner = "momomo5717"; repo = "emms-player-mpv-jp-radios"; - rev = "6897e43223eac133f0c2d9101932fec6479e58b6"; - sha256 = "1qjrnh25rv4n0cvdd8ynjlmvnb7zqibz1ky0x8ahkml72g672f5i"; + rev = "dbb22a8ccfabf961965093abefa77217cac1d8ff"; + sha256 = "0w22qkdqw5328rxn7ik4yfw77wbigaspyz30hd1v68qklhxpag94"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09ba6da5057061f055d4a3212d167f9666618d4f/recipes/emms-player-mpv-jp-radios"; @@ -18154,12 +18246,12 @@ emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }: melpaBuild { pname = "emojify"; - version = "20170313.640"; + version = "20170323.730"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "emacs-emojify"; - rev = "00e8d01f114ad5ca95d5e9509ef327afa0087e0f"; - sha256 = "171ic2qcrc0mwfjjn2v8894m0r5waq3qpmw80lqqc1a05yn656si"; + rev = "9ce171d38915c81ba0f387e013aad2e089d61d48"; + sha256 = "1p2hws3jyk4pvgxznirp20r9s6h1554h6sn8kil203cb4l64wb3f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; @@ -18376,12 +18468,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20170128.359"; + version = "20170318.1059"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "ee16c7a91b9ac1585be287ecf94e4b20aaaea3f5"; - sha256 = "15ldbviaxd9nlb11c3aw7dnp8xxyldm67dmbnsv6f3rpafy1gmzv"; + rev = "9ccf54cddb1d7884f36de9d7d077cee55eae410e"; + sha256 = "0y6v9bmhspfmr3bmqf5av4n1xdwj0nx9fws0gw8n9ln92yz6w3sz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -18657,11 +18749,11 @@ erc-hipchatify = callPackage ({ alert, emacs, fetchhg, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "erc-hipchatify"; - version = "20170228.1151"; + version = "20170314.937"; src = fetchhg { url = "https://bitbucket.com/seanfarley/erc-hipchatify"; - rev = "2b93fb7103f5"; - sha256 = "1z2vqy8wg5fhv0vfai0zla8swvld3j4378q72knnkyzjqrbn4s5p"; + rev = "a53227513692"; + sha256 = "0av0y65hz7fbiiqzmk5mmw6jv7fivhcd1w3s2xn5y5jpgps56mrc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b60e01e7064ce486fdac3d1b39fd4a1296b0dac5/recipes/erc-hipchatify"; @@ -18971,12 +19063,12 @@ ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }: melpaBuild { pname = "ergoemacs-mode"; - version = "20170112.1108"; + version = "20170328.832"; src = fetchFromGitHub { owner = "ergoemacs"; repo = "ergoemacs-mode"; - rev = "b4b5241e679cc1a7bd7b1f3703f1a7ce602cd1f6"; - sha256 = "1zmwzpp410hxgwycys7ij4xjmzz8piykx4scclvvyl63hhqlrrfh"; + rev = "87fe85ac20a6ac32b41df5e7464d6ace5528445b"; + sha256 = "0s2yf8hkigbzp5rhkznlkg4jqx3darj4i7h3dpbajc2lnc1c9nmc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode"; @@ -19017,8 +19109,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "47e46069d01960b74cefeba648e98e6afbb79e59"; - sha256 = "1319rs0cj396q3zdzfwiijynx8rgzy7zchqya8gjrqxfq5bh6p01"; + rev = "53b483cb14c4b3b666eab63f9f09d7ac827f9a7c"; + sha256 = "1pw1ibqyn7j56dk6yh21hg91xv5kp478da3xv3gb77mh4is09n8b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19387,12 +19479,12 @@ eshell-git-prompt = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-git-prompt"; - version = "20170310.2205"; + version = "20170316.1051"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "eshell-git-prompt"; - rev = "1e57eed52fad929f36ae5e3a9e3aa45ad019ee93"; - sha256 = "0wa4whvhg6l7v8yis2hlil79dsjsp2qacvc81pbhf5j24fbfhd5x"; + rev = "ec246fa4c27ecb7df10c93b0710e6a64fa5ef4c9"; + sha256 = "0dc1d6z8m3dvgqvp16nsw84g4fwzqv3nh21k1v2mr3iy8nmdf0l2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5272280b19579c302ba41b53c77e42bc5e8ccbda/recipes/eshell-git-prompt"; @@ -19492,12 +19584,12 @@ eslintd-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eslintd-fix"; - version = "20170310.835"; + version = "20170313.1943"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "eslintd-fix"; - rev = "fe2ed976c79474baa2cdb2fc4477786cb42d5b22"; - sha256 = "1y6c94kk4bb3y3dw7sbv7w6fj9c4j0hq0gsy1m1675zzv8ar1di9"; + rev = "afa5cd1c1fb644a918e410ef396392b841146632"; + sha256 = "04ixmv1y7zi32xwywn4dz0nvsvpmdk2m80y9fbaxi5skkx9r30g0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c72d2b3ee9b8066d51d09e165e58e9846ca879cc/recipes/eslintd-fix"; @@ -19597,12 +19689,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20170227.802"; + version = "20170327.248"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "e7e52d2c07d374209261d207293caa391db7b398"; - sha256 = "1apk33hmsn5qlagnrqnmd975pz2ydf69s4kwsnx00fj9fb48bkzz"; + rev = "dd623f1c67c54fb1f9c20403fa976cb1272a5074"; + sha256 = "033rsdxrmcjcmjpdkbqykr0zir7ycy0f706q5x6m3vn13wm5hgfb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -19843,12 +19935,12 @@ euslisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "euslisp-mode"; - version = "20161226.840"; + version = "20170315.2046"; src = fetchFromGitHub { owner = "iory"; repo = "euslisp-mode"; - rev = "cbbb60cf7d301c19906678bae933060af21c1a86"; - sha256 = "0xz4asnwg52f02jmyz2flmkl748isacvjylfwi23xdcxqiab454a"; + rev = "fbaa35e77eee91da5ce86fbf5342648722b97d7c"; + sha256 = "0y9l6h1824a7sd4w26s1ql8ffim42pcz8szadmwk2v4p64cya76l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09a7c4b73203d75c5260f1d08845236cbbeae46/recipes/euslisp-mode"; @@ -19969,12 +20061,12 @@ evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20170306.334"; + version = "20170323.1140"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "56e92f7cb4e04e665670460093b41f58446b7a2b"; - sha256 = "0063x3v849h57bf4pqf3k2kiqrjj0sjw5y9w9lr0q0v33mn8q145"; + rev = "273a714e2d073257f6604d03be53c5fd784117c4"; + sha256 = "0vrvfgrl1pdmvphscsf9zyy9yvl25xm53h5k1wiw7v3kb66x7s88"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil"; @@ -20407,6 +20499,27 @@ license = lib.licenses.free; }; }) {}; + evil-lion = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-lion"; + version = "20170328.21"; + src = fetchFromGitHub { + owner = "edkolev"; + repo = "evil-lion"; + rev = "da324d54e539f042a85344d1c168b69106896b8b"; + sha256 = "0sfs09bm6p55xz5f71370zika0qcmlph6mgcc9mzyvpx31vsyfg0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8a7a0691775afec6d2c7be3d6739b55bd1d2053d/recipes/evil-lion"; + sha256 = "1rwmpc5ifblb41c1yhhv26ayff4nk9iza7w0wb5ganny2r82fg2v"; + name = "evil-lion"; + }; + packageRequires = [ emacs evil ]; + meta = { + homepage = "https://melpa.org/#/evil-lion"; + license = lib.licenses.free; + }; + }) {}; evil-lisp-state = callPackage ({ bind-map, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }: melpaBuild { pname = "evil-lisp-state"; @@ -20830,12 +20943,12 @@ evil-snipe = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-snipe"; - version = "20170104.1209"; + version = "20170328.1011"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-snipe"; - rev = "e8acacd31466def1e8fa1eac0c5ccbbcd5a0ba2e"; - sha256 = "1x8qwvpjv87sv2lyda57k0l47mjvn0ichpgjs0vc7q8kmhww5k5h"; + rev = "3579123acb130e18e9bd8ff3b3029f7052528a32"; + sha256 = "0pn4k55wg2lzjlpv10c39mvcb6y2fgbc6cfb24czw70ykc5ln087"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe"; @@ -21354,12 +21467,12 @@ exwm-x = callPackage ({ cl-lib ? null, dmenu, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, start-menu, switch-window }: melpaBuild { pname = "exwm-x"; - version = "20160307.55"; + version = "20170313.1538"; src = fetchFromGitHub { owner = "tumashu"; repo = "exwm-x"; - rev = "cda2bc2b3b3347af34349e5f33d2d90f1ef27157"; - sha256 = "1i9lklzg7fyi4rl0vv1lidx0shlhih0474bbjsvc74p19p5cmlrq"; + rev = "b916c87ef43b6983d76334c2321ba57f4ec102ad"; + sha256 = "1ng7bd2gbn9ns6hhva66ibq4kqsjijxbqw30cay8xvn4m6kklmvp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x"; @@ -21375,12 +21488,12 @@ eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eyebrowse"; - version = "20161226.1438"; + version = "20170318.1418"; src = fetchFromGitHub { owner = "wasamasa"; repo = "eyebrowse"; - rev = "e7c3de9c8b3197f3a310d8d9259761fc70dfa3ef"; - sha256 = "0d2vc50m2wr6f0fd04xm3bzca25im3ka57y7lg6p0bn5fp6a62vl"; + rev = "56af9e96cfc8c03cfdcf3a60b581a8db9fdcbb20"; + sha256 = "0wdqvzq847mn3aday87wz0jnbnpl0j4b81y8y5gd7qj1vac1vndn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse"; @@ -21457,12 +21570,12 @@ eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eziam-theme"; - version = "20170306.534"; + version = "20170321.608"; src = fetchFromGitHub { owner = "thblt"; repo = "eziam-theme-emacs"; - rev = "3e888e489774e1f6e5ce15fda46296d2fee0de1f"; - sha256 = "1rxyah6xcdjf3zx1b0gn56wi6gsk95ifsarca67ir3lc1797ldwk"; + rev = "c53e4b4ba21bd00196a28746a900f3fc1a9d1cbc"; + sha256 = "0dbh9q0s1vps5nwdy16jcq5sqw9ilk0s9qlmbkiy0cvs4z08wgd1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme"; @@ -22751,22 +22864,22 @@ license = lib.licenses.free; }; }) {}; - flow-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-mode }: + flow-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flow-mode"; - version = "20170312.422"; + version = "20170320.1043"; src = fetchFromGitHub { owner = "an-sh"; repo = "flow-mode"; - rev = "111555a5edb1c3857e5767950a44cc08e14b8c30"; - sha256 = "18bxzzq6s80kgfgj34v8429nwx6bcvvfk951mkzqjydba56bch62"; + rev = "072efa15255146cf39450dd71fd8f35e9f6fe621"; + sha256 = "0cga2vzi82b93l8j54jx5krfcxksx64h1m6y18p9gjgqd424g014"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3eca3f0c0a4dda79d00cbd0045eb0925bb3ce2e4/recipes/flow-mode"; sha256 = "0hq1lkn4mn6r8ih74d52hba1a6gb6pg4qcv60sfsiga4b737yla8"; name = "flow-mode"; }; - packageRequires = [ emacs web-mode ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/flow-mode"; license = lib.licenses.free; @@ -22859,12 +22972,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20170309.145"; + version = "20170324.340"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "312f78cd712f696dc169a34cb45622ca154d097e"; - sha256 = "1jlbsy9pdcg76r75ca7gpn2lpkvpy71z31713cl5a1sqgb26lc8d"; + rev = "794e339ab3bae5fa033b3c4913ab24ddad49dc2e"; + sha256 = "099ffl46z046vzk1qhgcsn5b54zw6yjp9hnp6w7v4rr8pn4r1jlk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -23052,8 +23165,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "squiggly-clojure"; - rev = "c690f780b07cf9412b5b58e981b0caff2cef0e44"; - sha256 = "136pmcp6zkarp5fasmw5532klik948hrbls5bbq5iqddb82si7x3"; + rev = "2a0e96889b128808866a1e2e98694be1b251fd37"; + sha256 = "1yw9ky7720hx6z401623bw7h6rr2b837a7x8gfw6shq4k26kirzb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9c642a234f93ed4cf5edcf27a552a8916984946/recipes/flycheck-clojure"; @@ -23279,12 +23392,12 @@ flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-dmd-dub"; - version = "20161223.856"; + version = "20170323.634"; src = fetchFromGitHub { owner = "atilaneves"; repo = "flycheck-dmd-dub"; - rev = "8c6220f45c24d662f1c4afae54f311139f0242b1"; - sha256 = "0n0q5qhwpx3v0d3aw6swzv8w09cs5mlnx9aybfhclzfa44adn6rq"; + rev = "5bc8c9511eb9817fddadb65ff4f0520b52c09de3"; + sha256 = "18xcgpqr0cxhp79i6zq9c1131rwcsv9lmryiiyph56zl4vg2hb37"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub"; @@ -23384,12 +23497,12 @@ flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild }: melpaBuild { pname = "flycheck-flow"; - version = "20170207.605"; + version = "20170325.504"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-flycheck-flow"; - rev = "090e89455b1f1dcb2de7a2f40c36d2a002417795"; - sha256 = "1vp2mswzxfd88i253l7mx5qj8x1h47fgvgy7dwi31xvp7vr40n6g"; + rev = "e51aff467edf2d86e7b315d79d6f2f4d8408ea78"; + sha256 = "1w1s7rcbmiikb7f80rf9d77gzszjcfyymx75x20vvq3rw4wvdnyj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d18fb21d8ef9b33aa84bc26f5918e636c5771e5/recipes/flycheck-flow"; @@ -23426,12 +23539,12 @@ flycheck-gometalinter = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-gometalinter"; - version = "20161225.1721"; + version = "20170321.732"; src = fetchFromGitHub { owner = "favadi"; repo = "flycheck-gometalinter"; - rev = "b6fa2468401d9035b2aeb1dc9bdb12a518e0d13b"; - sha256 = "08cr2jij9iaa117l4b4mg977hi6klw9qj8knc42lfzz37d91r3i6"; + rev = "c90ea1aba80ddfdf603c9ba731be302400fd6ba2"; + sha256 = "0xw2wbch3y5nm90j9c53n3710xm161w724cknv8dwq27ickgp49b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bfe9f2d030c04fb292297eb9226072bfea2ac64/recipes/flycheck-gometalinter"; @@ -23846,12 +23959,12 @@ flycheck-pyflakes = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-pyflakes"; - version = "20140630.1521"; + version = "20170325.1258"; src = fetchFromGitHub { owner = "Wilfred"; repo = "flycheck-pyflakes"; - rev = "026ef070f1589bc0ae8f86a02072fa36e57b9912"; - sha256 = "16albss527dq4ncpiy8p326fib038qc6wjbh985lw2p1f9babswa"; + rev = "439c0e5bcc4bb1a0c68b619a862df6ea316f0b43"; + sha256 = "0fjjv8ygx55vk91fdzn7ikm6kgwq9kzn14f5lfawipyymxrih3na"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05e6f3041151006e44f91e5bcbaa7be3750fb403/recipes/flycheck-pyflakes"; @@ -23888,12 +24001,12 @@ flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-rust"; - version = "20161019.1103"; + version = "20170322.306"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-rust"; - rev = "f8ae845d4d7a18c1873ee1edd1a4db272fde5dd3"; - sha256 = "1p7ijqcbrflaxqk7r5zvgxznsvd8kcr8hfnzlymdylwbgy04j6wy"; + rev = "ae7c14758c3d33615d981f15951500feb2881b06"; + sha256 = "1gldjfg112jphpvzbaz3viars8yjyb783ry1sp37g5nlb80lf7jb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68d8cdf3d225b13ebbbe5ce81a01366f33266aed/recipes/flycheck-rust"; @@ -24053,15 +24166,36 @@ license = lib.licenses.free; }; }) {}; + flycheck-yamllint = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-yamllint"; + version = "20170325.1035"; + src = fetchFromGitHub { + owner = "krzysztof-magosa"; + repo = "flycheck-yamllint"; + rev = "c2b273d84f15bd03464d6722391e595d7c179a5c"; + sha256 = "0snj6kkshk8bivwsnhp7kiyhzcn7x6952vw098wgzwqw2hgdkq97"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/932ee0a1f13a52d53102b90911da79145208cbb5/recipes/flycheck-yamllint"; + sha256 = "1q2sy0hsbnwdlwq99wk8n5gi9fd8bs4jvi859np8bylbhhb3kj8m"; + name = "flycheck-yamllint"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-yamllint"; + license = lib.licenses.free; + }; + }) {}; flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }: melpaBuild { pname = "flycheck-ycmd"; - version = "20160913.130"; + version = "20170327.1418"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "0e6c93a6e2f3646b35ae860d50f2ca1777d8bd8a"; - sha256 = "0ms2q4sbr1m02ifqr9792ab36icg1481332dz7mkpfcz4x0l2k8c"; + rev = "8fbdaeaec7704155a047ac17c11d4cf4208f5f79"; + sha256 = "0hvvyficrdxwwg9gyyzmvdsx7v1dh07qrzcvcdn1lq1q1shwcng9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd"; @@ -25625,22 +25759,22 @@ license = lib.licenses.free; }; }) {}; - fstar-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + fstar-mode = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fstar-mode"; - version = "20170224.912"; + version = "20170329.953"; src = fetchFromGitHub { owner = "FStarLang"; repo = "fstar-mode.el"; - rev = "f7b982007e26e34e43debd8759346874966e6924"; - sha256 = "1mh1qv8vxipxyi060xzniq3y8h7b0as9j5si4ql6hs742fhpd2zk"; + rev = "a033486d2d01cccb3d1b3a17e57155cca167b08e"; + sha256 = "1dwcni802pqmj3safvr36c7l5mafdvyfvxy1k5qp3ah7qy08xknw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode"; sha256 = "0kyzkghdkrnqqbd5b969pjyz9jxgq0j8hkmvlcwikl7ynnhm9lgy"; name = "fstar-mode"; }; - packageRequires = [ dash emacs ]; + packageRequires = [ company dash emacs ]; meta = { homepage = "https://melpa.org/#/fstar-mode"; license = lib.licenses.free; @@ -25652,8 +25786,8 @@ version = "20170107.626"; src = fetchgit { url = "git://factorcode.org/git/factor.git"; - rev = "d60970c0a5de8cb16eba55fe71441e9de35d6299"; - sha256 = "0bhw69yh1jxlyny5w5dxpvd3r6s0rnp54il2q32dark22s75w72x"; + rev = "30f73d63f4031b35b52ecb28652aebf1a8e430f1"; + sha256 = "0yn1sk2fp3bvw79r9lalpcxkcnj70prn56gr82hmkd2n0lq5lzi1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; @@ -25778,8 +25912,8 @@ src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "29e26503c13569de25268283dce534f111726643"; - sha256 = "0g6xb811n4nd1vm7jraypaq2qarigd2chg2nbdx0nc23ga17f90q"; + rev = "9e9f3b91db7ac161e5985ee8e6104c7eb05d24f9"; + sha256 = "0kmj9kgp3xcyvx5xc67h69y8ghiw5wc42n9n2gc66in8j8sfxxr3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -26102,12 +26236,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20170201.1455"; + version = "20170325.1956"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "166593c68b66276e36c7d91a9653bb1c44650afc"; - sha256 = "0r7m1blswgkm8zkb703ksa74jy296i1vj4rfq5lw2f4ixdvkyq2h"; + rev = "b75e0376942c1ee54f7d173362d4a38e665342f9"; + sha256 = "1mbip1w35mjcl4048a1aglvpqwkkf0h990i9yjr6w9p7wlxb8car"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -26123,12 +26257,12 @@ general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general"; - version = "20170202.1509"; + version = "20170328.954"; src = fetchFromGitHub { owner = "noctuid"; repo = "general.el"; - rev = "b626fae4f0fbf2ec2bf7df850dd1c8ad15e70b65"; - sha256 = "1p9kwh9yadai0ijn98rag0sln18fj9ciy51p88967bgvbx1rx8x3"; + rev = "fa0e6e2d2a9c06671fd44b5d938ea24387654525"; + sha256 = "0wnh24jnnf0kl291l36hykx86nrn74kqwxlwzd2llydbhk07sq8s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general"; @@ -26585,12 +26719,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20170308.146"; + version = "20170314.1414"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "eb4258ea2b721cfa0c5b32f67a14b5703a4dbe0e"; - sha256 = "009wabnqblgn5sgs410lpb8rbzci7lkpp7nl1kfvyk22zg1jyd4n"; + rev = "13352f1ef23c5ccbf7f5f4c54049c1dd66ae3335"; + sha256 = "0cfz0mb5p7q1bizvv81pqywhcy883093ld6ly3zv4kxbg6lg5jcb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -26816,12 +26950,12 @@ git-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-timemachine"; - version = "20170226.24"; + version = "20170325.220"; src = fetchFromGitHub { owner = "pidu"; repo = "git-timemachine"; - rev = "efa6752397101739c6abb53a0ca7a904d1c7898d"; - sha256 = "1v85cci8rm82wgss53ia1dqvq2q17hf2vayx6pi34h0hvj7ihzlx"; + rev = "7cb0d03bc370d3e734c8ee23b809a4e768b01743"; + sha256 = "11yjw08dp8m25psl27qfgk8c9m9v51rbiyq3lp0mp9mhr17wdp9d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine"; @@ -27552,8 +27686,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "d09cef6327ed848a446636a857cd851dc7e63d19"; - sha256 = "1izc2f136v82zi9b8w606302xgvaf4jn6dqg2s3yq0pqabydl8zw"; + rev = "007b034ad7b6d5b70bd18348fc7609a9fdcbad18"; + sha256 = "1cy7fjbip8c9pmv91bk4kcjcl5qdz3an2i78ywlb3b2qhsac21kc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete"; @@ -28262,12 +28396,12 @@ gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gotham-theme"; - version = "20170310.349"; + version = "20170320.1245"; src = fetchFromGitHub { owner = "wasamasa"; repo = "gotham-theme"; - rev = "50833e9579ac2ed2647708982477edf9a783113e"; - sha256 = "0zcbmd3kdkcxx96mkl130j913y9mzcdxkbjd7x1vm48akirz598w"; + rev = "7baaee3002bf0be8848e87271b988e39cbd08588"; + sha256 = "13afqqkzlfww0w0ixckgbqyf68d2268s3cpfvc46j1cm8lzchya9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme"; @@ -28343,12 +28477,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "20170310.1402"; + version = "20170316.1124"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "4e7a21e556f26c636141c95a4041baa141e971d1"; - sha256 = "0l5dm0r44nchgn8vzzqsn7rhf5015ni5fp56fxnz8m4kkkas01lz"; + rev = "ba5f0223b6e1fa692f0e700718a8cfa65595e2b3"; + sha256 = "1bglnvp009x8c5na3zdzbvfz72i1arxmi5y1c2i0yjw4hggqvvlm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -28473,8 +28607,8 @@ src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "48f64589005d79f64beef367fc9a83afb6e26b1e"; - sha256 = "1fdn519hpr43h40d55qdang127bhw6zg4fr20886a4ia3ngw7iz8"; + rev = "3fc197576b0fada87b0b7a895a9fb0c27acd2827"; + sha256 = "0xa2pshxs18i16yzbs04x82l8yx8mi2pnzb9ipyi5xwxjdkphq7z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -28853,12 +28987,12 @@ groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "groovy-mode"; - version = "20170305.813"; + version = "20170323.817"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "48f64589005d79f64beef367fc9a83afb6e26b1e"; - sha256 = "1fdn519hpr43h40d55qdang127bhw6zg4fr20886a4ia3ngw7iz8"; + rev = "3fc197576b0fada87b0b7a895a9fb0c27acd2827"; + sha256 = "0xa2pshxs18i16yzbs04x82l8yx8mi2pnzb9ipyi5xwxjdkphq7z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; @@ -28983,8 +29117,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "gtk-pomodoro-indicator"; - rev = "f64fd33f95289e3c4c81e8496eb0bdafc0c42815"; - sha256 = "0x8r0hamq1ws5l3z9jcxfmdqvm5qcig40knvwanjmkb2whbqlyk9"; + rev = "902f5c8b2563ff6805f89505419b68ed0ff1e397"; + sha256 = "1fmnpavcz8s6m2sxbpk38l45q9kckc5w6sqray0i9hw4a1qc3fvf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b98ec72605077f3b3f587713a681eb2144f29645/recipes/gtk-pomodoro-indicator"; @@ -29063,12 +29197,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "20170313.813"; + version = "20170322.704"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "61d6ce9b133fb57d4b7a12d007b2e2c8bc6a645f"; - sha256 = "0jlzb06vcgdmj5yp0wnfq81bjdasnbrffvm3019b5yyx0cc7ysn3"; + rev = "e1dfd9655b69e5e27a040cae5aeff25afec383f1"; + sha256 = "19z6hapaj9nw238lyd7ivnhfhpxy6wnjkcn93jgdhdx4k3q9aq73"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -29172,8 +29306,8 @@ src = fetchFromGitHub { owner = "abrochard"; repo = "emacs-habitica"; - rev = "9b42651888c4b75e1d6f9df41d138ce6e77acbcc"; - sha256 = "1jrvjk8ccf47945liwz24xqvdaqm6zch1kb4cahgm4pp8m9hdcgn"; + rev = "f3e326b7342953ffd5d3ced9266b46387b2bf9ce"; + sha256 = "0aixxlfp04vmipki7r7aqid2lsrzy7d38g09qc1hrjjdba7jrjlp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9543db3564f4806440ed8c5c30fecbbc625fa1/recipes/habitica"; @@ -29186,6 +29320,27 @@ license = lib.licenses.free; }; }) {}; + hack-time-mode = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "hack-time-mode"; + version = "20170322.844"; + src = fetchFromGitLab { + owner = "marcowahl"; + repo = "hack-time-mode"; + rev = "02ee6c5c1f691564399a0c76b9c606d7d7dbfe05"; + sha256 = "0gxlmdf9gy2z3c0nswyac7g4j6cswgf7hd3ccb2bn25v67jb3y6c"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6481dc9f487c5677f2baf1bffdf8f2297185345e/recipes/hack-time-mode"; + sha256 = "0vz72ykl679a69sb0r2h9ymcr3xms7bij1w6vxndlfw5v9hg3hk5"; + name = "hack-time-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/hack-time-mode"; + license = lib.licenses.free; + }; + }) {}; hacker-typer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hacker-typer"; @@ -29546,12 +29701,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20170228.730"; + version = "20170325.553"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "775ff42884c0baab9da01fcdc87707c6c90480c8"; - sha256 = "1w6sc6klkr5b9fbp38pngmn0icps5hi6z6cbs59zlzz5lmq7jr9d"; + rev = "c8fe96acc1a8e73e39445b2d5e050540d69d9f5a"; + sha256 = "03wjrpr191ydqd1kgh65h6naw5bsk16zk14cw885zidyv27d0hr2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -29814,12 +29969,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20170312.2348"; + version = "20170329.1221"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "7ff2e13591657fe92c39de4938a9aa30ad9fead0"; - sha256 = "15z4ikk9y8p0ra91qygglvjazagx5530wp9ab1lqv4ibnrkns4kj"; + rev = "b7b2cf9fbf0ad68a7487ddab62677384d19b3b8a"; + sha256 = "0qhdyazyz5y0gs1fcyy4xf4ffdvwrjxpfiki4iyy1fin481bkhwv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -30024,12 +30179,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20170308.36"; + version = "20170321.1306"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "2e83867a39bbd4b7cb7901b897a66a131b5635e6"; - sha256 = "0gr8mlxypk5n4s19src71s2g6s91by3vp6ci9yqqh1q9ns31a43h"; + rev = "13f27f3cfdf137bdb22addfc0c832ba1c8572c25"; + sha256 = "02b9hb7nmh75qwkmanw6ci6pyann71ag8mp4fd5agrlwq6rrlgl4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -30105,6 +30260,27 @@ license = lib.licenses.free; }; }) {}; + helm-books = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-books"; + version = "20170324.2331"; + src = fetchFromGitHub { + owner = "grugrut"; + repo = "helm-books"; + rev = "625aadec1541a5ca36951e4ce1301f4b6fe2bf3f"; + sha256 = "1d3nps765gxmadhbd1yqn4qvs23bczglwhxkciprky7ixm5lx53k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/acba3db40f37e74e1bf9e30f2abed431c259ff50/recipes/helm-books"; + sha256 = "0xh53vji7nsnpi0b38cjh97x26ryxk61mj7bd6m63qwh8dyhs3yx"; + name = "helm-books"; + }; + packageRequires = [ helm ]; + meta = { + homepage = "https://melpa.org/#/helm-books"; + license = lib.licenses.free; + }; + }) {}; helm-bundle-show = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-bundle-show"; @@ -30364,8 +30540,8 @@ src = fetchFromGitHub { owner = "manuel-uberti"; repo = "helm-company"; - rev = "64b3e341776dcb2fe7b329ad0a790629e4a7b800"; - sha256 = "1h8yhvwh8973r9990mdizrva1g1c8r8xm5wrd3gpmllgx36mkkmv"; + rev = "df67d41adb08488957804e1f3f0105186bcab26a"; + sha256 = "0n5a4h62b1z7v1lf43p3x10vqscra75ri023gi9z7nc27qai27fh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78ff0a6cf493ff148406140f3e4902bfafd83e4a/recipes/helm-company"; @@ -30381,12 +30557,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20170310.529"; + version = "20170329.1221"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "7ff2e13591657fe92c39de4938a9aa30ad9fead0"; - sha256 = "15z4ikk9y8p0ra91qygglvjazagx5530wp9ab1lqv4ibnrkns4kj"; + rev = "b7b2cf9fbf0ad68a7487ddab62677384d19b3b8a"; + sha256 = "0qhdyazyz5y0gs1fcyy4xf4ffdvwrjxpfiki4iyy1fin481bkhwv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -30402,12 +30578,12 @@ helm-cscope = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, xcscope }: melpaBuild { pname = "helm-cscope"; - version = "20150609.649"; + version = "20170326.22"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "helm-cscope.el"; - rev = "ddc3f750a92044d6712585e29d3dbaface2e34db"; - sha256 = "0nhi8xhcf7qpsibpyy5v364xx7lqkhskzai7awkg0xcdq8b5090x"; + rev = "3cc7259ab4989f9f7ca039e703cdac14b907530a"; + sha256 = "0gh4csq6v6lqqpi966iwl2238wgkmr3vxb4kxffajpk8r0cq1c9x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2e3460df1ec750053bc8402ad6eb822c10c697/recipes/helm-cscope"; @@ -30549,12 +30725,12 @@ helm-dired-history = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-dired-history"; - version = "20161023.806"; + version = "20170321.2201"; src = fetchFromGitHub { owner = "jixiuf"; repo = "helm-dired-history"; - rev = "8149f5cbb1b2915afcdcfa3cb44e2c5663b872e6"; - sha256 = "1h7700lf5bmbwaryf0jswd9q8hgfkpazak5ypidwvqwacd1wvx15"; + rev = "9480383b6ccede6f7c200fbd50aaeb2898b3a008"; + sha256 = "0cfq06lray7hpnhkwnhjq18izyk2w0m4cxqg0m5nyidiwc4qssqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/56036d496c2a5fb1a6b32cdfcd1814944618e652/recipes/helm-dired-history"; @@ -31053,12 +31229,12 @@ helm-google = callPackage ({ fetchFromGitHub, fetchurl, google, helm, lib, melpaBuild }: melpaBuild { pname = "helm-google"; - version = "20160620.1149"; + version = "20170318.527"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "helm-google"; - rev = "c83f395e0876b4355bd7d0cd346b506cc53deb8f"; - sha256 = "1k8fl81jiaanyqyz8icl2wprlrv5i68kwjgvw5hgfk75cjbhj2lv"; + rev = "27e619d3bd9974a8e1aebd2e10ebf658f49e620b"; + sha256 = "01bw1papl2cblqd6kciw9aha7jkj3rilxb8mzi0avpxgm1g3d1fb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/88ed6db7b53d1ac75c40d12c21de1dec6d717fbe/recipes/helm-google"; @@ -31640,12 +31816,12 @@ helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-org-rifle"; - version = "20170312.1524"; + version = "20170322.1209"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "dc697094c48f97d485c1898b7a5ff3df6d992910"; - sha256 = "13r0x74yx1cyl2zwj76p867yj2x97pj5hxapc1v9fj3i9h9a99l6"; + rev = "bc9c69b0495b1dd8e84bfcf1722165e30ea87904"; + sha256 = "0zcxpijxgmpjxx8kincq9w8d83y4pnzi0glbiv92xlxm91fk3mbl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -31850,12 +32026,12 @@ helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-projectile"; - version = "20170202.1000"; + version = "20170328.2152"; src = fetchFromGitHub { owner = "bbatsov"; repo = "helm-projectile"; - rev = "e16da3ec6d6c495ee8355e3c3729294bdee0a57b"; - sha256 = "0wmzkqy7pr2nflfpbzq7gljk3jxxq3pbq76di1zl2rlj67whs1xk"; + rev = "c987e81ededdcb69c5a7b2bb6efc32bc2398ce54"; + sha256 = "06ygcmpdpr7qzpx6l7qlbdif10vpzw009zg8z8yl1p1r30qdcbs0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile"; @@ -32312,12 +32488,12 @@ helm-spotify-plus = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi }: melpaBuild { pname = "helm-spotify-plus"; - version = "20170311.221"; + version = "20170320.609"; src = fetchFromGitHub { owner = "wandersoncferreira"; repo = "helm-spotify-plus"; - rev = "a09f571ed5addbdb0a2b8354cf18b4d5551b5abb"; - sha256 = "1c6dv92n9kkaizhswlm7hhk175c5ywvq2710d7hpn18cdj3isjsx"; + rev = "847dfafbb5e5d65a44464b0ec8e2b7d88864a9aa"; + sha256 = "0i1vnaiqcs220nc1mjbx0959aa0nbjxhrqkvbrj3zy7ybsya22gq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/306aa9fd29f1495eef71476dfcba3b494223b0a9/recipes/helm-spotify-plus"; @@ -32330,6 +32506,27 @@ license = lib.licenses.free; }; }) {}; + helm-sql-connect = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-sql-connect"; + version = "20170319.551"; + src = fetchFromGitHub { + owner = "eric-hansen"; + repo = "helm-sql-connect"; + rev = "5aead55b6f8636140945714d8c332b287ab9ef10"; + sha256 = "037gri2r9y135av8gbgi9d8k90qs8jlax0bimzcbwdkyhibhzrcp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/58347c583dcf4a915c1af1262a5348755f28fe03/recipes/helm-sql-connect"; + sha256 = "1av42580c68iq694yr532hhcq0jn7m58x3cib4ix5c8b4ljvnnvd"; + name = "helm-sql-connect"; + }; + packageRequires = [ helm ]; + meta = { + homepage = "https://melpa.org/#/helm-sql-connect"; + license = lib.licenses.free; + }; + }) {}; helm-swoop = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-swoop"; @@ -32396,12 +32593,12 @@ helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-tramp"; - version = "20170313.139"; + version = "20170325.1029"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-helm-tramp"; - rev = "87d323306a79bf5d71b0f556a7aefdfe5824f523"; - sha256 = "08rzgfzd70xf1hh54py325p9kf5war40qi5w21anzs4wwg86rz1v"; + rev = "9c7204ea9d7ce232ce3ff88107854c219397528c"; + sha256 = "1vqr40bkf7ss25x5bd6nhqi417chgdrkf9gvp302z311vnvpycsy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a69f0a17c4efbaea012be8e878af4060fa0c93b/recipes/helm-tramp"; @@ -32993,12 +33190,12 @@ highlight-context-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-context-line"; - version = "20170310.1438"; + version = "20170319.1442"; src = fetchFromGitHub { owner = "ska2342"; repo = "highlight-context-line"; - rev = "18ca91d91f2a9e86311d8895c53741ad847180ba"; - sha256 = "1a0mvkbdhdad4nd0bqpg0ldz10lh211w72gcd2x1ydijwvkphjdc"; + rev = "716e10a0c7b703b5f1d9c6ca1481524a4d06b7b8"; + sha256 = "1ipj5l6d3d0mck3k8qsr685phk3zc7k4366vzvjyxvhgp5g2385l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/00df721571ff67fe158251fa843c8f515ded3469/recipes/highlight-context-line"; @@ -33246,8 +33443,8 @@ src = fetchFromGitHub { owner = "zk-phi"; repo = "highlight-stages"; - rev = "87c476f8ca0474912af41680a8de243c0c8d5b46"; - sha256 = "1s7hxv4vpbrpk4makdjn3589flddgfy35scyd3kac629fbqiiz79"; + rev = "29cbc5b78261916da042ddb107420083da49b271"; + sha256 = "0r6nbcrr0dqpgm8dir8ahzjy7rw4nrac48byamzrq96r7ajlxlv0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46884aa6588f55d6f688477a5e9f528f57673131/recipes/highlight-stages"; @@ -33369,8 +33566,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "336a440749e626df015be58e4582f1f6ad179984"; - sha256 = "0r8x7sjhx4l3yl5sfxl04qk8rmid4x7cmk3721zbbmsyzwzx1a2p"; + rev = "712ab8c48759dddc2b3f0c752db3c1e2f90b142b"; + sha256 = "1rrvcdqmgmk033bb5zvyrnbbwhbhkpmhi5rv9bbikci49ka4jy5g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -33407,12 +33604,12 @@ hippie-expand-slime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hippie-expand-slime"; - version = "20130907.132"; + version = "20170317.0"; src = fetchFromGitHub { owner = "purcell"; repo = "hippie-expand-slime"; - rev = "66665b65f9053ada47c0283caea0a7db3eaf2f5f"; - sha256 = "0xdbqillrxap29zg35mpxgilz66kjvhx7yvv7hblwj6j30p7bbkq"; + rev = "ed6c91a0600550788dc78a3ab32040ac28f7c8d4"; + sha256 = "0nqrz1wmg84xk08mi5w8h9mrymr23v8i39s2kdqsrmn6qpw37fpl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/hippie-expand-slime"; @@ -33713,12 +33910,12 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20170310.849"; + version = "20170315.1829"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "ef211ab1ad75cb323adfd3b13de5832e5b7b180e"; - sha256 = "1mz48jpr9af8p7yrplnbkkkgd3587nw28jigpdyik257v2787ayi"; + rev = "9b671c6ca7a2d76338d6f4e38966e9cdb78bd991"; + sha256 = "1v3bd43kaihwbxvflg5kfiw2wmwjmvh5hhdzmdjlvmvqrhwsnxdc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode"; @@ -33863,8 +34060,8 @@ src = fetchFromGitHub { owner = "Silex"; repo = "hookify"; - rev = "b4aa586b24ff63f84baa8de4ed2fd93be6479ade"; - sha256 = "1d3dlkrv95xrpv4rv3jgn58mxs71f6vi2lr88bddhxz702vb11d8"; + rev = "21baae7393b07257de5796402fde0ca72fb00d77"; + sha256 = "0sg4h0m1ds3f6kpzd3vk30g6x2xl74r5j9bidw658f3mmai7m1l8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aa04ccd0ac05beed5de8d51ed96ccbf0071fdea1/recipes/hookify"; @@ -34317,12 +34514,12 @@ hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hydra"; - version = "20170108.148"; + version = "20170325.815"; src = fetchFromGitHub { owner = "abo-abo"; repo = "hydra"; - rev = "36fb5e0149795404d0271419fd4354ba58f81dbc"; - sha256 = "1yycpyr1pc7jzb7fdkiyrbyz7wfgs2g0r27c034pmykcmj02sb1q"; + rev = "38ce88a9c3be11b0431080078095159b2211ca7a"; + sha256 = "0hja61lxhnkl0mpq3fj46pmd9pp85ncdzvgzc1dy82a48sib92dj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra"; @@ -34540,12 +34737,12 @@ id-manager = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "id-manager"; - version = "20161124.2045"; + version = "20170320.546"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-id-manager"; - rev = "98bd85db17914af59e7b75c89e82117323965af2"; - sha256 = "0fj3gsjpm58p7526c95g8fqkch51ic3h2rvr36fhmxqxd5baj5xf"; + rev = "14ebc35db298aac4dedc8aa188bc46bacab81f3b"; + sha256 = "0k9b12gzvjw06y5ycjkigkj8vcmj4rz57d4hyzip27g1v93vvimc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/64a61b3801a0cafec87b1875eaec5950746f716d/recipes/id-manager"; @@ -34708,12 +34905,12 @@ ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-completing-read-plus"; - version = "20161211.910"; + version = "20170313.1603"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-ubiquitous"; - rev = "2d6d38edc0798d9552fc3430bc2dd7ff5025ced1"; - sha256 = "0cks67cgbcv19hjim2jbvpqcgfwg61bssvm5d864bb32ygdg51af"; + rev = "2bd3a2722d8df0db9dfe25f5763f7dfaf0734624"; + sha256 = "1zz0k5ddcwkg0wjdzihklgnxq5f6rlsxldhn7h9jzyss5bsgykhj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+"; @@ -34768,6 +34965,27 @@ license = lib.licenses.free; }; }) {}; + ido-flex-with-migemo = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx-ido, lib, melpaBuild, migemo }: + melpaBuild { + pname = "ido-flex-with-migemo"; + version = "20170319.431"; + src = fetchFromGitHub { + owner = "ROCKTAKEY"; + repo = "ido-flex-with-migemo"; + rev = "c620934f50b9713693eba8e23f88c2aaa8510708"; + sha256 = "0aymvbf36ph0zaff38r5vd7q0z3kv8wl3ivakhaybpsa2zvsgvxf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1647d1ae7400ddbc8367c355ade16b5c360b42fc/recipes/ido-flex-with-migemo"; + sha256 = "1w8f1r17l4r7w5bacckv9zfl9qynv2ivsw639rzr5acg2ndxagv7"; + name = "ido-flex-with-migemo"; + }; + packageRequires = [ emacs flx-ido migemo ]; + meta = { + homepage = "https://melpa.org/#/ido-flex-with-migemo"; + license = lib.licenses.free; + }; + }) {}; ido-gnus = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }: melpaBuild { pname = "ido-gnus"; @@ -35002,12 +35220,12 @@ ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ido-ubiquitous"; - version = "20170211.1432"; + version = "20170313.1603"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-ubiquitous"; - rev = "2d6d38edc0798d9552fc3430bc2dd7ff5025ced1"; - sha256 = "0cks67cgbcv19hjim2jbvpqcgfwg61bssvm5d864bb32ygdg51af"; + rev = "2bd3a2722d8df0db9dfe25f5763f7dfaf0734624"; + sha256 = "1zz0k5ddcwkg0wjdzihklgnxq5f6rlsxldhn7h9jzyss5bsgykhj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous"; @@ -35623,12 +35841,12 @@ indent-tools = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild, s, yafolding }: melpaBuild { pname = "indent-tools"; - version = "20161220.856"; + version = "20170322.1001"; src = fetchFromGitLab { owner = "emacs-stuff"; repo = "indent-tools"; - rev = "b6b8bf42bf50c8b0b1aff56894d8265df79361cc"; - sha256 = "007102am1q2dkp18p1vlsy34i28lvvq4n8b3grz7nyblbik1v5wp"; + rev = "d50c762d9f6f66cd1b4b72f1b5d024284b378aa9"; + sha256 = "1jk8k13mx5z3v38q9d8m5lz52p14imj89zvy7484mbjqmvxh6wga"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d8c79e455b3a567b179812754f82452469dc267/recipes/indent-tools"; @@ -35686,12 +35904,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20170310.2255"; + version = "20170325.2346"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "d81e266e77316bc116ceca5dbc92fc3831825be3"; - sha256 = "0hrz6809w0ardqgb5xraxpr6gj25jh2w7cbcpacc5xv90cv4p7ri"; + rev = "4e802769559153b975f1b24d5a28bc80d212c807"; + sha256 = "0i66y0n0yq3dzhl176anqsjj7p0pvrpwfyahhg8cd5mw1svgdf5f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -35977,12 +36195,12 @@ inkpot-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inkpot-theme"; - version = "20170203.2120"; + version = "20170325.221"; src = fetchFromGitHub { owner = "ideasman42"; repo = "emacs-inkpot-theme"; - rev = "a7bbc67de279cbd1646d5f6733900fb4f4402280"; - sha256 = "1r0b7bnjg161km86pif4rsbwix81kr9n9w5bcp4p7ngrvxhfndgs"; + rev = "cbe5ead0b5993e290ee88d7a07a6ead46f2d0697"; + sha256 = "07qdg72i5na466gka1x50swlipy4d0k1pkhw1d1p6s3xwq7cfm2p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd3e02aaf8865d8038b9c590c8545e7a1b21d620/recipes/inkpot-theme"; @@ -36186,12 +36404,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20170308.2033"; + version = "20170321.129"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "5396b410c326f8685b473e3f38db7506b1616582"; - sha256 = "10qnz73djzwr4lb96d1x51vhia5qicjr3c1ijdysh2dhbxpz2y02"; + rev = "04265e68647bbf27772df7b71c9927d451e6256f"; + sha256 = "0zax01dmrk1zbqw8j8css1w6qynbavfdjfgfxs34pb37gp4v8mgg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -36456,12 +36674,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "20170312.1515"; + version = "20170322.1438"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "0c16cbe0038dcd5a2f70de2edd28a62a4008ac5e"; - sha256 = "19r6jzs47h15kxjmpsk3ddb0gc331vnsvfa5xcabkf5gk3h36mh1"; + rev = "63eb90e1f6f257ea8113450d0e02366148f5c2fb"; + sha256 = "19cr7k33gkkbwzbpib6hvp67r4iz4j68ykmd6mij4gk8r517bqsh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -36518,10 +36736,10 @@ }) {}; isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-plus"; - version = "20170303.1503"; + version = "20170321.1306"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/isearch+.el"; - sha256 = "0nkyav1fw3n16alb5b90cqb3bbmr7i74rc90bpd22hkm25wcvqbj"; + sha256 = "0zdc45nmswipfi8vrsbfipzd1vg9y0pcggvi5mfpwf7c3qn4sgh2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+"; @@ -36744,12 +36962,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20170312.844"; + version = "20170328.1957"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "1ac1cc1378eeaec2eb47a21dabbb1f6d775e7823"; - sha256 = "0024zry02vwzhdip5s5g55wlicakj4815yy8s617jzmj840x97mc"; + rev = "3fbeaa563916c0e23c6cafa82716e9f2eba44073"; + sha256 = "14z8f0lx5s63dy7h0x5m6lkhpfbmlq0p64g2r6y3dhswb8zn1pjl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -36765,12 +36983,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20170308.36"; + version = "20170321.1306"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "2e83867a39bbd4b7cb7901b897a66a131b5635e6"; - sha256 = "0gr8mlxypk5n4s19src71s2g6s91by3vp6ci9yqqh1q9ns31a43h"; + rev = "13f27f3cfdf137bdb22addfc0c832ba1c8572c25"; + sha256 = "02b9hb7nmh75qwkmanw6ci6pyann71ag8mp4fd5agrlwq6rrlgl4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -36786,12 +37004,12 @@ ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-erlang-complete"; - version = "20170216.952"; + version = "20170324.401"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "ead155b5474b0d5b21d78ae735aea74df1e4c3af"; - sha256 = "1lwb8hwbvalwdj1gybc4aw3w5li81mhxagkpxa0dlwxs08lq7v2y"; + rev = "1dcb258a0207053a33ac207c11f2414aa89daba2"; + sha256 = "1nc6d67cbizk1k44b53sx913h2lbrlfmdbi60pz3h567idclw83i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; @@ -36853,8 +37071,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "1ac1cc1378eeaec2eb47a21dabbb1f6d775e7823"; - sha256 = "0024zry02vwzhdip5s5g55wlicakj4815yy8s617jzmj840x97mc"; + rev = "3fbeaa563916c0e23c6cafa82716e9f2eba44073"; + sha256 = "14z8f0lx5s63dy7h0x5m6lkhpfbmlq0p64g2r6y3dhswb8zn1pjl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -36930,6 +37148,27 @@ license = lib.licenses.free; }; }) {}; + ivy-todo = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + melpaBuild { + pname = "ivy-todo"; + version = "20170315.334"; + src = fetchFromGitHub { + owner = "Kungsgeten"; + repo = "ivy-todo"; + rev = "7c72deff0ffa15c7d9a3389bd4386aec2dec9372"; + sha256 = "1y6ilcwzz2rbsdy0fj6yjs75mxks6asha8cv5i129ylcapj9ygdy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/97909da7899d4187e8eb6b3284f6225ebec7fa51/recipes/ivy-todo"; + sha256 = "12sfg2rbnk73a34ap94g4g70gx13llcgsrmfdrgrzk83a2274a2r"; + name = "ivy-todo"; + }; + packageRequires = [ emacs ivy ]; + meta = { + homepage = "https://melpa.org/#/ivy-todo"; + license = lib.licenses.free; + }; + }) {}; ivy-xcdoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-xcdoc"; @@ -37099,12 +37338,12 @@ jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "jade"; - version = "20170224.922"; + version = "20170321.214"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "jade"; - rev = "83ad172b96bb011bb705add136a7571b08f6c4c2"; - sha256 = "16l17sldq68492xa2nbkr956hcpncalmjr1spbf1avi9z910d17l"; + rev = "7cd363187a8d41fe604925df51169ca9ed32f798"; + sha256 = "0zy7xfa5m01518jf1jy0r4r4r0y0q4p0jd07zdvxihkga7ycr4bp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; @@ -37477,12 +37716,12 @@ jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }: melpaBuild { pname = "jdee"; - version = "20170303.1253"; + version = "20170326.1333"; src = fetchFromGitHub { owner = "jdee-emacs"; repo = "jdee"; - rev = "481b040c227e60c645094d0ec193a53adac7b09a"; - sha256 = "0qbiqjr2nkmvf1m874mdfwsszzcv32rfdvrp7bs62fw9q95wcrhb"; + rev = "940069c397b6db841acfd21ffd15495388deba7c"; + sha256 = "0p7pfy75cc2rqf4s9m71zaind8rfn3sqak63w10sn542d2m2nhng"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee"; @@ -37502,8 +37741,8 @@ src = fetchFromGitHub { owner = "tkf"; repo = "emacs-jedi"; - rev = "de1f5597b600c0cb7661b5f451da2af4cb722571"; - sha256 = "120l9zfh432ffj5n6q4x16msvnqwcazkaxib2n19k4pdyvpd1gbp"; + rev = "b0764f425766786dfb1bff910ed1d1670f11eb9c"; + sha256 = "19q1bii0dg3q566bwm63rw3fnnmwvas9i2ibjrlnni8laavc9r5p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bded1840a39fbf1e014c01276eb2f9c5a4fc218f/recipes/jedi"; @@ -37523,8 +37762,8 @@ src = fetchFromGitHub { owner = "tkf"; repo = "emacs-jedi"; - rev = "de1f5597b600c0cb7661b5f451da2af4cb722571"; - sha256 = "120l9zfh432ffj5n6q4x16msvnqwcazkaxib2n19k4pdyvpd1gbp"; + rev = "b0764f425766786dfb1bff910ed1d1670f11eb9c"; + sha256 = "19q1bii0dg3q566bwm63rw3fnnmwvas9i2ibjrlnni8laavc9r5p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bded1840a39fbf1e014c01276eb2f9c5a4fc218f/recipes/jedi-core"; @@ -37978,12 +38217,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20170221.1636"; + version = "20170321.153"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "4787b5f2b8dbc1a8f8620c374402aa347e311527"; - sha256 = "0zlmadvmyl9q8qlzs1i880slr4h800qq6zgqisa45nzychx8b07k"; + rev = "d3b31baf68acd1b7e0d05582e504c44e1a587be7"; + sha256 = "1k9y5vzm518j98iysc7l6vhp2xy8a06qyd1v5p2xmf3dq751r57v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -37999,12 +38238,12 @@ js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }: melpaBuild { pname = "js2-refactor"; - version = "20161102.1108"; + version = "20170315.1315"; src = fetchFromGitHub { owner = "magnars"; repo = "js2-refactor.el"; - rev = "5633ee969c4644bde96c7f4134b02de463f910e1"; - sha256 = "0jwirj3aaigr8d5hnb5gpi447y2yl6ashxaqcagbasy6gvdf1knc"; + rev = "1f0ffe0a3948d7a610f20544c31de91fb08a8bb5"; + sha256 = "0rf2lagzw8qnglnmgq73np829j2i7n8hzz3y8d8ragkaz8gipsi1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor"; @@ -38253,8 +38492,8 @@ src = fetchFromGitHub { owner = "JuliaLang"; repo = "julia-emacs"; - rev = "9c36479c83039c4fc26e583bb1c4dc27de058a4e"; - sha256 = "1w9fhc8k8zxxiscpyip39rrwd2yr1xpxias16scj470mviwh7j26"; + rev = "9067194d9df9c856ae6cff4060b19810759f74d4"; + sha256 = "0vaq2dv77pj9xkn8vfk4wv2lxxn1fy0a473blblzrhgcifd7dfv4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8522d197cb1b2c139959e7189765001c5ee7e61a/recipes/julia-mode"; @@ -38541,12 +38780,12 @@ kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-theme"; - version = "20170307.549"; + version = "20170329.649"; src = fetchFromGitHub { owner = "0rdy"; repo = "kaolin-theme"; - rev = "bfbcb88c7f107b85559562da5e7dc37af0ddb82e"; - sha256 = "11vrsswn6bzfdvprcy7psgxdpkn4ayggqb851pj2vz12bqj17jf0"; + rev = "be544a81cff86ab1b54ad673b9229185882ca998"; + sha256 = "1pjbkff8lcjb6ixjh9pdmgzfdjqq21w9c4q8qjcwmicj1pn1wwya"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme"; @@ -38937,12 +39176,12 @@ kill-or-bury-alive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kill-or-bury-alive"; - version = "20161231.1559"; + version = "20170316.509"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "kill-or-bury-alive"; - rev = "beadb20a0f436b5f3413a0dee215a20f614f070e"; - sha256 = "1ck9v01xih9ik85q46ijhl1m3ppazkr6f9fjcamxgxcwxrniwj4j"; + rev = "23f911c35414b0157f23c0b01fac898ef0740fdb"; + sha256 = "0ay9x6vk505p67hsf8hijxvm5nf8qwf6k67hv7cq9z4cxfmyzpl1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive"; @@ -39046,8 +39285,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "3bcc310e4f62eb567d5d568446058f7f5811ade8"; - sha256 = "0zx73p4hdgpsvy2ifbi6zwi2ard1sjnkd1ig0habhzd5c7f52igr"; + rev = "dce021f9d6d4b20f32e93876302c89e27e1b3f44"; + sha256 = "0h0vgrmcg922dcssn58slbnqbrlmifwg2qngj1k1gp9kmp8z5jih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -39498,6 +39737,27 @@ license = lib.licenses.free; }; }) {}; + lastpass = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "lastpass"; + version = "20170327.352"; + src = fetchFromGitHub { + owner = "storvik"; + repo = "emacs-lastpass"; + rev = "37ce019f3d305ac9806bf7a6f087bd53b12b48b0"; + sha256 = "0yvdi4fdgk7bk8mz3vjd246wbfbyw6yl821cx94zczlajg9cz9dn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/46e5e8735baab7728bddce2693cea6bcee0e6360/recipes/lastpass"; + sha256 = "0x4c9c110nqv3v6kzcxdg9a9zcg7yn1hj6ffgrbsd8c3wbrdxrlj"; + name = "lastpass"; + }; + packageRequires = [ cl-lib emacs seq ]; + meta = { + homepage = "https://melpa.org/#/lastpass"; + license = lib.licenses.free; + }; + }) {}; latex-extra = callPackage ({ auctex, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "latex-extra"; @@ -39756,8 +40016,8 @@ src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "084849f8350a51224a968184cc2b1debdb75bc93"; - sha256 = "0iy603ym4bx85gp44cndxzqpcn8xgbz9nrwiid9bmjicizv9xld8"; + rev = "a1b17719db89af5f865bbe72866ecb65210a6b52"; + sha256 = "1v4jkmmxy27090bcjjvxmqr64izql5zx951vzh5r3f4c48dn0ig6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/851eca11911b337f809d030785dc2608c8a47424/recipes/ledger-mode"; @@ -39836,12 +40096,12 @@ lenlen-theme = callPackage ({ color-theme-solarized, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lenlen-theme"; - version = "20150307.11"; + version = "20170328.1945"; src = fetchFromGitHub { owner = "zk-phi"; repo = "lenlen-theme"; - rev = "05202458fa0a5242e5c6e4451e375f6c16920272"; - sha256 = "0ab84qiqaz3swiraks8lx0y1kzwylpy9wz2104xgnpwnc5169z65"; + rev = "b8a6412c81633b10fb98ba0930f55b25071c084a"; + sha256 = "177fqqhd498v2h6wki6pgg982rp4jxhn4wrzajcqppjz4nidb1b7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47d5b3c931cdbc2351e01d15e2b98c78081c9506/recipes/lenlen-theme"; @@ -40145,12 +40405,12 @@ link-hint = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "link-hint"; - version = "20161216.857"; + version = "20170313.1945"; src = fetchFromGitHub { owner = "noctuid"; repo = "link-hint.el"; - rev = "5c3bac30fea5ff74493712273a64a1a6a9f72957"; - sha256 = "18s5frmaf7d3l15by9yvr8hzgnk9fing4bjpfj53bcck2nmfd7qj"; + rev = "6b926a6fbb7288eb062b28747a32644c5c8fea4f"; + sha256 = "047y75wkqiv1vlrgg6fy78xsfms14drfwmil2sb7j5p5p0cw5xc7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d24b48fe0bc127ae6ac4084be8059aacb8445afd/recipes/link-hint"; @@ -40318,12 +40578,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20170312.957"; + version = "20170326.801"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "0ea4c086756e0f332821ca757ea884ea9ee0a81f"; - sha256 = "0kf20hkav15r8dv9hdvbrn9x3x0dc3m0k15gnv3a99fi5qlnwh12"; + rev = "15301856dbefe5138f14ade673df4a574cf15eae"; + sha256 = "15wqgjnpr8i9lsk0mj9y0yaykdr8slh2xswh18hvky4x6azzc6lx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -40652,12 +40912,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20170225.2207"; + version = "20170326.934"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "0c253d6547008202c20eba2cb5649dd1f44b3126"; - sha256 = "02wrf9mih1dx2xgzwc5465gb8ylm4i3y84x0y0bv1pk420y4iiav"; + rev = "b2ff3b041697d56dbc7bfd70d94f708e551a970a"; + sha256 = "1xpwsajfr2ddn68w2d6j206m4g6h05b6n3xig5flk845899954a4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -40739,8 +40999,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "00ea544948006ad27602b656c5eb3e2b2051c1be"; - sha256 = "1zibr3x6y7p6mynjivd55y102hjyl97sv2ipwgm9n1jsif2iz6ig"; + rev = "fef24043fa2c4020eec6ef45d0da7b8b3f967b57"; + sha256 = "0wnzjj84n23nkfvx18pjfhc8jfip54qqbw218w3ci4qfghdx741p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -41135,7 +41395,7 @@ owner = "immerrr"; repo = "lua-mode"; rev = "652e299cb967fccca827dda381d61a9c144d97de"; - sha256 = "1had9sj3pbbmdb66mw1dxs7i866ck0af7pak3wi6213v5vip7w6b"; + sha256 = "1k64cjzylmfw89pyfjza8s9sxijraknwg573vh619wvnggflc7lb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/lua-mode"; @@ -41148,22 +41408,22 @@ license = lib.licenses.free; }; }) {}; - luarocks = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + luarocks = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "luarocks"; - version = "20170226.1430"; + version = "20170326.941"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "luarocks.el"; - rev = "29fb50ec6ec1943b54b5a4810c3249bccee249ce"; - sha256 = "19ailxb0jlvkl5ljvbpddd1862j8x9vf767lfrby89s09fjxwfcp"; + rev = "e0e52ba395432e18508740cc3d097b2918f55b9b"; + sha256 = "0rdsjmmi95agb859997qdhbk0dns2jyx2mlg8rync58wna70nmbn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5abd2b52a071ab206d40057dc85c891183204ea/recipes/luarocks"; sha256 = "05srrk9gmv1vhq7m5bjhh2hl2siis04j15b31x0sgknxh3ybr33x"; name = "luarocks"; }; - packageRequires = [ emacs ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/luarocks"; license = lib.licenses.free; @@ -41421,12 +41681,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20170311.925"; + version = "20170329.221"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "eb4258ea2b721cfa0c5b32f67a14b5703a4dbe0e"; - sha256 = "009wabnqblgn5sgs410lpb8rbzci7lkpp7nl1kfvyk22zg1jyd4n"; + rev = "13352f1ef23c5ccbf7f5f4c54049c1dd66ae3335"; + sha256 = "0cfz0mb5p7q1bizvv81pqywhcy883093ld6ly3zv4kxbg6lg5jcb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -41621,8 +41881,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "eb4258ea2b721cfa0c5b32f67a14b5703a4dbe0e"; - sha256 = "009wabnqblgn5sgs410lpb8rbzci7lkpp7nl1kfvyk22zg1jyd4n"; + rev = "13352f1ef23c5ccbf7f5f4c54049c1dd66ae3335"; + sha256 = "0cfz0mb5p7q1bizvv81pqywhcy883093ld6ly3zv4kxbg6lg5jcb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -41869,12 +42129,12 @@ make-it-so = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "make-it-so"; - version = "20170313.206"; + version = "20170328.216"; src = fetchFromGitHub { owner = "abo-abo"; repo = "make-it-so"; - rev = "07dfde3f4236498fac31fe1ed5a9b87e92c484f8"; - sha256 = "0dz8mijsfnzsi7bd928a55d7dmc04c45jx28zg9v0mmgx6fkkr28"; + rev = "1f2015cb131d69ffd7994dcc153abef969999027"; + sha256 = "0brqh1dis4ahxxa4q8zsqr039l6k7arxkji4bx9yh65aimp8ckcd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aad592089ed2200e2f8c5191e8adeac1db4bce54/recipes/make-it-so"; @@ -42079,12 +42339,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20170308.2031"; + version = "20170325.1917"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "67c15f292515142c2417f147117ea2a3172cd195"; - sha256 = "1kbr2x4s0ynwizm5hy3q4xdjs1jmfdsnpndcs0dlh0di0mhld6x0"; + rev = "ab6cccaccea2d0d26fc461942b4ae3ea65bd8f39"; + sha256 = "0k4dcm4gkjy82nhcg00wgk2hipzbzvrwn8qyvjjn5r6h1jcpmfb3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -42226,12 +42486,12 @@ markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; - version = "20161222.1416"; + version = "20170317.1202"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "df4ac404ce92abdf1a0b78da8ef1675f1cd1f196"; - sha256 = "1k5bxqbcz174b6g3av6hr2q828bybinq96avab0561zqwqxlhkql"; + rev = "0f88075c9091b4120fac96aaf091ec647d2ea555"; + sha256 = "0cjchpnfwj06y4whnlj3a005ckn3l6ylpv1zmhxv5233znnp6zhs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; @@ -42247,12 +42507,12 @@ markdown-mode-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "markdown-mode-plus"; - version = "20120829.510"; + version = "20170320.1404"; src = fetchFromGitHub { owner = "milkypostman"; repo = "markdown-mode-plus"; - rev = "f35e63284c5caed19b29501730e134018a78e441"; - sha256 = "1adl36fj506kgfw40gpagzsd7aypfdvy60141raggd5844i6y96r"; + rev = "411d079f4430a33c34ec0bbcb1535fe1145a2509"; + sha256 = "0427cxvykmz8kz1gnn27yc9c4z8djyy6m9qz6wbd4np1cgqlmly2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/markdown-mode+"; @@ -42711,12 +42971,12 @@ mbsync = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mbsync"; - version = "20170303.206"; + version = "20170320.503"; src = fetchFromGitHub { owner = "dimitri"; repo = "mbsync-el"; - rev = "8e34a059445b70a18ee5546921385d1636aeda09"; - sha256 = "1w1kjpi2gnhmvkay71q2rkc92bcibdrdjx8r7p979sds5pgaq332"; + rev = "046a745ea1ea85152e27efd4c83fd3487aacffaa"; + sha256 = "1s5zxv4qvy2lqh090lb2bc61y4y67mr22j0b02y69wd61s1w3ppx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ef6ffa53bb0ce2ba796555e39f59534fc134aa5/recipes/mbsync"; @@ -42795,12 +43055,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "20170228.1746"; + version = "20170324.222"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "67e7ca4488aa39eaa8b5236db392730efdac91a9"; - sha256 = "0k9bv4wdik3lqqpd2ijz3xnlcnjjy589rmqs6z8pwzxsx0vd7wlp"; + rev = "1ddaca25ee978736dcb3922bb1952d750c39cd5a"; + sha256 = "09g81d1l5mhji4vbljxgfrgr0051sv7kqy0vwf7awxa4slgl6bnd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -43188,12 +43448,12 @@ mhc = callPackage ({ calfw, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mhc"; - version = "20160526.18"; + version = "20160704.633"; src = fetchFromGitHub { owner = "yoshinari-nomura"; repo = "mhc"; - rev = "81c63fbd49d8267124fbfc775dc7cf06d2ebf7a0"; - sha256 = "1gvwcgxj7f9a8zrp01mcbj07692kg1pi8fi2srwg09jls4j84xnb"; + rev = "d5f7c5abe90831248581c26ef3abfec70b2c2b9c"; + sha256 = "0f5ilbl6dc5hf9s4lfp027qjdlwd0kzb7sni7lda6v5597vhsnb4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8d3efa0fcd6cd4af94bc99b35614ef6402cbdba/recipes/mhc"; @@ -43723,12 +43983,12 @@ mmt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mmt"; - version = "20161231.1556"; + version = "20170319.434"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "mmt"; - rev = "66adeeeccc52121fae7350698c11583b31cbb5c3"; - sha256 = "01s1i7cc653yzxdmnlamz177sjlgjbknmz717kvrwd6wixgn2p08"; + rev = "f7db836a10720ee50217012e7e2597ebcf624f90"; + sha256 = "13vbfc5597v0gd87qyhn10f93nb477vjpg3jlpphbax9fvkf4gav"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1137bb53ecd92b1a8537abcd2635602c5ab3277/recipes/mmt"; @@ -43807,12 +44067,12 @@ mocha = callPackage ({ f, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "mocha"; - version = "20161214.839"; + version = "20170320.1128"; src = fetchFromGitHub { owner = "scottaj"; repo = "mocha.el"; - rev = "23831bab8290a90e9253b648176d99385a438568"; - sha256 = "0v8d0605c31x1crjhgr73x5372rhxlrbap29j0j3zlbv0shd39v7"; + rev = "55f1e6afd100891ffd7008f5c5efbc5a9ab1c22d"; + sha256 = "1jqygkn02vawynfnymvnjnglj7gscfinwyk7vbkbh2dp932wsl02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c26134ba95f277a4e9400e506433d96a695aa4/recipes/mocha"; @@ -44134,15 +44394,36 @@ license = lib.licenses.free; }; }) {}; + monokai-alt-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "monokai-alt-theme"; + version = "20170325.1430"; + src = fetchFromGitHub { + owner = "dawidof"; + repo = "emacs-monokai-theme"; + rev = "584aaf88b83a40bbbfeb6a7c89c5feecebf5a52b"; + sha256 = "1709f2gf8gdz5ppb0k3gxcg4z0r7kgcm2hpymji9gnag87nnx1m6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6ff05515c2f3bd80cb8d7de9afc8fd983e62ad91/recipes/monokai-alt-theme"; + sha256 = "135bli9vhgl898526q6znjvck356bja1ylsfi95d9445jd136c4v"; + name = "monokai-alt-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/monokai-alt-theme"; + license = lib.licenses.free; + }; + }) {}; monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "20161216.628"; + version = "20170314.1612"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "1a921469d0d3a974bf626a76bc5e9fb342fb32d6"; - sha256 = "1xby4jxxjwcgpai242y5c6ha2cj07hs1nndvxa6f1ncfkh5a7azx"; + rev = "46fe076b5943ccc6fdc9cdacc7e8ad02b64bcd36"; + sha256 = "03aw9ab54a5fljhwygg62hr2n9kk82xfwcdq17ln5z0951gqi99r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -44343,10 +44624,10 @@ }) {}; mouse3 = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "mouse3"; - version = "20170307.858"; + version = "20170324.1050"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/mouse3.el"; - sha256 = "0as1d26m3r1vacccsdlbw0rp6jyhj054wv1lssiky6d0kqzn6wa6"; + sha256 = "0rnpfz0d4spxkyssgf3j5kfajm54i1vism2q0giikd0savrh0a1c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/mouse3"; @@ -44677,12 +44958,12 @@ mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: melpaBuild { pname = "mu4e-alert"; - version = "20170220.2245"; + version = "20170323.2254"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "mu4e-alert"; - rev = "38452683b2cb4448de13062d47264f9e9d35e7c8"; - sha256 = "0mazixn55g0wcg541vj1wg2madczcy9r3ka38zfxnvj3jbf18cij"; + rev = "e8b2c1d1a95c5275b1062956eb5384bf45fa8047"; + sha256 = "06jyq6vilry39f24bn08l0wjh1kv9m1pl57vw1qvzk36vmld5cqy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5a48e8cb571e91b582ff0dea18e8dc75601edc35/recipes/mu4e-alert"; @@ -44800,11 +45081,11 @@ multi-project = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multi-project"; - version = "20170221.232"; + version = "20170322.332"; src = fetchhg { url = "https://bitbucket.com/ellisvelo/multi-project"; - rev = "c04d5bdeb213"; - sha256 = "1m4sjmbrc8rln8817b4nybbh1akphbl58i0pfl1ic515xn1g3by2"; + rev = "c03cafbbfba9"; + sha256 = "0v0q4v3pnqmm89hix90pfx4hpfpc9iv1r5ldn3zwzwhbs0jvgj3d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project"; @@ -45714,8 +45995,8 @@ src = fetchFromGitHub { owner = "naota"; repo = "navi2ch"; - rev = "faebfd15184de9df6903eae436dafb52c38ee86e"; - sha256 = "15l2zmm8bp4ip8m1hfxkvswfwa29pg72kisfya2n5v900r184a4m"; + rev = "f39d93c32acd5b9c3a7fb1a9fe14c5e1c4b5288e"; + sha256 = "0i0icyaa2zzzl0cr9n1zv44pg2lric8gic58dkjxjv8yyk6y01cn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/36bea1eca58de15d6106cbd293d941d12ee3d21c/recipes/navi2ch"; @@ -45798,8 +46079,8 @@ src = fetchFromGitHub { owner = "rsdn"; repo = "nemerle"; - rev = "851a186de01369721042a1a9fa951f89c98a68fa"; - sha256 = "1n67k2h919rjsn41qsnxm13a7qdasfh2hj5d52wqjf3ld8f88zqb"; + rev = "d0777b677c50714415174e407a321efc1e9bfdae"; + sha256 = "19darrq975w11n4809f5blrc3paaxpdxmvwmsd96k8g5gwi0yf5m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle"; @@ -45966,8 +46247,8 @@ src = fetchFromGitHub { owner = "AdamNiederer"; repo = "ng2-mode"; - rev = "d06d8af34c1e74a7c7a8601233f5e42c38420035"; - sha256 = "0nz1lrx0iiapmhy78d17m8v91nly11hlykg00xvj91y1iw0713ql"; + rev = "e48698fd474fb1b76356101fc97df00eaa610ddd"; + sha256 = "0k356rw2ack1bf5f0km7fljws5iml9f8scp1ykpf86kskrl2gygq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a856ecd8aca2d9232bb20fa7019de9e1dbbb19f4/recipes/ng2-mode"; @@ -46087,12 +46368,12 @@ nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "nim-mode"; - version = "20161001.2336"; + version = "20170326.144"; src = fetchFromGitHub { owner = "nim-lang"; repo = "nim-mode"; - rev = "2ddac4faa12fc405fcb2148f7d045be83cae5f3d"; - sha256 = "1iaf03791x3jw1vgp2pc4aa01xw5kfr7mk87x7bg1py88pljkh7l"; + rev = "dc81622d899976cb7d4515b592972d17d590ca20"; + sha256 = "1mdficz9dgdlb6hvi7c5qkvw22j1wgaap3a6as1qka16mhlgv13j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode"; @@ -46105,6 +46386,27 @@ license = lib.licenses.free; }; }) {}; + nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "nimbus-theme"; + version = "20170329.538"; + src = fetchFromGitHub { + owner = "m-cat"; + repo = "nimbus-theme"; + rev = "94c08d19c94924b5f549aff61be84efc46e41126"; + sha256 = "06plyf6hlkwk3c9kv8sagq5qhjmv82nv4rqbwlfjc0yxk2dr6gcf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme"; + sha256 = "1hy4rc1v5wg7n6nazdq09gadirb0qvn887mmdavwjnnac45xyi18"; + name = "nimbus-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/nimbus-theme"; + license = lib.licenses.free; + }; + }) {}; ninja-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ninja-mode"; @@ -46154,8 +46456,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "96443e94a1932cff13f23d202839c53483b9290e"; - sha256 = "027agsvbi6wmhdsdzxjvbhskjlgc20dzq13jb7sjvq5a330fgjsw"; + rev = "c60715e937e3773bbb8a114fc9b9c6577f8c5cb5"; + sha256 = "0hkc4g7i3z06y3rsdxqzdnx5rz77jb8ij1j13bdskbvpp7vfm60p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -46420,6 +46722,27 @@ license = lib.licenses.free; }; }) {}; + nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "nord-theme"; + version = "20170325.2314"; + src = fetchFromGitHub { + owner = "arcticicestudio"; + repo = "nord-emacs"; + rev = "8df429d20d69e5fd914881a71ae3a044d02b392a"; + sha256 = "15gjcrx514790djsyfmm8z8q36a3kyf4yhrms5qj423hfc94d3s7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme"; + sha256 = "0p4fqg4i2ayimd8kxsqnb1xkapzhhxf7szxi1skva4dcym3z67cc"; + name = "nord-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/nord-theme"; + license = lib.licenses.free; + }; + }) {}; nose = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nose"; version = "20140520.948"; @@ -46441,11 +46764,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20170304.1716"; + version = "20170313.1712"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "c0c5645538d9dda84657602ee4189f4ff3ca1aeb"; - sha256 = "092mv01pn5i7brn311zdcd74pspw5lsmq4vhvi3n80z9byrh6w1h"; + rev = "e1c1d33f3726f5cadb2f92d23735dcd1102fbc88"; + sha256 = "0s2spmjl2v2zv80ri1l36njgipyxkdg7zvlb8ik5118i0fhbf3p2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -47003,12 +47326,12 @@ ob-go = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-go"; - version = "20170302.849"; + version = "20170324.932"; src = fetchFromGitHub { owner = "pope"; repo = "ob-go"; - rev = "f4e9c1afebe4b8a2d89bdf012ac533a2544cdf4e"; - sha256 = "05yz1kf1jszns4psf065gq18c5y12xlyg2zcqqbw5zjkvbgsgnh1"; + rev = "1f582d5c16ff032207a40d49be0727190a227912"; + sha256 = "1i0c7z1jfrd39pfdfr67qcisv578mmi6i73jnm9zliygk1mryggf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3afb687d6d3d1e52336ca9a7343278a9f37c3d54/recipes/ob-go"; @@ -47441,6 +47764,27 @@ license = lib.licenses.free; }; }) {}; + obfusurl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "obfusurl"; + version = "20170325.802"; + src = fetchFromGitHub { + owner = "davep"; + repo = "obfusurl.el"; + rev = "96c619fe4753062af93a12f44b67ba8aed22f2fb"; + sha256 = "176a8r4y4glrjssywvc2xzdbk987fs796zsj892xcamcmzc688na"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/201fe11682cb06b26775a52c81b6a1258b74b4d0/recipes/obfusurl"; + sha256 = "0xx2zsjbkd17iy7xzqc66f9xgc97f9js3nz656yhmmxakjk2krra"; + name = "obfusurl"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/obfusurl"; + license = lib.licenses.free; + }; + }) {}; objc-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "objc-font-lock"; @@ -47889,8 +48233,8 @@ src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "d6a00ff463f53f7357fd7ffbad95accdc8d1c367"; - sha256 = "0zq0rn1vbwmhr4z5dcgd5k9kslq3xxl05jiyab8835nfacb0zdf2"; + rev = "bcc5d7ba940c1118ab61071783747162f0c927cf"; + sha256 = "05i3z6whvgq81qnrwgvfglhwi214145ksg8h81rc0g4ir54wzsik"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp"; @@ -48351,12 +48695,12 @@ org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-board"; - version = "20170228.1156"; + version = "20170327.1337"; src = fetchFromGitHub { owner = "scallywag"; repo = "org-board"; - rev = "346140fcd727964dbac623dde856addb08d9ddd3"; - sha256 = "04ax2c6rg197i6is24gfm7cwdgkr98ic5r8x5h4dlqkr36f43f9m"; + rev = "53469a2f0577924de1c7d887fecea409d17fd588"; + sha256 = "0fg7lkgcr7zwwjald7hbvwgl72m21lqxmz7p8sq31iw3jh42fqgf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board"; @@ -48456,12 +48800,12 @@ org-chinese-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-chinese-utils"; - version = "20170312.2316"; + version = "20170313.2148"; src = fetchFromGitHub { owner = "tumashu"; repo = "org-chinese-utils"; - rev = "9f3ea014d049e026105055330500ee9ed82e9bc4"; - sha256 = "1i05ds7dz5ra2vyzx3fd0038qnzgr527cnnnrhl4afr93cqgjp6a"; + rev = "f44d7114899102f1e1109bb7aeeab4330281ff94"; + sha256 = "127nnjdd7p3sy38pd39ivrpxgnzdhbh6sf99667s7qxryfx837y8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/org-chinese-utils"; @@ -48519,12 +48863,12 @@ org-clock-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "org-clock-csv"; - version = "20170130.2213"; + version = "20170326.1041"; src = fetchFromGitHub { owner = "atheriel"; repo = "org-clock-csv"; - rev = "59482e800700e66db5381661c1e6b3edb2c03a34"; - sha256 = "099mjbd0n7azv4v3i4a7fw3f85c16ck334sqv2l92k0dpsjdmnrx"; + rev = "0bae215df11e5602b07294e83b595447ae73ca0d"; + sha256 = "17im4njl1w5wm0rxvib2g7v0ibg1p6n0ibq480wwz204jd98q4gv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv"; @@ -48789,6 +49133,27 @@ license = lib.licenses.free; }; }) {}; + org-edit-latex = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-edit-latex"; + version = "20170327.1847"; + src = fetchFromGitHub { + owner = "et2010"; + repo = "org-edit-latex"; + rev = "ecdae5aa9763adbb1c103578a49dcd7fbfea3de7"; + sha256 = "18mg5zy67hvm79y10z5gzjfdggdkfksb1zkpijqv347f84w1l31z"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/180416a18ea8c424ec990be91bc11fc149e427d0/recipes/org-edit-latex"; + sha256 = "0bnpr6plndz3q8515lni0mjwlpxy05jkg4bqifmrd52qh91x7j17"; + name = "org-edit-latex"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org-edit-latex"; + license = lib.licenses.free; + }; + }) {}; org-ehtml = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-server }: melpaBuild { pname = "org-ehtml"; @@ -49088,8 +49453,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "7b426972600154286ce6fddbaf9b7c7503845bbe"; - sha256 = "0q6paa8x0i92sdggiv525hfi17cysmpv636q7rikf92v10qmxrw2"; + rev = "8892fbdb6092af9e5ab5d9ed46762da67b57ffa1"; + sha256 = "1n4djqrk9hqsxrra1x2cxgfx2djsavdmqd53bpik3wn6lr00w1gj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -49108,8 +49473,8 @@ version = "20170105.1723"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "7b426972600154286ce6fddbaf9b7c7503845bbe"; - sha256 = "0q6paa8x0i92sdggiv525hfi17cysmpv636q7rikf92v10qmxrw2"; + rev = "8892fbdb6092af9e5ab5d9ed46762da67b57ffa1"; + sha256 = "1n4djqrk9hqsxrra1x2cxgfx2djsavdmqd53bpik3wn6lr00w1gj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -49164,6 +49529,27 @@ license = lib.licenses.free; }; }) {}; + org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-mru-clock"; + version = "20170323.308"; + src = fetchFromGitHub { + owner = "unhammer"; + repo = "org-mru-clock"; + rev = "98691aac779001d50516b12679e2a53b5192f164"; + sha256 = "02v872vmvrda94s8gpv3ylss2fvj3ja6r70rvcmannjikmjdan5k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock"; + sha256 = "1arww5x6vdyyn1bwxry91w88phbr9l6nk8xxrw40iqmmbhggahgm"; + name = "org-mru-clock"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org-mru-clock"; + license = lib.licenses.free; + }; + }) {}; org-multiple-keymap = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-multiple-keymap"; @@ -49188,12 +49574,12 @@ org-notebook = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-notebook"; - version = "20170311.1302"; + version = "20170321.2152"; src = fetchFromGitHub { owner = "Rahi374"; repo = "org-notebook"; - rev = "ea6e477015a5f25d41df25af25252f521b12691a"; - sha256 = "1i1jchigh70z0ymil85plfx6wf9hwxlkl7jx9kxhv70zpc3m9mlg"; + rev = "d90c4aeca2442161e6dd89de175561af85aace03"; + sha256 = "15hf0x0v4fz6gxj8qx9pfm6xic7qni33nn4ga6cxbdgpwgyr61wz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04149b1f158e857ea824fe120372ac52a000adcf/recipes/org-notebook"; @@ -49209,12 +49595,12 @@ org-octopress = callPackage ({ ctable, fetchFromGitHub, fetchurl, lib, melpaBuild, org, orglue }: melpaBuild { pname = "org-octopress"; - version = "20150826.416"; + version = "20170315.441"; src = fetchFromGitHub { owner = "yoshinari-nomura"; repo = "org-octopress"; - rev = "e04d55c3f4bb88e5661ee136cb3a55f998dca931"; - sha256 = "132jv1zvp3yp4pa4ysl0n3a81d39cdi3nqfziz1ha1pl10qbn6wr"; + rev = "a8a251d6940623daae58453dd91630593c2536c0"; + sha256 = "14iqxg75x7iq0wbjsir6ijbmbkapzfcxjc64kzncwa5ixgdxph3j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fba6c3c645ba903f636814b5a2bb1baca0b5283b/recipes/org-octopress"; @@ -49278,21 +49664,21 @@ license = lib.licenses.free; }; }) {}; - org-parser = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: + org-parser = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-parser"; - version = "20170302.2113"; + version = "20170317.2238"; src = fetchhg { url = "https://bitbucket.com/zck/org-parser.el"; - rev = "690b6d4e1b83"; - sha256 = "0smla8pxnqdzgfhxhs6hsqv8par5xcvfcww857i691gya6scslnb"; + rev = "a1dd102b9cb5"; + sha256 = "06qwqfv0lz7l1fy5i2r4dbc8alkzshxcv8r3s4iy2866z2lgl7pi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28d55005cbce276cda21021a8d9368568cb4bcc6/recipes/org-parser"; sha256 = "06yb78mf486b986dhvqg3avflfyi271vykyars465qpk0v8ahq8h"; name = "org-parser"; }; - packageRequires = [ emacs ]; + packageRequires = [ dash emacs ]; meta = { homepage = "https://melpa.org/#/org-parser"; license = lib.licenses.free; @@ -49426,12 +49812,12 @@ org-protocol-jekyll = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-protocol-jekyll"; - version = "20151119.838"; + version = "20170328.939"; src = fetchFromGitHub { owner = "vonavi"; repo = "org-protocol-jekyll"; - rev = "f41902baaa62c8de3f81ad67a5f36d6aa5781578"; - sha256 = "1jzp65sf1am6pz533kg1z666h4jlynvjyx1mf24gyksiiwdhypsy"; + rev = "dec064a42d6dfe81dfde7ba59ece5ca103ac6334"; + sha256 = "1pgc0lfbz6q2x8b5qkk766i5qylql4p0ng732rcqr7rzg6j31gm7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1ee7c75da91fcf303ea89d148a05ac1e58e23e/recipes/org-protocol-jekyll"; @@ -49447,12 +49833,12 @@ org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-random-todo"; - version = "20161018.219"; + version = "20170321.804"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-random-todo"; - rev = "10293cc751b13ef13ebdacb22968b4ffdcadb163"; - sha256 = "1fjlrs12kwybpx9zqrvyhalp4macx7v3vw739nd7bqsl1srwwr4f"; + rev = "14a065e1d376838f16a6ba32ed8710304542a4e6"; + sha256 = "07qkn59613l32j6b06ckmccl9s2rfwwivmak5v86z0fafzhxk6ir"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo"; @@ -49516,12 +49902,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }: melpaBuild { pname = "org-ref"; - version = "20170313.713"; + version = "20170325.703"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "2f8152e6e45885f68c01b39a227c625a441d6ded"; - sha256 = "03ra8dr5qpmny3s293al8fckyrspkhbrgw31adz3x9z69c919qjn"; + rev = "4117e8b9273ea8533a4ca9f1271cc81b789c57a4"; + sha256 = "0kgfask1ylphcxjb93ybdgxmzrmhn58wky1iq0npcsq1949ajx1w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -49649,6 +50035,27 @@ license = lib.licenses.free; }; }) {}; + org-sync-snippets = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org-sync-snippets"; + version = "20170319.902"; + src = fetchFromGitHub { + owner = "abrochard"; + repo = "org-sync-snippets"; + rev = "80d89985ae52c3adf445deba851b6eadc794eef3"; + sha256 = "0vgq51im5124f7qzbqbyfyv4qbhjw4z4q1ksz3p5axd9hgir6520"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/96aff3f39adfa0c68aca8ff8d3b11fbfd889327e/recipes/org-sync-snippets"; + sha256 = "0kv15zqva2cgx7jscp02x9gx20b5ckf525h546hyca86vfaakfbp"; + name = "org-sync-snippets"; + }; + packageRequires = [ emacs f org ]; + meta = { + homepage = "https://melpa.org/#/org-sync-snippets"; + license = lib.licenses.free; + }; + }) {}; org-table-comment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-table-comment"; @@ -49673,12 +50080,12 @@ org-table-sticky-header = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-table-sticky-header"; - version = "20170227.1242"; + version = "20170317.1913"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "org-table-sticky-header"; - rev = "4dba2dc9a3ed63f58aa946aeec84a52d46ca4043"; - sha256 = "0az4lzd9qk4cx7jjfj36r2fvlkwyrhn3xqhha5d1pydglnhd9amy"; + rev = "4048357d4ac42885b207677eb6f118e167a0f20f"; + sha256 = "1x5b931khl89yfnknndqfwhpqqqy6i8fylr59dpsffsrfp7pbqs1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5dd0e18bf4c3f3263eff8aff6d7c743a554243b5/recipes/org-table-sticky-header"; @@ -49904,12 +50311,12 @@ org-webpage = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "org-webpage"; - version = "20170311.1713"; + version = "20170318.450"; src = fetchFromGitHub { owner = "tumashu"; repo = "org-webpage"; - rev = "bd7b0e896e250a7c330568b33520c347b6731890"; - sha256 = "1l3smz4xx9s4jsr82isnh0hz6ivsf9y5jl87fcfkh98aqlym4z8a"; + rev = "c71042f16bf33120d0d3d40e107f3f4de044ae53"; + sha256 = "1jy55qapc8fqf6r3wz4v489iyw4pxzj2hadkwsgsv1m1ha1sdvyk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1428ef6b2291d415ae2114de123652d9e378398e/recipes/org-webpage"; @@ -49967,12 +50374,12 @@ org2elcomment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org2elcomment"; - version = "20170216.1455"; + version = "20170324.245"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "org2elcomment"; - rev = "c97c8934c8df20873ce1bc7023740b69beeb2d30"; - sha256 = "1995w31na7g4agyknbm9jgxzs4mwbz0mli43cj8aqlbnq5py31hg"; + rev = "c88a75d9587c484ead18f7adf08592b09c1cceb0"; + sha256 = "19r7rxnd2cl0vc8bbf86mh5b779pl5z917657ymlc74bqq140m3x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8af13650de8b4a814832638d4182bf8ce576244c/recipes/org2elcomment"; @@ -50643,8 +51050,8 @@ src = fetchFromGitHub { owner = "jkitchin"; repo = "scimax"; - rev = "f9c485ecb08bd1820f47c6e5c160eae0776a1ed7"; - sha256 = "0vwfhgsxgnwg0533359r5hng29k9wjs5j3yjx82y1qxdla13j51j"; + rev = "ac2479dd030ff47c760c30b68d7d6d133ed82903"; + sha256 = "1vgqi073i6wlgfgjnpyaqbygrb3m9pm5frv0r70k07q2kvmalhy9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip"; @@ -50660,12 +51067,12 @@ ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-epub"; - version = "20170304.1600"; + version = "20170328.1131"; src = fetchFromGitHub { owner = "ofosos"; repo = "ox-epub"; - rev = "edc253b6f7397ac89a3a0b2d2a05e650baa483f8"; - sha256 = "0kvs5kpkly45fqdb7mka1w2yn7pks95gxgiy2ayx12cgvn3inyw6"; + rev = "94ff7358ad311cc6ad3bd720fbbb51fbcce94aa3"; + sha256 = "0iz38qc7fpd8rl9wacwq76y49mi53vr9jy6bw7f0ja1gbzfa8sgg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub"; @@ -50765,12 +51172,12 @@ ox-jira = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-jira"; - version = "20170112.1537"; + version = "20170326.47"; src = fetchFromGitHub { owner = "stig"; repo = "ox-jira.el"; - rev = "3a2467d4050637a0551e1fac957f85644147d280"; - sha256 = "1c09rfwx5ywcdbjsmkb4a6ixmqn1f289986dx96pvh26jnh2k2vp"; + rev = "638a9a44c96f5b21e2e36121465645e586910713"; + sha256 = "12is86csnix270rnyf9q0l7ds70g128fn9nzgjgjgfylsp5nk9rf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8a77d9c903acd6d7fdcb53f63384144e85589c9/recipes/ox-jira"; @@ -50786,12 +51193,12 @@ ox-latex-chinese = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-latex-chinese"; - version = "20170312.600"; + version = "20170313.2146"; src = fetchFromGitHub { owner = "tumashu"; repo = "ox-latex-chinese"; - rev = "f4f49ed0c6de69b11739b62cd1ebc1351ad657f4"; - sha256 = "1bppfj3zwkn5k11wk0845gf32k69c8jz5fsqq4iwvl89ijfjk5xn"; + rev = "7bc56542dc488d24f22f2653232b1cf5dab17c5f"; + sha256 = "1hs0rrk8bcyskay945d7phjj5ln8j8gr01qybqnl6a6mfrcpv2b2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/ox-latex-chinese"; @@ -50825,6 +51232,27 @@ license = lib.licenses.free; }; }) {}; + ox-minutes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ox-minutes"; + version = "20170323.835"; + src = fetchFromGitHub { + owner = "kaushalmodi"; + repo = "ox-minutes"; + rev = "ad9632f35524ac546c6d55dfa827e8597669e1e1"; + sha256 = "07knwl6d85sygqyvc7pm23y7v4nraiq1wl1b7szkzi2knd8wzi0s"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/162d0dacbb7252508147edb52fe33b1927a6bd69/recipes/ox-minutes"; + sha256 = "13rwcp0k9h7l5g8xw2s2r1xhsmkibhfqyq6hlicvddv232g724sj"; + name = "ox-minutes"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ox-minutes"; + license = lib.licenses.free; + }; + }) {}; ox-nikola = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, ox-rst }: melpaBuild { pname = "ox-nikola"; @@ -51164,12 +51592,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "20170305.2112"; + version = "20170324.1727"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "4448466c8fe6f2dc049e076ac10cdc3ba31472fb"; - sha256 = "0fsj7fq2qgvaz76jdxcgrh08q3fnbl4afbsm44mcldfj7fjn1klk"; + rev = "de08b846b3a031838b79445bb7a254c9de4a80f6"; + sha256 = "0mvs4afjp5ab89vdz3bd9pca55brn57lxvjqjjyc6cyqxpclh06j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -51231,8 +51659,8 @@ src = fetchFromGitHub { owner = "Silex"; repo = "package-utils"; - rev = "4ee0d996d4c1a6fed0689361bd9524661339ebdd"; - sha256 = "0a1wvjlr176dbkqgf44f0iwvx865wl2isns36gllcq5fsh4g1q1c"; + rev = "3cbbc2ff50ecb5e6fb20a309cb07d74ca10d4d42"; + sha256 = "1bp04c2ljcgxf590yv05wzvqz7b7ih22h343g7rwdd5l3cli43km"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1bb884a0299408daa716eba42cb39f79622766c/recipes/package-utils"; @@ -51248,12 +51676,12 @@ packed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "packed"; - version = "20170130.1015"; + version = "20170314.1340"; src = fetchFromGitHub { owner = "tarsius"; repo = "packed"; - rev = "d2f01bffc987b226f618dda0663a1e233161518d"; - sha256 = "16xwgi0zkbbvkbxf0ld6g4xlfd95j45sca57h162wld6l27jrv4f"; + rev = "536f4a3bda06cc09759fed1aa0cdebb068ff75a1"; + sha256 = "1ayizqkhxjd3rv3chnl51sl12gsfhxcqqnz0p6r0xbwglx4n3vzi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee9e95c00f791010f77720068a7f3cd76133a1c/recipes/packed"; @@ -51476,12 +51904,12 @@ pangu-spacing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pangu-spacing"; - version = "20150927.24"; + version = "20170317.157"; src = fetchFromGitHub { owner = "coldnew"; repo = "pangu-spacing"; - rev = "e3dbbe87b91ab3e368fdcbcd0761ce403020db36"; - sha256 = "0bcqc4r0v02v99llphk8s0mj38gxk87a3jqcp8v4sb9040dkm8gd"; + rev = "a4463dbb74abdeddb6c1c132a1f8fcf67ed87498"; + sha256 = "143ywxgaf5y52ynd4wcqp40c5pgy61ng431y77l46iix10vasslq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c0b00eda1d20ff2cbffe3ac606e5fd60d915a5d6/recipes/pangu-spacing"; @@ -51684,12 +52112,12 @@ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parinfer"; - version = "20170126.2111"; + version = "20170315.2109"; src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "12f54f661180f894be9bc0fd956b30a69b3f39e0"; - sha256 = "0w44w2qgvbv1m5dwyqa7863r1r32fva5rgc0w14srpak41nn3bj2"; + rev = "c67686b24cf14064931d812f29f4114b30696d12"; + sha256 = "0lpj81hkzw24v1f3s13rw22sm1nm0i177di5v2b8kwy50pjirs8v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; @@ -51726,12 +52154,12 @@ parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parsebib"; - version = "20170311.1430"; + version = "20170326.2344"; src = fetchFromGitHub { owner = "joostkremers"; repo = "parsebib"; - rev = "ee1dfbb53fff9fd5c4dc6571bf498516b7ffff01"; - sha256 = "05rgi9hk17h2kjib5v68i4ikg7292f65qxxinaxkhsy0xsx6kybl"; + rev = "73327c471d92c7716484d8c3cbcdeed1d70ae468"; + sha256 = "18g7mir5ynik5ryg0hl6vpjpajz6d6j0xd9ni54h3h60vvhciwmi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c39633957475dcd6a033760ba20a957716cce59c/recipes/parsebib"; @@ -51855,8 +52283,8 @@ version = "20151027.1449"; src = fetchgit { url = "http://git.zx2c4.com/password-store"; - rev = "6c7425b16895c6925c4f1ec875dac4576574b34c"; - sha256 = "1i4g5qhsp426jkxn4z1kps4cnb97lsrbfd2yk7x456v7dkrd6fn8"; + rev = "caaa5f0f85fd93c1651d4c74c8bb8287a18c4e88"; + sha256 = "10nqf5l320p61pajx7pj5yh7hxf666zsj1kcdb91ddb367kcwzzv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e204fb4d672220ee1a4a49975fd3999916e60f8c/recipes/password-store"; @@ -52312,12 +52740,12 @@ pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }: melpaBuild { pname = "pdf-tools"; - version = "20170228.2312"; + version = "20170317.810"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; - rev = "7cca03bd2fc534a6b42eafc2afef20099bf83dbf"; - sha256 = "05m282b4n2pgj3qgmdms8i8yxb2h2sdlvd7r9xlfp3j5xb35pk27"; + rev = "c01c8673338c73e92a88d2aa7e3a26ca8417fbfa"; + sha256 = "05lyzvxcghyv3jd4vcxk6jm88bq10sss0nvbhk4arbjf4wlmmf1z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; @@ -52602,6 +53030,27 @@ license = lib.licenses.free; }; }) {}; + persp-mode-projectile-bridge = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, persp-mode, projectile }: + melpaBuild { + pname = "persp-mode-projectile-bridge"; + version = "20170315.420"; + src = fetchFromGitHub { + owner = "Bad-ptr"; + repo = "persp-mode-projectile-bridge.el"; + rev = "f6453cd7b8b4352c06e771706f2c5b7e2cdff1ce"; + sha256 = "1gyfn2fhx3bqzr9m1r4b8nyak8pmpcgj7yz2bagnjs21vfngr18c"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2c049b0067b70577511114dc8abac0a00a9e0588/recipes/persp-mode-projectile-bridge"; + sha256 = "169mpikixa33ljmh2n9sm186yibrik3f5p8m1hcisnzdsc3wgxmp"; + name = "persp-mode-projectile-bridge"; + }; + packageRequires = [ cl-lib persp-mode projectile ]; + meta = { + homepage = "https://melpa.org/#/persp-mode-projectile-bridge"; + license = lib.licenses.free; + }; + }) {}; persp-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, perspective, projectile }: melpaBuild { pname = "persp-projectile"; @@ -52941,12 +53390,12 @@ phoenix-dark-pink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "phoenix-dark-pink-theme"; - version = "20161206.1519"; + version = "20170324.1144"; src = fetchFromGitHub { owner = "j0ni"; repo = "phoenix-dark-pink"; - rev = "024a1dae5e12d9c62c67c6ba0bc56d2f8a109c15"; - sha256 = "1sfsf4ds6qvdj5hzzla31s1pvp5acbyxqqpncim2kvgim6sxyrac"; + rev = "219edf69adb7e911394c5849c310ca0f4201a917"; + sha256 = "0i7m9iqnglirwfdibskz2alk8bzkffp8gaa38yqg6bxwb46x67nq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87e3b036fbcc96b047bbb141345a7b51f19d6951/recipes/phoenix-dark-pink-theme"; @@ -52962,12 +53411,12 @@ php-auto-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, yasnippet }: melpaBuild { pname = "php-auto-yasnippets"; - version = "20141128.1411"; + version = "20170324.914"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-auto-yasnippets"; - rev = "7da250a0d40f3ec44c7249997436ee8c5cae04ef"; - sha256 = "1l64rka9wrnwdgfgwv8xh7mq9f1937z2v3r82qcfi6il3anw4zm0"; + rev = "d6e04b2db9ebe220e25e4d3a1550bf6fdafdf032"; + sha256 = "160y5kp5m7kfkj832i7rawgj4ylnf100xqn7v0fppqapri2f177l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d47ca8cd5900a80a2ede1b354547addf9b2bbbac/recipes/php-auto-yasnippets"; @@ -53400,6 +53849,27 @@ license = lib.licenses.free; }; }) {}; + pippel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "pippel"; + version = "20170325.649"; + src = fetchFromGitHub { + owner = "brotzeitmacher"; + repo = "pippel"; + rev = "764c8ec30ad14288accd05c7f8a1c9425d6aab7f"; + sha256 = "0plpjjyhn1rz8pwyldshwa61r7pfz310j4qciw55smjizz4hfjx8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8dbdb25c8344c96048a7863333ace6dc07d8154c/recipes/pippel"; + sha256 = "1yxy0z5377xmb9gjpm16rybi8wr8x95k5hcf8g23690vr9ndjw67"; + name = "pippel"; + }; + packageRequires = [ emacs s ]; + meta = { + homepage = "https://melpa.org/#/pippel"; + license = lib.licenses.free; + }; + }) {}; pivotal-tracker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pivotal-tracker"; @@ -53778,8 +54248,8 @@ version = "20160827.857"; src = fetchgit { url = "git://git.savannah.gnu.org/gettext.git"; - rev = "e5a008ae54ffa54a5343632f88f10ba2e63c4595"; - sha256 = "0fvr0bybqyaix3qcbaj06r61gw69wff63vgsflkc36a92pj971b1"; + rev = "41e5199f0e4a3e9d518d6f95a3efdfae5e2c7913"; + sha256 = "06ww6081aicw2d4rprig8ab5g1rx7dqx7cl9xh444k746c8a554d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode"; @@ -53795,12 +54265,12 @@ pocket-api = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "pocket-api"; - version = "20160530.738"; + version = "20170315.1934"; src = fetchFromGitHub { owner = "lujun9972"; repo = "pocket-api.el"; - rev = "355424350e9367c67aa8b4e430568390e3960b67"; - sha256 = "1m3rczp5jyh83gfmv4rq11ya5vqly5zf7h4h6za3s5s3n38lldyc"; + rev = "de4c14122ffe6a04c93590da0ad4b8411801c6f5"; + sha256 = "1f1frnxsi8pgbmiycssq1jh1qjp12yfy1hq6zqscj0v510c4kzcq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04e3be76aef4d1b6d5bb3eda533b5deffcc8a5bc/recipes/pocket-api"; @@ -53813,6 +54283,27 @@ license = lib.licenses.free; }; }) {}; + pocket-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pocket-api }: + melpaBuild { + pname = "pocket-mode"; + version = "20170327.438"; + src = fetchFromGitHub { + owner = "lujun9972"; + repo = "pocket-mode"; + rev = "4338e869862a057e7ad1e53953e8c4a2c0f12a46"; + sha256 = "0c23np33g9hndppyfvvh9qb8xdh2v92r8rvcsi2cbwwm4z7xsvra"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6aa3d04058bfc0bc1da3393d17429d517275e97c/recipes/pocket-mode"; + sha256 = "04zxll5yg021m13vr54w2pnrmqb87ykdbpa8nx2wn9myg2rywh0v"; + name = "pocket-mode"; + }; + packageRequires = [ emacs pocket-api ]; + meta = { + homepage = "https://melpa.org/#/pocket-mode"; + license = lib.licenses.free; + }; + }) {}; podcaster = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "podcaster"; @@ -53943,8 +54434,8 @@ src = fetchFromGitHub { owner = "TatriX"; repo = "pomidor"; - rev = "c361814b1abbff2b213bd3cd5376efd3e749ce2e"; - sha256 = "15ryj9hp9kc9fn6jwipwwgaj6f5cwwmjswq1017y0f69qf69dd1i"; + rev = "bac68f7a1c72da3db6020d3bda45e38576c9c488"; + sha256 = "13bq9cm9aclnlsjzw66kig2618xr2v5sfb12dff8ja5hmw0j2jla"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor"; @@ -54125,15 +54616,36 @@ license = lib.licenses.free; }; }) {}; + popup-edit-menu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "popup-edit-menu"; + version = "20170329.452"; + src = fetchFromGitHub { + owner = "debugfan"; + repo = "popup-edit-menu"; + rev = "bd823ae3068e053804258697848392492538914c"; + sha256 = "0j2ynj8dshpagbjg38snfk626pfsb25y23w2nkb4h7v4kfv6587g"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e824ae5bd9214f8de210059f8145f13a4e62e8a1/recipes/popup-edit-menu"; + sha256 = "1mqni09l1xfxv4g64hskpsla41r5d2xfbw81ncbszwqzlln6k5bf"; + name = "popup-edit-menu"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/popup-edit-menu"; + license = lib.licenses.free; + }; + }) {}; popup-imenu = callPackage ({ dash, fetchFromGitHub, fetchurl, flx-ido, lib, melpaBuild, popup }: melpaBuild { pname = "popup-imenu"; - version = "20160409.510"; + version = "20170326.340"; src = fetchFromGitHub { owner = "ancane"; repo = "popup-imenu"; - rev = "540e8c0473fd50ff0a85c870057e397a0d3c5eb5"; - sha256 = "19mqzfpki2zlnibp2vzymhdld1m20jinxwgdhmbl6zdfx74zbz7b"; + rev = "c5e2e69adbd3a630e4cb750965a1aee8c10c1f09"; + sha256 = "0vn0jli0ya7xnapifkgzynbnh3rpnzb82j5k9bla2j4miqfc6cg8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5ca5d65d6a9c7ef3fa2684271fe087dc132d3a61/recipes/popup-imenu"; @@ -54416,12 +54928,12 @@ prassee-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "prassee-theme"; - version = "20170228.618"; + version = "20170329.758"; src = fetchFromGitHub { owner = "prassee"; repo = "prassee-emacs-theme"; - rev = "5c95639cf397b6cae5b0b37e462bd370296f84b2"; - sha256 = "0qyzfw7qxy6jb1qv93a6dvylji62yi06wvi8bqaxjsqf0a3zhb32"; + rev = "5be0ad067182881012bea5ae352636eaff06b01b"; + sha256 = "1l73dvi5pdbw8x1qbk9zhi1ddz000k54lm0jg2rzlcsxwnz2f4sf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/15425b576045af1c508912e2091daf475b80b429/recipes/prassee-theme"; @@ -54872,12 +55384,12 @@ project-shells = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "project-shells"; - version = "20170311.409"; + version = "20170312.1912"; src = fetchFromGitHub { owner = "hying-caritas"; repo = "project-shells"; - rev = "ab10fcd370781f684ca334f83fd70ed22a3f93b9"; - sha256 = "0fh61myklzg514zlqasp09arxdg43lvyqv7sv2dr74ins29zc0lq"; + rev = "1baec678ff04c2970591a2cb477c00b0182d6db1"; + sha256 = "05x0i3zyqgx72r9mzs98anzwdy7l1v2p5m6k4sffp1fcsp78b80v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/becf54de5ae9582d7c76382dff16d40b04b1a464/recipes/project-shells"; @@ -54918,8 +55430,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "codesearch.el"; - rev = "7f5ea7d653d01071ff9ce3c3281dc2bed4f96c5c"; - sha256 = "0ch3naqp3ji0q4blpjfr1xbzgzxhw10h08y2akik96kk1pnkwism"; + rev = "7013d933cd9d3c04f19a6572176483b48a311807"; + sha256 = "0g5w6p0hpsz5x4f3ic6q38ba5j5jfbx9nl77cxj6h1wpqdk49dhp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aa69679a71495a9ebaa8fcaac42f6682a5167d00/recipes/projectile-codesearch"; @@ -54998,12 +55510,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "20170301.1407"; + version = "20170323.210"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "4e5cecdf28e5c7a255648b246883adf6add987f6"; - sha256 = "0wdbmsqw806qji12wwiw2blzldnpyj2lzqj3qcyxladq5w576xqs"; + rev = "6f866e1e7cd50db563a16ae9237ad10f3be97fef"; + sha256 = "1fs5pcqk1zfhgbh2k9kdyi7sm089iy2mwaqipa1k91lvmqawz5i6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -55296,8 +55808,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "a69bc9de75fe08f5fe7ad6e2339dfc5b0da5d8ef"; - sha256 = "11b7wmzkm35bsbczhswl5495zz84ib2dm3syyyvyhbrgqrayppmq"; + rev = "4a0dd03e52e09332c8fd0f8f26a8e0ae9f911182"; + sha256 = "0x741ivcyx1yn5qp63swl3n5966zwjngmalwr85sq3qb5vacifj0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -55310,15 +55822,36 @@ license = lib.licenses.free; }; }) {}; + protocols = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "protocols"; + version = "20170327.758"; + src = fetchFromGitHub { + owner = "davep"; + repo = "protocols.el"; + rev = "1c93a48d4173635a7b742248797f424e7ce851e3"; + sha256 = "1hbk7ikcp041m7g2nfbbvsyj15d7p3dhsv0yvyy1n6bm5azh30zr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9c9a75671a00e9196d00b08911232aac87fd8c83/recipes/protocols"; + sha256 = "1wg3qh8a1ms82lkzz4i1bk787147a8agcj8rszj1zfvwg0ckqq1a"; + name = "protocols"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/protocols"; + license = lib.licenses.free; + }; + }) {}; psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, s, seq }: melpaBuild { pname = "psc-ide"; - version = "20170131.23"; + version = "20170324.243"; src = fetchFromGitHub { owner = "epost"; repo = "psc-ide-emacs"; - rev = "4a78aac90d84ea7aef6219497bd75c3ead988806"; - sha256 = "04qckg29wgzcr4z696s5wm4w8lrq3m799p447l87z5i23gk4hw7j"; + rev = "28a3a95890243993b20c2c2bf66d6c00a2f0fd21"; + sha256 = "0kajvmfyaxma9mh7mbrc3hiilzkdjwmgvv6zdfv39r9llwkrv80k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide"; @@ -55533,12 +56066,12 @@ puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "puppet-mode"; - version = "20170213.207"; + version = "20170323.331"; src = fetchFromGitHub { owner = "voxpupuli"; repo = "puppet-mode"; - rev = "03f608234ed0cf403966454de6758ec7fc9c784d"; - sha256 = "11kqbi4bjwn9cb48wn1nfy4d8rln07wmpj263cpb3npm1y6hfvpp"; + rev = "ce098468af9e7dc50a3979b0f4b7de54abe0aa78"; + sha256 = "1vap7vk6fsslpijy2iq3y0fb94naxjm60mcyf3xlz1gym3hfrwl5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode"; @@ -55658,12 +56191,12 @@ px = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "px"; - version = "20170123.851"; + version = "20170317.1630"; src = fetchFromGitHub { owner = "aaptel"; repo = "preview-latex"; - rev = "446f2c4670ae5a0e62393871190423333c531660"; - sha256 = "02rr4akm93c42zvlm5l1q8q7wipa051bcfv6h52p6fksw18ablha"; + rev = "0c52f7933eab3ca1642ab0df151db9950430c9e2"; + sha256 = "0f741a2gpc2mdl85ivbiskga620b6ci2x0dwjs7m8c1vk6xrxbpi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/326fc9b057a5016248ac36ca166e9a38f13babf6/recipes/px"; @@ -56039,8 +56572,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "d78e0130720aba010a55e388ba16bd58debef828"; - sha256 = "0my3a7h7v6x1b19d8fd6lpdzn32zav4nwpmc8f8pypf076kjaf82"; + rev = "da2e9724a195ea48451222457e56fbb9311186da"; + sha256 = "15xwdmsffj4xysl4mg17ip7pid9i035xhsh3r1qg2bqi2ikwqzgr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -56119,12 +56652,12 @@ python-docstring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-docstring"; - version = "20160509.315"; + version = "20170314.43"; src = fetchFromGitHub { owner = "glyph"; repo = "python-docstring-mode"; - rev = "a07bad8498a995d3389711a1989a7fe3502c82d2"; - sha256 = "0y554x7gpjnw2l8yr70h4b0fj2adsl55lndfq6hba5xdiv7y3wkn"; + rev = "6ac0b4cab3beb7cb8923f2b273526183179ccf86"; + sha256 = "0vhhni9wxcwdv7lfdp12a223dvn5w3i5y62cv0gmlsgcr9qdy3cq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e159e59ba0b60326cca0e1ea68fac4b85d54cd24/recipes/python-docstring"; @@ -56581,12 +57114,12 @@ racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "racket-mode"; - version = "20170308.1044"; + version = "20170315.1216"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "8cd8966db88de17d4c2f558540f1fe4b1b9e5a2e"; - sha256 = "0lflbfrz90vkxmi33mw060vjimxsw6dr4fdpp2x38ykv97bwlpi1"; + rev = "1c2c8964c5d16bf5c4ead2be8d19abc0244f59e6"; + sha256 = "0cxi81rgqv4ri96gbzr2p2mnwyp3jn3klsvds9jkmgw6dd5q4b8a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode"; @@ -56665,12 +57198,12 @@ railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "railscasts-reloaded-theme"; - version = "20170214.116"; + version = "20170314.146"; src = fetchFromGitHub { owner = "thegeorgeous"; repo = "railscasts-reloaded-theme"; - rev = "077af9cb791d9eba4c561cd7cb3b10d2fcfc39d2"; - sha256 = "1wd6j7m3w81rks6q8mrq5n6p6in0bc93szksds7sx2j2rz6vhfkn"; + rev = "bd6e385752c89760fdee7bdf331e24d1d80ee7e9"; + sha256 = "17vr2mbz1v20w7r52iqb7hicy131yaqhifbksvknx8xnm6z27pnm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme"; @@ -56837,8 +57370,8 @@ src = fetchFromGitHub { owner = "kakakaya"; repo = "random-splash-image"; - rev = "907e2db5ceff781ac7f4dbdd65fe71736c36aa22"; - sha256 = "1z25xmz8pl3rsfahw6ay8wx5wbnlxabnzr2dq20m0i5jyci8lqll"; + rev = "53a39ebfd8ac6be066a652a508a717870f94218a"; + sha256 = "1mky9xhghzz34sswqm2v3jhfc25fdrjx4hh4a1hs4h45g1v58lm9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bfbfe83143299b86f867c4d7faf6a0d7a070e1e/recipes/random-splash-image"; @@ -56854,12 +57387,12 @@ ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ranger"; - version = "20170207.2133"; + version = "20170315.2037"; src = fetchFromGitHub { owner = "ralesi"; repo = "ranger.el"; - rev = "efd54e6090114138f6b3acaf21168eca29363cd4"; - sha256 = "02hi45xd6vgaj98v772nmwhwqzlz68d9h5ywndp3i18zddnpr9y7"; + rev = "e0429a06d55b3f11b369da61aa9043bb2843fa12"; + sha256 = "171r9iljbp0pz7lvqsrnhdnir0bq2ynmhlb1ikf4k3i02w95i4v6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0207e754f424823fb48e9c065c3ed9112a0c445b/recipes/ranger"; @@ -57257,8 +57790,8 @@ src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "f7012d43f55957256ca81612c2ab5ae496b5a9da"; - sha256 = "0irhzy52vyg7363m0z3d0m9pymzdjwspaffi1j5ahi0lma18c438"; + rev = "2328ede5bbe6f20c69c0696e9f6ed4692ca4b4f0"; + sha256 = "04fa6sbw7hwwmrs0s94l1bdb4gw9q5xs3y26ngqqx0y6a211pb6q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -57284,8 +57817,8 @@ src = fetchFromGitHub { owner = "rocky"; repo = "realgud-byebug"; - rev = "5f45e790cc8261caccc8f30b99b36c303e2c78f5"; - sha256 = "1gqszhdgrqcrlb3b7i1ng3qxkd8s1fxa69rh652ggwssy0ss8qsc"; + rev = "cb75d6bd9abbe04afa4c74a7ce9c66852814e0c3"; + sha256 = "04fn27a079zsdrf08w4rrvw9xd473ni1bh57gbizdznnvgjldfkr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud-byebug"; @@ -57301,12 +57834,12 @@ realgud-old-debuggers = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }: melpaBuild { pname = "realgud-old-debuggers"; - version = "20161225.626"; + version = "20170316.31"; src = fetchFromGitHub { owner = "rocky"; repo = "realgud-old-debuggers"; - rev = "fd38ebe7d4a59786d34b0cf972c315278871bf47"; - sha256 = "1p3dk81f1cyisv6fb7fny6a9nij4c0yljypcdwiy79zq3fniskhp"; + rev = "1e1d573a6ba731afbe68c1309a316457ca3fbb94"; + sha256 = "1gk8k9lqbvqq4ngw0ffp3sqhkaj23n54m3ndh2ba9gvlmx7mxm7g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/260b4d5a85c380dda0f7bb0370e3ffa8cc3c0275/recipes/realgud-old-debuggers"; @@ -57326,8 +57859,8 @@ src = fetchFromGitHub { owner = "rocky"; repo = "realgud-pry"; - rev = "fca36075a223f6a4a643764199babe3d1dfde2ac"; - sha256 = "08jnav5v5q1mwgk9x100magm3jcprzfhmx8z6x8vcmp7xf79n1pp"; + rev = "4c903439b6292f51037d4a12ea54897e3a23541f"; + sha256 = "0nm9w3w2k7v2nbdp8q6k37ysahr34iprnqjfag631xhlswshiwrl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud-pry"; @@ -57347,8 +57880,8 @@ src = fetchFromGitHub { owner = "rocky"; repo = "realgud-ruby-debugger2"; - rev = "8d1bf53e250d10bc4b051b32ee6a89161706c66a"; - sha256 = "1ip22z48vj6a6xh54s26ss10pxhqrdm5k9h28i1vgv5x75kqgxii"; + rev = "b394bee61e75b7c6a5fa565594aa79b74887f5df"; + sha256 = "17lspprzaxv6lmwxgqr0vazkvh6dm2cpqs5yildczlr843k90vv5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud-rdb2"; @@ -57593,8 +58126,8 @@ src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "d06d39486348a74981b2c4c4c2ed3af95b01d5ca"; - sha256 = "0k3f7pa332d0fs1js8hi7zszcirir1943bhkgwfxzsqx17m26x3n"; + rev = "bdf027de732e4a8d10f9f954389dfff0c822f18b"; + sha256 = "08w4ll3z2pygry85x1g1kz2ibbiq93zq3my9zll226xi9hx1nll0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -57672,12 +58205,12 @@ refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: melpaBuild { pname = "refine"; - version = "20170311.114"; + version = "20170322.1527"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refine"; - rev = "e46948a3567a462094fcda227daa0f462e9f9120"; - sha256 = "1damy0y5c4qnfvdmv9qzr7w6vs88dm71wsfv918p79a0drp7xrdb"; + rev = "55984dbd570c361e7d56d85f2d4ecfbcc567bda1"; + sha256 = "0amj5i69cgk0p0c3wlm68dgrav8in5n19msglnks210mbfd1vzhj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine"; @@ -58088,12 +58621,12 @@ req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, log4e, melpaBuild, use-package }: melpaBuild { pname = "req-package"; - version = "20161012.427"; + version = "20170314.2342"; src = fetchFromGitHub { owner = "edvorg"; repo = "req-package"; - rev = "f0a81e86ede9896b4653839d5b3ca23f784d3678"; - sha256 = "1mk9wl63yhk0pjnbpsk0awvgxh31r6k98jik1b96adid77jxqj76"; + rev = "e7108177d05fc6f674b1766f1154d0652654b1af"; + sha256 = "1pv3yvglfq09rc2vxhy48hglppydsz0ji92564xba5kngqbbjw34"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f58a801f0791566d0c39493a5f82ff0d15d7ab41/recipes/req-package"; @@ -58193,12 +58726,12 @@ resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "resize-window"; - version = "20170130.1926"; + version = "20170329.1644"; src = fetchFromGitHub { owner = "dpsutton"; repo = "resize-window"; - rev = "194805787694194cf713ff15ee52a78c8da2d1fa"; - sha256 = "1g2vyi53sna5416q1sgc74yaw8vpqwwhxas4r5xcp8qyxxk5zspy"; + rev = "e4879731f3a3bc2261d6ec465bff01f88bd77d1d"; + sha256 = "0lhf1sk1gx0vpy038bdnmlqjzpg4kchlladihk36pv4hgqn5r9w7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window"; @@ -58214,12 +58747,12 @@ restart-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "restart-emacs"; - version = "20170306.2230"; + version = "20170313.939"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "restart-emacs"; - rev = "d7eacf44b643babce367076d91bef87cdf8e732e"; - sha256 = "0gw5i62d74byj4zdas480cpylz9rnb4jishpzhpq1zvmdhh5sd0d"; + rev = "38603b019b703f6e78f640478ee6412ba743f7b1"; + sha256 = "0zvknsakxfzkbfi7sg61q1m3484h1a0h6clzxd8hg4xifw6crf9y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9faeb6d910d686cbcafe7d12e0bcf62a85689bd/recipes/restart-emacs"; @@ -58239,8 +58772,8 @@ src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "10671d044f0b2bdbf908dab7ac994d6fc296182d"; - sha256 = "1iimkd5w8bjj1i64vqwvbwvwy7r2ha8xmxx3lklkssjnyi3icpvp"; + rev = "87c4f25155abef1ee8678e2137c1d8b3b2154ff5"; + sha256 = "18ym81hmcj83qsw96y6amb84wxjk63a9fgij6hbkq7d6vp970x5g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient"; @@ -58256,12 +58789,12 @@ restclient-helm = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, restclient }: melpaBuild { pname = "restclient-helm"; - version = "20160407.249"; + version = "20170314.854"; src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "10671d044f0b2bdbf908dab7ac994d6fc296182d"; - sha256 = "1iimkd5w8bjj1i64vqwvbwvwy7r2ha8xmxx3lklkssjnyi3icpvp"; + rev = "87c4f25155abef1ee8678e2137c1d8b3b2154ff5"; + sha256 = "18ym81hmcj83qsw96y6amb84wxjk63a9fgij6hbkq7d6vp970x5g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient-helm"; @@ -58457,22 +58990,22 @@ license = lib.licenses.free; }; }) {}; - rg = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: melpaBuild { pname = "rg"; - version = "20170212.938"; + version = "20170318.657"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "fd0f056a5912caeeb2d4f668969d9df81c9e22db"; - sha256 = "1lig93lj5mnm2fjvwac42kfw8bhq8ggs4jfc73fmclm6s5dg8661"; + rev = "6c85ce6974b67644dce5a607285f04197fe4874e"; + sha256 = "09r5rnnwxyqkf9kzpragwqxhhlgpr49kbvxc6ci18bkcs44vvcnw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm"; name = "rg"; }; - packageRequires = [ cl-lib s ]; + packageRequires = [ cl-lib emacs s seq ]; meta = { homepage = "https://melpa.org/#/rg"; license = lib.licenses.free; @@ -58632,8 +59165,8 @@ src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "276be756cdf3cbaf23198e5f19ce7daa7bc2b6e8"; - sha256 = "0lhwkgk3n36kd6rzvnj6h5xcp5wwa4yczri0274a7ch5gz2jdhhz"; + rev = "5347e3609c5ea8b767f9ec0c08969467d288c516"; + sha256 = "1gnbphf4ldi60wdfwpcyyyhgj2scj0wmlxp10014cwz9xcdqnfl5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -58649,12 +59182,12 @@ robe = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "robe"; - version = "20160926.656"; + version = "20170316.511"; src = fetchFromGitHub { owner = "dgutov"; repo = "robe"; - rev = "0c6d8b52293dea80e62b73204871d177c8896c0c"; - sha256 = "0brhw5fl5xhmmwx27aj1yqjslqvk0qdj4akpgq1ikpx8y4gac95d"; + rev = "53360f55df3857933a483af652aefe33187f5304"; + sha256 = "1na2h4pxrs0l3i5bsyn2c5mf5nbpr90lyhxav57wc2jcqz24nz4l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/673f920d02fe761bc080b73db7d37dbf5b6d86d8/recipes/robe"; @@ -58712,12 +59245,12 @@ rope-read-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rope-read-mode"; - version = "20170131.217"; + version = "20170325.831"; src = fetchFromGitHub { owner = "marcowahl"; repo = "rope-read-mode"; - rev = "a3810cf223c92353338418058153a466657a2dca"; - sha256 = "1i6dk80h6f4crw55iwbi5qxj15pr46j8cbd3b5nxcsvhl32900by"; + rev = "a43d56d79a0595374a8414979b758fbea3cab0a8"; + sha256 = "1z5f6z3mii24h82lhpdlyaazjlf69ffp6la1ajl0hn91hx297dw9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14a674559aa485e92357a8b941304ae8167b9c3e/recipes/rope-read-mode"; @@ -58796,12 +59329,12 @@ rpn-calc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "rpn-calc"; - version = "20150302.534"; + version = "20170328.349"; src = fetchFromGitHub { owner = "zk-phi"; repo = "rpn-calc"; - rev = "ed202e9eb59c4ace74b4703174f7bc7fa7e2d594"; - sha256 = "0i5qwbhhdnspgs2y67kkgbk9zq6fx2j509q92mgfzbvjnf54h1r8"; + rev = "9f38d2a5f9a7f24e01804dafcf8a4951daa2bc62"; + sha256 = "08y8yczzpwg7bw01bgpc54kx0ijhg0y8pwl8kcgdxgmav38y46fb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47d5b3c931cdbc2351e01d15e2b98c78081c9506/recipes/rpn-calc"; @@ -58859,12 +59392,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20170303.1422"; + version = "20170329.1245"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "606864f4e3f6e00426a69087b707cbc44d19404c"; - sha256 = "1ga88cjjb91pma47r4hz3kg6080dk29lbvghlffh9x0r91w1y5pj"; + rev = "8d868af718f29e7428658fe56979e05659f3a9c3"; + sha256 = "1nj1r3hdgzfhmhy7v9s7ivww7y1hd70bw4vp904m20qwq81zpm69"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -58925,7 +59458,7 @@ version = "20161115.2259"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "57962"; + rev = "58216"; sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { @@ -59005,7 +59538,7 @@ version = "20150424.752"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "57962"; + rev = "58216"; sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { @@ -59631,12 +60164,12 @@ sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sbt-mode"; - version = "20170201.246"; + version = "20170317.330"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-sbt-mode"; - rev = "c8fb801958e7c628ae618e8e1e4e04434ca41110"; - sha256 = "0acbsf5srdpk7gl27wyqkqg56akbg0xff3wzi07yw4hwaspcbm0s"; + rev = "c92cf327f49d9bf8a146dec64b72baf7d341d80c"; + sha256 = "1iysw66g3nxsfl3svxi2j7ish3hzi4b8qy30wcj27jjwfjn2mywp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode"; @@ -59656,8 +60189,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "3a7dd67970c5ac57df24c40e18e77a99fd14e1c7"; - sha256 = "0hk965ldfxybjjaw9sfyn4zw28178pdmaljk454y4y6xfnm2xcrw"; + rev = "714e14e4a6b8eb62677784de6213e1cde79a6554"; + sha256 = "0yq86lm8754899lvx9g9w4y34gsw91xw51m9rsk59x7jfd2lfq6x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -59694,12 +60227,12 @@ scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scala-mode"; - version = "20170131.2121"; + version = "20170323.502"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-scala-mode"; - rev = "730e16d254478d6f63f62cb04d47c137c9002f2d"; - sha256 = "1aq1bfv8jz53zp365awqk43ysjwkpj51pcy6fyp87j8bbb02mgq9"; + rev = "970d88eeff82df635ee12336ab1eb185585f30c6"; + sha256 = "0wfv20dyb13v7fbfsvy0k5dajvmyyhn80l6xyx6kppiv3qmy9s90"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode"; @@ -60299,8 +60832,8 @@ src = fetchFromGitHub { owner = "kiyoka"; repo = "sekka"; - rev = "09f7c7c75d8570909ecb45599d6f3ba75768321c"; - sha256 = "0s6y3aqavc4lfqi84hkvbdyyjgw9j5n99272blj0878a0qmia658"; + rev = "987c1cce65c8f30b12cdb5991e1b1ad9da766916"; + sha256 = "03930cfqq97f7m6z9da2y9388iyymc56b1vdrl5a6mpggv3wifn7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka"; @@ -60482,12 +61015,12 @@ seoul256-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "seoul256-theme"; - version = "20161121.1247"; + version = "20170320.1311"; src = fetchFromGitHub { owner = "anandpiyer"; repo = "seoul256-emacs"; - rev = "4ec545214b137bd0062d53108b8a523250bda875"; - sha256 = "0hwvsxq7cba2bqanjmlln8cx63nhsq3rlg9p12lwbqrfppmlfj18"; + rev = "8afaf6aa2c63a003e2899e3e5ba8be85f6fdd350"; + sha256 = "0viwqym1vns2l3lrxv0sdrbvadn6apk8gip26a3ln4pzq1723qxh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/664fc68d7b0eb92940fc188f5b9bee7ac7e0c674/recipes/seoul256-theme"; @@ -60582,6 +61115,27 @@ license = lib.licenses.free; }; }) {}; + services = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "services"; + version = "20170327.835"; + src = fetchFromGitHub { + owner = "davep"; + repo = "services.el"; + rev = "87d65bf9fd8b02101f751846c650fc518355d1ea"; + sha256 = "01wlknj97jrmhji3c3dyc6cm8pp0rj93knfrg3l7zimr7crx3rg3"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/beb91b4397f6e35a1d5c73a127d8cd7fc9201935/recipes/services"; + sha256 = "02lgmpbw52ps6z4p9gwzvh9iaxisq5mb0n9aml9ajxac1473vpcd"; + name = "services"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/services"; + license = lib.licenses.free; + }; + }) {}; session = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "session"; @@ -60648,12 +61202,12 @@ sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sexy-monochrome-theme"; - version = "20170225.346"; + version = "20170324.510"; src = fetchFromGitHub { owner = "nuncostans"; repo = "sexy-monochrome-theme"; - rev = "436206eef592ca22e4c3e0cd3bd87a1fba4083a1"; - sha256 = "0aaicpiihrd5ny2g68cpkasysyx5wj28gs727qwdqw3ljpc0qlz9"; + rev = "c221231bb8a0d60413d710efe6226683326d57b0"; + sha256 = "0zjy6d4fqg08dwbn1y360514pzzj3nrg3wzm656n7sg90mffh22i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9a09ffb7d271773f6cfa7c7eeaba45a717a5bdca/recipes/sexy-monochrome-theme"; @@ -61064,8 +61618,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "structured-haskell-mode"; - rev = "074c8696f52253af24a74e4b3a99edf9c0993aa9"; - sha256 = "1cn2kh5ccp09mg6y743vh2y9m96m0zbnh9w5infl9nj9xbidza72"; + rev = "45b32a79d90a4e23064f0ca18d4ff9283b01ef03"; + sha256 = "189vx1kjrdr0lxbfbvfvrxvr1y216px23rfa52ysha5av2khr39v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68a2fddb7e000487f022b3827a7de9808ae73e2a/recipes/shm"; @@ -61577,12 +62131,12 @@ simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }: melpaBuild { pname = "simplenote2"; - version = "20170106.2358"; + version = "20170317.335"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "simplenote2.el"; - rev = "9a97863bc8e089b2a751d8659a7fa2d19876d9bc"; - sha256 = "0vd1n2wsgzhwz6ir5cr90cl844r1yph28iav0kwa6bmk6zkfd3c6"; + rev = "5f267d6289b103d77feb2f038baedeae39deee75"; + sha256 = "07rmwga7qd8g71km5p3g3vjmmiy8cr5snyrvhiwi9lcnai83kc50"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2"; @@ -61619,12 +62173,12 @@ skeletor = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "skeletor"; - version = "20151220.2054"; + version = "20170327.1529"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "skeletor.el"; - rev = "78df0da39bdf0d3e78f8d672a3486c02baa9dbd0"; - sha256 = "1sabk2ly80k67hwypm5g292n3c4hjlcmvc61n3ixlkm4nq8dp6sy"; + rev = "cf643ea320e172b3727f897f05e87a8e5a02c589"; + sha256 = "1l3gjzzvrbkiapk41jxp1hwx2z2wc69m8bsy179nwvv9gsnxvwv1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e63aefc869900c2af6f958dc138f9c72c63e2b8/recipes/skeletor"; @@ -61745,12 +62299,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20170306.718"; + version = "20170328.2044"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "e64753db3c989ba12f6b52796e9dbcf8c285fbea"; - sha256 = "0bxn7nngc851h5z8bwmc61cl3yps6w6zwf26af6fpcj7d4i8435r"; + rev = "fc85625ed4421e4fe79c87c3844d6561543c0ab8"; + sha256 = "08xfqacvq1a0g6pvj6pjg3mi2yl1c756kn92csacdq3g7z4sfkm2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -61808,12 +62362,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20170209.1240"; + version = "20170319.1601"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "9eeb7163f07a88450871fff2be78446ee7a4fd52"; - sha256 = "0pxc5ygjc3jz42nxim5l0yc0wns4rfzs2rxwpxy027rqwkk0ap6j"; + rev = "0f3459f558bb71daab2416102b99a8ce39947d83"; + sha256 = "0sqjsc7gbiqivi9f8y53fc3nys61dhs8lq1zz57yg24qvv3hxqi3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -61997,12 +62551,12 @@ sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sly"; - version = "20170305.1423"; + version = "20170317.1656"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "f419ab5294015368ef30e658f94894ff2084f5b9"; - sha256 = "0llax80z1d5kn03ip6d4jclnd2x8ydx8q3y8kyx8ypzyvx1ya43n"; + rev = "d3f586a99e1d3ecb225b2a7c56435eaac2e5527c"; + sha256 = "00wyvc34mcdqrb7cnayc0biw4rz92jad9vpv4w38zbs8331lkh5k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; @@ -62480,8 +63034,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "a212f777eea775a5c106b5022dea3bbb215bf98a"; - sha256 = "19fpal1r0x11515s1lwgr5cjs0jk7pggfnv6y7jj4bvrvq87imnk"; + rev = "2acdee84701021049bea0925988df61e340c2311"; + sha256 = "1k0aybgaa595gdr8d1v3wid349hzmnxr3i0isdh3sdzf9b9dh313"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -62832,12 +63386,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "20170226.1852"; + version = "20170326.1920"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "6f2c034f1ec557c9e7e624cfd53e8ebb997376ab"; - sha256 = "0255lh2r73h84kks3h7pfr8242q86kb8qrv8sm6dwv9jcbjp094n"; + rev = "349980879a66493ed421e9c83f4857662267b8df"; + sha256 = "0alwp2i554alac76zlskviabi12nivmpy4yhm9nwz7lsnv7qsikj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -62874,12 +63428,12 @@ snapshot-timemachine-rsnapshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq, snapshot-timemachine }: melpaBuild { pname = "snapshot-timemachine-rsnapshot"; - version = "20161008.305"; + version = "20170324.513"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "snapshot-timemachine-rsnapshot"; - rev = "4ff6b96219f4da576141e376b0348813c1c25615"; - sha256 = "0krb1ziyjldyq27sp0phmygm1p9lssp251ycj08gdczbbfpw4lsa"; + rev = "72b0b700d80f1a0442e62bbbb6a0c8c59182f97f"; + sha256 = "1bdy7p0bjfdlv6l6yih6fvvi7xpldal4rj8l2ajpc6sgby24h8bb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94358fb8d1486491903c331d9e90ba5198117aa8/recipes/snapshot-timemachine-rsnapshot"; @@ -63368,8 +63922,8 @@ src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "80f40d21ff3350f6dbd3e572e49e177f734391fe"; - sha256 = "0yavgzricvgrvqgnjwxhw4vlphkglh9bb91j78wsmqr11l1sl66n"; + rev = "9358c37ee9c90a3d13a43afcd6917fea8eef144b"; + sha256 = "1k711ppzkd9c5ial8cs0aazsi0zig6r9acmbhr0h9zizbrsw5sl1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -64110,12 +64664,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20170109.2256"; + version = "20170315.844"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "1c1e379b153bc6206985c765969fd6a9f56aec25"; - sha256 = "10p5yaagv5lhv6d0jcfk8pynqcw6njkjgjmgicl32nwrkgfapa6f"; + rev = "4c1a539e6f95e4847c13685d2b752e40d2b8aad8"; + sha256 = "1zkxiy66d34v09krfajx6y8i2s5jdp99sxfzbvzi854s9hldl58x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy"; @@ -64916,12 +65470,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20161205.450"; + version = "20170326.321"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "19bfa7d6c2356a62647c7fe85876a88ab3b6475f"; - sha256 = "0sh3nryhcr2spxjh7p0jsjyfhvmqnwjayzz2zrwv3xi2vdgg8gb8"; + rev = "d23e9e86c413561177f7f0704056627ee3c0eb15"; + sha256 = "0p02sjrhlcjbprw4s2gy8rccgm0k9ds4haj6hmg48gsbahxiz59v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -65288,12 +65842,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20170225.356"; + version = "20170328.737"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "1ac1cc1378eeaec2eb47a21dabbb1f6d775e7823"; - sha256 = "0024zry02vwzhdip5s5g55wlicakj4815yy8s617jzmj840x97mc"; + rev = "3fbeaa563916c0e23c6cafa82716e9f2eba44073"; + sha256 = "14z8f0lx5s63dy7h0x5m6lkhpfbmlq0p64g2r6y3dhswb8zn1pjl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -66018,12 +66572,12 @@ tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tao-theme"; - version = "20170301.557"; + version = "20170327.1017"; src = fetchFromGitHub { owner = "11111000000"; repo = "tao-theme-emacs"; - rev = "df36a5b37928855f013d40bd47c87e2ed281727c"; - sha256 = "0qn1z4cxc3v4s6fl0j7k95zdnfs5r860nd0ah0w9yn7ic71jl9ib"; + rev = "0b89755a5d985c27378795ec017c00b8bdd78f55"; + sha256 = "04v6lb4mz802g72565ar8h2vx4fxfvs5y8hkiimr7r04y3b73d5p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme"; @@ -66463,8 +67017,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "e6a7777f273050098fa7074577ac196bae59d80b"; - sha256 = "0qyw5zzqqbbah7k3axyqyk78iy9h6ndw5rmajsm033nj9a9d8rxv"; + rev = "e5a3f048ee7c7729434918648cafc564cbb3046a"; + sha256 = "0dgsg6nppssf3fjv37idb7z4c3k6plxjybp9al079bqhkr1cawdz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -66484,8 +67038,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "e6a7777f273050098fa7074577ac196bae59d80b"; - sha256 = "0qyw5zzqqbbah7k3axyqyk78iy9h6ndw5rmajsm033nj9a9d8rxv"; + rev = "e5a3f048ee7c7729434918648cafc564cbb3046a"; + sha256 = "0dgsg6nppssf3fjv37idb7z4c3k6plxjybp9al079bqhkr1cawdz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -66564,12 +67118,12 @@ test-c = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "test-c"; - version = "20170123.950"; + version = "20170316.1432"; src = fetchFromGitHub { owner = "aaptel"; repo = "test-c"; - rev = "94e9f76659c45100a9b0e2a9fecf6482427cbbac"; - sha256 = "0lnx9fidpfpmwi7xa2ik5mc72lcfc9g8cm9r25s5x7sfy9vr3q8c"; + rev = "5a8c22a0e5ae6e2b0157bf1c41f0fe798c562a21"; + sha256 = "0g1xbb8n3006cqzb6awiqk7n0b6h54dlm7iz5r1n48zaf7mp6046"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef915dc2d3bc09ef79eb8edde02101c89733c0b2/recipes/test-c"; @@ -66711,12 +67265,12 @@ textx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "textx-mode"; - version = "20161106.1243"; + version = "20170329.339"; src = fetchFromGitHub { owner = "novakboskov"; repo = "textx-mode"; - rev = "74b701ec2d31b228a8e1e9c993edd00f5c324dca"; - sha256 = "1i4bd17kymdc9w2xd83549f0dva2asnvqcppgsg3svyab8x1aa7z"; + rev = "cd47daf9737479ff06e2fa43fbb45ada2d7386e8"; + sha256 = "165m6p18nzpqvdvx2a6hf94blsa2r947wdf1x6jicqflfpki45cx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dada0378af342e0798c418032a8dcc7dfd80d600/recipes/textx-mode"; @@ -66907,6 +67461,27 @@ license = lib.licenses.free; }; }) {}; + thinks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "thinks"; + version = "20170325.430"; + src = fetchFromGitHub { + owner = "davep"; + repo = "thinks.el"; + rev = "122c0dcafa79bb1d9b37dc5bf6045e9f62666e6c"; + sha256 = "05jczr3vj7j7b83sv2w79hrd4hq8xip79yx4z9g1v8lr3j3l4gzq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/439957cabf379651dc243219a83c3c96bae6f8cf/recipes/thinks"; + sha256 = "11vj9mjfzmqwdmkq97aqns3fh8hkgx9scnki6c2iag5lj0av2vcq"; + name = "thinks"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/thinks"; + license = lib.licenses.free; + }; + }) {}; thread-dump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "thread-dump"; @@ -66956,8 +67531,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "6582757752e62efea3f9786dddf0260efaa1f450"; - sha256 = "1c9miaq60d0l352yyxc2l3v927wzgadsyvfxyvs88qdk6pmz59ig"; + rev = "7470995ce4bb480a86beaf1d8babce95c6f4b8c7"; + sha256 = "0srq5qcmnfplr30yxh6l4szl4vjfj41dwm615zq0mfjakxd3pbm1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -67013,12 +67588,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "20170310.2151"; + version = "20170325.602"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "70d859495d8bd76f338868f6fc1a89dbcabf7a2b"; - sha256 = "0nd5lcs2lv5m0s56vga3d7j66zfy2w4dafv8g3jv3m3p5hll1dq4"; + rev = "a38e71fd07fceaa069d701cb6a3637dfd53c9f23"; + sha256 = "01fg82i1a5ck6f5qj2nrz2hzl46hcsaxk13chbb71r99r80xm9lm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -67154,6 +67729,36 @@ license = lib.licenses.free; }; }) {}; + timonier = callPackage ({ all-the-icons, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pkg-info, request, s }: + melpaBuild { + pname = "timonier"; + version = "20170328.116"; + src = fetchFromGitHub { + owner = "nlamirault"; + repo = "timonier"; + rev = "f5d42f0a234b906f72da759240b9fc2067de1e80"; + sha256 = "1dl99zwcps8n22pf60mp47r8px98a9ihyf95j1y6dfivnzm7kjy2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a31b0c177fd83bdeb1842a6ec3095de143bb4eae/recipes/timonier"; + sha256 = "0vb83kv2dkca2bq876icxs8iivv9qgkzmzrsxfpnvbv752b220b0"; + name = "timonier"; + }; + packageRequires = [ + all-the-icons + dash + emacs + f + hydra + pkg-info + request + s + ]; + meta = { + homepage = "https://melpa.org/#/timonier"; + license = lib.licenses.free; + }; + }) {}; timp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, fifo-class, lib, melpaBuild, signal }: melpaBuild { pname = "timp"; @@ -67325,12 +67930,12 @@ toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "toc-org"; - version = "20170131.558"; + version = "20170324.103"; src = fetchFromGitHub { owner = "snosov1"; repo = "toc-org"; - rev = "cda8f73640ae26c476990eae421e42627445f9d0"; - sha256 = "1qkm70ay10blhji8z6c64f18288r1gswzmmkvg7b2z2rz9w475fm"; + rev = "f0b94e07bb4b32db039088a58578bced29256431"; + sha256 = "1dbi8kzr5nnb3sclafniq2sipwyran8h1vsqdy1wqd1a5306538h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org"; @@ -67718,8 +68323,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-traad"; - rev = "de76278e77d26ab8c400c03cef7bc3326be1e257"; - sha256 = "1l092pxpm02wr0wp5j1027s8wdd0qjaj5rl2gfl9b2qskw4qh8f2"; + rev = "6d797f124fd4e037df7727d7696328a95748b9af"; + sha256 = "1r3s7qjlf943h3wqc5plw0la0p54xmxzdj3iwaz9lymfxx6n3h72"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad"; @@ -67846,12 +68451,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "20170312.1927"; + version = "20170326.1044"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "fd6334f795df409d8d854a0762ef2d2ac74556c0"; - sha256 = "0mi3xrgsshds09j70mv42ngn1f702wswvrn4wm3xh8gv6sqfbz5m"; + rev = "5b88e643e93115af3a96c8cf558eb506b34a64fc"; + sha256 = "1zcpy3628s9cm9am92imwhp31fdnd6146hz0x4qaazia4gbhp66z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -68384,12 +68989,12 @@ typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typescript-mode"; - version = "20170311.1208"; + version = "20170324.1301"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "typescript.el"; - rev = "ca510ab853feb45bb0a6fa5bfe01c96bb1da50ba"; - sha256 = "11g98jy74bpkryb9y5kclndm1zv40rwg7cfpd782fp8f767f17rq"; + rev = "f25f4751fea12298905c811a1f469a6b0a169ef1"; + sha256 = "1s4qzhi8bd45l824pwzh97i9npf7j4ai6wkbhf28q2nd1hiv29hw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; @@ -68588,12 +69193,12 @@ ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ujelly-theme"; - version = "20170309.131"; + version = "20170321.1016"; src = fetchFromGitHub { owner = "marktran"; repo = "color-theme-ujelly"; - rev = "c9ae717f38a7d01de30a8030f80032a5782aa88c"; - sha256 = "0jx8rfm8jrpn7b8q0wkabjsnvlbzmgn2q60qscmvz1bggb01r9ak"; + rev = "2db6f0ab6054e9d6893d65bb239cdae5c2decf5f"; + sha256 = "10m4bic1n8vmz1gr81cpr1cwyamyvp6iw3wdc0vwfma2fskd1pq2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme"; @@ -68673,8 +69278,8 @@ src = fetchFromGitHub { owner = "sviridov"; repo = "undercover.el"; - rev = "465e339749f924606df71e250ae10d1f910f71a9"; - sha256 = "0p75m1v9hvdlmlpg9zk09q9zyxf1ld6njfqir6hx83lidgvs5wsm"; + rev = "3d69b33a0b52ba25415ba8ad8552b0cfb250435d"; + sha256 = "15h2nabbi6ysr6xrf35p8zs0mi00ifk645kskhhfyn3hm103j052"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d58ad9eb863494f609114e3c6af8c14c891b83a5/recipes/undercover"; @@ -69096,6 +69701,27 @@ license = lib.licenses.free; }; }) {}; + uptimes = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "uptimes"; + version = "20170326.515"; + src = fetchFromGitHub { + owner = "davep"; + repo = "uptimes.el"; + rev = "5e321692bf5ccdc286f4831fa8fe55467c1c56aa"; + sha256 = "04n4bryfid6scma43whw156wcza77ij7szgc5f73d98j9fji6lay"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes"; + sha256 = "0r8s5c2hdcb1ly7rnhzar4qzf1c9d49gd914ndnc3mg9yb9gyy5h"; + name = "uptimes"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/uptimes"; + license = lib.licenses.free; + }; + }) {}; url-shortener = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "url-shortener"; @@ -69159,12 +69785,12 @@ use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; - version = "20170218.132"; + version = "20170327.1449"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "53bf803f1d3efc61653f94fe56ff30a72304861e"; - sha256 = "1knyd7gf975akjkzn3dh3jckvk377x3n1b6b1d425rw9clwnginp"; + rev = "a354568ec2af8444b741f595a3a7183e3f67ad58"; + sha256 = "19aaqcaycq1msfgvvnlqkzqqijbzqzc015k69pbg41l5bvrwnqcq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; @@ -69205,8 +69831,8 @@ src = fetchFromGitHub { owner = "diml"; repo = "utop"; - rev = "f2015062fa5f8ff5a39d3f2db9475862f433b2d0"; - sha256 = "1l00rhh9l4b9ww5sx1vm87qnydcr59ka4w2n2faifglnsv3awzn6"; + rev = "d6f6a9465a26fc78ff72a3c234f118256ab24309"; + sha256 = "1nswnzmr43b4x1kcai0ygy5v3nyc3713209x3pwq30hs7jk3swb0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop"; @@ -69558,12 +70184,12 @@ vdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "vdiff"; - version = "20170204.1636"; + version = "20170320.1805"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-vdiff"; - rev = "d243767ed4b1ac68515c9276f53cc3ea407456a3"; - sha256 = "1xg4jxz1nxsmfwdqwzz35mkvd3afa28dlxgd5rw19m0wqsb0miim"; + rev = "f11c7c2eeef33a0b75fe4e025818e7e672c57397"; + sha256 = "1shkjk38piwrsn78bcy557zvm68xznlk4kg5l2fgiwfmmzdnvj13"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff"; @@ -69705,12 +70331,12 @@ vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }: melpaBuild { pname = "vhdl-tools"; - version = "20161010.239"; + version = "20170315.1525"; src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "c964571c38fd3a6bfadc88fd9def3ed03132a052"; - sha256 = "01sdkhljh7mdwv4mvm37gimjvl3i0jpn4xzmd9sdjll0dbc8rxki"; + rev = "6f3f8ba58432dfdac59122164c732ccc0dfc475b"; + sha256 = "076v5zafalv1r14ms90zs1p7yq11fzff4vywrda6dh63i0yk2vxs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; @@ -69831,16 +70457,16 @@ vimgolf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vimgolf"; - version = "20140814.1448"; + version = "20170323.600"; src = fetchFromGitHub { owner = "timvisher"; - repo = "vimgolf"; - rev = "289bef87963b660c0cf6ea1f648ac2440c609c88"; - sha256 = "1i407ilhmk2qrk66ygbvizq964bdk502x7lvrzs4wxwfr5y8ciyj"; + repo = "vimgolf.el"; + rev = "741e414ec24072af05471058a5719271bfcfe766"; + sha256 = "0fs0gimry8xzydh7m305j86h1rq7qivsda19ah48sxbxks6xq5ax"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0bded518d1544a9442c13c5cbfab64f0f1cbdb6d/recipes/vimgolf"; - sha256 = "1hvw2pfa5a984hm6wd33bf6zz6hmlprc6qs3g789dfx91qm890vn"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/50dc1c26cb848986dda3c930c8d9b421cd3b1d17/recipes/vimgolf"; + sha256 = "15xq5vm82hy4pjw04m7xcqav7azsb3c65lp8cfxa29z7xg81w62f"; name = "vimgolf"; }; packageRequires = []; @@ -70203,22 +70829,22 @@ license = lib.licenses.free; }; }) {}; - vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }: + vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }: melpaBuild { pname = "vue-mode"; - version = "20170206.120"; + version = "20170329.612"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "vue-mode"; - rev = "0b159770abc865796a1fa02be2f5959138b2f8a6"; - sha256 = "1i6a6g4l9xy45kllgr6kgai3mfg8b060dpspn6vv69kpwjcqiza7"; + rev = "cbd1e35375309f0c813b5689a765c483caef6d60"; + sha256 = "1lpac1bkgjnkhhglynpwfz4vr3g90m8124ii43yd5n06vpx21c3d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode"; sha256 = "0gy7a5sliaijq0666l55vbkg15anrw7k1828szdn1ppkraw14bn0"; name = "vue-mode"; }; - packageRequires = [ mmm-mode ]; + packageRequires = [ mmm-mode ssass-mode vue-html-mode ]; meta = { homepage = "https://melpa.org/#/vue-mode"; license = lib.licenses.free; @@ -70325,12 +70951,12 @@ wakatime-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wakatime-mode"; - version = "20161019.602"; + version = "20170324.2348"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime-mode"; - rev = "4a99c5ad1e25135a086cab63ad797fae9b03afbb"; - sha256 = "0y4ydwqvjnkf8iav0c08zpmqm1zja7r5c6cjwnk07rsnb5zhpzjw"; + rev = "7172a92df66a69537c849182c22404715ddd9bfe"; + sha256 = "0scayq5vwxsilm90zbma8lc6fvmm6w7p3gfyphcvvsm93rx5601r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a46036a0e53afbebacafd3bc9545c99af79ccfcc/recipes/wakatime-mode"; @@ -70367,12 +70993,12 @@ wandbox = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "wandbox"; - version = "20160418.1114"; + version = "20170324.1014"; src = fetchFromGitHub { owner = "kosh04"; repo = "emacs-wandbox"; - rev = "c5c4f1279f48e7871407d0fca2409512f427107e"; - sha256 = "0xzwflvj0mq0h9qr62aq473jz71jggnq2dlf1x2vy0a7rh8qw445"; + rev = "4e52c14aca11de4686d4f1de98588cb5cf42d815"; + sha256 = "1c9wvnc8nqizh5sw424hznnqymfcyqdgdj8gzwfy5i04mi7mic4p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/wandbox"; @@ -70388,12 +71014,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20170309.1426"; + version = "20170325.357"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "40ea87cc62ac6d858235edf2e5d10e5867aa230e"; - sha256 = "0kmw7rhx7d1a9vhabrfks5l95jafya4lw6yl937imkyxjb6kqdf5"; + rev = "0a324086eb9cf2d357d3c8a431e80cd45fce016a"; + sha256 = "0hcyy44xxg6f7c10db6xf8944wiaijxln3kgrl49kc0m3icilxyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -70619,12 +71245,12 @@ web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20170309.3"; + version = "20170320.1240"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "b8b0dec9fb429012e530a36eb1aa918f84c6ee82"; - sha256 = "1k7rzk04n7vw0dzxfl4fdlb88br1zxn8w3i2ld5abz2b0x87497p"; + rev = "4d16489eb14e47f3d63b4bdd4d9f7177133a973c"; + sha256 = "0xgij4ln7r8q56c79m729nayr66bzmlkfbmmy8pr33rca6m66hfr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -70703,12 +71329,12 @@ webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "webpaste"; - version = "20170306.946"; + version = "20170328.1448"; src = fetchFromGitHub { owner = "etu"; repo = "webpaste.el"; - rev = "92a586752b7fbc4089a6d92750c70274448aa496"; - sha256 = "00b6sbcp827n5d8ql87503m3k1wnlx6rbr3xgrr41aq0b0xj6z7k"; + rev = "382e01d787c4a0fa6bd4c58bed1810ed5b7787e2"; + sha256 = "1nz4ri36k49gwdkc9sb886avpijijssrj4frjyrw27ff9aj9q9h0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste"; @@ -70955,12 +71581,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20170209.729"; + version = "20170315.1055"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "0d56e4369b53af2c5960af4827b56b06d9162d62"; - sha256 = "08dw13hn1w9m37gd2cch3z9af504x55w0hlinn05j1jgvja50c7f"; + rev = "3c7ecc69d48258af66978a685aedcbc8d1ada512"; + sha256 = "1q6v4bnw9sl6f138lxkqp979xpbgsb57gxj8a1k7clms16kkn5ci"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -71145,8 +71771,8 @@ src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-widget-mvc"; - rev = "ef5648d7dd6dbb88ca946e42011fe8eccadb524e"; - sha256 = "1wlybqs45firifk7w7yndh70wmsimdrw6pv7hyaciyy0ghidya3n"; + rev = "ff5a85880df7b87f9f480fe3c28438a0712b7b87"; + sha256 = "1s0srhklmkmj3lfs8vr1dqi3s48z7fwx9mxqxckk5njld317hqg7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76d3c38e205076a22628f490d8e8ddd80d091eab/recipes/widget-mvc"; @@ -71166,8 +71792,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "83bce5f49e49e526a66e528445f54889cd57dbb6"; - sha256 = "02dmmw20jqcx1ij2kj3aam9fhwqcb52sjhcx7k4faryzdbx6zvwd"; + rev = "e66476fef5c5afe75f09e4fe94109423a99fc2c6"; + sha256 = "1lvk8nh9gp3i98jjinqx17fxammxkfwh0dvzhah9ram73i6xq1yd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -71534,8 +72160,8 @@ version = "20160419.1232"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "3a654cfe6632"; - sha256 = "1ahmpk0302g375w9ikkzagjvx8qblkzx40w960ka0cqf7nzyk75d"; + rev = "c5c0bb98b281"; + sha256 = "0gxvx2n6xza17qf1p4v0nbcqfkkhrmg9a56c5d126b4vgmg3bf9v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -71761,12 +72387,12 @@ worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "worf"; - version = "20170306.1230"; + version = "20170326.712"; src = fetchFromGitHub { owner = "abo-abo"; repo = "worf"; - rev = "9dc5a0f5077e20ea3177376823a1fed18840d5f2"; - sha256 = "076mz72qqfcbrs2gw9ng8gbzhr9kzc9mnjmv51n67dmd7hi5mmyc"; + rev = "820fe2316d672e7bb2be7a2ead8ad5ed027f1a9a"; + sha256 = "13d089n9y8y7ka708byg9704rq0slxvdzfhw8vk0yzzd3jrbfgs3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf"; @@ -71842,6 +72468,27 @@ license = lib.licenses.free; }; }) {}; + wotd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "wotd"; + version = "20170328.1248"; + src = fetchFromGitHub { + owner = "cute-jumper"; + repo = "emacs-word-of-the-day"; + rev = "d2937a3d91e014f8028a1f33d21c18cc0b065a64"; + sha256 = "0nwq5ymj9kx1fx3kfc789nkd80gwzljwmk7xxzzsrdrv47gm047m"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7a52690a9bae634825bdfb5b6b17e5faccb93e13/recipes/wotd"; + sha256 = "145knl4n35kpqqzqkz1vd18d619nw011d93f8qp5h82xm92p3sb5"; + name = "wotd"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://melpa.org/#/wotd"; + license = lib.licenses.free; + }; + }) {}; wrap-region = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wrap-region"; @@ -71887,12 +72534,12 @@ writeroom-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, visual-fill-column }: melpaBuild { pname = "writeroom-mode"; - version = "20170228.1521"; + version = "20170324.1514"; src = fetchFromGitHub { owner = "joostkremers"; repo = "writeroom-mode"; - rev = "f853350da848d0814f822587ae310e52d895f523"; - sha256 = "1al4ch96p0c8qf51pqv62nl3cwz05w8s2cgkxl01ff3l9y7qjsvz"; + rev = "071ebbecf6bc9dc40c5d1a120a9aa3d27ddaa81b"; + sha256 = "1w4bhp9b3jm6gqj4lvxbljr2xw05xldsxb8xaddj3ac82afq7kh5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/writeroom-mode"; @@ -71950,12 +72597,12 @@ wttrin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }: melpaBuild { pname = "wttrin"; - version = "20160414.837"; + version = "20170322.2041"; src = fetchFromGitHub { owner = "bcbcarl"; repo = "emacs-wttrin"; - rev = "e2a02cc58920a4f34ba01f7015c9e6bfcce51f61"; - sha256 = "1bq552mxlhq9sd2c9p2yir52p0jnfdav6vcdgs3xklcf89b1403m"; + rev = "00ae9ee54056b16bb20c5b35e6bd262e6bda7eb5"; + sha256 = "09vxi1vm5vsh7q9dqjbya8qrrclwid8r2hq9ycc46mbhx5blyz45"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b2b6876562f1fadd4af1ea9b279ac4dc1b21660/recipes/wttrin"; @@ -72139,12 +72786,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20170213.321"; + version = "20170317.2237"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "073190840e6a07566f75a6dcabd1d3c120b0639e"; - sha256 = "19b8d4a5g43n9y2y0r8l12ds5badns9zlky0j201bzz3yrcid7xb"; + rev = "4d61f0b6d9209c17e6834aaced28cd7d8aabaad1"; + sha256 = "1i1f30yy6hzhlpsn2836zk2cv6rbcvapwzp310l28ngr4wd6k4x7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys"; @@ -72874,12 +73521,12 @@ yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yang-mode"; - version = "20170213.154"; + version = "20170323.1104"; src = fetchFromGitHub { owner = "mbj4668"; repo = "yang-mode"; - rev = "46c201b1d5195842fdf540d4c153127f91b1a125"; - sha256 = "0bfx6wsj8g6ryawxly17x2nppzcgg3bxpkx00ar1hgcrs11988kk"; + rev = "0d5d5df86dbb6cbb2de3c0f2d0d5f8c8f29d0695"; + sha256 = "0ca55vjv9lz7w8mk2z731bia9vialrd4kv0igi09xs1mm0r2x5nv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode"; @@ -72915,10 +73562,10 @@ }) {}; yaoddmuse = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaoddmuse"; - version = "20160717.2212"; + version = "20170325.1752"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/yaoddmuse.el"; - sha256 = "0j73zkzk1iyxpxca6zvjwq5iig8a6la6hm6i5kwwnbc9c681acqx"; + sha256 = "0vlllq3xmnlni0ws226pqxj68nshclbl5rgqv6y11i3yvzgiazr6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e7dcbe43b65944968a882705ff4b3b2c9f40b6d2/recipes/yaoddmuse"; @@ -73018,12 +73665,12 @@ yascroll = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yascroll"; - version = "20170309.555"; + version = "20170315.1206"; src = fetchFromGitHub { owner = "m2ym"; repo = "yascroll-el"; - rev = "7b58febbc698e10b3714506a2ce09071fb172bff"; - sha256 = "0zk8j1jbq2sba09kr8kn2mmsf2i78ng567s9823336b4s61279qx"; + rev = "fe4494e5f4faf2832e665c7de0fed99cdbb39478"; + sha256 = "09y8phmvqdwp1k9w84rf6p609jrg0mhgx6akwda8rsvxrrbsh6j4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/yascroll"; @@ -73039,12 +73686,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20170310.1724"; + version = "20170326.1030"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "7f337f4488da6e3ea4b92057ca1576d17bc51743"; - sha256 = "0g1irdas5vvzjfrzvvzpz7kii52smn4aa58s6v10kchppxrrikzc"; + rev = "5043a961215158619199cf03a85a0c063a28c644"; + sha256 = "145v9fvfm1yldr7k02d1lk3sgycs2j8zg9d8zmz7g7b9lghkp6fk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -73142,12 +73789,12 @@ ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "20170227.2341"; + version = "20170329.1433"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "0e6c93a6e2f3646b35ae860d50f2ca1777d8bd8a"; - sha256 = "0ms2q4sbr1m02ifqr9792ab36icg1481332dz7mkpfcz4x0l2k8c"; + rev = "8fbdaeaec7704155a047ac17c11d4cf4208f5f79"; + sha256 = "0hvvyficrdxwwg9gyyzmvdsx7v1dh07qrzcvcdn1lq1q1shwcng9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -73775,11 +74422,11 @@ zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }: melpaBuild { pname = "zpresent"; - version = "20170307.1646"; + version = "20170326.1630"; src = fetchhg { url = "https://bitbucket.com/zck/zpresent.el"; - rev = "f79f9e8247da"; - sha256 = "0mdajrwwcfgy6g330ca3s6a240wnj56ryag6h2ghwwclzy81nwdc"; + rev = "ef1de4ed0def"; + sha256 = "1fb7n64wj1b6s5vm43i9xharbbfx9r97fzshmjfhik8vsjc7k4c5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 8a5d293ab05..488699f8a79 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -860,6 +860,27 @@ license = lib.licenses.free; }; }) {}; + add-node-modules-path = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "add-node-modules-path"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "codesuki"; + repo = "add-node-modules-path"; + rev = "9ed240e05dcb9628ba380151b54b02688be5e78e"; + sha256 = "0avv3ypdpscchq9n1lxs0ba0fc52zjyv7dbv54s7sclqxx4mi63k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/63e99d8fc0678d7b1831cae8940e9e6547780861/recipes/add-node-modules-path"; + sha256 = "0gbl875fgqr5np6r4cs8njs6fil1qmy8a5wir88x78ybdwwxsmbl"; + name = "add-node-modules-path"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/add-node-modules-path"; + license = lib.licenses.free; + }; + }) {}; adoc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, markup-faces, melpaBuild }: melpaBuild { pname = "adoc-mode"; @@ -1166,12 +1187,12 @@ android-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "android-mode"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "remvee"; repo = "android-mode"; - rev = "146476c5ae958715520bec2b7f8de6b30c48c19f"; - sha256 = "0gjynmzqlqz0d57fb4np6xrklqdn11y4vjbm18rlpvmk92bgw740"; + rev = "f274da87429617b0b9c5889d46b36de64d982da4"; + sha256 = "17m4hp2qb54widwadv23amc1lasnbwzh2ipc6180fnajg8zcbvyw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77633aa340803a433570327943fbe31b396f4355/recipes/android-mode"; @@ -1480,12 +1501,12 @@ anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anything-tramp"; - version = "0.2"; + version = "0.3.2"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-anything-tramp"; - rev = "75df15ac263701f921649fefb29f03f6b7d49b9f"; - sha256 = "0al2k5az5x6idnhkhckjxr4vh52f0n9fi20ranwid9ac8k6kspvz"; + rev = "ca9d94c2a55c3cbbcc77b6818cc386dbd2f36d39"; + sha256 = "0j1fm1ngd9vg3qrv9ks53ha9aijnl6mvx2sxsvlvn1libg7ym3zz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5be5351cb187dff8388865ac424f8e5be71639/recipes/anything-tramp"; @@ -2452,12 +2473,12 @@ beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "beginend"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "beginend"; - rev = "de3833a1a651532e76df668bd92cfa07893501f1"; - sha256 = "1agrci37bni1vfkxg171l53fvsnjdryhf05v54wj07jngnwf3cw9"; + rev = "9c6ad190ecc71373f6ac7485c924f1ef3dce6fc4"; + sha256 = "05z23amn1s1692y3wzwmbzpnm5m6qskq53aqp47wiyyxn3dq2kdj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend"; @@ -2746,12 +2767,12 @@ boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; - version = "0.4"; + version = "1.0"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "c72d26ca2f9c0672192b5f40302ad0ebfc2d6db6"; - sha256 = "1grsaajfbhgq1wlraq8v21sfqdnk9ja3gj7y982hh44671haqjvw"; + rev = "d9f0545708bbbbe3df23b2b91cdd2824beb0df56"; + sha256 = "0crqwyhzkwpi7c0rqcgmgqx6g4f8fw9gd9nh0ii6p5agiw140yj8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; @@ -2764,22 +2785,22 @@ license = lib.licenses.free; }; }) {}; - boxquote = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + boxquote = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "boxquote"; - version = "1.22"; + version = "2.0"; src = fetchFromGitHub { owner = "davep"; repo = "boxquote.el"; - rev = "4c49b2046647ed187920c885e175ed388f4833dc"; - sha256 = "0235l4f1cxj7nysfnay4fz52mg0c13pzqxbhw65vdpfzz1gl1p73"; + rev = "b0239fb7b7a9d75d4ac3c66f9b96abd911dbf4e0"; + sha256 = "0agnsghxf35b6g49radxigw81bmvw1ggljzzmy771nmwl44q2dbb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2148f8f17b16154bfc337df69a5ad31e25a9b05/recipes/boxquote"; sha256 = "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s"; name = "boxquote"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/boxquote"; license = lib.licenses.free; @@ -3061,12 +3082,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "657acef2132a6fdf0796f8ec62c5f261c1beebf0"; - sha256 = "0wkivh8x75gfsks6hy1ps9mlk101hrwsk8hqxx7qhs7f5iv0a082"; + rev = "c95b95fe8d93eeed510c281990842718a21e53b3"; + sha256 = "077hxzichvr406m9grdxjf31k0l33g6wh9zdvx73f7crsmzxhkzy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -4185,12 +4206,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.8.0pre2"; + version = "3.8.0pre3"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "e1adec32b8325fb731da084e99acd6070f5e39bf"; - sha256 = "08illrxn9jks2z8yj7kczy65k7q3dkifima6j706kz8vjza60ikm"; + rev = "3b7f19a72ff2216b4613fdc8c5edf5d56e74d6fc"; + sha256 = "0da0ywk6bxr78hiy34m7yf0fwvir2v2hvdmspai8n8kcnlcinkyw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -4434,22 +4455,22 @@ license = lib.licenses.free; }; }) {}; - company = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "c9912e9ba7ef441677c1a9de7e14f78cb2da5e0e"; - sha256 = "1jc9mnqj38lnn3yxkcixlwgqkxb7lsyzqybakk74mh3l3gr9cv8k"; + rev = "f1499404163d8148e7a6303a8598f9c0f696d1cb"; + sha256 = "1ncfvf6ndqnn95m02ij66l7674h7chzgwg2r9biymqadzxjxim9i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; sha256 = "0v4x038ly970lkzb0n8fbqssfqwx1p46xldr7nss32jiqvavr4m4"; name = "company"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/company"; license = lib.licenses.free; @@ -4968,12 +4989,12 @@ company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }: melpaBuild { pname = "company-ycmd"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "be21ca7f807e70812b6fc0e0a4ea83b41723d815"; - sha256 = "1q30k8rhk3plknkk544h2dk48yqmxwh4xp3rq1lz8isc3580qwxx"; + rev = "9f5ad4a20e6bf893491635108adfff71f3c6b590"; + sha256 = "08kvbvhx5y3239bzdb1xpr81lfrhjy9xka4kn9dpa5bdxs0xx92w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd"; @@ -5892,12 +5913,12 @@ datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "datetime"; - version = "0.2"; + version = "0.2.1"; src = fetchFromGitHub { owner = "doublep"; repo = "datetime"; - rev = "6585b2dcb0b3871a2a63656d01baa0c9a300d457"; - sha256 = "07rb8r3j8293h0ffpwhf7mxnshqi08pb63swhmdzb34hn57cx4jg"; + rev = "3ecf9985250ecd441e91614b44cf12323af907c0"; + sha256 = "1x8kj6d9p42lffk15m0c955ibwxxvfxhihij43alwq5xab2l16bv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime"; @@ -7052,12 +7073,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "0.4.3"; + version = "0.5.0"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "3f15f30a7330dd13a1d88891345ab382e9bee7cd"; - sha256 = "12y5gf65jdmh1m0fygzx4snfixlgc1laaax0w7ajkbhahyn8dwzc"; + rev = "c96467b3079495353350a6b00fd2e6052b3a3fd0"; + sha256 = "04jhbapf84if54d648mx1fk7b9vwrnd0apyarwjv7p1azasm6vwl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump"; @@ -7076,8 +7097,8 @@ version = "0.7"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "c4f10d72febc"; - sha256 = "0x9h38vs5vnvswp3dm3i2pdzw8rvqwxpsfpsjx7r84bww9nr9dyd"; + rev = "6f4b44fb1966"; + sha256 = "10d69aah8kq5ln3rcd2vcdck1vvqq5x47kk0bk4vpphh26j14jjp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -7258,6 +7279,27 @@ license = lib.licenses.free; }; }) {}; + easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "easy-hugo"; + version = "0.4.1"; + src = fetchFromGitHub { + owner = "masasam"; + repo = "emacs-easy-hugo"; + rev = "8e8dde2ce96c9bf561bffa1ee0886cf9b87db370"; + sha256 = "13jf3rps8s54pyxnmxdrxmza5jnyhzcixmqqw4vp4br3kay7lbrz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/544fa512dc3e6379f451fd9b596d74a5849c87d2/recipes/easy-hugo"; + sha256 = "07pa48rv5aqpz7fwkbc48scvnvnvg1v3qkapn2h1qllfc0h2nn5i"; + name = "easy-hugo"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/easy-hugo"; + license = lib.licenses.free; + }; + }) {}; easy-kill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-kill"; @@ -7366,12 +7408,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "2.10.1"; + version = "2.10.2"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "d415b91c91581ff39364384fec35c219cb89d43a"; - sha256 = "13283ymm4av2gk7zj2rsppg6sk0lixy9g4lic4arrm8b5yb0vcsd"; + rev = "558097220099505994b7e9a2ea9e1208da6c5668"; + sha256 = "1v9x69jzsfl7kh5nnbax218xykylz6ib0f73f9yrsjbmgap3fvva"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -9070,8 +9112,8 @@ version = "0.1"; src = fetchhg { url = "https://bitbucket.com/seanfarley/erc-hipchatify"; - rev = "2b93fb7103f5"; - sha256 = "1z2vqy8wg5fhv0vfai0zla8swvld3j4378q72knnkyzjqrbn4s5p"; + rev = "a53227513692"; + sha256 = "0av0y65hz7fbiiqzmk5mmw6jv7fivhcd1w3s2xn5y5jpgps56mrc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b60e01e7064ce486fdac3d1b39fd4a1296b0dac5/recipes/erc-hipchatify"; @@ -9213,12 +9255,12 @@ erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "19.2.3"; + version = "19.3"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "aa315e1cf1b79ab782e5b4c944595495ebf4e2f4"; - sha256 = "1lsmjpz2g4hj44fz95w7sswzj40iv7jq5jk64x0095lhvxmlf57c"; + rev = "a748cafdc7063d9f181ba12088db6458793ced2f"; + sha256 = "0pp2hl8jf4iafpnsmf0q7jbm313daqzif6ajqcmjyl87m5pssr86"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -9839,6 +9881,27 @@ license = lib.licenses.free; }; }) {}; + evil-embrace = callPackage ({ emacs, embrace, evil-surround, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-embrace"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "cute-jumper"; + repo = "evil-embrace.el"; + rev = "4379adea032b25e359d01a36301b4a5afdd0d1b7"; + sha256 = "0rj1ippc6yi560xalhd91r7a00lk3d0jk13w464myznkpnasfw3a"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d4886f068766514deab5673b4366d6bdd311e3b6/recipes/evil-embrace"; + sha256 = "10cfkksh3llyfk26x36b7ri0x6a6hrcv275pxk7ckhs1pyhb14y7"; + name = "evil-embrace"; + }; + packageRequires = [ emacs embrace evil-surround ]; + meta = { + homepage = "https://melpa.org/#/evil-embrace"; + license = lib.licenses.free; + }; + }) {}; evil-escape = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-escape"; @@ -10513,12 +10576,12 @@ eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eyebrowse"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "wasamasa"; repo = "eyebrowse"; - rev = "e7c3de9c8b3197f3a310d8d9259761fc70dfa3ef"; - sha256 = "0d2vc50m2wr6f0fd04xm3bzca25im3ka57y7lg6p0bn5fp6a62vl"; + rev = "56af9e96cfc8c03cfdcf3a60b581a8db9fdcbb20"; + sha256 = "0wdqvzq847mn3aday87wz0jnbnpl0j4b81y8y5gd7qj1vac1vndn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse"; @@ -11507,12 +11570,12 @@ flycheck-package = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, package-lint }: melpaBuild { pname = "flycheck-package"; - version = "0.11"; + version = "0.12"; src = fetchFromGitHub { owner = "purcell"; repo = "flycheck-package"; - rev = "cf561bf9896d3e7b6bdcdb7801de6cb9f548b573"; - sha256 = "124ahlxpkcb5mcndmg8k8rdxx0piis6372zllxk6ywmgxz9mlgy1"; + rev = "afe8a49343d90d08ee72ac6f993d424dcc39cc38"; + sha256 = "19pz8h01yacfqsyh5940pam6vigvavsqg6qd84994d7mmzl534qa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17ec69c9f192625e74dfadf03b11d0d7dc575e7/recipes/flycheck-package"; @@ -11693,15 +11756,36 @@ license = lib.licenses.free; }; }) {}; + flycheck-yamllint = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-yamllint"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "krzysztof-magosa"; + repo = "flycheck-yamllint"; + rev = "aa211b1243168a4f752888c0014c5b9d2da178b1"; + sha256 = "1dg2lymb53vp16isdc6k0gq1a43h7vjpksbacskyd4nwmsxaf2bm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/932ee0a1f13a52d53102b90911da79145208cbb5/recipes/flycheck-yamllint"; + sha256 = "1q2sy0hsbnwdlwq99wk8n5gi9fd8bs4jvi859np8bylbhhb3kj8m"; + name = "flycheck-yamllint"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-yamllint"; + license = lib.licenses.free; + }; + }) {}; flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }: melpaBuild { pname = "flycheck-ycmd"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "be21ca7f807e70812b6fc0e0a4ea83b41723d815"; - sha256 = "1q30k8rhk3plknkk544h2dk48yqmxwh4xp3rq1lz8isc3580qwxx"; + rev = "9f5ad4a20e6bf893491635108adfff71f3c6b590"; + sha256 = "08kvbvhx5y3239bzdb1xpr81lfrhjy9xka4kn9dpa5bdxs0xx92w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd"; @@ -15049,12 +15133,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "2.5.3"; + version = "2.5.4"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "a7d4308604ae790ff568730f8a2f47e578209d3a"; - sha256 = "10xjdq8ch68c2ysfynrby9sxms23b5g2vmhjv8gv0vn15cc50ir5"; + rev = "7a969880e7ea607517dbaa9d98da036fd9fec2fd"; + sha256 = "0y9jg4xidb0f496fi30p1xjr73kg220qsjrzcr1i6p96qxr0qpfd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -15214,6 +15298,27 @@ license = lib.licenses.free; }; }) {}; + helm-books = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-books"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "grugrut"; + repo = "helm-books"; + rev = "b4c57d2aed596faad41a753dccbcd0a31a717b76"; + sha256 = "1yr5prp9xvd73balxbn4yn52zah2advq1186ba5aanj436pal0fh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/acba3db40f37e74e1bf9e30f2abed431c259ff50/recipes/helm-books"; + sha256 = "0xh53vji7nsnpi0b38cjh97x26ryxk61mj7bd6m63qwh8dyhs3yx"; + name = "helm-books"; + }; + packageRequires = [ helm ]; + meta = { + homepage = "https://melpa.org/#/helm-books"; + license = lib.licenses.free; + }; + }) {}; helm-bundle-show = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-bundle-show"; @@ -15343,12 +15448,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "2.5.3"; + version = "2.5.4"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "a7d4308604ae790ff568730f8a2f47e578209d3a"; - sha256 = "10xjdq8ch68c2ysfynrby9sxms23b5g2vmhjv8gv0vn15cc50ir5"; + rev = "7a969880e7ea607517dbaa9d98da036fd9fec2fd"; + sha256 = "0y9jg4xidb0f496fi30p1xjr73kg220qsjrzcr1i6p96qxr0qpfd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -15427,12 +15532,12 @@ helm-dired-history = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-dired-history"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "jixiuf"; repo = "helm-dired-history"; - rev = "75416fa6ca9c5e113cca409ef63518266b4d8d56"; - sha256 = "17z84dx3z48mx2ssdhlhgzaqrxlzdy9mx3d14qlm0rcrmc0sck8i"; + rev = "9480383b6ccede6f7c200fbd50aaeb2898b3a008"; + sha256 = "0cfq06lray7hpnhkwnhjq18izyk2w0m4cxqg0m5nyidiwc4qssqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/56036d496c2a5fb1a6b32cdfcd1814944618e652/recipes/helm-dired-history"; @@ -15466,6 +15571,27 @@ license = lib.licenses.free; }; }) {}; + helm-ext = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-ext"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "cute-jumper"; + repo = "helm-ext"; + rev = "115a3ca9a466fa84c1874ac6175fdf2256c3765c"; + sha256 = "19bcrgj531par1ayhgwxvzz28fyd7dx5flslxf1vl4qawhn173fz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee74cb0aa3445bc9ae4226c2043ee4de3ac6cd3/recipes/helm-ext"; + sha256 = "0la2i0b7nialib4wq26cxcak8nq1jzavsw8f0mvbavsb7hfwkpgw"; + name = "helm-ext"; + }; + packageRequires = [ emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-ext"; + license = lib.licenses.free; + }; + }) {}; helm-firefox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-firefox"; @@ -16393,12 +16519,12 @@ helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-tramp"; - version = "0.2"; + version = "0.3.2"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-helm-tramp"; - rev = "87d323306a79bf5d71b0f556a7aefdfe5824f523"; - sha256 = "08rzgfzd70xf1hh54py325p9kf5war40qi5w21anzs4wwg86rz1v"; + rev = "604e4630070ce2e345cbd21c2fbd8414eb064ef2"; + sha256 = "09nbg890ppjvz1v2a3zcb198k1zq9gaa04ai4v3xynz6c3kvzyr9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a69f0a17c4efbaea012be8e878af4060fa0c93b/recipes/helm-tramp"; @@ -17275,12 +17401,12 @@ ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-completing-read-plus"; - version = "3.15"; + version = "3.16"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-ubiquitous"; - rev = "950afaed5d36fc4447dd3a517ddb0dd281d8aaf6"; - sha256 = "0gk1bkllzs3fil2fcj3iha43y43370sgrrs5r6j7hzyhnxqmp965"; + rev = "2bd3a2722d8df0db9dfe25f5763f7dfaf0734624"; + sha256 = "1zz0k5ddcwkg0wjdzihklgnxq5f6rlsxldhn7h9jzyss5bsgykhj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+"; @@ -17380,12 +17506,12 @@ ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ido-ubiquitous"; - version = "3.15"; + version = "3.16"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-ubiquitous"; - rev = "950afaed5d36fc4447dd3a517ddb0dd281d8aaf6"; - sha256 = "0gk1bkllzs3fil2fcj3iha43y43370sgrrs5r6j7hzyhnxqmp965"; + rev = "2bd3a2722d8df0db9dfe25f5763f7dfaf0734624"; + sha256 = "1zz0k5ddcwkg0wjdzihklgnxq5f6rlsxldhn7h9jzyss5bsgykhj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous"; @@ -19771,12 +19897,12 @@ linum-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "linum-relative"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "coldnew"; repo = "linum-relative"; - rev = "1074e12904d08e00dda438d9700f2a3bff238bd5"; - sha256 = "1m4g4b96cxs05pfln7kdi6gvrdbv76f8dk806py5lq0gq7da2csc"; + rev = "b8a99dcfe38a491172a8193053fb7849634b43c0"; + sha256 = "11bjnqqwvr9zrvz5dlm8a0yw4zg9ysh3jdiq5a6iw09d3f0h1v2s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97ae01be4892a7c35aa0f82213433a2944041d87/recipes/linum-relative"; @@ -21031,12 +21157,12 @@ meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "0.6.6"; + version = "0.7.2"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "67e7ca4488aa39eaa8b5236db392730efdac91a9"; - sha256 = "0k9bv4wdik3lqqpd2ijz3xnlcnjjy589rmqs6z8pwzxsx0vd7wlp"; + rev = "1ddaca25ee978736dcb3922bb1952d750c39cd5a"; + sha256 = "09g81d1l5mhji4vbljxgfrgr0051sv7kqy0vwf7awxa4slgl6bnd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -21450,12 +21576,12 @@ mmt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mmt"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "mmt"; - rev = "e77b809e39b9ab437b662ee759e990163bc89377"; - sha256 = "05nmcx3f63ds31cj3qwwp03ksflkfwlcn3z2xyxbny83r0dxbgvc"; + rev = "f7db836a10720ee50217012e7e2597ebcf624f90"; + sha256 = "13vbfc5597v0gd87qyhn10f93nb477vjpg3jlpphbax9fvkf4gav"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1137bb53ecd92b1a8537abcd2635602c5ab3277/recipes/mmt"; @@ -21489,6 +21615,27 @@ license = lib.licenses.free; }; }) {}; + mocha-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: + melpaBuild { + pname = "mocha-snippets"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "cowboyd"; + repo = "mocha-snippets.el"; + rev = "e054137bd78f0d236e983874da1f345d30a71816"; + sha256 = "0lxc5zhb03jpy48ql4mn2l35qhsdwav4dkxyqim72b7c75cy1cml"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/93c472e3d7f318373342907ca7253253ef12dab8/recipes/mocha-snippets"; + sha256 = "0dbsdk4jpzxv2sxx0nia9zhd0a0wmkz1qcqmbd15m1909ccdwxds"; + name = "mocha-snippets"; + }; + packageRequires = [ yasnippet ]; + meta = { + homepage = "https://melpa.org/#/mocha-snippets"; + license = lib.licenses.free; + }; + }) {}; mocker = callPackage ({ eieio ? null, el-x, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mocker"; @@ -21618,12 +21765,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "fc5822fcb11c3c6af67b5fb152f92c3e6e3c49d3"; - sha256 = "0r81jdwfmgzivfpkxqr425qajgw3dzzs8y2v5lsiwl1d5z8rz52a"; + rev = "46fe076b5943ccc6fdc9cdacc7e8ad02b64bcd36"; + sha256 = "03aw9ab54a5fljhwygg62hr2n9kk82xfwcdq17ln5z0951gqi99r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -22437,12 +22584,12 @@ nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; - version = "1.11.7"; + version = "1.11.8"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "13fe83dc8e28a32bdd454d04908fe1514ec50d51"; - sha256 = "1mddzphb0xbsa5ma83h3hmama77fvxxhwp5qbcrnwpihz1g1l5dv"; + rev = "206b61b07405229979ed9a1518da1560930d05ee"; + sha256 = "1qlddlzkpavhsrb7h3cyqhif5qc2qhkhjwnv4pbzg9hamqbd45wc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -22539,6 +22686,27 @@ license = lib.licenses.free; }; }) {}; + nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "nord-theme"; + version = "0.1.2"; + src = fetchFromGitHub { + owner = "arcticicestudio"; + repo = "nord-emacs"; + rev = "5327be91c155eb9fed19061a0f02619dd4284c64"; + sha256 = "15gjcrx514790djsyfmm8z8q36a3kyf4yhrms5qj423hfc94d3s7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme"; + sha256 = "0p4fqg4i2ayimd8kxsqnb1xkapzhhxf7szxi1skva4dcym3z67cc"; + name = "nord-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/nord-theme"; + license = lib.licenses.free; + }; + }) {}; nose = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nose"; version = "0.1.1"; @@ -22913,6 +23081,27 @@ license = lib.licenses.free; }; }) {}; + obfusurl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "obfusurl"; + version = "2.0"; + src = fetchFromGitHub { + owner = "davep"; + repo = "obfusurl.el"; + rev = "fb7524fe8432bf58f0c4f637e5a12565ae81134e"; + sha256 = "15w8cnwl4hpcslfbmb3j81gbr2dvp0xra2z841503b26s5w91961"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/201fe11682cb06b26775a52c81b6a1258b74b4d0/recipes/obfusurl"; + sha256 = "0xx2zsjbkd17iy7xzqc66f9xgc97f9js3nz656yhmmxakjk2krra"; + name = "obfusurl"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/obfusurl"; + license = lib.licenses.free; + }; + }) {}; ocodo-svg-modelines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, svg-mode-line-themes }: melpaBuild { pname = "ocodo-svg-modelines"; @@ -23109,8 +23298,8 @@ src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "d6a00ff463f53f7357fd7ffbad95accdc8d1c367"; - sha256 = "0zq0rn1vbwmhr4z5dcgd5k9kslq3xxl05jiyab8835nfacb0zdf2"; + rev = "bcc5d7ba940c1118ab61071783747162f0c927cf"; + sha256 = "05i3z6whvgq81qnrwgvfglhwi214145ksg8h81rc0g4ir54wzsik"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp"; @@ -23363,6 +23552,27 @@ license = lib.licenses.free; }; }) {}; + org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-board"; + version = "1011"; + src = fetchFromGitHub { + owner = "scallywag"; + repo = "org-board"; + rev = "53469a2f0577924de1c7d887fecea409d17fd588"; + sha256 = "0fg7lkgcr7zwwjald7hbvwgl72m21lqxmz7p8sq31iw3jh42fqgf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board"; + sha256 = "00jsrxc8f85cvrh7364n7337frdj12yknlfp28fhdgk2ph6d7bp4"; + name = "org-board"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/org-board"; + license = lib.licenses.free; + }; + }) {}; org-bookmark-heading = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-bookmark-heading"; @@ -23847,12 +24057,12 @@ org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-random-todo"; - version = "0.4.1"; + version = "0.5"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-random-todo"; - rev = "7398b8dff09bef54f579d158ce47b0090f00201e"; - sha256 = "1bi09hd5m994rkqcx0a045h20419b6n4vvwiiggzsi0723dd9fb9"; + rev = "14a065e1d376838f16a6ba32ed8710304542a4e6"; + sha256 = "07qkn59613l32j6b06ckmccl9s2rfwwivmak5v86z0fafzhxk6ir"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo"; @@ -24676,12 +24886,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "93fdd7b51ad7456387b905ff4c9b104d0b3089a8"; - sha256 = "17swzcd58zh7yf221pfk8pmz8yhx2dsi2ad1y6lb2xpxxc5csflm"; + rev = "de08b846b3a031838b79445bb7a254c9de4a80f6"; + sha256 = "0mvs4afjp5ab89vdz3bd9pca55brn57lxvjqjjyc6cyqxpclh06j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -24760,12 +24970,12 @@ packed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "packed"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "tarsius"; repo = "packed"; - rev = "d2f01bffc987b226f618dda0663a1e233161518d"; - sha256 = "16xwgi0zkbbvkbxf0ld6g4xlfd95j45sca57h162wld6l27jrv4f"; + rev = "536f4a3bda06cc09759fed1aa0cdebb068ff75a1"; + sha256 = "1ayizqkhxjd3rv3chnl51sl12gsfhxcqqnz0p6r0xbwglx4n3vzi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee9e95c00f791010f77720068a7f3cd76133a1c/recipes/packed"; @@ -25010,12 +25220,12 @@ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parinfer"; - version = "0.4.7"; + version = "0.4.9"; src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "a91b1ee5392c6a98c102ddba2f0c15ab67f8ad1b"; - sha256 = "09337fpv492rzd2ah7d8kxyv5spcgwf58xr943ya09sgi2invkbx"; + rev = "c67686b24cf14064931d812f29f4114b30696d12"; + sha256 = "0lpj81hkzw24v1f3s13rw22sm1nm0i177di5v2b8kwy50pjirs8v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; @@ -25031,12 +25241,12 @@ parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parsebib"; - version = "2.0.3"; + version = "2.2"; src = fetchFromGitHub { owner = "joostkremers"; repo = "parsebib"; - rev = "748d6a179fcbbc4af77c7b96059a66d579f34dc8"; - sha256 = "0f8rcifzfp4fs52pjgfly39vqz54kgjb3yqyxlh4adq12zbq11cd"; + rev = "621a87d444d9b9c479221fffcd8f7cb5ce2f7717"; + sha256 = "14rvqjd24xwp2pvl4r00jvhvq7p2wndpz3yy1ml9yymkkn1p1hnh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c39633957475dcd6a033760ba20a957716cce59c/recipes/parsebib"; @@ -26140,12 +26350,12 @@ popup-imenu = callPackage ({ dash, fetchFromGitHub, fetchurl, flx-ido, lib, melpaBuild, popup }: melpaBuild { pname = "popup-imenu"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "ancane"; repo = "popup-imenu"; - rev = "540e8c0473fd50ff0a85c870057e397a0d3c5eb5"; - sha256 = "19mqzfpki2zlnibp2vzymhdld1m20jinxwgdhmbl6zdfx74zbz7b"; + rev = "c5e2e69adbd3a630e4cb750965a1aee8c10c1f09"; + sha256 = "0vn0jli0ya7xnapifkgzynbnh3rpnzb82j5k9bla2j4miqfc6cg8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5ca5d65d6a9c7ef3fa2684271fe087dc132d3a61/recipes/popup-imenu"; @@ -26496,12 +26706,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "038c7f9724f684c7862e108150e256a00ff9c5c6"; - sha256 = "0hjf54nn08ifd8cd3y19g47lwyvacqjx1fmy8x4kpn14fwzs4xnv"; + rev = "fb28fc8710b614e9ab535788ee58f9a9070561f1"; + sha256 = "0v7ddlk8mzqa8gvxrrcvd15klap5m31df8vn14z99s3ybj3zk0yb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -26661,6 +26871,27 @@ license = lib.licenses.free; }; }) {}; + protocols = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "protocols"; + version = "1.6"; + src = fetchFromGitHub { + owner = "davep"; + repo = "protocols.el"; + rev = "f5549f5d873a683af45a0e19c732524d5b964026"; + sha256 = "0v9is6r307814gvrnch2d3mvikd7j8lnmsqb2c3gj6gvfj4p9y7r"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9c9a75671a00e9196d00b08911232aac87fd8c83/recipes/protocols"; + sha256 = "1wg3qh8a1ms82lkzz4i1bk787147a8agcj8rszj1zfvwg0ckqq1a"; + name = "protocols"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/protocols"; + license = lib.licenses.free; + }; + }) {}; psci = callPackage ({ dash, deferred, f, fetchFromGitHub, fetchurl, lib, melpaBuild, purescript-mode, s }: melpaBuild { pname = "psci"; @@ -27858,22 +28089,22 @@ license = lib.licenses.free; }; }) {}; - req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, use-package }: + req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, log4e, melpaBuild, use-package }: melpaBuild { pname = "req-package"; - version = "0.9"; + version = "1.0"; src = fetchFromGitHub { owner = "edvorg"; repo = "req-package"; - rev = "374c6d1a81b5448a66295be8c132c42ca44eeddb"; - sha256 = "1xzp2hnkr9lsjx50cxlpki9mvyhjsv0vyc77480jrlnpspakj7qs"; + rev = "30f76a9c52994562191c90c315002410706f6c0b"; + sha256 = "0qdr2pshfq6v75s9hx9wgvn56pd7b65vaqaa64dryr7v4yzd4r15"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f58a801f0791566d0c39493a5f82ff0d15d7ab41/recipes/req-package"; sha256 = "1438f60dnmc3a2dh6hd0wslrh25nd3af797aif70kv6qc71h87vf"; name = "req-package"; }; - packageRequires = [ dash log4e use-package ]; + packageRequires = [ dash ht log4e use-package ]; meta = { homepage = "https://melpa.org/#/req-package"; license = lib.licenses.free; @@ -27945,12 +28176,12 @@ resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "resize-window"; - version = "0.4.0"; + version = "0.5"; src = fetchFromGitHub { owner = "dpsutton"; repo = "resize-window"; - rev = "27364959798de0f019da799975027842c07e7829"; - sha256 = "0x92s4cv9k566rc248zrcmh507df7d19p7b3vcfd0dlfpbqc0qnv"; + rev = "e4879731f3a3bc2261d6ec465bff01f88bd77d1d"; + sha256 = "0lhf1sk1gx0vpy038bdnmlqjzpg4kchlladihk36pv4hgqn5r9w7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window"; @@ -28302,12 +28533,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "2.8"; + version = "2.9"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "6ac7740eaf05cdd9b699185f71cc2d1f634a761b"; - sha256 = "1w506qaklrly1lnq1i5kshl8m9aki8h2ba1y7h578gwx6lph3vhi"; + rev = "ffa21b5408a30a346815bc4db6e74e2c6562d936"; + sha256 = "0828i5lcbspacydjnbrp3zhgbw2gggaaizzm0qqgmvry4cs79bxv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -28747,8 +28978,8 @@ src = fetchFromGitHub { owner = "ensime"; repo = "emacs-scala-mode"; - rev = "730e16d254478d6f63f62cb04d47c137c9002f2d"; - sha256 = "1aq1bfv8jz53zp365awqk43ysjwkpj51pcy6fyp87j8bbb02mgq9"; + rev = "970d88eeff82df635ee12336ab1eb185585f30c6"; + sha256 = "0wfv20dyb13v7fbfsvy0k5dajvmyyhn80l6xyx6kppiv3qmy9s90"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode"; @@ -28867,12 +29098,12 @@ sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "sekka"; - version = "1.6.5"; + version = "1.6.6"; src = fetchFromGitHub { owner = "kiyoka"; repo = "sekka"; - rev = "001e205b37ae0dded430b9a809425dc7ed730366"; - sha256 = "113i8i705qkd3nccspacnmk9ysy5kwavg8h9z9djdgki611q700q"; + rev = "987c1cce65c8f30b12cdb5991e1b1ad9da766916"; + sha256 = "03930cfqq97f7m6z9da2y9388iyymc56b1vdrl5a6mpggv3wifn7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka"; @@ -28969,6 +29200,27 @@ license = lib.licenses.free; }; }) {}; + services = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "services"; + version = "1.7"; + src = fetchFromGitHub { + owner = "davep"; + repo = "services.el"; + rev = "514e4095e8964c4d0f38c4f3ad6c692e86d12faa"; + sha256 = "1k6w2ghi1iczh65bbln5ryxwnxmkkjm3p0p54s155q9sjidiqlwb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/beb91b4397f6e35a1d5c73a127d8cd7fc9201935/recipes/services"; + sha256 = "02lgmpbw52ps6z4p9gwzvh9iaxisq5mb0n9aml9ajxac1473vpcd"; + name = "services"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/services"; + license = lib.licenses.free; + }; + }) {}; session = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "session"; @@ -29014,12 +29266,12 @@ sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sexy-monochrome-theme"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "nuncostans"; repo = "sexy-monochrome-theme"; - rev = "436206eef592ca22e4c3e0cd3bd87a1fba4083a1"; - sha256 = "0aaicpiihrd5ny2g68cpkasysyx5wj28gs727qwdqw3ljpc0qlz9"; + rev = "d74cf7a50852c469ad13c634df74be2fcb3f3a96"; + sha256 = "14va3sy94vpkn4fc9g7gsxk3anl25jvp9a92c8ppndqzfisy7vgg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9a09ffb7d271773f6cfa7c7eeaba45a717a5bdca/recipes/sexy-monochrome-theme"; @@ -30001,12 +30253,12 @@ snapshot-timemachine-rsnapshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq, snapshot-timemachine }: melpaBuild { pname = "snapshot-timemachine-rsnapshot"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "snapshot-timemachine-rsnapshot"; - rev = "4ff6b96219f4da576141e376b0348813c1c25615"; - sha256 = "0krb1ziyjldyq27sp0phmygm1p9lssp251ycj08gdczbbfpw4lsa"; + rev = "72b0b700d80f1a0442e62bbbb6a0c8c59182f97f"; + sha256 = "1bdy7p0bjfdlv6l6yih6fvvi7xpldal4rj8l2ajpc6sgby24h8bb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94358fb8d1486491903c331d9e90ba5198117aa8/recipes/snapshot-timemachine-rsnapshot"; @@ -31884,6 +32136,27 @@ license = lib.licenses.free; }; }) {}; + thinks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "thinks"; + version = "1.10"; + src = fetchFromGitHub { + owner = "davep"; + repo = "thinks.el"; + rev = "370d399703d232010599d24a242b5f91e25a1b9d"; + sha256 = "1kac32mgk2gcchh9lvnny81xq03h4656v05xyd3fpkpr30sisyrq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/439957cabf379651dc243219a83c3c96bae6f8cf/recipes/thinks"; + sha256 = "11vj9mjfzmqwdmkq97aqns3fh8hkgx9scnki6c2iag5lj0av2vcq"; + name = "thinks"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/thinks"; + license = lib.licenses.free; + }; + }) {}; thrift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "thrift"; @@ -31968,6 +32241,27 @@ license = lib.licenses.free; }; }) {}; + timonier = callPackage ({ all-the-icons, dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pkg-info, request, s }: + melpaBuild { + pname = "timonier"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "nlamirault"; + repo = "timonier"; + rev = "33ca5887a1d1b63349177237e9edfb73546511a5"; + sha256 = "0z6s26kc50rbmgkkbxzpasphi8hcwhixmi8ksqzrclayccjjj7ar"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a31b0c177fd83bdeb1842a6ec3095de143bb4eae/recipes/timonier"; + sha256 = "0vb83kv2dkca2bq876icxs8iivv9qgkzmzrsxfpnvbv752b220b0"; + name = "timonier"; + }; + packageRequires = [ all-the-icons dash hydra pkg-info request s ]; + meta = { + homepage = "https://melpa.org/#/timonier"; + license = lib.licenses.free; + }; + }) {}; toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "toc-org"; @@ -32603,6 +32897,27 @@ license = lib.licenses.free; }; }) {}; + uptimes = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "uptimes"; + version = "3.1"; + src = fetchFromGitHub { + owner = "davep"; + repo = "uptimes.el"; + rev = "5e321692bf5ccdc286f4831fa8fe55467c1c56aa"; + sha256 = "04n4bryfid6scma43whw156wcza77ij7szgc5f73d98j9fji6lay"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes"; + sha256 = "0r8s5c2hdcb1ly7rnhzar4qzf1c9d49gd914ndnc3mg9yb9gyy5h"; + name = "uptimes"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/uptimes"; + license = lib.licenses.free; + }; + }) {}; use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; @@ -32816,12 +33131,12 @@ vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }: melpaBuild { pname = "vhdl-tools"; - version = "5.3"; + version = "5.4"; src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "f6dfac6851c6bc78f9d72849befd54b09ac64ce7"; - sha256 = "03qqvv9l83b5cpdcjdcq0wv3ghhx13y3b16rn1d1l0vfndzmnz42"; + rev = "6f3f8ba58432dfdac59122164c732ccc0dfc475b"; + sha256 = "076v5zafalv1r14ms90zs1p7yq11fzff4vywrda6dh63i0yk2vxs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; @@ -32855,27 +33170,6 @@ license = lib.licenses.free; }; }) {}; - vimgolf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "vimgolf"; - version = "0.10.0"; - src = fetchFromGitHub { - owner = "timvisher"; - repo = "vimgolf"; - rev = "9fd8aaf68bc69d1dd628de4c7cbb070e366545a9"; - sha256 = "1f94qx8rbnn21cl0grxqa9gzkbrz68vmqsihv8vvi8qf1c1dmd0i"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0bded518d1544a9442c13c5cbfab64f0f1cbdb6d/recipes/vimgolf"; - sha256 = "1hvw2pfa5a984hm6wd33bf6zz6hmlprc6qs3g789dfx91qm890vn"; - name = "vimgolf"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/vimgolf"; - license = lib.licenses.free; - }; - }) {}; vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vimish-fold"; @@ -33089,12 +33383,12 @@ wandbox = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "wandbox"; - version = "0.6.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "kosh04"; repo = "emacs-wandbox"; - rev = "70728ba1bfa425dee7a66fd86c7bbf2747b2514c"; - sha256 = "1nx7cr7d4qmzwbvp59kc8139nzc965ibc9vf7afrz8z2h5qg4d4l"; + rev = "4e52c14aca11de4686d4f1de98588cb5cf42d815"; + sha256 = "1c9wvnc8nqizh5sw424hznnqymfcyqdgdj8gzwfy5i04mi7mic4p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/wandbox"; @@ -33278,12 +33572,12 @@ webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "webpaste"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "etu"; repo = "webpaste.el"; - rev = "58f66efcb8f061d25bf474b14f3867ae856f6b1d"; - sha256 = "0qczw7pdkjgqmjibwyw8psxhqy1bx183qzni832qx59sds15j13q"; + rev = "f6583397a4f8c9cde6b556175a6e05303d6238de"; + sha256 = "0z7pkqfli1lqvfjjaf8p1sbbwf0f7xgz87k3rqqav9xyc9iqh0ni"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste"; @@ -33446,12 +33740,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "2.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "ea6f1dc5aacff2f3d909e410db05af01966555aa"; - sha256 = "0pckvxk2vpwqfypz5vyk0ig6g5697ibnlk8vspvqpanahvgaj0nh"; + rev = "3c7ecc69d48258af66978a685aedcbc8d1ada512"; + sha256 = "1q6v4bnw9sl6f138lxkqp979xpbgsb57gxj8a1k7clms16kkn5ci"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -33722,8 +34016,8 @@ version = "0.9.1"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "3a654cfe6632"; - sha256 = "1ahmpk0302g375w9ikkzagjvx8qblkzx40w960ka0cqf7nzyk75d"; + rev = "c5c0bb98b281"; + sha256 = "0gxvx2n6xza17qf1p4v0nbcqfkkhrmg9a56c5d126b4vgmg3bf9v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -34430,12 +34724,12 @@ ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "be21ca7f807e70812b6fc0e0a4ea83b41723d815"; - sha256 = "1q30k8rhk3plknkk544h2dk48yqmxwh4xp3rq1lz8isc3580qwxx"; + rev = "9f5ad4a20e6bf893491635108adfff71f3c6b590"; + sha256 = "08kvbvhx5y3239bzdb1xpr81lfrhjy9xka4kn9dpa5bdxs0xx92w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix index fabf8ac4ce4..5d44173729d 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation (rec { src = fetchgit { url = "https://github.com/ProofGeneral/PG.git"; - rev = "4bcac92df46da9e68b5e3d565bb118fb63b4feb4"; - sha256 = "143anwll7mij6iskf3jbbbfzmkp2vnp0q329zpsl2l6v3wk2vv64"; + rev = "62ec846fcaaef8f3ae94302cbef2972f88a0804f"; + sha256 = "0vln1bc884qynbl5yci0dkr6ckz3p46q4jrhxgylcx4w0jkhizhm"; }; buildInputs = [ emacs texinfo perl which ] ++ stdenv.lib.optional enableDoc texLive; diff --git a/pkgs/applications/editors/emacs/macport-24.5.nix b/pkgs/applications/editors/emacs/macport-24.5.nix deleted file mode 100644 index 33d24242db7..00000000000 --- a/pkgs/applications/editors/emacs/macport-24.5.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext -, AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit -, autoconf, automake -, ImageCaptureCore, GSS, ImageIO # These may be optional -}: - -stdenv.mkDerivation rec { - emacsName = "emacs-24.5"; - name = "${emacsName}-mac-5.15"; - - builder = ./builder.sh; - - src = fetchurl { - url = "mirror://gnu/emacs/${emacsName}.tar.xz"; - sha256 = "0kn3rzm91qiswi0cql89kbv6mqn27rwsyjfb8xmwy9m5s8fxfiyx"; - }; - - macportSrc = fetchurl { - url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz"; - sha256 = "1r47bm1pf5av2yr37byz91y7bp6vdw9smahiy18g5qp4jp6mz193"; - }; - - enableParallelBuilding = true; - - buildInputs = [ ncurses libxml2 gnutls pkgconfig texinfo gettext autoconf automake ]; - - propagatedBuildInputs = [ - AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit - ImageCaptureCore GSS ImageIO # may be optional - ]; - - postUnpack = '' - mv $emacsName $name - tar xzf $macportSrc - mv $name $emacsName - ''; - - postPatch = '' - patch -p1 < patch-mac - sed -i 's|/usr/share/locale|${gettext}/share/locale|g' lisp/international/mule-cmds.el - ''; - - configureFlags = [ - "LDFLAGS=-L${ncurses.out}/lib" - "--with-xml2=yes" - "--with-gnutls=yes" - "--with-mac" - "--enable-mac-app=$$out/Applications" - ]; - - CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090"; - LDFLAGS = "-O3 -L${ncurses.out}/lib"; - - postInstall = '' - mkdir -p $out/share/emacs/site-lisp/ - cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el - ''; - - doCheck = true; - - meta = with stdenv.lib; { - description = "GNU Emacs 24, the extensible, customizable text editor"; - homepage = http://www.gnu.org/software/emacs/; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ jwiegley ]; - platforms = platforms.darwin; - - longDescription = '' - GNU Emacs is an extensible, customizable text editor—and more. At its - core is an interpreter for Emacs Lisp, a dialect of the Lisp - programming language with extensions to support text editing. - - The features of GNU Emacs include: content-sensitive editing modes, - including syntax coloring, for a wide variety of file types including - plain text, source code, and HTML; complete built-in documentation, - including a tutorial for new users; full Unicode support for nearly all - human languages and their scripts; highly customizable, using Emacs - Lisp code or a graphical interface; a large number of extensions that - add other functionality, including a project planner, mail and news - reader, debugger interface, calendar, and more. Many of these - extensions are distributed with GNU Emacs; others are available - separately. - - This is "Mac port" addition to GNU Emacs 24. This provides a native - GUI support for Mac OS X 10.4 - 10.11. Note that Emacs 23 and later - already contain the official GUI support via the NS (Cocoa) port for - Mac OS X 10.4 and later. So if it is good enough for you, then you - don't need to try this. - ''; - }; -} diff --git a/pkgs/applications/editors/emacs/macport-25.1.nix b/pkgs/applications/editors/emacs/macport.nix similarity index 85% rename from pkgs/applications/editors/emacs/macport-25.1.nix rename to pkgs/applications/editors/emacs/macport.nix index 9169c12417a..34729783cce 100644 --- a/pkgs/applications/editors/emacs/macport-25.1.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -4,8 +4,10 @@ }: stdenv.mkDerivation rec { - emacsName = "emacs-25.1"; - name = "${emacsName}-mac-6.1"; + emacsVersion = "25.1"; + emacsName = "emacs-${emacsVersion}"; + macportVersion = "6.1"; + name = "emacs-mac-${emacsVersion}-${macportVersion}"; builder = ./builder.sh; @@ -15,7 +17,7 @@ stdenv.mkDerivation rec { }; macportSrc = fetchurl { - url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz"; + url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz"; sha256 = "1zwxh7zsvwcg221mpjh0dhpdas3j9mc5q92pprf8yljl7clqvg62"; }; @@ -35,7 +37,7 @@ stdenv.mkDerivation rec { postUnpack = '' mv $sourceRoot $name - tar xzf $macportSrc + tar xzf $macportSrc -C $name --strip-components=1 mv $name $sourceRoot # extract retina image resources @@ -59,7 +61,7 @@ stdenv.mkDerivation rec { "--enable-mac-app=$$out/Applications" ]; - CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090"; + CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10 -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10"; LDFLAGS = "-O3 -L${ncurses.out}/lib"; postInstall = '' @@ -92,8 +94,8 @@ stdenv.mkDerivation rec { extensions are distributed with GNU Emacs; others are available separately. - This is "Mac port" addition to GNU Emacs 24. This provides a native - GUI support for Mac OS X 10.4 - 10.11. Note that Emacs 23 and later + This is "Mac port" addition to GNU Emacs 25. This provides a native + GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later already contain the official GUI support via the NS (Cocoa) port for Mac OS X 10.4 and later. So if it is good enough for you, then you don't need to try this. diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 5a27a8efeb0..89235514bb8 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file }: +with stdenv.lib; + let - version = "1.30"; + version = "1.30.1"; in stdenv.mkDerivation rec { @@ -9,12 +11,13 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.geany.org/${name}.tar.bz2"; - sha256 = "b2dec920c77bc3e88d5f7b0f1dbe4f5200f36df3b346d1aba39323bc30afae6d"; + sha256 = "0ac360f1f3d6c28790a81d570252a7d40421f6e1d8e5a8d653756bd041d88491"; }; NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - - buildInputs = [ gtk2 which pkgconfig intltool file ]; + + nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ gtk2 which file ]; doCheck = true; @@ -47,9 +50,9 @@ stdenv.mkDerivation rec { - Simple project management - Plugin interface ''; - homepage = "http://www.geany.org/"; + homepage = http://www.geany.org/; license = "GPL"; - maintainers = [ stdenv.lib.maintainers.bbenoist ]; - platforms = stdenv.lib.platforms.all; + maintainers = []; + platforms = platforms.all; }; } diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index c9f5aa1e024..e298385f793 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -172,12 +172,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2016.3.4"; + version = "2017.1"; 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 = "712dccd726b43e2187e8025a6effb711d35310b36d553dbf7bf85400ec1cec15"; + sha256 = "0pfsf7ykwixvljcmrv4gldaaflf13brch70cd6xpax0m89vm22vm"; }; wmClass = "jetbrains-idea-ce"; }; @@ -208,12 +208,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2016.3.4"; + version = "2017.1"; 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}.tar.gz"; - sha256 = "1ichjrdmnhyqv9cr73d8kif9l53k3x36i8js8nf9cmkbhdsfckn3"; + sha256 = "1858jhmyyb7nhx08yxbn5bfgx9m32r8yqwjxjw17rf8gnfvs8225"; }; wmClass = "jetbrains-idea"; }; @@ -256,36 +256,36 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2016.3.2"; + version = "2017.1"; description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0fag5ng9n953mnf3gmxpac1icnb1qz6dybhqwjbr13qij8v2s2g1"; + sha256 = "14p6f15n0927awgpsdsdqgmdfbbwkykrw5xggz5hnfl7d05i4sb6"; }; wmClass = "jetbrains-pycharm-ce"; }; pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2016.3.2"; + version = "2017.1"; description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1nylq0fyvix68l4dp9852dak58dbiamjphx2hin087cadaji6r63"; + sha256 = "1rvic3njsq480pslhw6rxld7jngchihkplq3dfnmkr2h9gx26lkf"; }; wmClass = "jetbrains-pycharm"; }; phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2016.3.2"; + version = "2017.1"; description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "05ylhpn1mijjphcmv6ay3123xp72yypw19430dgr8101zpsnifa5"; + sha256 = "1ynffm5x8fqq2r71rr9rbvdifbwbvbhqb2x1hkyy4az38gxal1bm"; }; wmClass = "jetbrains-phpstorm"; }; @@ -304,12 +304,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2016.3.3"; + version = "2017.1"; description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "08f266afi8ia5jvvgk2lncra2n3i0l5c3h7c8fwxz6y8fhhlas4y"; + sha256 = "e651ad78ff9de92bb5b76698eeca1e02ab0f0c36209908074fa4a6b48586071c"; }; wmClass = "jetbrains-webstorm"; }; diff --git a/pkgs/applications/editors/joe/default.nix b/pkgs/applications/editors/joe/default.nix index 323059417ea..d6c87c4991b 100644 --- a/pkgs/applications/editors/joe/default.nix +++ b/pkgs/applications/editors/joe/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl } : stdenv.mkDerivation rec { - version = "4.2"; + version = "4.4"; name = "joe-${version}"; src = fetchurl { url = "mirror://sourceforge/joe-editor/${name}.tar.gz"; - sha256 = "0x39x0qrwdbhl45wd8r8cpzigsip6m5j2crajsrbffk8qm5scpdw"; + sha256 = "0y898r1xlrv75m00y598rvwwsricabplyh80wawsqafapcl4hw55"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index 65fb927d48e..81f9ddd96d2 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { name = "leo-editor-${version}"; - version = "5.3"; + version = "5.5"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "0whbay8ilabzpxdjaxv447y6bqbsilx161fv7wa15v3qqm2kapsp"; + sha256 = "0crzljirzfiy9xn02ydd23clmd8bzdjxkyxdqsvdkgfy9j41b8hr"; }; dontBuild = true; - buildInputs = [ makeWrapper python3Packages.python ]; + nativeBuildInputs = [ makeWrapper python3Packages.python ]; propagatedBuildInputs = with python3Packages; [ pyqt5 ]; desktopItem = makeDesktopItem rec { @@ -56,10 +56,10 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://leoeditor.com"; + homepage = http://leoeditor.com; description = "A powerful folding editor"; longDescription = "Leo is a PIM, IDE and outliner that accelerates the work flow of programmers, authors and web designers."; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ leonardoce ramkromberg ]; }; } diff --git a/pkgs/applications/editors/mg/configure.patch b/pkgs/applications/editors/mg/configure.patch deleted file mode 100644 index 11105299eb4..00000000000 --- a/pkgs/applications/editors/mg/configure.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- configure.old 2013-07-30 19:42:51.000000000 +0200 -+++ configure 2013-07-30 19:47:26.000000000 +0200 -@@ -163,31 +163,7 @@ - echo 'Fails.' - fi - -- --if [ ! -r /usr/include/term.h ]; then -- note 'term.h' -- if [ -r /usr/include/ncurses/term.h ]; then -- echo "Found in /usr/include/ncurses" -- extraflags="$extraflags -I/usr/include/ncurses" -- else -- for i in pkg local; do -- if [ -r /usr/$i/include/term.h ]; then -- echo "Found in /usr/$i/include" -- extralibs="$extralibs -L/usr/$i/lib" -- extraflags="$extraflags -I/usr/$i/include" -- break -- else -- false -- fi -- done || -- { -- echo 'Not found!' >&2 -- echo 'Do you have the ncurses devel package installed?' >&2 -- echo 'If you know where term.h is, please email the author!' >&2 -- exit 1 -- } -- fi --fi -+extraflags="$extraflags $NIX_CFLAGS_COMPILE" - - note 'base and dirname' - if gcc_defines "__GLIBC__" || gcc_defines "__CYGWIN__" ; then diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index 95a6205125b..b8bfd40c079 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -1,19 +1,19 @@ -{ fetchurl, stdenv, ncurses }: +{ fetchurl, stdenv, ncurses, pkgconfig, libbsd }: stdenv.mkDerivation rec { - name = "mg-20110905"; + name = "mg-${version}"; + version = "20161005"; src = fetchurl { - url = http://homepage.boetes.org/software/mg/mg-20110905.tar.gz; - sha256 = "0ac2c7wy5kkcflm7cmiqm5xhb5c4yfw3i33iln8civ1yd9z7vlqw"; + url = "http://homepage.boetes.org/software/mg/${name}.tar.gz"; + sha256 = "0qaydk2cy765n9clghmi5gdnpwn15y2v0fj6r0jcm0v7d89vbz5p"; }; - dontAddPrefix = true; - - patches = [ ./configure.patch ]; - patchFlags = "-p0"; - NIX_CFLAGS_COMPILE = "-Wno-error"; - buildFlags = [ "CC=cc" ]; + + preConfigure = '' + substituteInPlace GNUmakefile \ + --replace /usr/bin/pkg-config ${pkgconfig}/bin/pkg-config + ''; installPhase = '' mkdir -p $out/bin @@ -22,12 +22,13 @@ stdenv.mkDerivation rec { cp mg.1 $out/share/man/man1 ''; - buildInputs = [ ncurses ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses libbsd ]; - meta = { + meta = with stdenv.lib; { homepage = http://homepage.boetes.org/software/mg/; description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team"; - license = stdenv.lib.licenses.publicDomain; - platforms = stdenv.lib.platforms.all; + license = licenses.publicDomain; + platforms = platforms.all; }; } diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 9814e697d22..f3a5a27bd36 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -17,23 +17,33 @@ let rev = "17e0de65e1cbba3d6baa82deaefa853b41f5c161"; sha256 = "1g51h65i31andfs2fbp1v3vih9405iknqn11fzywjxji00kjqv5s"; }; + in stdenv.mkDerivation rec { name = "nano-${version}"; - version = "2.7.3"; + version = "2.8.0"; + src = fetchurl { url = "mirror://gnu/nano/${name}.tar.xz"; - sha256 = "1z0bfyc5cvv83l3bjmlcwl49mpxrp65k5ffsfpnayfyjc18fy9nr"; + sha256 = "1hjxr0kgq3q1fcns9y4lj0dbhjf33j3pa2wayrb3p3c8v3sbrh8m"; }; + nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; buildInputs = [ ncurses ]; + outputs = [ "out" "info" ]; + configureFlags = '' --sysconfdir=/etc ${optionalString (!enableNls) "--disable-nls"} ${optionalString enableTiny "--enable-tiny"} + '' + # Unclear why (perhaps an impurity?) but for some reason it decides that REG_ENHANCED is available + # during configure but then can't find it at build time. + + optionalString stdenv.isDarwin '' + nano_cv_flag_reg_extended=REG_EXTENDED ''; - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = optionalString stdenv.isDarwin '' substituteInPlace src/text.c --replace "__time_t" "time_t" ''; diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index d933a207cd4..a15b557f0e5 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -1,16 +1,18 @@ { stdenv, fetchurl, xlibsWrapper, motif, libXpm }: stdenv.mkDerivation rec { - name = "nedit-5.6a"; + name = "nedit-${version}"; + version = "5.7"; src = fetchurl { url = "mirror://sourceforge/nedit/nedit-source/${name}-src.tar.gz"; - sha256 = "1v8y8vwj3kn91crsddqkz843y6csgw7wkjnd3zdcb4bcrf1pjrsk"; + sha256 = "0ym1zhjx9976rf2z5nr7dj4mjkxcicimhs686snjhdcpzxwsrndd"; }; hardeningDisable = [ "format" ]; - buildInputs = [ xlibsWrapper motif libXpm ]; + nativeBuildInputs = [ xlibsWrapper ]; + buildInputs = [ motif libXpm ]; buildFlags = if stdenv.isLinux then "linux" else # the linux config works fine on darwin too! @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.nedit.org; + homepage = http://sourceforge.net/projects/nedit; platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix index 0de33d6d194..b553e09ed5e 100644 --- a/pkgs/applications/editors/notepadqq/default.nix +++ b/pkgs/applications/editors/notepadqq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, which, qtbase }: +{ stdenv, fetchgit, pkgconfig, which, qtbase, qtsvg, qttools, qtwebkit }: let version = "0.53.0"; @@ -12,11 +12,11 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ - pkgconfig which + pkgconfig which qttools ]; buildInputs = [ - qtbase.qtsvg qtbase.qtwebkit qtbase.qttools + qtbase qtsvg qtwebkit ]; preConfigure = '' diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix index 989d3e42a6f..d02a08a0a59 100644 --- a/pkgs/applications/editors/scite/default.nix +++ b/pkgs/applications/editors/scite/default.nix @@ -1,18 +1,16 @@ { stdenv, fetchurl, pkgconfig, gtk2 }: -let - version = "3.3.7"; - - version_short = stdenv.lib.replaceChars [ "." ] [ "" ] "${version}"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "scite-${version}"; + version = "3.7.3"; src = fetchurl { - url = "mirror://sourceforge/project/scintilla/SciTE/${version}/scite${version_short}.tgz"; - sha256 = "0x7i6yxq50frsjkrp3lc5zy0d1ssq2n91igjn0dmqajpg7kls2dd"; + url = "mirror://sourceforge/project/scintilla/SciTE/${version}/scite373.tgz"; + sha256 = "05d81h1fqhjlw9apvrni3x2q4a562cd5ra1071qpna8h4ml0an9m"; }; - buildInputs = [ pkgconfig gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 ]; sourceRoot = "scintilla/gtk"; buildPhase = '' @@ -25,11 +23,11 @@ in stdenv.mkDerivation { make install prefix=$out/ ''; - meta = { + meta = with stdenv.lib; { homepage = "http://www.scintilla.org/SciTE.html"; description = "SCIntilla based Text Editor"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.rszibele ]; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.rszibele ]; }; } diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index 7a066b068e1..0c716ed63c1 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -6,10 +6,10 @@ stdenv.mkDerivation rec { name = "sigil-${version}"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { - sha256 = "0hihd5f3avpdvxwp5j80qdg74zbw7p20y6j9q8cw7wd0bak58h9c"; + sha256 = "17m2f7pj2sx5rxrbry6wk1lvviy8fi2m270h47sisywnrhddarh7"; rev = version; repo = "Sigil"; owner = "Sigil-Ebook"; @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with python3Packages; [ lxml ]; + nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; + buildInputs = [ - cmake pkgconfig boost xercesc qtbase qttools qtwebkit qtxmlpatterns - python3 python3Packages.lxml makeWrapper - ]; + python3 python3Packages.lxml ]; preFixup = '' wrapProgram "$out/bin/sigil" \ @@ -32,12 +32,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "Free, open source, multi-platform ebook (ePub) editor"; homepage = https://github.com/Sigil-Ebook/Sigil/; - license = stdenv.lib.licenses.gpl3; - inherit version; - maintainers = with stdenv.lib.maintainers; [ ramkromberg ]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl3; + maintainers =[ maintainers.ramkromberg ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix index 1e24054b996..d1fa03c5479 100644 --- a/pkgs/applications/editors/textadept/default.nix +++ b/pkgs/applications/editors/textadept/default.nix @@ -43,11 +43,11 @@ let # These lists are taken from the Makefile. - scintilla_tgz = "scintilla367.tgz"; + scintilla_tgz = "scintilla373.tgz"; tre_zip = "cdce45e8dd7a3b36954022b4a4d3570e1ac5a4f8.zip"; scinterm_zip = "scinterm_1.8.zip"; - scintillua_zip = "scintillua_3.6.7-1.zip"; - lua_tgz = "lua-5.3.3.tar.gz"; + scintillua_zip = "33298b6cbce3.zip"; + lua_tgz = "lua-5.3.4.tar.gz"; lpeg_tgz = "lpeg-1.0.0.tar.gz"; lfs_zip = "v_1_6_3.zip"; lspawn_zip = "lspawn_1.5.zip"; @@ -60,7 +60,8 @@ let scinterm_url = "http://foicica.com/scinterm/download/" + scinterm_zip; tre_url = "https://github.com/laurikari/tre/archive/" + tre_zip; - scintillua_url = "http://foicica.com/scintillua/download/" + scintillua_zip; + #scintillua_url = "http://foicica.com/scintillua/download/" + scintillua_zip; + scintillua_url = "http://foicica.com/hg/scintillua/archive/" + scintillua_zip; gtdialog_url = "http://foicica.com/gtdialog/download/" + gtdialog_zip; lspawn_url = "http://foicica.com/lspawn/download/" + lspawn_zip; @@ -75,11 +76,11 @@ let termkey_url = "http://www.leonerd.org.uk/code/libtermkey/" + termkey_tgz; - get_scintilla = get_url scintilla_url "0rh1xgd06qcnj4l0vi8g4i94vi63s76366b8hhqky3iqdjgwsxpi"; + get_scintilla = get_url scintilla_url "0rkczxzj6bqxks4jcbxbyrarjhfjh95nwxxiqprfid1kaamgkfm2"; get_tre = get_url tre_url "0mw8npwk5nnhc33352j4akannhpx77kqvfam8jdq1n4yf8js1gi7"; get_scinterm = get_url scinterm_url "02ax6cjpxylfz7iqp1cjmsl323in066a38yklmsyzdl3w7761nxi"; - get_scintillua = get_url scintillua_url "0fhyjrkfj2cvxnql65687nx1d0sfyg5lbrxmylyzhnfh4s4jnwmq"; - get_lua = get_url lua_url "18mcfbbmjyp8f2l9yy7n6dzk066nq6man0kpwly4bppphilc04si"; + get_scintillua = get_url scintillua_url "1kx113dpjby1p9jcsqlnlzwj01z94f9szw4b38077qav3bj4lk6g"; + get_lua = get_url lua_url "0320a8dg3aci4hxla380dx1ifkw8gj4gbw5c4dz41g1kh98sm0gn"; get_lpeg = get_url lpeg_url "13mz18s359wlkwm9d9iqlyyrrwjc6iqfpa99ai0icam2b3khl68h"; get_lfs = get_url_zip lfs_url "1hxcnqj53540ysyw8fzax7f09pl98b8f55s712gsglcdxp2g2pri"; get_lspawn = get_url lspawn_url "09c6v9irblay2kv1n7i59pyj9g4xb43c6rfa7ba5m353lymcwwqi"; @@ -87,7 +88,7 @@ let get_libluajit = get_url libluajit_url "1nhvcdjpqrhd5qbihdm3bxpw84irfvnw2vmfqnsy253ay3dxzrgy"; get_gtdialog = get_url gtdialog_url "0nvcldyhj8abr8jny9pbyfjwg8qfp9f2h508vjmrvr5c5fqdbbm0"; get_cdk = get_url cdk_url "0j74l874y33i26y5kjg3pf1vswyjif8k93pqhi0iqykpbxfsg382"; - get_bombay = get_url_zip bombay_url "05fnh1imxdb4sb076fzqywqszp31whdbkzmpkqxc8q2r1m5vj3hg" + get_bombay = get_url_zip bombay_url "0illabngrrxidkprgz268wgjqknrds34nhm6hav95xc1nmsdr6jj" + "mv tip.zip bombay.zip\n"; get_termkey = get_url termkey_url "12gkrv1ldwk945qbpprnyawh0jz7rmqh18fyndbxiajyxmj97538"; @@ -108,7 +109,7 @@ let + get_termkey; in stdenv.mkDerivation rec { - version = "9.0"; + version = "9.3"; name = "textadept-${version}"; buildInputs = [ @@ -118,7 +119,7 @@ stdenv.mkDerivation rec { src = fetchhg { url = http://foicica.com/hg/textadept; rev = "textadept_${version}"; - sha256 = "1fkxblf2db4i0kbfww94xwps7nbn88qc4fwghrm4dcszcq32jlfi"; + sha256 = "18x79pazm86agn1khdxfnf87la6kli3xasi7dcjx7l6yyz19y14d"; }; preConfigure = '' diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 5f2fffa5f50..be518b9336a 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, qmakeHook +{ stdenv, fetchFromGitHub, pkgconfig, qmakeHook , python, qtbase, qttools, zlib }: let # qtEnv = with qt5; env "qt-${qtbase.version}" [ qtbase qttools ]; in stdenv.mkDerivation rec { name = "tiled-${version}"; - version = "0.17.0"; + version = "0.18.2"; - src = fetchurl { - name = "${name}.tar.gz"; - url = "https://github.com/bjorn/tiled/archive/v${version}.tar.gz"; - sha256 = "0c9gykxmq0sk0yyfdq81g9psd922scqzn5asskjydj84d80f5z7p"; + src = fetchFromGitHub { + owner = "bjorn"; + repo = "tiled"; + rev = "v${version}"; + sha256 = "087jl36g6w2g5l70gz573iwyvx3r7i8fijl3y4mmmf8pyqdyq1n2"; }; nativeBuildInputs = [ pkgconfig qmakeHook ]; @@ -26,6 +27,6 @@ in stdenv.mkDerivation rec { gpl2Plus # all the rest ]; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; + maintainers = [ maintainers.nckx ]; }; } diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index f6760895b57..291c7b1b412 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -1,18 +1,15 @@ { stdenv, fetchFromGitHub, pkgconfig, makeWrapper, makeDesktopItem , ncurses, libtermkey, lpeg, lua , acl ? null, libselinux ? null -, version ? "2016-10-09" -, rev ? "b0c9b0063d0b9ed9a7f93c69779749130b353ff1" -, sha256 ? "0g3242g3r2w38ld3w71f79qp7zzy3zhanff2nhwkwmyq89js8s90" }: stdenv.mkDerivation rec { - name = "vis-unstable-${version}"; - inherit version; + name = "vis-${version}"; + version = "0.3"; src = fetchFromGitHub { - inherit sha256; - inherit rev; + rev = "v${version}"; + sha256 = "13xyyq30dg66v4azl2jvlyfyglxmc3r9p7p87vrganq0p6lmb0bk"; repo = "vis"; owner = "martanne"; }; @@ -37,8 +34,8 @@ stdenv.mkDerivation rec { cp $desktopItem/share/applications/* $out/share/applications echo wrapping $out/bin/vis with runtime environment wrapProgram $out/bin/vis \ - --prefix LUA_CPATH : "${lpeg}/lib/lua/${lua.luaversion}/?.so" \ - --prefix LUA_PATH : "${lpeg}/share/lua/${lua.luaversion}/?.lua" \ + --prefix LUA_CPATH ';' "${lpeg}/lib/lua/${lua.luaversion}/?.so" \ + --prefix LUA_PATH ';' "${lpeg}/share/lua/${lua.luaversion}/?.lua" \ --prefix VIS_PATH : "\$HOME/.config:$out/share/vis" ''; diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index a92f8633c3a..b6734d09d0e 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -1,35 +1,38 @@ { stdenv, lib, callPackage, fetchurl, unzip, atomEnv, makeDesktopItem, - makeWrapper, libXScrnSaver }: + makeWrapper, libXScrnSaver, libxkbfile }: let - version = "1.10.0"; - rev = "49129d126e2c3c5592cfc8a509d872067b69d262"; + version = "1.11.1"; channel = "stable"; - # The revision can be obtained with the following command (see https://github.com/NixOS/nixpkgs/issues/22465): - # curl -w "%{url_effective}\n" -I -L -s -S https://vscode-update.azurewebsites.net/latest/linux-x64/stable -o /dev/null + plat = { + "i686-linux" = "linux-ia32"; + "x86_64-linux" = "linux-x64"; + "x86_64-darwin" = "darwin"; + }.${stdenv.system}; - sha256 = if stdenv.system == "i686-linux" then "14ip00ysnn6daw7ws3vgnhib18pi7r1z1szfr7s996awbq12ir3i" - else if stdenv.system == "x86_64-linux" then "1krrshsx2pjkr4pc1d6zad664f5khdbhwaq8lpx1aagxxd921mx6" - else if stdenv.system == "x86_64-darwin" then "1y574b4wpkk06a36clajx57ydj7a0scn2gms4070cqaf0afzy19f" - else throw "Unsupported system: ${stdenv.system}"; + sha256 = { + "i686-linux" = "14wdblh7q3m5qdsm34dpg5p7qk6llrbqk60md8wd0fb4chpvrq94"; + "x86_64-linux" = "0rmzvaiar3y062mbrggiwjbwxs7izcih5333rn208ax4jxmbk4pc"; + "x86_64-darwin" = "1f3zdwsz0l6r7c2k25a7j5m0dl78219jzg4axcmbfa2qcs2hw0x6"; + }.${stdenv.system}; - urlBase = "https://az764295.vo.msecnd.net/${channel}/${rev}/"; + archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; + + rpath = lib.concatStringsSep ":" [ + atomEnv.libPath + "${lib.makeLibraryPath [libXScrnSaver]}/libXss.so.1" + "${lib.makeLibraryPath [libxkbfile]}/libxkbfile.so.1" + "$out/lib/vscode" + ]; - urlStr = if stdenv.system == "i686-linux" then - urlBase + "code-${channel}-code_${version}-1488384152_i386.tar.gz" - else if stdenv.system == "x86_64-linux" then - urlBase + "code-${channel}-code_${version}-1488387854_amd64.tar.gz" - else if stdenv.system == "x86_64-darwin" then - urlBase + "VSCode-darwin-${channel}.zip" - else throw "Unsupported system: ${stdenv.system}"; in stdenv.mkDerivation rec { name = "vscode-${version}"; - inherit version; src = fetchurl { - url = urlStr; + name = "VSCode_${version}_${plat}.${archive_fmt}"; + url = "https://vscode-update.azurewebsites.net/${version}/${plat}/${channel}"; inherit sha256; }; @@ -45,28 +48,30 @@ in buildInputs = if stdenv.system == "x86_64-darwin" then [ unzip makeWrapper libXScrnSaver ] - else [ makeWrapper libXScrnSaver ]; + else [ makeWrapper libXScrnSaver libxkbfile ]; - installPhase = '' - mkdir -p $out/lib/vscode $out/bin - cp -r ./* $out/lib/vscode - ln -s $out/lib/vscode/code $out/bin + installPhase = + if stdenv.system == "x86_64-darwin" then '' + mkdir -p $out/lib/vscode $out/bin + cp -r ./* $out/lib/vscode + ln -s $out/lib/vscode/Contents/Resources/app/bin/code $out/bin + '' else '' + mkdir -p $out/lib/vscode $out/bin + cp -r ./* $out/lib/vscode + ln -s $out/lib/vscode/bin/code $out/bin - mkdir -p $out/share/applications - cp $desktopItem/share/applications/* $out/share/applications + mkdir -p $out/share/applications + cp $desktopItem/share/applications/* $out/share/applications - mkdir -p $out/share/pixmaps - cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png - ''; + mkdir -p $out/share/pixmaps + cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png + ''; postFixup = lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}:$out/lib/vscode" \ + --set-rpath "${rpath}" \ $out/lib/vscode/code - - wrapProgram $out/bin/code \ - --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/graphics/PythonMagick/default.nix b/pkgs/applications/graphics/PythonMagick/default.nix index a8d0d490f8b..332bb8794e7 100644 --- a/pkgs/applications/graphics/PythonMagick/default.nix +++ b/pkgs/applications/graphics/PythonMagick/default.nix @@ -1,20 +1,16 @@ {stdenv, fetchurl, python, boost, pkgconfig, imagemagick}: -let - - version = "0.9.14"; - -in - stdenv.mkDerivation rec { name = "pythonmagick-${version}"; + version = "0.9.16"; src = fetchurl { url = "mirror://imagemagick/python/releases/PythonMagick-${version}.tar.xz"; - sha256 = "1flkdfi3c19wy2qcfzax1cqvmmri10rvmhc2y85gmagqvv01zz22"; + sha256 = "0vkgpmrdz530nyvmjahpdrvcj7fd7hvsp15d485hq6103qycisv8"; }; - buildInputs = [python boost pkgconfig imagemagick]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [python boost imagemagick]; meta = { homepage = http://www.imagemagick.org/script/api.php; diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index 2a78f509429..dc974aed057 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -1,15 +1,20 @@ { stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig, gtkmm2, glibmm, libxml2, libsecret, curl, unrar, libzip, librsvg, gst_all_1, autoreconfHook, makeWrapper }: -stdenv.mkDerivation { - name = "ahoviewer-1.4.6"; + +stdenv.mkDerivation rec { + name = "ahoviewer-${version}"; + version = "1.4.8"; + src = fetchFromGitHub { owner = "ahodesuka"; repo = "ahoviewer"; - rev = "414cb91d66d96fab4b48593a7ef4d9ad461306aa"; - sha256 = "081jgfmbwf2av0cn229cf4qyv6ha80ridymsgwq45124b78y2bmb"; + rev = version; + sha256 = "0fsak22hpi2r8zqysswdyngaf3n635qvclqh1p0g0wrkfza4dbc4"; }; + enableParallelBuilding = true; + nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; buildInputs = [ glibmm libconfig gtkmm2 glibmm libxml2 libsecret curl unrar libzip librsvg @@ -18,18 +23,21 @@ stdenv.mkDerivation { gst_all_1.gst-plugins-bad gst_all_1.gst-libav gst_all_1.gst-plugins-base ]; + postPatch = ''patchShebangs version.sh''; + postInstall = '' wrapProgram $out/bin/ahoviewer \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; - meta = { + + meta = with stdenv.lib; { homepage = "https://github.com/ahodesuka/ahoviewer"; description = "A GTK2 image viewer, manga reader, and booru browser"; - maintainers = [ stdenv.lib.maintainers.skrzyp ]; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.allBut [ "darwin" "cygwin" ]; + maintainers = [ maintainers.skrzyp ]; + license = licenses.mit; + platforms = platforms.allBut [ "darwin" "cygwin" ]; }; } diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix index 263c411a8db..848f132060f 100644 --- a/pkgs/applications/graphics/alchemy/default.nix +++ b/pkgs/applications/graphics/alchemy/default.nix @@ -1,12 +1,14 @@ {stdenv, fetchurl, jre}: -stdenv.mkDerivation { - name = "alchemy-007"; +stdenv.mkDerivation rec { + name = "alchemy-${version}"; + version = "008"; + enableParallelBuilding = true; src = fetchurl { - url = http://al.chemy.org/files/Alchemy-007.tar.gz; - sha256 = "1pk00m4iajvv9jzv96in10czpcf7zc3d4nmd9biqagpsg28mr70b"; + url = "http://al.chemy.org/files/Alchemy-${version}.tar.gz"; + sha256 = "0449bvdccgx1jqnws1bckzs4nv2d230523qs0jx015gi81s1q7li"; }; installPhase = '' @@ -20,7 +22,7 @@ stdenv.mkDerivation { chmod +x $out/bin/alchemy ''; - meta = { + meta = with stdenv.lib; { description = "Drawing application"; longDescription = '' Alchemy is an open drawing project aimed at exploring how we can sketch, @@ -31,8 +33,8 @@ stdenv.mkDerivation { an expanded range of ideas and possibilities in a serendipitous way. ''; homepage = http://al.chemy.org/; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3Plus; + maintainers = [ maintainers.marcweber ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index a8f38d61f9d..8d8e36a8bc8 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = { description = "Gnome Diagram drawing software"; homepage = http://live.gnome.org/Dia; - maintainers = with stdenv.lib.maintainers; [raskin urkud]; + maintainers = with stdenv.lib.maintainers; [raskin]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index 2276b868b59..85c0f58174a 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -1,19 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, djvulibre, qt4, xorg, libtiff }: +{ stdenv, fetchurl, pkgconfig +, djvulibre, qt4, xorg, libtiff }: -let - qt = qt4; - # TODO: qt = qt5.base; # should work but there's a mysterious "-silent" error -in stdenv.mkDerivation rec { - name = "djview-4.10.5"; + name = "djview-${version}"; + version = "4.10.6"; + src = fetchurl { url = "mirror://sourceforge/djvu/${name}.tar.gz"; - sha256 = "0gbvbly7w3cr8wgpyh76nf9w7cf7740vp7k5hccks186f6005cx0"; + sha256 = "08bwv8ppdzhryfcnifgzgdilb12jcnivl4ig6hd44f12d76z6il4"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ djvulibre qt xorg.libXt libtiff ]; + buildInputs = [ djvulibre qt4 xorg.libXt libtiff ]; passthru = { mozillaPlugin = "/lib/netscape/plugins"; @@ -23,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://djvu.sourceforge.net/djview4.html; description = "A portable DjVu viewer and browser plugin"; license = licenses.gpl2; - inherit (qt.meta) platforms; - maintainers = [ maintainers.urkud ]; + platforms = platforms.unix; + maintainers = [ ]; }; } diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index 75033cf0f9d..5f0605bbf87 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp, libdrm , pkgconfig, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm -, epoxy, poppler }: +, epoxy, poppler, lirc }: stdenv.mkDerivation rec { - name = "fbida-2.12"; + name = "fbida-2.13"; src = fetchurl { url = "http://dl.bytesex.org/releases/fbida/${name}.tar.gz"; - sha256 = "0bw224vb7jh0lrqaf4jgxk48xglvxs674qcpj5y0axyfbh896cfk"; + sha256 = "01yv4qqqfbz9v281y2jlxhxdym3ricyb0zkqkgp5b40qrmfik1x8"; }; nativeBuildInputs = [ pkgconfig which ]; buildInputs = [ libexif libjpeg libpng libungif freetype fontconfig libtiff - libwebp imagemagick curl sane-backends libdrm libXpm epoxy poppler ]; + libwebp imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc ]; makeFlags = [ "prefix=$(out)" "verbose=yes" ]; @@ -21,10 +21,8 @@ stdenv.mkDerivation rec { sed -e 's@ cpp\>@ gcc -E -@' -i GNUmakefile ''; - configurePhase = "make config $makeFlags"; - crossAttrs = { - makeFlags = makeFlags ++ [ "CC=${stdenv.cross.config}-gcc" "STRIP="]; + makeFlags = makeFlags ++ [ "CC=${stdenv.cross.config}-gcc" "STRIP=" ]; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 5b385f2acbf..035a275618c 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -1,40 +1,45 @@ -{ stdenv, fetchurl, makeWrapper, xorg, imlib2, libjpeg, libpng +{ stdenv, fetchurl, makeWrapper +, xorg, imlib2, libjpeg, libpng , curl, libexif, perlPackages }: +with stdenv.lib; + stdenv.mkDerivation rec { - name = "feh-2.18.1"; + name = "feh-${version}"; + version = "2.18.2"; src = fetchurl { url = "http://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "1ck55rhh5ax1d9k9gy2crvyjwffh6028f4kxaisd8ymgbql40f2c"; + sha256 = "09f5rfzls4h5jcrp7ylwbiljp5qzc2nbw9p2csv0pnlaixj69gil"; }; outputs = [ "out" "doc" ]; nativeBuildInputs = [ makeWrapper xorg.libXt ] - ++ stdenv.lib.optionals doCheck [ perlPackages.TestCommand perlPackages.TestHarness ]; + ++ optionals doCheck [ perlPackages.TestCommand perlPackages.TestHarness ]; buildInputs = [ xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ]; preBuild = '' makeFlags="PREFIX=$out exif=1" - ''; + ''; postInstall = '' wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg.bin}/bin" \ - --add-flags '--theme=feh' - ''; - + --add-flags '--theme=feh' + ''; + checkPhase = '' PERL5LIB="${perlPackages.TestCommand}/lib/perl5/site_perl" make test ''; + doCheck = true; meta = { description = "A light-weight image viewer"; homepage = https://derf.homelinux.org/projects/feh/; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; unix; + license = licenses.mit; + maintainers = [ maintainers.viric ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix index fc30a355910..ced6a5f7258 100644 --- a/pkgs/applications/graphics/fontmatrix/default.nix +++ b/pkgs/applications/graphics/fontmatrix/default.nix @@ -1,10 +1,14 @@ -{ stdenv, fetchurl, cmake, qt4 }: +{ stdenv, fetchFromGitHub, cmake, qt4 }: stdenv.mkDerivation rec { - name = "fontmatrix-0.6.0"; - src = fetchurl { - url = "http://fontmatrix.be/archives/${name}-Source.tar.gz"; - sha256 = "bcc5e929d95d2a0c9481d185144095c4e660255220a7ae6640298163ee77042c"; + name = "fontmatrix-${version}"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "fontmatrix"; + repo = "fontmatrix"; + rev = "v${version}"; + sha256 = "0aqndj1jhm6hjpwmj1qm92z2ljh7w78a5ff5ag47qywqha1ngn05"; }; buildInputs = [ qt4 ]; @@ -13,10 +17,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - meta = { + meta = with stdenv.lib; { description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac"; - homepage = http://fontmatrix.be/; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + homepage = http://github.com/fontmatrix/fontmatrix; + license = licenses.gpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index cf1ab1942e5..6dcf8223777 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, barcode, gnome3 +{ stdenv, fetchurl, barcode, gnome3, autoreconfHook , gtk3, gtk_doc, libxml2, librsvg , libtool, libe-book , intltool, itstool, makeWrapper, pkgconfig, which }: stdenv.mkDerivation rec { name = "glabels-${version}"; - version = "3.2.1"; - src = fetchFromGitHub { - owner = "jimevins"; - repo = "glabels"; - rev = "glabels-3_2_1"; - sha256 = "1y6gz0v9si3cvdzhakbgkyc94fajg19rmykfgnc37alrc21vs9zg"; + version = "3.4.0"; + + src = fetchurl { + url = "http://ftp.gnome.org/pub/GNOME/sources/glabels/3.4/glabels-3.4.0.tar.xz"; + sha256 = "04345crf5yrhq6rlrymz630rxnm8yw41vx04hb6xn2nkjn9hf3nl"; }; + nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ]; buildInputs = [ - autoconf automake barcode gtk3 gtk_doc gnome3.yelp_tools + barcode gtk3 gtk_doc gnome3.yelp_tools gnome3.gnome_common gnome3.gsettings_desktop_schemas - intltool itstool libxml2 librsvg libe-book libtool - makeWrapper pkgconfig + itstool libxml2 librsvg libe-book libtool + ]; preFixup = '' @@ -26,8 +26,6 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; - preConfigure = "./autogen.sh"; - meta = { description = "Create labels and business cards"; homepage = http://glabels.org/; diff --git a/pkgs/applications/graphics/graphicsmagick/cmyka-bounds.patch b/pkgs/applications/graphics/graphicsmagick/cmyka-bounds.patch new file mode 100644 index 00000000000..dd375143277 --- /dev/null +++ b/pkgs/applications/graphics/graphicsmagick/cmyka-bounds.patch @@ -0,0 +1,36 @@ +# HG changeset patch +# User Bob Friesenhahn +# Date 1487905610 21600 +# Node ID 6156b4c2992d855ece6079653b3b93c3229fc4b8 +# Parent 0392c4305a4369984ec8069055acc470c0a73647 +Fix out of bounds access when reading CMYKA tiff which claims wrong samples/pixel. + +diff -r 0392c4305a43 -r 6156b4c2992d coders/tiff.c +--- a/coders/tiff.c Sun Jan 29 10:04:57 2017 -0600 ++++ b/coders/tiff.c Thu Feb 23 21:06:50 2017 -0600 +@@ -1230,8 +1230,8 @@ + case 0: + if (samples_per_pixel == 1) + *quantum_type=GrayQuantum; +- else +- *quantum_type=RedQuantum; ++ else ++ *quantum_type=RedQuantum; + break; + case 1: + *quantum_type=GreenQuantum; +@@ -1411,12 +1411,12 @@ + } + else + { +- if (image->matte) ++ if (image->matte && samples_per_pixel >= 5) + { + *quantum_type=CMYKAQuantum; + *quantum_samples=5; + } +- else ++ else if (samples_per_pixel >= 4) + { + *quantum_type=CMYKQuantum; + *quantum_samples=4; diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index f655979c2cc..0858dfba8b4 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation { url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-7/debian/patches/CVE-2016-9830.patch"; sha256 = "0qh15sd7nx7vf9sld4453iml951bwsx2fx84hxc7plhds2k3gjpa"; }) + ./cmyka-bounds.patch ]; configureFlags = [ diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 8aa2cf8f9f1..93894d0c6cb 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "gthumb"; - version = "${major}.4"; - major = "3.4"; + version = "${major}.1"; + major = "3.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz"; - sha256 = "154bdc8c1940209f1e3d9c60184efef45b0d24f5f7f7f59b819e9c08e19c2981"; + sha256 = "1hxnjskrq57d5ycn2fyif7363n1bav931pkjvq1fr2r4yrj0d202"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index 5bb577011e7..b7063a0c4e7 100644 --- a/pkgs/applications/graphics/jpegoptim/default.nix +++ b/pkgs/applications/graphics/jpegoptim/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, libjpeg }: stdenv.mkDerivation rec { - version = "1.4.3"; + version = "1.4.4"; name = "jpegoptim-${version}"; src = fetchurl { url = "http://www.kokkonen.net/tjko/src/${name}.tar.gz"; - sha256 = "0k53q7dc8w5ashz8v261x2b5vvz7gdvg8w962rz9gjvkjbh4lg93"; + sha256 = "1cn1i0g1xjdwa12w0ifbnzgb1vqbpr8ji6h05vxksj79vyi3x849"; }; # There are no checks, it seems. @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { buildInputs = [ libjpeg ]; - meta = { + meta = with stdenv.lib; { description = "Optimize JPEG files"; homepage = http://www.kokkonen.net/tjko/projects.html ; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.aristid ]; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2; + maintainers = [ maintainers.aristid ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix index 96384765bd0..5f27cb44699 100644 --- a/pkgs/applications/graphics/leocad/default.nix +++ b/pkgs/applications/graphics/leocad/default.nix @@ -3,22 +3,22 @@ To use aditional parts libraries set the variable LEOCAD_LIB=/path/to/libs/ or use option -l /path/to/libs/ */ -{ stdenv, fetchsvn, qt4, qmake4Hook, zlib }: +{ stdenv, fetchFromGitHub, qt4, qmake4Hook, zlib }: stdenv.mkDerivation rec { name = "leocad-${version}"; - version = "0.81"; + version = "17.02"; - src = fetchsvn { - url = "http://svn.leocad.org/tags/${name}"; - sha256 = "1190gb437ls51hhfiwa79fq131026kywpy3j3k4fkdgfr8a9v3q8"; + src = fetchFromGitHub { + owner = "leozide"; + repo = "leocad"; + rev = "v${version}"; + sha256 = "0d7l2il6r4swnmrmaf1bsrgpjgai5xwhwk2mkpcsddnk59790mmc"; }; - buildInputs = [ qt4 qmake4Hook zlib ]; - + nativeBuildInputs = [ qmake4Hook ]; + buildInputs = [ qt4 zlib ]; postPatch = '' - sed '1i#include ' -i common/camera.cpp - substituteInPlace common/camera.cpp --replace "isnan(" "std::isnan(" export qmakeFlags="$qmakeFlags INSTALL_PREFIX=$out" ''; diff --git a/pkgs/applications/graphics/meh/default.nix b/pkgs/applications/graphics/meh/default.nix new file mode 100644 index 00000000000..1b5fbc2271b --- /dev/null +++ b/pkgs/applications/graphics/meh/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, libX11, libXext, libjpeg, libpng, giflib }: + +stdenv.mkDerivation rec { + name = "meh-unstable-2015-04-11"; + + src = fetchFromGitHub { + owner = "jhawthorn"; + repo = "meh"; + rev = "4ab1c75f97cb70543db388b3ed99bcfb7e94c758"; + sha256 = "1j1n3m9hjhz4faryai97jq7cr6a322cqrd878gpkm9nrikap3bkk"; + }; + + installPhase = '' + make PREFIX=$out install + ''; + + outputs = [ "out" "doc" ]; + + buildInputs = [ libXext libX11 libjpeg libpng giflib ]; + + meta = { + description = "A minimal image viewer using raw XLib"; + homepage = http://www.johnhawthorn.com/meh/; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix new file mode 100644 index 00000000000..669e46c6a84 --- /dev/null +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -0,0 +1,65 @@ +{ stdenv +, fetchFromGitHub +, cmake +, makeWrapper +, pkgconfig +, wrapGAppsHook +, gsettings_desktop_schemas + +, qtbase +, qttools +, qtsvg + +, exiv2 +, opencv +, libraw +, libtiff +, quazip +}: + +stdenv.mkDerivation rec { + version = "3.6.1"; + src = fetchFromGitHub { + owner = "nomacs"; + repo = "nomacs"; + rev = version; + sha256 = "0yli05hhmd57v3mynq78nmr15rbpm0vadv273pavmcnayv86yl44"; + }; + + name = "nomacs-${version}"; + + enableParallelBuilding = true; + + sourceRoot = "${name}-src/ImageLounge"; + + patches = [./fix-appdata-install.patch]; + + nativeBuildInputs = [cmake + pkgconfig + wrapGAppsHook]; + + buildInputs = [qtbase + qttools + qtsvg + exiv2 + opencv + libraw + libtiff + quazip + gsettings_desktop_schemas]; + + cmakeFlags = ["-DENABLE_OPENCV=ON" + "-DENABLE_RAW=ON" + "-DENABLE_TIFF=ON" + "-DENABLE_QUAZIP=ON" + "-DUSE_SYSTEM_QUAZIP=ON"]; + + meta = with stdenv.lib; { + homepage = https://nomacs.org; + description = "Qt-based image viewer"; + maintainers = [maintainers.ahmedtd]; + license = licenses.gpl3Plus; + repositories.git = https://github.com/nomacs/nomacs.git; + inherit (qtbase.meta) platforms; + }; +} diff --git a/pkgs/applications/graphics/nomacs/fix-appdata-install.patch b/pkgs/applications/graphics/nomacs/fix-appdata-install.patch new file mode 100644 index 00000000000..cdeed56f496 --- /dev/null +++ b/pkgs/applications/graphics/nomacs/fix-appdata-install.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/UnixBuildTarget.cmake b/cmake/UnixBuildTarget.cmake +index 3521056a..34f99ed9 100644 +--- a/cmake/UnixBuildTarget.cmake ++++ b/cmake/UnixBuildTarget.cmake +@@ -80,7 +80,7 @@ install(FILES ${NOMACS_QM} DESTINATION share/nomacs/translations) + # manpage + install(FILES Readme/nomacs.1 DESTINATION share/man/man1) + # appdata +-install(FILES nomacs.appdata.xml DESTINATION /usr/share/appdata/) ++install(FILES nomacs.appdata.xml DESTINATION share/appdata/) + + # "make dist" target + string(TOLOWER ${PROJECT_NAME} CPACK_PACKAGE_NAME) diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index d16800dc881..44faeea007d 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchurl, boost, cmake, ilmbase, libjpeg, libpng, libtiff +{ stdenv, fetchFromGitHub, boost, cmake, ilmbase, libjpeg, libpng, libtiff , opencolorio, openexr, unzip }: stdenv.mkDerivation rec { name = "openimageio-${version}"; - version = "1.6.11"; + version = "1.7.12"; - src = fetchurl { - url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip"; - sha256 = "0cr0z81a41bg193dx9crcq1mns7mmzz7qys4lrbm18cmdbwkk88x"; + src = fetchFromGitHub { + owner = "OpenImageIO"; + repo = "oiio"; + rev = "Release-${version}"; + sha256 = "1ganx4f7zis5lkxxrwc83dbgngaxww2846bsc4vrg5dhjnns6n4y"; }; outputs = [ "bin" "out" "dev" "doc" ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ - boost cmake ilmbase libjpeg libpng libtiff opencolorio openexr + boost ilmbase libjpeg libpng + libtiff opencolorio openexr unzip ]; diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix index 3cc5fe6fdd2..82fa4d5ee95 100644 --- a/pkgs/applications/graphics/potrace/default.nix +++ b/pkgs/applications/graphics/potrace/default.nix @@ -2,22 +2,22 @@ stdenv.mkDerivation rec { name = "potrace-${version}"; - version = "1.13"; + version = "1.14"; src = fetchurl { url = "http://potrace.sourceforge.net/download/${version}/potrace-${version}.tar.gz"; - sha256 = "115p2vgyq7p2mf4nidk2x3aa341nvv2v8ml056vbji36df5l6lk2"; + sha256 = "0znr9i0ljb818qiwm22zw63g11a4v08gc5xkh0wbdp6g259vcwnv"; }; configureFlags = [ "--with-libpotrace" ]; buildInputs = [ zlib ]; - meta = { + meta = with stdenv.lib; { homepage = http://potrace.sourceforge.net/; description = "A tool for tracing a bitmap, which means, transforming a bitmap into a smooth, scalable image"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.pSub ]; - license = stdenv.lib.licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.pSub ]; + license = licenses.gpl2; }; } diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index 25c6fc36c6c..2023d9486bd 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchurl, getopt, which, pkgconfig, gtk2 } : +{ stdenv, fetchFromGitHub, getopt, which, pkgconfig, gtk2 } : stdenv.mkDerivation (rec { - name = "pqiv-0.12"; + name = "pqiv-${version}"; + version = "2.8.3"; - src = fetchurl { - url = "https://github.com/downloads/phillipberndt/pqiv/${name}.tbz"; - sha256 = "646c69f2f4e7289913f6b8e8ae984befba9debf0d2b4cc8af9955504a1fccf1e"; + src = fetchFromGitHub { + owner = "phillipberndt"; + repo = "pqiv"; + rev = version; + sha256 = "0fhmqa1q1y5y0ivrgx9xv864zqvd5dk4fiqi4bgi1ybdfx7vv2fy"; }; - buildInputs = [ getopt which pkgconfig gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ getopt which gtk2 ]; - preConfigure='' - substituteInPlace configure --replace /bin/bash "$shell" - sed -i -e 's|$(tempfile -s.*)|temp.c|' -e 's|tempfile|mktemp|' configure - ''; + prePatch = "patchShebangs ."; - unpackCmd = '' - tar -xf ${src} - ''; - - meta = { + meta = with stdenv.lib; { description = "Rewrite of qiv (quick image viewer)"; homepage = http://www.pberndt.com/Programme/Linux/pqiv; + license = licenses.gpl3; + maintainers = [ maintainers.ndowens ]; + platforms = platforms.unix; }; }) diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix index 55c083ba71f..b7672a39d0d 100644 --- a/pkgs/applications/graphics/rapcad/default.nix +++ b/pkgs/applications/graphics/rapcad/default.nix @@ -1,23 +1,33 @@ -{ stdenv, fetchgit, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline +{ stdenv, fetchFromGitHub, fetchurl, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline , qtbase, qmakeHook, mesa_glu }: stdenv.mkDerivation rec { - version = "0.9.5"; + version = "0.9.8"; name = "rapcad-${version}"; - src = fetchgit { - url = "https://github.com/GilesBathgate/RapCAD.git"; - rev = "refs/tags/v${version}"; - sha256 = "1i5h4sw7mdbpdbssmbjccwgidndrsc606zz4wy9pjsg2wzrabw7x"; + src = fetchFromGitHub { + owner = "gilesbathgate"; + repo = "rapcad"; + rev = "v${version}"; + sha256 = "0a0sqf6h227zalh0jrz6jpm8iwji7q3i31plqk76i4qm9vsgrhir"; }; - buildInputs = [ qtbase qmakeHook cgal boost gmp mpfr flex bison dxflib readline mesa_glu ]; + patches = [ + (fetchurl { + url = "https://github.com/GilesBathgate/RapCAD/commit/278a8d6c7b8fe08f867002528bbab4a6319a7bb6.patch"; + sha256 = "1vvkyf0wg79zdzs5zlggfrr1lrp1x75dglzl0mspnycwldsdwznj"; + name = "disable-QVector-qHash.patch"; + }) + ]; - meta = { - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [raskin]; - platforms = stdenv.lib.platforms.linux; + nativeBuildInputs = [ qmakeHook ]; + buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline mesa_glu ]; + + meta = with stdenv.lib; { + license = licenses.gpl3; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; description = ''Constructive solid geometry package''; }; } diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 53fdc67cf24..97d04b03622 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm2, libXau -, libXdmcp, lcms2, libiptcdata, libcanberra_gtk2, fftw, expat, pcre, libsigcxx +{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm3, libXau +, libXdmcp, lcms2, libiptcdata, libcanberra_gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -9,15 +9,17 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Beep6581"; repo = "RawTherapee"; - rev = "1077c4ba2e2dbe249884e6974c6050db8eb5e9c2"; - sha256 = "1xqmkwprk3h9nhy6q562mkjdpynyg9ff7a92sdga50k56gi0aj0s"; + rev = version + "-gtk3"; + sha256 = "06v3ir5562yg4zk9z8kc8a7sw7da88193sizjlk74gh5d3smgr4q"; }; buildInputs = [ - pkgconfig cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp - lcms2 libiptcdata libcanberra_gtk2 fftw expat pcre libsigcxx + pkgconfig cmake pixman libpthreadstubs gtkmm3 libXau libXdmcp + lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx ]; + nativeBuildInputs = [ wrapGAppsHook ]; + cmakeFlags = [ "-DPROC_TARGET_NUMBER=2" ]; diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix new file mode 100644 index 00000000000..be4457c932f --- /dev/null +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchFromGitHub, cmake, qtbase, qtx11extras +, pkgconfig, xorg, makeQtWrapper, vulkan-loader +}: + +stdenv.mkDerivation rec { + name = "renderdoc-${version}"; + version = "0.34pre"; + + src = fetchFromGitHub { + owner = "baldurk"; + repo = "renderdoc"; + rev = "5e2717daec53e5b51517d3231fb6120bebbe6b7a"; + sha256 = "1zpvjvsj5c441kyjpmd2d2r0ykb190rbq474nkmp1jk72cggnpq0"; + }; + + buildInputs = [ + qtbase xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader + ]; + nativeBuildInputs = [ cmake makeQtWrapper pkgconfig ]; + + cmakeFlags = [ + "-DBUILD_VERSION_HASH=${src.rev}-distro-nix" + # TODO: use this instead of preConfigure once placeholders land + #"-DVULKAN_LAYER_FOLDER=${placeholder out}/share/vulkan/implicit_layer.d/" + ]; + preConfigure = '' + cmakeFlags+=" -DVULKAN_LAYER_FOLDER=$out/share/vulkan/implicit_layer.d/" + ''; + preFixup = '' + mkdir $out/bin/.bin + mv $out/bin/qrenderdoc $out/bin/.bin/qrenderdoc + ln -s $out/bin/.bin/qrenderdoc $out/bin/qrenderdoc + wrapQtProgram $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib + mv $out/bin/renderdoccmd $out/bin/.bin/renderdoccmd + ln -s $out/bin/.bin/renderdoccmd $out/bin/renderdoccmd + wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib + ''; + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A single-frame graphics debugger"; + homepage = https://renderdoc.org/; + license = licenses.mit; + longDescription = '' + RenderDoc is a free MIT licensed stand-alone graphics debugger that + allows quick and easy single-frame capture and detailed introspection + of any application using Vulkan, D3D11, OpenGL or D3D12 across + Windows 7 - 10, Linux or Android. + ''; + maintainers = [maintainers.jansol]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 8cd1a04e977..0c77857e66b 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { version = "${major}.${minor}"; - major = "0.25"; - minor = "90"; + major = "0.26"; + minor = "0"; name = "shotwell-${version}"; src = fetchurl { url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz"; - sha256 = "1xlywhwr27n2q7xid19zzgf6rmmiyf4jq62rxn2af2as8rpkf1pm"; + sha256 = "090hvw9qcfs3irh05aji7pqh50j4v6xpwmsbl3r11svik7ag8p9h"; }; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix index 39db1dd1f6d..023008183ff 100644 --- a/pkgs/applications/graphics/vimiv/default.nix +++ b/pkgs/applications/graphics/vimiv/default.nix @@ -68,5 +68,6 @@ python3Packages.buildPythonApplication rec { description = "An image viewer with Vim-like keybindings"; license = lib.licenses.mit; platforms = lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index d97a970df2a..9af46f5cb35 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "yEd-${version}"; - version = "3.16.2.1"; + version = "3.17"; src = requireFile { name = "${name}.zip"; url = "https://www.yworks.com/en/products/yfiles/yed/"; - sha256 = "019qfmdifqsrc9h4g3zbn7ivdc0dzlp3isa5ixdkgdhfsdm79b27"; + sha256 = "1wk58cql90y3i5l7jlxqfjjgf26i0zrv5cn0p9npgagaw6aiw2za"; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 986b3fe8f77..4a42c55c249 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "albert-${version}"; - version = "0.9.4"; + version = "0.10.2"; src = fetchFromGitHub { - owner = "manuelschneid3r"; + owner = "albertlauncher"; repo = "albert"; rev = "v${version}"; - sha256 = "131ij525rgh2j9m2vydh79wm4bs0p3x27crar9f16rqhz15gkcpl"; + sha256 = "0plb8c7js91bpf7qgq1snhry8x4zixyy34lq42nhsglab2kaq4ns"; }; nativeBuildInputs = [ cmake makeQtWrapper ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/manuelSchneid3r/albert; + homepage = https://albertlauncher.github.io/; description = "Desktop agnostic launcher"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ericsagnes ]; diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index b4f01bc642b..2585b554548 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -9,6 +9,7 @@ , enableLibsndfile ? true, libsndfile ? null # amrnb and amrwb are unfree, disabled by default , enableAMR ? false, amrnb ? null, amrwb ? null +, enableLibpulseaudio ? true, libpulseaudio ? null }: with stdenv.lib; @@ -30,7 +31,8 @@ stdenv.mkDerivation rec { optional enableFLAC flac ++ optional enablePNG libpng ++ optional enableLibsndfile libsndfile ++ - optionals enableAMR [ amrnb amrwb ]; + optionals enableAMR [ amrnb amrwb ] ++ + optional enableLibpulseaudio libpulseaudio; meta = { description = "Sample Rate Converter for audio"; diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix index 9211ef0ab83..3f22d1629e2 100644 --- a/pkgs/applications/misc/calcurse/default.nix +++ b/pkgs/applications/misc/calcurse/default.nix @@ -1,18 +1,23 @@ -{stdenv, fetchurl, ncurses, gettext}: +{stdenv, fetchurl, ncurses, gettext, python3, makeWrapper }: -stdenv.mkDerivation { - name = "calcurse-4.0.0"; +stdenv.mkDerivation rec { + name = "calcurse-${version}"; + version = "4.2.2"; src = fetchurl { - url = http://calcurse.org/files/calcurse-4.0.0.tar.gz; - sha256 = "0d33cpkbhyidvm3xx6iw9ljqdvl6477c2kcwix3bs63nj0ch06v2"; + url = "http://calcurse.org/files/${name}.tar.gz"; + sha256 = "0il0y06akdqgy0f9p40m4x6arn66nh7sr1w1i41bszycs7div266"; }; - buildInputs = [ncurses gettext]; + buildInputs = [ncurses gettext python3 ]; + nativeBuildInputs = [ makeWrapper ]; - meta = { + postInstall = '' + makeWrapper ${python3}/bin/python3 $out/bin/calcurse-caldav + ''; + + meta = with stdenv.lib; { description = "A calendar and scheduling application for the command line"; - version = "4.0.0"; longDescription = '' calcurse is a calendar and scheduling application for the command line. It helps keep track of events, appointments and everyday tasks. A configurable notification @@ -21,7 +26,7 @@ stdenv.mkDerivation { be used to filter and format appointments, making it suitable for use in scripts. ''; homepage = http://calcurse.org/; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd2; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index fc0374985cd..39f3a12b90a 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.80.0"; + version = "2.82.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "1cgj30b0imv4gl12y1lcd07w3bx10sapclvjr78z78n7g32xp9ik"; + sha256 = "073iarhjsapqf1g8ji1w835biixybqq869flq58vkz37wjmray8k"; }; patches = [ diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix index 469da1f6ec4..67d37489feb 100644 --- a/pkgs/applications/misc/chirp/default.nix +++ b/pkgs/applications/misc/chirp/default.nix @@ -1,25 +1,20 @@ { stdenv, fetchurl, libxml2Python, libxslt, makeWrapper -, python, pyserial, pygtk -}: -let - version = "20161018"; -in +, python, pyserial, pygtk }: + stdenv.mkDerivation rec { name = "chirp-daily-${version}"; - inherit version; + version = "20170311"; src = fetchurl { - url = "http://trac.chirp.danplanet.com/chirp_daily/daily-${version}/chirp-daily-${version}.tar.gz"; - sha256 = "0f3r919az4vvcgxzqmxvhrxa2byzk5algy7srzzs15ihkvyxcwkb"; + url = "http://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz"; + sha256 = "0mvj650vm3bfk94b174gl99fj4jigrx38f1iciz1cp3gn8hcrcpj"; }; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ - makeWrapper pyserial pygtk libxml2Python libxslt pyserial ]; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - installPhase = '' mkdir -p $out/bin $out/share/chirp cp -r . $out/share/chirp/ diff --git a/pkgs/applications/misc/colort/default.nix b/pkgs/applications/misc/colort/default.nix new file mode 100644 index 00000000000..554c7d8c78b --- /dev/null +++ b/pkgs/applications/misc/colort/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + name = "colort-unstable-2017-03-12"; + + src = fetchFromGitHub { + owner = "neeasade"; + repo = "colort"; + rev = "8470190706f358dc807b4c26ec3453db7f0306b6"; + sha256 = "10n8rbr2h6hz86hcx73f86pjbbfiaw2rvxsk0yfajnma7bpxgdxw"; + }; + + makeFlags = ["PREFIX=$(out)"]; + + meta = with stdenv.lib; { + description = "A program for 'tinting' color values"; + homepage = https://github.com/neeasade/colort; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.neeasade ]; + }; +} diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 0892f889932..7461f6853f4 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -1,21 +1,25 @@ -{ stdenv, fetchurl, cmake, qt4, libXfixes, libXtst}: +{ stdenv, fetchFromGitHub, cmake, qt4, libXfixes, libXtst}: -let version = "2.5.0"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "CopyQ-${version}"; - src = fetchurl { - url = "https://github.com/hluk/CopyQ/archive/v${version}.tar.gz"; - sha256 = "7726745056e8d82625531defc75b2a740d3c42131ecce1f3181bc0a0bae51fb1"; + version = "2.9.0"; + + src = fetchFromGitHub { + owner = "hluk"; + repo = "CopyQ"; + rev = "v${version}"; + sha256 = "1gnqsfh50w3qcnbghkpjr5qs42fgl6643lmg4mg4wam8a852s64f"; }; - buildInputs = [ cmake qt4 libXfixes libXtst ]; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ qt4 libXfixes libXtst ]; meta = with stdenv.lib; { - homepage = "https://hluk.github.io/CopyQ"; + homepage = https://hluk.github.io/CopyQ; description = "Clipboard Manager with Advanced Features"; license = licenses.gpl3; - maintainers = with maintainers; [ willtim ]; + maintainers = [ maintainers.willtim ]; # NOTE: CopyQ supports windows and osx, but I cannot test these. # OSX build requires QT5. platforms = platforms.linux; diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix index 96b42969115..4a7c4d7ec30 100644 --- a/pkgs/applications/misc/devilspie2/default.nix +++ b/pkgs/applications/misc/devilspie2/default.nix @@ -2,18 +2,15 @@ stdenv.mkDerivation rec { name = "devilspie2-${version}"; - version = "0.39"; + version = "0.42"; src = fetchurl { - url = "http://download.savannah.gnu.org/releases/devilspie2/devilspie2_0.39-src.tar.gz"; - sha256 = "07b74ffc078e5f01525d9da7a1978b4c1a9725b814b344f83a1a203cf4caae09"; + url = "http://download.savannah.gnu.org/releases/devilspie2/devilspie2_${version}-src.tar.gz"; + sha256 = "119zb9x5i3y4cp30h4113psqxb5d7zxiyijpq02g8kds1wqvrx8i"; }; - buildInputs = [ intltool pkgconfig glib gtk lua libwnck3 ]; - - patchPhase = '' - sed -i -e s@/usr/local@$out@ Makefile - ''; + nativeBuildInputs = [ intltool pkgconfig ]; + buildInputs = [ glib gtk lua libwnck3 ]; installPhase = '' mkdir -p $out/bin $out/share/man/man1 @@ -22,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Devilspie2 is a window matching utility"; + description = "A window matching utility"; longDescription = '' Devilspie2 is a window matching utility, allowing the user to perform scripted actions on windows as they are created. For diff --git a/pkgs/applications/misc/direwolf/default.nix b/pkgs/applications/misc/direwolf/default.nix index 0341ffc64af..d4c8b1ada6c 100644 --- a/pkgs/applications/misc/direwolf/default.nix +++ b/pkgs/applications/misc/direwolf/default.nix @@ -1,38 +1,43 @@ -{ stdenv, fetchFromGitHub, unzip, alsaLib }: -let - version = "1.2"; -in +{ stdenv, fetchFromGitHub +, espeak, alsaLib, perl +, python }: + +with stdenv.lib; + stdenv.mkDerivation rec { name = "direwolf-${version}"; - inherit version; + version = "1.3"; src = fetchFromGitHub { owner = "wb2osz"; repo = "direwolf"; - rev = "8b81a32"; - sha256 = "0r4fgdxghh292bzhqshr7zl5cg2lfsvlgmy4d5vqcli7x6qa1gcs"; + rev = version; + sha256 = "1x6vvl3fy70ic5pqvqsyr0bkqwim8m9jaqnm5ls8z8i66rwq23fg"; }; buildInputs = [ - unzip alsaLib - ]; + espeak perl python + ] ++ (optional stdenv.isLinux alsaLib); patchPhase = '' - substituteInPlace Makefile.linux \ - --replace "/usr/local" "$out" \ - --replace "/usr/share" "$out/share" - ''; + substituteInPlace Makefile.* \ + --replace /usr/share $out/share - preInstall = '' - mkdir -p $out/bin - ''; + substituteInPlace dwespeak.sh \ + --replace espeak ${espeak}/bin/espeak + ''; - meta = with stdenv.lib; { + installPhase = '' + mkdir -p $out/bin + make INSTALLDIR=$out install + ''; + + meta = { description = "A Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway"; # On the page: This page will be disappearing on October 8, 2015. - homepage = https://home.comcast.net/~wb2osz/site/; + homepage = https://github.com/wb2osz/direwolf/; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.the-kenny ]; }; } diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix index 093382e13e6..6e158f5696c 100644 --- a/pkgs/applications/misc/djvulibre/default.nix +++ b/pkgs/applications/misc/djvulibre/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "A library and viewer for the DJVU file format for scanned images"; homepage = http://djvu.sourceforge.net; license = licenses.gpl2; - maintainers = with maintainers; [ urkud ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/dmenu2/default.nix b/pkgs/applications/misc/dmenu2/default.nix index 9dca8f983a4..3d567603359 100644 --- a/pkgs/applications/misc/dmenu2/default.nix +++ b/pkgs/applications/misc/dmenu2/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = { description = "A patched fork of the original dmenu - an efficient dynamic menu for X"; homepage = https://bitbucket.org/melek/dmenu2; - license = stdenv.lib.licenses.mit; - maintainers = with maintainers; [ cstrahan ]; + license = licenses.mit; + maintainers = [ maintainers.cstrahan ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index a8d35680dbd..61b0357bb9d 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { substituteInPlace src/core/CMakeLists.txt --replace /usr/share/applications "$out"/share/applications ''; - meta = { + meta = with stdenv.lib; { homepage = http://doomseeker.drdteam.org/; description = "Multiplayer server browser for many Doom source ports"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ MP2E ]; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.MP2E ]; }; } diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 0fde5c8644e..a2d39f2d486 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "electrum-${version}"; - version = "2.8.1"; + version = "2.8.2"; src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "1398s9d8j04is24il2xjb6xkj666pj21bsr90xglpsmfa1js9z7g"; + sha256 = "01xphbi7lx64s9380zjfakz5h8blqmxp0ryqlll7px66qpmjn5fq"; }; propagatedBuildInputs = with python2Packages; [ diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix index 57d3539d271..7248fe2c875 100644 --- a/pkgs/applications/misc/emem/default.nix +++ b/pkgs/applications/misc/emem/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "emem"; - version = "0.2.42"; + version = "0.2.48"; name = "${pname}-${version}"; inherit jdk; src = fetchurl { url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar"; - sha256 = "0zm3sqgbiaj44nkgkjiifxwwyrcjs42nry6zmbg3dnnpd0v82v8j"; + sha256 = "0l68qqjh8lbqb2yqvggiga9qz2j32h3qklcfkycmcffn6l1nlqnq"; }; phases = [ "buildPhase" "installPhase" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = '' cp $src $out/share/java/${pname}.jar - cat > $out/bin/${pname} < $out/bin/${pname} << EOF #! $SHELL $jdk/bin/java -jar $out/share/java/${pname}.jar "\$@" EOF diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix index 09bef975c85..b6c10dbebca 100644 --- a/pkgs/applications/misc/epdfview/default.nix +++ b/pkgs/applications/misc/epdfview/default.nix @@ -1,14 +1,16 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, poppler }: stdenv.mkDerivation rec { - name = "epdfview-0.1.8"; + name = "epdfview-${version}"; + version = "0.1.8"; src = fetchurl { - url = "http://trac.emma-soft.com/epdfview/chrome/site/releases/${name}.tar.bz2"; - sha256 = "1w7qybh8ssl4dffi5qfajq8mndw7ipsd92vkim03nywxgjp4i1ll"; + url = "mirror://debian/pool/main/e/epdfview/epdfview_${version}.orig.tar.gz"; + sha256 = "0ibyb60a0b4n34bsjgvhdw8yf24463ky0hpmf6a2jjqsbm5g4v64"; }; - buildInputs = [ pkgconfig gtk2 poppler ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 poppler ]; hardeningDisable = [ "format" ]; @@ -24,16 +26,16 @@ stdenv.mkDerivation rec { }) ]; - meta = { - homepage = http://trac.emma-soft.com/epdfview/; + meta = with stdenv.lib; { + homepage = https://packages.debian.org/wheezy/epdfview; description = "A lightweight PDF document viewer using Poppler and GTK+"; longDescription = '' ePDFView is a free lightweight PDF document viewer using Poppler and GTK+ libraries. The aim of ePDFView is to make a simple PDF document viewer, in the lines of Evince but without using the Gnome libraries. ''; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2; + maintainers = [ maintainers.astsmtl ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/evopedia/default.nix b/pkgs/applications/misc/evopedia/default.nix index 4a9c2b60006..170e2385d4a 100644 --- a/pkgs/applications/misc/evopedia/default.nix +++ b/pkgs/applications/misc/evopedia/default.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchgit, bzip2, qt4, qmake4Hook, libX11 }: +{ stdenv, fetchFromGitHub, bzip2, qt4, qmake4Hook, libX11 }: stdenv.mkDerivation rec { name = "evopedia-${version}"; version = "0.4.4"; - src = fetchgit { - url = https://github.com/evopedia/evopedia_qt; - rev = "refs/tags/v${version}"; + src = fetchFromGitHub { + owner = "evopedia"; + repo = "evopedia_qt"; + rev = "v${version}"; sha256 = "0snp5qiywj306kfaywvkl7j34fivgxcb8dids1lzmbqq5xcpqqvc"; }; buildInputs = [ bzip2 qt4 libX11 ]; nativeBuildInputs = [ qmake4Hook ]; - meta = { + meta = with stdenv.lib; { description = "Offline Wikipedia Viewer"; homepage = http://www.evopedia.info; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ qknight ]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl3Plus; + maintainers = [ maintainers.qknight ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index 962d8f8b31f..d0b98863d20 100644 --- a/pkgs/applications/misc/exercism/default.nix +++ b/pkgs/applications/misc/exercism/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "exercism-${version}"; - version = "2.3.0"; + version = "2.4.0"; goPackagePath = "github.com/exercism/cli"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "exercism"; repo = "cli"; rev = "v${version}"; - sha256 = "1zhvvmsh5kw739kylk0bqj1wa6vjyahz43dlxdpv42h8gfiiksf5"; + sha256 = "1hl13sr4ymqg9sjhkxdmhf8cfw69cic3bysw34xfv2j6bjjxfwaa"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix new file mode 100644 index 00000000000..de22e08c705 --- /dev/null +++ b/pkgs/applications/misc/far2l/default.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, + xdg_utils, xterm, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz }: + +stdenv.mkDerivation rec { + rev = "c2f2b89db31b1c3cb9bed53267873f4cd7bc996d"; + build = "2017-03-18-${builtins.substring 0 10 rev}"; + name = "far2l-2.1.${build}"; + + src = fetchFromGitHub { + owner = "elfmz"; + repo = "far2l"; + rev = rev; + sha256 = "1172ajg4n8g4ag14b6nb9lclwh2r6v7ccndmvhnj066w35ixnqgb"; + }; + + nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper ]; + + buildInputs = [ wxGTK30 glib pcre ]; + + postPatch = '' + echo 'echo ${build}' > far2l/bootstrap/scripts/vbuild.sh + + substituteInPlace far2l/bootstrap/open.sh \ + --replace 'gvfs-trash' '${gvfs}/bin/gvfs-trash' + substituteInPlace far2l/bootstrap/open.sh \ + --replace 'xdg-open' '${xdg_utils}/bin/xdg-open' \ + --replace 'xterm' '${xterm}/bin/xterm' + substituteInPlace far2l/vtcompletor.cpp \ + --replace '"/bin/bash"' '"${bash}/bin/bash"' + substituteInPlace multiarc/src/formats/zip/zip.cpp \ + --replace '"unzip ' '"${unzip}/bin/unzip ' \ + --replace '"zip ' '"${zip}/bin/zip ' + substituteInPlace multiarc/src/formats/7z/7z.cpp \ + --replace '"^7z ' '"^${p7zip}/lib/p7zip/7z ' \ + --replace '"7z ' '"${p7zip}/lib/p7zip/7z ' + substituteInPlace multiarc/src/formats/targz/targz.cpp \ + --replace '"xz ' '"${xz}/bin/xz ' \ + --replace '"gzip ' '"${gzip}/bin/gzip ' \ + --replace '"bzip2 ' '"${bzip2}/bin/bzip2 ' \ + --replace '"tar ' '"${gnutar}/bin/tar ' + ''; + + installPhase = '' + mkdir -p $out/{bin,share} + rm install/{far2l_askpass,far2l_sudoapp} + mv install/far2l $out/bin/far2l + mv install $out/share/far2l + ln -s -r $out/bin/far2l $out/share/far2l/far2l_askpass + ln -s -r $out/bin/far2l $out/share/far2l/far2l_sudoapp + ''; + + stripDebugList = "bin share"; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "An orthodox file manager"; + homepage = http://github.com/elfmz/far2l; + license = licenses.gpl2; + maintainers = [ maintainers.volth ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix index 1d8412a25f3..053cdd05991 100644 --- a/pkgs/applications/misc/finalterm/default.nix +++ b/pkgs/applications/misc/finalterm/default.nix @@ -1,27 +1,29 @@ -{ stdenv, lib, fetchgit, makeWrapper +{ stdenv, lib, fetchFromGitHub, makeWrapper , pkgconfig, cmake, libxml2, vala_0_23, intltool, libmx, gnome3, gtk3, gtk_doc , keybinder3, clutter_gtk, libnotify , libxkbcommon, xorg, udev , bashInteractive }: +with stdenv.lib; + stdenv.mkDerivation { name = "finalterm-git-2014-11-15"; - src = fetchgit { - url = "https://github.com/p-e-w/finalterm.git"; + src = fetchFromGitHub { + owner = "p-e-w"; + repo = "finalterm"; rev = "39b078b2a96a5c3c9e74f92b1929f383d220ca8b"; sha256 = "14viln5nabr39lafg1lzf6ydibz1h5d9346drp435ljxc6wsh21i"; }; + nativeBuildInputs = [ pkgconfig cmake intltool makeWrapper ]; buildInputs = [ - pkgconfig cmake vala_0_23 intltool gtk3 gnome3.gnome_common gnome3.libgee - gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify makeWrapper + vala_0_23 gtk3 gnome3.gnome_common gnome3.libgee + gtk_doc clutter_gtk libmx keybinder3 libxml2 libnotify xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence libxkbcommon - ] ++ lib.optionals stdenv.isLinux [ - udev - ]; + ] ++ optionals stdenv.isLinux [ udev ]; preConfigure = '' substituteInPlace data/org.gnome.finalterm.gschema.xml \ @@ -44,7 +46,7 @@ stdenv.mkDerivation { --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" ''; - meta = with lib; { + meta = { homepage = "http://finalterm.org"; description = "A new breed of terminal emulator"; longDescription = '' @@ -57,7 +59,7 @@ stdenv.mkDerivation { - GUI terminal controls ''; license = licenses.gpl3Plus; - maintainers = with maintainers; [ cstrahan ]; + maintainers = [ maintainers.cstrahan ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/freicoin/default.nix b/pkgs/applications/misc/freicoin/default.nix deleted file mode 100644 index b4e71d4bbc7..00000000000 --- a/pkgs/applications/misc/freicoin/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ fetchurl, stdenv, db, boost, gmp, mpfr, miniupnpc, qt4, qmake4Hook, unzip }: - -stdenv.mkDerivation rec { - version = "0.8.3-1"; - name = "freicoin-${version}"; - - src = fetchurl { - url = "https://github.com/freicoin/freicoin/archive/v${version}.zip"; - sha256 = "0v3mh8a96nnb86mkyaylyjj7qfdrl7i9gvybh7f8w2hrl9paszfh"; - }; - - # I think that openssl and zlib are required, but come through other - # packages - buildInputs = [ db boost gmp mpfr miniupnpc qt4 unzip qmake4Hook ]; - - installPhase = '' - mkdir -p $out/bin - cp freicoin-qt $out/bin - ''; - - meta = { - description = "Peer-to-peer currency with demurrage fee"; - homepage = "http://freicoi.in/"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/applications/misc/galculator/default.nix index 5d5f83a2370..44071b32875 100644 --- a/pkgs/applications/misc/galculator/default.nix +++ b/pkgs/applications/misc/galculator/default.nix @@ -1,17 +1,20 @@ -{ stdenv, fetchurl -, intltool, pkgconfig, gtk }: +{ stdenv, fetchFromGitHub +, autoreconfHook, intltool +, gtk, pkgconfig, flex }: stdenv.mkDerivation rec { - name = "galculator-${version}"; - version = "2.1.3"; + version = "2.1.4"; - src = fetchurl { - url = "mirror://sourceforge/galculator/${name}.tar.gz"; - sha256 = "12m7dldjk10lpkdxk7zpk98n32ci65zmxidghihb7n1m3rhp3q17"; + src = fetchFromGitHub { + owner = "galculator"; + repo = "galculator"; + rev = "v${version}"; + sha256 = "0q0hb62f266709ncyq96bpx4a40a1i6dc5869byvd7x285sx1c2w"; }; - buildInputs = [ intltool pkgconfig gtk ]; + nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; + buildInputs = [ gtk flex ]; meta = with stdenv.lib; { description = "A GTK 2/3 algebraic and RPN calculator"; diff --git a/pkgs/applications/misc/gammu/bashcomp-dir.patch b/pkgs/applications/misc/gammu/bashcomp-dir.patch index 94cc2929c1e..d41aa432cf3 100644 --- a/pkgs/applications/misc/gammu/bashcomp-dir.patch +++ b/pkgs/applications/misc/gammu/bashcomp-dir.patch @@ -1,12 +1,11 @@ -diff -Naur gammu-1.33.0.orig/contrib/CMakeLists.txt gammu-1.33.0/contrib/CMakeLists.txt ---- gammu-1.33.0.orig/contrib/CMakeLists.txt 2013-12-26 20:56:22.887772110 +0100 -+++ gammu-1.33.0/contrib/CMakeLists.txt 2013-12-26 20:57:04.386276037 +0100 -@@ -85,7 +85,7 @@ +--- a/contrib/CMakeLists.txt ++++ b/contrib/CMakeLists.txt +@@ -85,7 +85,7 @@ endif (INSTALL_PHP_EXAMPLES) if (INSTALL_BASH_COMPLETION) + macro_optional_find_package (BashCompletion) + if (NOT BASH_COMPLETION_FOUND) +- set (BASH_COMPLETION_COMPLETIONSDIR "/etc/bash_completion.d" CACHE PATH "Location of bash_completion.d") ++ set (BASH_COMPLETION_COMPLETIONSDIR "${CMAKE_INSTALL_PREFIX}/etc/bash_completion.d" CACHE PATH "Location of bash_completion.d") + endif (NOT BASH_COMPLETION_FOUND) install ( FILES bash-completion/gammu -- DESTINATION "/etc/bash_completion.d" -+ DESTINATION "${CMAKE_INSTALL_PREFIX}/etc/bash_completion.d" - COMPONENT "bash" - ) - endif (INSTALL_BASH_COMPLETION) diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index 10ee8272f38..950ce210c06 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, pkgconfig, cmake, bluez, libusb1, curl +{ stdenv, fetchFromGitHub, python, pkgconfig, cmake, bluez, libusb1, curl , libiconv, gettext, sqlite , dbiSupport ? false, libdbi ? null, libdbiDrivers ? null , postgresSupport ? false, postgresql ? null @@ -8,16 +8,20 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "gammu-${version}"; - version = "1.33.0"; + version = "1.38.2"; - src = fetchurl { - url = "mirror://sourceforge/project/gammu/gammu/${version}/gammu-${version}.tar.xz"; - sha256 = "18gplx1v9d70k1q86d5i4n4dfpx367g34pj3zscppx126vwhv112"; + src = fetchFromGitHub { + owner = "gammu"; + repo = "gammu"; + rev = version; + sha256 = "1rk3p3sjyy6n6mlqs4qgyxna4swrh1zm7b77npxv8j341wxj3khv"; }; - patches = [ ./bashcomp-dir.patch ]; + patches = [ ./bashcomp-dir.patch ./systemd.patch ]; - buildInputs = [ python pkgconfig cmake bluez libusb1 curl gettext sqlite libiconv ] + nativeBuildInputs = [ pkgconfig cmake ]; + + buildInputs = [ python bluez libusb1 curl gettext sqlite libiconv ] ++ optionals dbiSupport [ libdbi libdbiDrivers ] ++ optionals postgresSupport [ postgresql ]; diff --git a/pkgs/applications/misc/gammu/systemd.patch b/pkgs/applications/misc/gammu/systemd.patch new file mode 100644 index 00000000000..22b49a5a2ff --- /dev/null +++ b/pkgs/applications/misc/gammu/systemd.patch @@ -0,0 +1,30 @@ +diff --git a/cmake/templates/gammu.spec.in b/cmake/templates/gammu.spec.in +index 8302353..e3ca59a 100644 +--- a/cmake/templates/gammu.spec.in ++++ b/cmake/templates/gammu.spec.in +@@ -387,9 +387,9 @@ fi + %doc %{_mandir}/man7/gammu-smsd-run.7* + %doc %{_mandir}/man7/gammu-smsd-sql.7* + %doc %{_mandir}/man7/gammu-smsd-tables.7* +-%dir %{_libexecdir}/systemd +-%dir %{_libexecdir}/systemd/system +-%{_libexecdir}/systemd/system/gammu-smsd.service ++%dir %{_prefix}/systemd ++%dir %{_prefix}/systemd/system ++%{_prefix}/systemd/system/gammu-smsd.service + + %files -n libGammu%{so_ver} -f libgammu.lang + %defattr(-,root,root,-) +diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt +index 78cc7fc..d674c36 100644 +--- a/contrib/CMakeLists.txt ++++ b/contrib/CMakeLists.txt +@@ -97,7 +97,7 @@ endif (INSTALL_BASH_COMPLETION) + if (WITH_SYSTEMD) + install ( + FILES init/gammu-smsd.service +- DESTINATION "${SYSTEMD_SERVICES_INSTALL_DIR}" ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/systemd" + COMPONENT "systemd" + ) + endif (WITH_SYSTEMD) diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index 7560a8bfeb4..d3ba5a97333 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -1,13 +1,14 @@ -{ fetchFromGitHub, lib, pythonPackages }: +{ stdenv, lib, fetchFromGitHub, pythonPackages +, libnotify ? null }: pythonPackages.buildPythonApplication rec { version = "3.4.0"; name = "gcalcli-${version}"; src = fetchFromGitHub { - owner = "insanum"; - repo = "gcalcli"; - rev = "v${version}"; + owner = "insanum"; + repo = "gcalcli"; + rev = "v${version}"; sha256 = "171awccgnmfv4j7m2my9387sjy60g18kzgvscl6pzdid9fn9rrm8"; }; @@ -20,12 +21,23 @@ pythonPackages.buildPythonApplication rec { parsedatetime six vobject - ] ++ lib.optional (!pythonPackages.isPy3k) futures; + ] + ++ lib.optional (!pythonPackages.isPy3k) futures; + + # there are no tests as of 3.4.0 + doCheck = false; + + postInstall = lib.optionalString stdenv.isLinux '' + substituteInPlace $out/bin/gcalcli \ + --replace "command = 'notify-send -u critical -a gcalcli %s'" \ + "command = '${libnotify}/bin/notify-send -i view-calendar-upcoming-events -u critical -a Calendar %s'" + ''; meta = with lib; { homepage = https://github.com/insanum/gcalcli; description = "CLI for Google Calendar"; license = licenses.mit; - maintainers = [ maintainers.nocoolnametom ]; + maintainers = with maintainers; [ nocoolnametom ]; + inherit version; }; } diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index a858fefa8c2..d024b0fce99 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -1,9 +1,20 @@ -{stdenv, fetchurl, atomicparsley, flvstreamer, ffmpeg, makeWrapper, perl, buildPerlPackage, perlPackages, rtmpdump}: +{stdenv, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg, makeWrapper, perl, buildPerlPackage, perlPackages, rtmpdump}: + +with stdenv.lib; + buildPerlPackage rec { name = "get_iplayer-${version}"; - version = "2.97"; + version = "2.99"; + + src = fetchFromGitHub { + owner = "get-iplayer"; + repo = "get_iplayer"; + rev = "v${version}"; + sha256 = "085bgwkjnaqp96gvd2s8qmkw69rz91si1sgzqdqbplkzj9bk2qii"; + }; - buildInputs = [makeWrapper perl]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ perl ]; propagatedBuildInputs = with perlPackages; [HTMLParser HTTPCookies LWP XMLLibXML XMLSimple]; preConfigure = "touch Makefile.PL"; @@ -13,21 +24,15 @@ buildPerlPackage rec { installPhase = '' mkdir -p $out/bin $out/share/man/man1 cp get_iplayer $out/bin - wrapProgram $out/bin/get_iplayer --suffix PATH : ${stdenv.lib.makeBinPath [ atomicparsley ffmpeg flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB + wrapProgram $out/bin/get_iplayer --suffix PATH : ${makeBinPath [ atomicparsley ffmpeg flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB cp get_iplayer.1 $out/share/man/man1 ''; - - src = fetchurl { - url = "https://github.com/get-iplayer/get_iplayer/archive/v${version}.tar.gz"; - sha256 = "0bb6kmzjmazwfxq5ip7yxm39vssfgz3v5vfx1114wfssp6pw0r44"; - }; meta = { description = "Downloads TV and radio from BBC iPlayer"; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; homepage = https://squarepenguin.co.uk/; - downloadPage = https://github.com/get-iplayer/get_iplayer/releases; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index d6a59a89be6..8654e7f3a26 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -1,15 +1,19 @@ { fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE , IOKit ? null }: +with stdenv.lib; + stdenv.mkDerivation rec { - name = "gkrellm-2.3.5"; + name = "gkrellm-2.3.10"; + src = fetchurl { - url = "http://members.dslextreme.com/users/billw/gkrellm/${name}.tar.bz2"; - sha256 = "12rc6zaa7kb60b9744lbrlfkxxfniprm6x0mispv63h4kh75navh"; + url = "http://gkrellm.srcbox.net/releases/${name}.tar.bz2"; + sha256 = "0rnpzjr0ys0ypm078y63q4aplcgdr5nshjzhmz330n6dmnxci7lb"; }; - buildInputs = [gettext pkgconfig glib gtk2 libX11 libSM libICE] - ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [gettext glib gtk2 libX11 libSM libICE] + ++ optionals stdenv.isDarwin [ IOKit ]; hardeningDisable = [ "format" ]; @@ -22,12 +26,11 @@ stdenv.mkDerivation rec { sed -i "$i" -e "s|/usr/X11R6|${libX11.dev}|g ; s|-lICE|-lX11 -lICE|g" done ''; - buildPhase = '' - make PREFIX="$out" ''; - installPhase = '' - make install PREFIX="$out" ''; + installPhase = '' + make DESTDIR=$out install + ''; - meta = { + meta = { description = "Themeable process stack of system monitors"; longDescription = '' GKrellM is a single process stack of system monitors which supports @@ -35,10 +38,9 @@ stdenv.mkDerivation rec { or any other theme. ''; - homepage = http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html; - license = stdenv.lib.licenses.gpl3Plus; - + homepage = http://gkrellm.srcbox.net; + license = licenses.gpl3Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix index dbff65d3651..6c712db01a5 100644 --- a/pkgs/applications/misc/gmrun/default.nix +++ b/pkgs/applications/misc/gmrun/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://sourceforge.net/projects/gmrun/"; license = "GPL"; - maintainers = [ stdenv.lib.maintainers.bbenoist ]; + maintainers = []; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix new file mode 100644 index 00000000000..a86cf268801 --- /dev/null +++ b/pkgs/applications/misc/gmtp/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, libmtp, libid3tag, flac, libvorbis, gtk3 +, gsettings_desktop_schemas, wrapGAppsHook +}: + +let version = "1.3.10"; in + +stdenv.mkDerivation { + name = "gmtp-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/gmtp/gMTP-${version}/gmtp-${version}.tar.gz"; + sha256 = "b21b9a8e66ae7bb09fc70ac7e317a0e32aff3917371a7241dea73c41db1dd13b"; + }; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings_desktop_schemas ]; + + enableParallelBuilding = true; + + meta = { + description = "A simple MP3 and Media player client for UNIX and UNIX like systems."; + homepage = "https://gmtp.sourceforge.io"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.pbogdan ]; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix index 600a5493121..ef805a31567 100644 --- a/pkgs/applications/misc/gpa/default.nix +++ b/pkgs/applications/misc/gpa/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk2, gpgme, libgpgerror, libassuan }: stdenv.mkDerivation rec { - name = "gpa-0.9.9"; + name = "gpa-0.9.10"; src = fetchurl { url = "mirror://gnupg/gpa/${name}.tar.bz2"; - sha256 = "0d235hcqai7m3qb7m9kvr2r4qg4714f87j9fdplwrlz1p4wdfa38"; + sha256 = "09xphbi2456qynwqq5n0yh0zdmdi2ggrj3wk4hsyh5lrzlvcrff3"; }; - buildInputs = [ intltool pkgconfig gtk2 gpgme libgpgerror libassuan ]; + nativeBuildInputs = [ intltool pkgconfig ]; + buildInputs = [ gtk2 gpgme libgpgerror libassuan ]; meta = with stdenv.lib; { description = "Graphical user interface for the GnuPG"; diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 742bdaad996..46278f42e7b 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -3,17 +3,17 @@ }: stdenv.mkDerivation rec { - name = "gphoto2-2.5.8"; + name = "gphoto2-2.5.11"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "0kgfql6c64ha1gahjdwlqhmkslnfywmc2fkys4c5682zv4awvax9"; + sha256 = "1sgr6rsvzzagcwhc8fxbnvz3k02wr2hab0vrbvcb04k5l3b48a1r"; }; - nativeBuildInputs = [ pkgconfig gettext ]; - buildInputs = [ libgphoto2 libexif popt libjpeg readline libtool ]; + nativeBuildInputs = [ pkgconfig gettext libtool ]; + buildInputs = [ libgphoto2 libexif popt libjpeg readline ]; - meta = { + meta = with stdenv.lib; { description = "A ready to use set of digital camera software applications"; longDescription = '' @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gphoto.org/; - license = stdenv.lib.licenses.gpl2Plus; - platforms = with stdenv.lib.platforms; unix; - maintainers = with stdenv.lib.maintainers; [ jcumming ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.jcumming ]; }; } diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix index 5026fea0e35..e691c79d85c 100644 --- a/pkgs/applications/misc/gpscorrelate/default.nix +++ b/pkgs/applications/misc/gpscorrelate/default.nix @@ -1,17 +1,22 @@ -{ fetchurl, stdenv, pkgconfig, exiv2, libxml2, gtk2 +{ fetchFromGitHub, stdenv, pkgconfig, exiv2, libxml2, gtk2 , libxslt, docbook_xsl, docbook_xml_dtd_42 }: stdenv.mkDerivation rec { - name = "gpscorrelate-1.6.0"; + name = "gpscorrelate-${version}"; + version = "1.6.1"; - src = fetchurl { - url = "http://freefoote.dview.net/linux/${name}.tar.gz"; - sha256 = "1j0b244xkvvf0i4iivp4dw9k4xgyasx4sapd91mnwki35fy49sp0"; + src = fetchFromGitHub { + owner = "freefoote"; + repo = "gpscorrelate"; + rev = version; + sha256 = "1z0fc75rx7dl6nnydksa578qv116j2c2xs1czfiijzxjghx8njdj"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig exiv2 libxml2 gtk2 - libxslt docbook_xsl docbook_xml_dtd_42 + exiv2 libxml2 gtk2 + libxslt docbook_xsl + docbook_xml_dtd_42 ]; patchPhase = '' @@ -19,7 +24,7 @@ stdenv.mkDerivation rec { -es",^[[:blank:]]*prefix[[:blank:]]*=.*$,prefix = $out,g" ''; - meta = { + meta = with stdenv.lib; { description = "A GPS photo correlation tool, to add EXIF geotags"; longDescription = '' @@ -38,9 +43,8 @@ stdenv.mkDerivation rec { one takes the GPS data in a different format. ''; - license = stdenv.lib.licenses.gpl2Plus; - - homepage = http://freefoote.dview.net/linux_gpscorr.html; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + homepage = https://github.com/freefoote/gpscorrelate; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/htmldoc/default.nix b/pkgs/applications/misc/htmldoc/default.nix deleted file mode 100644 index e8274418ae1..00000000000 --- a/pkgs/applications/misc/htmldoc/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, fltk, openssl, libpng, libjpeg }: -stdenv.mkDerivation rec { - name = "htmldoc-1.8.27"; - src = fetchurl { - url = http://ftp.easysw.com/pub/htmldoc/1.8.27/htmldoc-1.8.27-source.tar.bz2; - sha256 = "04wnxgx6fxdxwiy9vbawdibngwf55mi01hjrr5fkfs22fcix5zw9"; - }; - buildInputs = [ fltk openssl libpng libjpeg ]; - meta = { - homepage = http://www.htmldoc.org/; - description = "Converts HTML files to indexed HTML, PS or PDF"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ viric ]; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/applications/misc/inspectrum/default.nix b/pkgs/applications/misc/inspectrum/default.nix index 536582e4ee7..6ec968ecc94 100644 --- a/pkgs/applications/misc/inspectrum/default.nix +++ b/pkgs/applications/misc/inspectrum/default.nix @@ -1,18 +1,35 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, boost, fftwFloat, qt5, gnuradio }: +{ stdenv +, fetchFromGitHub +, pkgconfig +, cmake +, boost +, fftwFloat +, qt5 +, gnuradio +, liquid-dsp +}: stdenv.mkDerivation rec { name = "inspectrum-${version}"; - version = "20160403"; + version = "20170218"; src = fetchFromGitHub { owner = "miek"; repo = "inspectrum"; - rev = "27381dbb30f59267a429c04d17d792d3953a6b99"; - sha256 = "0y4j62khq6fcv2qqlqi0kn2ix821m5gcqzg72nhc2zzfb3cdm9nm"; + rev = "d8d1969a4cceeee0ebfd2f39e791fddd5155d4de"; + sha256 = "05sarfin9wqkvgwn3fil1r4bay03cwzzhjwbdjslibc5chdrr2cn"; }; - buildInputs = [ pkgconfig cmake qt5.qtbase fftwFloat boost gnuradio ]; - + buildInputs = [ + pkgconfig + cmake + qt5.qtbase + fftwFloat + boost + gnuradio + liquid-dsp + ]; + meta = with stdenv.lib; { description = "Tool for analysing captured signals from sdr receivers"; homepage = https://github.com/miek/inspectrum; diff --git a/pkgs/applications/misc/iterm2/default.nix b/pkgs/applications/misc/iterm2/default.nix index 028e5d6b725..fa2ac38d383 100644 --- a/pkgs/applications/misc/iterm2/default.nix +++ b/pkgs/applications/misc/iterm2/default.nix @@ -2,16 +2,19 @@ stdenv.mkDerivation rec { name = "iterm2-${version}"; - version = "3.0.4"; + version = "3.0.14"; src = fetchFromGitHub { owner = "gnachman"; repo = "iTerm2"; rev = "v${version}"; - sha256 = "0ffg9l2jvv503h13nd5rjkn5xrahswcqqwmm052qzd6d0lmqjm93"; + sha256 = "03m0ja11w9910z96yi8fzq3436y8xl14q031rdb2w3sapjd54qrj"; }; patches = [ ./disable_updates.patch ]; + postPatch = '' + sed -i -e 's/CODE_SIGN_IDENTITY = "Developer ID Application"/CODE_SIGN_IDENTITY = ""/g' ./iTerm2.xcodeproj/project.pbxproj + ''; makeFlagsArray = ["Deployment"]; installPhase = '' mkdir -p "$out/Applications" diff --git a/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/pkgs/applications/misc/j4-dmenu-desktop/default.nix index 9a60cd060f5..9896fd15b85 100644 --- a/pkgs/applications/misc/j4-dmenu-desktop/default.nix +++ b/pkgs/applications/misc/j4-dmenu-desktop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "j4-dmenu-desktop-${version}"; - version = "2.14"; + version = "2.15"; src = fetchFromGitHub { owner = "enkore"; repo = "j4-dmenu-desktop"; rev = "r${version}"; - sha256 = "14srrkz4qx8qplgrrjv38ri4pnkxaxaq6jy89j13xhna492bq128"; + sha256 = "1yn45i3hpim2hriaqkq7wmawwsmkynvy2xgz7dg6p5r0ikw5bn1r"; }; postPatch = '' diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/applications/misc/jp2a/default.nix index e552ac9777f..138ee397d3f 100644 --- a/pkgs/applications/misc/jp2a/default.nix +++ b/pkgs/applications/misc/jp2a/default.nix @@ -1,16 +1,19 @@ -{ stdenv, fetchurl, libjpeg }: +{ stdenv, fetchFromGitHub, libjpeg, autoreconfHook }: stdenv.mkDerivation rec { - version = "1.0.6"; + version = "1.0.7"; name = "jp2a-${version}"; - src = fetchurl { - url = "mirror://sourceforge/jp2a/${name}.tar.gz"; - sha256 = "076frk3pa16s4r1b10zgy81vdlz0385zh3ykbnkaij25jn5aqc09"; + src = fetchFromGitHub { + owner = "cslarsen"; + repo = "jp2a"; + rev = "v${version}"; + sha256 = "12a1z9ba2j16y67f41y8ax5sgv1wdjd71pg7circdxkj263n78ql"; }; makeFlags = "PREFIX=$(out)"; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libjpeg ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix index bda64765941..072685b8194 100644 --- a/pkgs/applications/misc/k3b/default.nix +++ b/pkgs/applications/misc/k3b/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CD/DVD Burning Application for KDE"; license = licenses.gpl2Plus; - maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ]; + maintainers = [ maintainers.sander maintainers.phreedom ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index c5bd9afd2cf..a5defaf5c29 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "keepassx-community-${version}"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = "${version}"; - sha256 = "0ncc157xki1mzxfa41bgwjfsz5jq9sq750ka578lq61smyzh5lq6"; + sha256 = "1zamk3dc44fn61b880i3l1r0np2sx2hs05cvcf2x4748r3xicacf"; }; cmakeFlags = optional (withKeePassHTTP) [ "-DWITH_XC_HTTP=ON" ]; diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix index 8ce74850e1a..1137d6c07f6 100644 --- a/pkgs/applications/misc/krename/default.nix +++ b/pkgs/applications/misc/krename/default.nix @@ -21,7 +21,7 @@ let homepage = http://www.krename.net; description = "A powerful batch renamer for KDE"; inherit (kconfig.meta) platforms; - maintainers = with maintainers; [ urkud peterhoeg ]; + maintainers = with maintainers; [ peterhoeg ]; }; buildInputs = [ taglib exiv2 podofo ]; diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix index 75b2da6e8a2..ed74eae46f3 100644 --- a/pkgs/applications/misc/krusader/default.nix +++ b/pkgs/applications/misc/krusader/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { description = "Norton/Total Commander clone for KDE"; license = "GPL"; homepage = http://www.krusader.org; - maintainers = with stdenv.lib.maintainers; [ sander urkud ]; + maintainers = with stdenv.lib.maintainers; [ sander ]; inherit (kdelibs4.meta) platforms; }; } diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix new file mode 100644 index 00000000000..8792a07e3e9 --- /dev/null +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, cmake, plasma-framework, fetchFromGitHub }: + +let version = "0.5.98"; in + +stdenv.mkDerivation { + name = "latte-dock-${version}"; + + src = fetchFromGitHub { + owner = "psifidotos"; + repo = "Latte-Dock"; + rev = version; + sha256 = "0z02ipbbv0dmcxs2g3dq5h62klhijni1i4ikq903hjg0j2cqg5xh"; + }; + + buildInputs = [ plasma-framework ]; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "Dock-style app launcher based on Plasma frameworks"; + homepage = https://github.com/psifidotos/Latte-Dock; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.benley ]; + }; +} diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index 3882f679cae..a1744f7a2c0 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "An openstreetmap editor"; homepage = http://merkaartor.org/; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric urkud]; + maintainers = with stdenv.lib.maintainers; [viric]; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/applications/misc/mpvc/default.nix b/pkgs/applications/misc/mpvc/default.nix new file mode 100644 index 00000000000..fffa9595262 --- /dev/null +++ b/pkgs/applications/misc/mpvc/default.nix @@ -0,0 +1,29 @@ +{ stdenv, socat, fetchFromGitHub, makeWrapper }: + +stdenv.mkDerivation rec { + name = "mpvc-unstable-2017-03-18"; + + src = fetchFromGitHub { + owner = "wildefyr"; + repo = "mpvc"; + rev = "aea5c661455248cde7ac9ddba5f63cc790d26512"; + sha256 = "0qiyvb3ck1wyd3izajwvlq4bwgsbq7x8ya3fgi5i0g2qr39a1qml"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + installFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + wrapProgram $out/bin/mpvc --prefix PATH : "${socat}/bin/" + ''; + + buildInputs = [ socat makeWrapper ]; + + meta = with stdenv.lib; { + description = "A mpc-like control interface for mpv"; + homepage = https://github.com/wildefyr/mpvc; + license = licenses.mit; + maintainers = [ maintainers.neeasade ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index e5c35c5290d..661f8dfe48f 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -1,101 +1,100 @@ -{ stdenv, fetchFromGitHub, pythonPackages, fetchurl }: +{ stdenv, fetchFromGitHub, python2, fetchurl }: let - tornado_4_0_2 = pythonPackages.buildPythonPackage rec { - name = "tornado-${version}"; - version = "4.0.2"; + pythonPackages = python2.pkgs.override { + overrides = self: super: with self; { + backports_ssl_match_hostname = self.backports_ssl_match_hostname_3_4_0_2; - propagatedBuildInputs = with pythonPackages; [ backports_ssl_match_hostname_3_4_0_2 certifi ]; + tornado = buildPythonPackage rec { + name = "tornado-${version}"; + version = "4.0.2"; - src = fetchurl { - url = "mirror://pypi/t/tornado/${name}.tar.gz"; - sha256 = "1yhvn8i05lp3b1953majg48i8pqsyj45h34aiv59hrfvxcj5234h"; + propagatedBuildInputs = [ backports_ssl_match_hostname certifi ]; + + src = fetchurl { + url = "mirror://pypi/t/tornado/${name}.tar.gz"; + sha256 = "1yhvn8i05lp3b1953majg48i8pqsyj45h34aiv59hrfvxcj5234h"; + }; + }; + + flask_login = buildPythonPackage rec { + name = "Flask-Login-${version}"; + version = "0.2.2"; + + src = fetchurl { + url = "mirror://pypi/F/Flask-Login/${name}.tar.gz"; + sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p"; + }; + + propagatedBuildInputs = [ flask ]; + buildInputs = [ nose ]; + + # No tests included + doCheck = false; + }; + + jinja2 = buildPythonPackage rec { + pname = "Jinja2"; + version = "2.8.1"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/J/Jinja2/${name}.tar.gz"; + sha256 = "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m"; + }; + + propagatedBuildInputs = [ markupsafe ]; + + # No tests included + doCheck = false; + }; }; }; - sockjs-tornado = pythonPackages.buildPythonPackage rec { - name = "sockjs-tornado-${version}"; - version = "1.0.3"; - - src = fetchurl { - url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz"; - sha256 = "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd"; - }; - - # This is needed for compatibility with OctoPrint - propagatedBuildInputs = [ tornado_4_0_2 ]; - }; - - websocket_client = pythonPackages.buildPythonPackage rec { - name = "websocket_client-0.32.0"; - - src = fetchurl { - url = "mirror://pypi/w/websocket-client/${name}.tar.gz"; - sha256 = "cb3ab95617ed2098d24723e3ad04ed06c4fde661400b96daa1859af965bfe040"; - }; - - propagatedBuildInputs = with pythonPackages; [ six backports_ssl_match_hostname_3_4_0_2 unittest2 argparse ]; - }; - - flask_login = pythonPackages.buildPythonPackage rec { - name = "Flask-Login-${version}"; - version = "0.2.2"; - - src = fetchurl { - url = "mirror://pypi/F/Flask-Login/${name}.tar.gz"; - sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p"; - }; - - propagatedBuildInputs = with pythonPackages; [ flask ]; - - # FIXME - doCheck = false; - }; - in pythonPackages.buildPythonApplication rec { name = "OctoPrint-${version}"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "foosel"; repo = "OctoPrint"; rev = version; - sha256 = "1av755agyym1k5ig9av0q9ysf26ldfixz82x73v3g47a1m28pxq9"; + sha256 = "0wyrxi754xa111b88fqvaw2s5ib2a925dlrgym5mn93i027m50wk"; }; # We need old Tornado propagatedBuildInputs = with pythonPackages; [ awesome-slugify flask_assets rsa requests2 pkginfo watchdog - semantic-version flask_principal werkzeug flaskbabel tornado_4_0_2 + semantic-version flask_principal werkzeug flaskbabel tornado psutil pyserial flask_login netaddr markdown sockjs-tornado pylru pyyaml sarge feedparser netifaces click websocket_client scandir chainmap future ]; + buildInputs = with pythonPackages; [ nose mock ddt ]; + # Jailbreak dependencies. - # Currently broken for new: tornado, pyserial, flask_login postPatch = '' sed -i \ - -e 's,werkzeug>=[^"]*,werkzeug,g' \ - -e 's,requests>=[^"]*,requests,g' \ -e 's,pkginfo>=[^"]*,pkginfo,g' \ - -e 's,semantic_version>=[^"]*,semantic_version,g' \ - -e 's,psutil>=[^"]*,psutil,g' \ - -e 's,Flask-Babel>=[^"]*,Flask-Babel,g' \ -e 's,Flask-Principal>=[^"]*,Flask-Principal,g' \ - -e 's,markdown>=[^"]*,markdown,g' \ - -e 's,Flask-Assets>=[^"]*,Flask-Assets,g' \ - -e 's,rsa>=[^"]*,rsa,g' \ - -e 's,PyYAML>=[^"]*,PyYAML,g' \ - -e 's,flask>=[^"]*,flask,g' \ - -e 's,Click>=[^"]*,Click,g' \ -e 's,websocket-client>=[^"]*,websocket-client,g' \ + -e 's,Click>=[^"]*,Click,g' \ + -e 's,rsa>=[^"]*,rsa,g' \ + -e 's,flask>=[^"]*,flask,g' \ + -e 's,Flask-Babel>=[^"]*,Flask-Babel,g' \ + -e 's,Flask-Assets>=[^"]*,Flask-Assets,g' \ + -e 's,PyYAML>=[^"]*,PyYAML,g' \ -e 's,scandir>=[^"]*,scandir,g' \ - -e 's,Jinja2>=[^"]*,Jinja2,g' \ + -e 's,werkzeug>=[^"]*,werkzeug,g' \ + -e 's,psutil>=[^"]*,psutil,g' \ + -e 's,requests>=[^"]*,requests,g' \ setup.py ''; + checkPhase = "nosetests"; + meta = with stdenv.lib; { homepage = "http://octoprint.org/"; description = "The snappy web interface for your 3D printer"; diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 2f894514c51..8bc4a22bc92 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, octoprint, pythonPackages }: +{ stdenv, fetchFromGitHub, fetchpatch, octoprint, pythonPackages }: let buildPlugin = args: pythonPackages.buildPythonApplication (args // { @@ -23,6 +23,11 @@ let patches = [ ./m33-fio-one-library.patch + # Fix incompatibility with new OctoPrint + (fetchpatch { + url = "https://github.com/foosel/M33-Fio/commit/bdf2422dee3fb8e53b33f087f734956c3b209d72.patch"; + sha256 = "0jm415sx6d3m0z4gfhbnxlasg08zf3f3mslaj4amn9wbvsik9s5d"; + }) ]; postPatch = '' diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 49bcd4fe90a..3c42e8d8fcc 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "pdfpc"; - version = "4.0.5"; + version = "4.0.6"; src = fetchFromGitHub { repo = "pdfpc"; owner = "pdfpc"; rev = "v${version}"; - sha256 = "13spngkp0lq2qlw4mxsngx4ckr201axzn5ppjax0bhlckirvzr2s"; + sha256 = "05cfx45i0xnwvclrbwlmqsjj2sk1galk62dc0mrkhr6293mbp1mx"; }; nativeBuildInputs = [ cmake pkgconfig vala ]; diff --git a/pkgs/applications/misc/pdfshuffler/default.nix b/pkgs/applications/misc/pdfshuffler/default.nix new file mode 100644 index 00000000000..e01956e3611 --- /dev/null +++ b/pkgs/applications/misc/pdfshuffler/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchsvn +, wrapGAppsHook, makeWrapper, gettext +, python3Packages, gtk3, poppler_gi +, gnome3, gsettings_desktop_schemas, shared_mime_info, +}: + +python3Packages.buildPythonApplication rec { + name = "pdfshuffler-unstable-2017-02-26"; # no official release in 5 years + + src = fetchsvn { + url = "http://svn.gna.org/svn/pdfshuffler/trunk"; + rev = "20"; + sha256 = "1g20dy45xg5vda9y58d2b1gkczj44xgrfi59jx6hr62ynd3z0dfc"; + }; + + nativeBuildInputs = [ wrapGAppsHook gettext makeWrapper ]; + + buildInputs = [ + gtk3 gsettings_desktop_schemas poppler_gi gnome3.adwaita-icon-theme + ]; + + propagatedBuildInputs = with python3Packages; [ + pygobject3 + pycairo + pypdf2 + ]; + + preFixup = '' + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") + ''; + + doCheck = false; # no tests + + meta = with stdenv.lib; { + homepage = https://gna.org/projects/pdfshuffler/; + description = "Merge or split pdf documents and rotate, crop and rearrange their pages"; + platforms = platforms.linux; + maintainers = with maintainers; [ mic92 ]; + }; +} diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index 0aeb7d7eb8f..4f95879d5eb 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -1,25 +1,44 @@ -{ stdenv, fetchFromGitHub -, qtbase, qtwebengine -, qmakeHook }: +{ stdenv, lib, fetchFromGitHub, procps ? null +, qtbase, qtwebengine, qtwebkit +, cmake, makeQtWrapper +, syncthing, syncthing-inotify ? null +, preferQWebView ? false }: stdenv.mkDerivation rec { version = "0.5.7"; name = "qsyncthingtray-${version}"; src = fetchFromGitHub { - owner = "sieren"; - repo = "QSyncthingTray"; - rev = "${version}"; + owner = "sieren"; + repo = "QSyncthingTray"; + rev = "${version}"; sha256 = "0crrdpdmlc4ahkvp5znzc4zhfwsdih655q1kfjf0g231mmynxhvq"; }; - buildInputs = [ qtbase qtwebengine ]; - nativeBuildInputs = [ qmakeHook ]; + buildInputs = [ qtbase qtwebengine ] ++ lib.optional preferQWebView qtwebkit; + nativeBuildInputs = [ cmake makeQtWrapper ]; enableParallelBuilding = true; - postInstall = '' + cmakeFlags = lib.optional preferQWebView "-DQST_BUILD_WEBKIT=1"; + + postPatch = '' + ${lib.optionalString stdenv.isLinux '' + substituteInPlace includes/platforms/linux/posixUtils.hpp \ + --replace '"/usr/local/bin/syncthing"' '"${syncthing}/bin/syncthing"' \ + --replace '"/usr/local/bin/syncthing-inotify"' '"${syncthing-inotify}/bin/syncthing-inotify"' \ + --replace '"pgrep -x' '"${procps}/bin/pgrep -x' + ''} + + ${lib.optionalString stdenv.isDarwin '' + substituteInPlace includes/platforms/darwin/macUtils.hpp \ + --replace '"/usr/local/bin/syncthing"' '"${syncthing}/bin/syncthing"' + ''} + ''; + + installPhase = let qst = "qsyncthingtray"; in '' mkdir -p $out/bin - cp binary/QSyncthingTray $out/bin + install -m755 QSyncthingTray $out/bin/${qst} + ln -s $out/bin/${qst} $out/bin/QSyncthingTray ''; meta = with stdenv.lib; { @@ -31,7 +50,7 @@ stdenv.mkDerivation rec { Written in C++ with Qt. ''; license = licenses.lgpl3; - maintainers = with maintainers; [ zraexy ]; + maintainers = with maintainers; [ zraexy peterhoeg ]; platforms = platforms.all; broken = builtins.compareVersions qtbase.version "5.7.0" >= 0; }; diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix new file mode 100644 index 00000000000..fa160c51fe2 --- /dev/null +++ b/pkgs/applications/misc/stog/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, ocf, ptime, + uutf, uri, ppx_blob, xtmpl, ocaml_lwt, higlo, camlp4, omd +}: + +stdenv.mkDerivation rec { + name = "stog-${version}"; + version = "0.17.0"; + src = fetchFromGitHub { + owner = "zoggy"; + repo = "stog"; + rev = "release-${version}"; + sha256 = "06fnl3im0rycn05w39adfmm7w4s8l3jrj43h8f8h3b56grh21x0d"; + }; + + buildInputs = [ ocaml camlp4 uutf ]; + propagatedBuildInputs = [ findlib omd ppx_blob ocf ptime uri xtmpl ocaml_lwt higlo ]; + + createFindlibDestdir = true; + + patches = [ ./install.patch ]; + + meta = with stdenv.lib; { + description = "XML documents and web site compiler"; + homepage = "https://zoggy.github.io/stog/"; + license = licenses.lgpl3; + platforms = ocaml.meta.platforms or []; + maintainers = with maintainers; [ regnat ]; + }; +} + + diff --git a/pkgs/applications/misc/stog/install.patch b/pkgs/applications/misc/stog/install.patch new file mode 100644 index 00000000000..a2407d3079f --- /dev/null +++ b/pkgs/applications/misc/stog/install.patch @@ -0,0 +1,18 @@ +diff --git a/src/Makefile b/src/Makefile +index 736dd037..79a85b9c 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -431,11 +431,12 @@ install-lib: + install-share: + + install-bin: ++ mkdir $(out)/bin + $(CP) $(MAIN) $(MAIN_BYTE) $(TMPL) $(TMPL_BYTE) \ + $(SERVER) $(SERVER_BYTE) $(OCAML_SESSION) \ + $(MK_STOG) $(MK_STOG_BYTE) $(MK_STOG_OCAML) \ + $(LATEX2STOG) $(LATEX2STOG_BYTE) \ +- `dirname \`which $(OCAMLC)\``/ ++ $(out)/bin + + uninstall: uninstall-lib uninstall-share uninstall-bin + diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/pkgs/applications/misc/terminal-parrot/default.nix new file mode 100644 index 00000000000..a34c5e4766a --- /dev/null +++ b/pkgs/applications/misc/terminal-parrot/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "terminal-parrot-1.1.0"; + version = "1.1.0"; + goPackagePath = "github.com/jmhobbs/terminal-parrot"; + + src = fetchFromGitHub { + owner = "jmhobbs"; + repo = "terminal-parrot"; + rev = "22c9bde916c12d8b13cf80ab252995dbf47837d1"; + sha256 = "1mrxmifsmndf6hdq1956p1gyrrp3abh3rmwjcmxar8x2wqbv748y"; + }; + + meta = with stdenv.lib; { + description = "Shows colorful, animated party parrot in your terminial"; + homepage = https://github.com/jmhobbs/terminal-parrot; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.heel ]; + }; +} diff --git a/pkgs/applications/misc/tnef/default.nix b/pkgs/applications/misc/tnef/default.nix index 9e3cf011316..604c9f59e60 100644 --- a/pkgs/applications/misc/tnef/default.nix +++ b/pkgs/applications/misc/tnef/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, lib, autoreconfHook }: stdenv.mkDerivation rec { - version = "1.4.12"; + version = "1.4.14"; name = "tnef-${version}"; src = fetchFromGitHub { owner = "verdammelt"; repo = "tnef"; rev = "${version}"; - sha256 = "02hwdaaa3yk0lbzb40fgxlkyhc1wicl6ncajpvfcz888z6yxps2c"; + sha256 = "0p7yji5hqq7k4pcba1cnv4jkl0fkg7jd77c1q164wk0vwinpmsc2"; }; doCheck = true; diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix new file mode 100644 index 00000000000..a3fa8924df7 --- /dev/null +++ b/pkgs/applications/misc/veracrypt/default.nix @@ -0,0 +1,45 @@ +{ fetchurl, stdenv, pkgconfig, nasm, fuse, wxGTK30, devicemapper, makeself, + wxGUI ? true +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "veracrypt-${version}"; + version = "1.19"; + + src = fetchurl { + url = "https://launchpad.net/veracrypt/trunk/${version}/+download/VeraCrypt_${version}_Source.tar.gz"; + sha256 = "111xs1zmic82lpn5spn0ca33q0g4za04a2k4cvjwdb7k3vcicq6v"; + }; + + # The source archive appears to be compressed twice ... + unpackPhase = + '' + gzip -dc $src | tar xz + cd Vera*/src + ''; + + nativeBuildInputs = [ makeself nasm pkgconfig ]; + buildInputs = [ fuse devicemapper ] + ++ optional wxGUI wxGTK30; + makeFlags = optionalString (!wxGUI) "NOGUI=1"; + + 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 + ''; + + meta = { + description = "Free Open-Source filesystem on-the-fly encryption"; + homepage = https://veracrypt.codeplex.com/; + license = "VeraCrypt License"; + maintainers = with maintainers; [ dsferruzza ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index 0ea1159208f..b372cd5b2dd 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/misc/xfe/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://sourceforge.net/projects/xfe/"; license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.bbenoist ]; + maintainers = []; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/xrq/default.nix b/pkgs/applications/misc/xrq/default.nix new file mode 100644 index 00000000000..c0c5616db79 --- /dev/null +++ b/pkgs/applications/misc/xrq/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, libX11}: + +stdenv.mkDerivation rec { + name = "xrq-unstable-2016-01-15"; + + src = fetchFromGitHub { + owner = "arianon"; + repo = "xrq"; + rev = "d5dc19c63881ebdd1287a02968e3a1447dde14a9"; + sha256 = "1bxf6h3fjw3kjraz7028m7p229l423y1ngy88lqvf0xl1g3dhp36"; + }; + + installPhase = '' + make PREFIX=$out install + ''; + + outputs = [ "out" "doc" ]; + + buildInputs = [ libX11 ]; + + meta = { + description = "X utility for querying xrdb"; + homepage = https://github.com/arianon/xrq; + license = stdenv.lib.licenses.mit; + platforms = with stdenv.lib.platforms; unix; + }; +} diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 20a7743439a..176784ea7a4 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 = "0bbr5wr5icrw5101dlhyn20pg28mah7w4vk365i4gf6a1zvyrd8n"; - sha256bin64 = "0dx9ivjc7avm0zgw0jcx5mmlzapwc2lp1sdjpwgd4y0iai1zr3yw"; - version = "57.0.2987.98"; + sha256 = "1rpmi9dl98948a2ll7q0sagyx8v27mmwa2j6fmvfx6r1mwpvbrgz"; + sha256bin64 = "1xj1fl0k0ck4pxl4q0cdhi55sqfmwbb1vcjj70idlz166ll8lpxh"; + version = "58.0.3029.19"; }; dev = { - sha256 = "1i6qr1ypjww3q59lqg60xpns8xqxxrkd0yrpyx96alb1bp22x85p"; - sha256bin64 = "1ahp99p4hi8r2bvkdpnkakwkpmmnndjn299axc7cafz85zs6z9vl"; - version = "58.0.3029.14"; + sha256 = "1rpmi9dl98948a2ll7q0sagyx8v27mmwa2j6fmvfx6r1mwpvbrgz"; + sha256bin64 = "1wx5r3vmmki419llki0ls6y4z6r93zm66v2h4vnxswjb77svl578"; + version = "58.0.3029.19"; }; stable = { - sha256 = "0bbr5wr5icrw5101dlhyn20pg28mah7w4vk365i4gf6a1zvyrd8n"; - sha256bin64 = "1qs8pmfasf3j84pjf4fnf6yb0pfa2hdgicskvfmr1sqy7c7yg348"; - version = "57.0.2987.98"; + sha256 = "1r495ffcwxsd4pxn5akfr7k9iiv1dj0zq6w9i6xxii8knf8a40va"; + sha256bin64 = "04ig9q8j4xbgq749qprfddlgpm6g28jjvwwnqmvinymnrh4vc7cn"; + version = "57.0.2987.110"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index 06aca4b58e3..69b14db7047 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -1,925 +1,925 @@ { - version = "52.0.1"; + version = "52.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ach/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ach/firefox-52.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "9005c3ebc0eebb7e1b29384e931ed5c2b888d0d55c8a3f34133dda908b82df0a437c5f2a6f91288396306e161fd82df2cca4f2c49685f898760b125b6d7743dd"; + sha512 = "5fbb048cce8addbbf8b985920a44fcd2580a31ebead7f1c9029287245bcdefffbe6c73d887da08dc7ffcbbd1f35ac235af59cc900519b49eb6d741a610b4d538"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/af/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/af/firefox-52.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "8b5e3fba883af6b097ec61bb79d3e024e55c59e9f1c3f443f74e944b9b71d56ac8ce7199bbdabff06087e0082db618636d3fc832fdde926a35877046c7baf740"; + sha512 = "e48997da8e26a95c479804b4dbe75d5513574f9301b264f8f28bb8e2b2982b5d69792a454239ea6e8c384e2e5015bb1842dde450411f0019e5f11e0e19eedc33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/an/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/an/firefox-52.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "cf0949e99606dc9f961da9f8324f96f5873ea3f7fc0454aebbf982b43704ae71575371fc8bad84b036348f206e9112ef251a0939185f39d3f0ff15aa3dcccbc0"; + sha512 = "18ad310dc853078f556af387afefb6a4adbfa9b3db1ac3a710963510ab0b40acceae50d79cd4d851b1c6d114bdf555f792fddeecb53e0e00bce3c9827dd2ebb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ar/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ar/firefox-52.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "202e602cea8fab71cf3b0cad522986904fa328e181599d7005e7668a115edc3eedc3d03a66eee3a3f2ff3b07b36b43394ab90e5ddd915c89550302c203ce0a27"; + sha512 = "8cd1078dbba732b635dae123206b0c5c312fdc1cc9c77271f451670e45f54fc13cda66623d2d6bbf4d99b94c463fd35300ebf6372d0b7206c493966f5aaff7c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/as/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/as/firefox-52.0.2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "9eaaad262dbe64e70d21b651f847abeac51c66fc9ee6116847440e4217dae28bbc28d54c8d90ec7e35dc614170c86fd66bbe4d7d4e26359769d3022c3b1194fe"; + sha512 = "e11476e2b9da554583fb2b5c8ce47b4e96a8de888a10191822fb8afa646da260df8517b3109853d08f2dad591e40c3bf20ab2bb101ec3bdac480d87a68cb9d03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ast/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ast/firefox-52.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "93bbd1bffd278e0b9ad3f137bfaf28ba0defc95c7c9c646daf034be198051fff59e3905bac5fbddb7e6e4565e21424e0de7fa1d223ff9367d165877fcea88675"; + sha512 = "a476386d83f4b0ac51d9b21c5fa2a9c0a0241a17334f090528a9115c83fcd2aca302ae03ad3263b894ed4f1bef5fc3fd07f33d06ec2be493175fae0c155579b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/az/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/az/firefox-52.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "a7a431a8d9aff2ed8dec35b60c0802825a69ced5de4683c006feaaf2f7e05c5d19f3944fa2598be2dc6b3013e6483a0897a5924d648a8663e2a7f2647d86d491"; + sha512 = "da12bb98f708cc7c30005581e0c17c2af7231a61042e6a5b94b6b15c802dbb4d5cd34e8f6ccdd8f919a6f369b7bf76cefd637eda2529fe3cc29a33850174eba6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/bg/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/bg/firefox-52.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "edf77b166ce81c45f823d1e672ad17b9da4fa598322110c57866d32366e4df99c5b61ad96a5dd6696c5c7af4d8af941d32eedaa4e998e3cdfec1fb7512e2e503"; + sha512 = "2beb76258e0addde9d4e5e478830e8ca04816fc4ae4964e1a74b7dc919144b5b811b075b6a8808032c9f343ab2d74dca00c2d73f9fd9e8ea5d72078225f43227"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/bn-BD/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/bn-BD/firefox-52.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "97b39ab362e5c99be87408bf69ac25fa9385a6fa9131e0cb653ab04993e379de1624df6cede9862535cb301244ab16e8356c243ce15970a0e292317c84399426"; + sha512 = "ec5133db8877cc50159fac7ecae02cc7c084ce1b8183f88e654355fcc0467b593d4a7099b100746bf26dfeece89a2764bb42a728b1dfde7e87a6140ca9674f5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/bn-IN/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/bn-IN/firefox-52.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "8b49ee12c9e9516348268a595b51a808dedb505b94c35ac55e357046e9346998ccc2b94e7540a749dec2c87b3ad6be95dad2f00edf8873feacef2fed162bba2c"; + sha512 = "5333c97ec057f5fa5323a82bc81b93511fb5770df9937b679085f9ccb02ac02d35800427ddc9ef3d009e4042b95926796a5cdfd8cad7608d150248ca8677905f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/br/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/br/firefox-52.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "b464d2da9bb8a734974e35740c8609ceafc7b731feffdc250fb16d9210c895f582f9e3faac3f70484d76b8c37f435163d6b3d1c0f9c1388f9bd1f473eaad42fe"; + sha512 = "d9259119132d42aa8eb8ac07378ec87e58b724173dcd0540ffedc116448dbf8f0abf51c438533ea6ec69b882a423c2fa8a65a448ffee05af5cefbe5b06837778"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/bs/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/bs/firefox-52.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "f323bfb8893c0899810e7f58ce72e569771de10e50d1f711a52df627bd074d95532d09bd9c3dc5579876ef32ba3302e3ec6799f7d8e93fa4830d6584d8a69e1b"; + sha512 = "8afe61d4d2bdb40d21d0673569b6b0514c559e492c9a736e0ab56f5bf35f07dd727a5a11c049a0d3a1eed211584d511bbca2c5248a54ed43779183301c4b207d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ca/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ca/firefox-52.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "717cba2c2f690051e60a71f74e0b33d7792ddcf574cf65388de6780bf9bed90c231187a39357332bd389be83279a3b00778a04149adfaefbb6a1047077ff886c"; + sha512 = "7ef55d89c32e45cb84aa2568d053d0950dd0e0f448056a7c6b9dff55484e0b2a0a81183bcb7708a8f85e2fdafd794b846ba4672b447cf987f903df04617cad99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/cak/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/cak/firefox-52.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "53c5a18b593450cac1336b6b16767bde7e3feb8575a5f32e00f57963daaea6a14276679378dddbeed4bf729ce55e929670ff79a65e2b3bc2da882d19a4c750af"; + sha512 = "341739dbddac50589949738376aafd039029b7e566d02d6beb71d00dcfb27eab8fc36129273eaae983bcfb0cfe0f266ea7e2b1613a95515b5ed129d0d13763c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/cs/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/cs/firefox-52.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "464b3b2d86256fa941a8cbbc04e68452961e8562194abc14e3e972a15ac7ccd59472e41e9a3c80ea92e5ddebaf2f56c6ff297efdfa25d3d9a892ce6d75612c14"; + sha512 = "8a03c8f2487d853d3c662510d486a4349b5f1c94d8064f38291b231e7a4ee1b02ea58d22324cf6cbb2c02e490e49244d99a20f1cf432e2da0c882fdb5436e3a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/cy/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/cy/firefox-52.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "00fc374e844bc59793e60d7813c7c2a255d6fcd62994455eb55a014743bec81b2eb5fa31ba39219d1d7ecfc79751f62913b3dd786d62227bdfb030f7c2d24c3c"; + sha512 = "d22710f178f69efad411f8619a618264ab8b678f3156f1ba8ed4c1c15fb9598f8cda42840837e0bf62024cd160b1b4bbe3002072852c007d905486dd04eec617"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/da/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/da/firefox-52.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "d61608a98197a6c48bc38edbcdfa7cc821fba8221c16534ffe67e6a013e5b1ba23011c3524a8e8f2b07e6f5c86952854cadb4c8b8d04f945f2e6dbfb1fb4aeff"; + sha512 = "ed130939217b4a2fcffa91ad7112a5485752baac2834adb30a2ee5915a905a3383fdbe651b268d0c245920d608de80a37dca01ca6380cb6aede5bbfd8dd757f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/de/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/de/firefox-52.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "af188724c00163656584d8e28bab102ac3660353a6f78c703b9fa336f1996e7b3598144d0862e31de595b0b40d5345527dbd2c515009f93af9c4452f7faafd25"; + sha512 = "a16eda9c74517026092169ec9caa4e13876760e9e05774c70fd4148653e0198ed000f9ff3f6dd4224b8aca5fd5fcdb7dd3bb60043f9d4c32d93909f879f35e16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/dsb/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/dsb/firefox-52.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "a15754dab9300b45db4369e84f5adad3231763d0de944c589ebb90789b80116233ad159f90ce6ab5275e6e53266e09b1095905fcbca3b857318608174a776a13"; + sha512 = "9e379f2d6ceacb223e4255c0ca89a6c1f13ed877168a06fc76b181d8b4476e9eb51a3f25a3be9853239363bcdad91f50cf8b2abe67ff937ec73fbedad1d03630"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/el/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/el/firefox-52.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "fbefdf3d5f155e726132eac8eb61e2f94352a5377502b9f56e128c386e7950b4a9718c1c50782ef2e98cb2e4c5bb4eeacc11f200ca36c97baa0ad0adbe14b9ed"; + sha512 = "b62e72b5583b204d121ca8739f83c57aae4a39467d8d0f7b48f5bd894c69f3a9c8689d6840f5b0cf9bdff94b669fff520b2a3d4478fd6b35637eb2ff597e3fc5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/en-GB/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/en-GB/firefox-52.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "6d492447da62f9d0f759c67b50b88bad0346a9d932f3eea2959b105395488dceb2a773f51c3e75ca97fca4426c3110ce1209fbbed4900f9d7bab1d78e5ec6883"; + sha512 = "48bd9c2281d5f87b694b06354e35090ee940eb81a3c2fc05c0bd84a312b96952bc627995359eabc43fe12da6f7879c86f2e85efb0cddca5b4bb9a7a1eb7b6842"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/en-US/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/en-US/firefox-52.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "186ddb8b223a968c4a4364dd0ea6a1492149e2290056f3fda58a1436f37312374c1e07775244debecd1044eb51586f43b893b82add94971eacbc86414757c0fd"; + sha512 = "f84b186c83e7cc3cc2bcab136029e299cfb4cbf89891f07a7f0c79584df18c914c24c51615e6bdb677571e194e964cd6d49cdf10f76f68f3b7b9bcaae50ceb3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/en-ZA/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/en-ZA/firefox-52.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "1aa8e9c6de59af862b0578b6ff44d3a0e98827c6ddb8ad31d4e6de3f26768b7e302252bb76a7c9c8e0494b49d820806b00d9d89c1618eb44d307bcece7345f01"; + sha512 = "f7d93f3b87b7b544b8f9e216e44c1198664651e338cfca2ed80c0b1da58f5ebc4e3ddff846fc24817fc990bc0fc4e71dc9ccab7536fbf00038c89b74c9792ff4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/eo/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/eo/firefox-52.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "5f1b247a37d72c0587ade24f4f4a9fb79f25bd8395e5777524a877d0854cfbb921b62e07a4662d8992d02fc1de6c318d2e28cd3cbeef5ec26ee9f2ef25e87939"; + sha512 = "48a53a09475afb8a869d132b7d0eb9a4a95b51fa5b67660bad0ef2b85fb5fbeab8f1b87b1b11292be1449735abad8905aa5a35e23c3f9d04b23f8abc775309a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/es-AR/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/es-AR/firefox-52.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "e6f1f54b43da0740b14bed00b45db2ae2d23735cbf9baff26b5d828f2e20161b8527d10ac2c2a63351122b7d3f8a2ac4b0d546f136ad063b75eab7255b16ab29"; + sha512 = "f95ab62d722f2c4417dae3d95e07bff50cd94db863988f6216234a2781711b5ad6479276b213abf470be174a8130ae5fb40cca79cffd67acbee6a6d583e5131a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/es-CL/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/es-CL/firefox-52.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "9cb2f8c9aac77caeff715e687d239d9a57567e079c61efeec5647eaa65bde141251285509ea066a4f8a053986119cdf731a6d7ba182660ade5e2948cdee0352d"; + sha512 = "ec9ec0fd29ca215de08656582738d0f00206c38ae9d52516abe8499c107af8b85567b96bd71345deb9e8eda98ca16ea5a6e89fa87769e65aa43832011eb36abd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/es-ES/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/es-ES/firefox-52.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "21254e11b51050a422ba68ac9df14be6f7f672518a7473e874145f7ff07f9071ae315c0d7395940c38caa8735bf53242f63658f3c2a9cfe12320525e24ded2d1"; + sha512 = "b84b43d975d5848355d10e88ee131ab85cf3bd4f2f48668d2d75752b7e5d517e9aaa32eb7a482d768f5bb9512dd79240f6ffa3947ce21c377f632ed2c6ad3bdc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/es-MX/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/es-MX/firefox-52.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "98629639d6f6cf4c59ef294dc6b1bc3677babaf9130506e940e288beb4253406862484f1a0953accd25ee10492a5bb3578bbf692b61e7ee36a0b238e7ce6f317"; + sha512 = "dd6c3ea08ce626ce5ac6ea14bbbff373394da116d386714d9a5eb62a5ceb50975e2246ab30948569693b75fd5ae63adf7bd76e6b694601e7968ea8e5d5426b6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/et/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/et/firefox-52.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "affc635c93901437f078bc4bb07c7f22939429ad20e0ef5171ee53762fe31124115892d77519d6ff59f86d19170ba239cd895273ac84f26aec4283323d7f7682"; + sha512 = "0941ff6cceb4aa355933a4d631af009757c1be88d63568d3087685407d5162630012b1a3746ce23166cc31f56629d017efab1fb1c3fd7a9e7b62e61c01fb004a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/eu/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/eu/firefox-52.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "2891294c7e382ac55a9c210d7e824479baa281eec8fdbd6cad6d1dea0baf08caa9051f49530c1aca11b71ce5d50fa475a1e192490c232170ffdb9aafa47d1458"; + sha512 = "fa7d4950f1ff3414961ad2a0caf1d1beabe9522694baa212c7c58b91681c7971fe323b9b85296021635c805b853ae4de12428ea6ff83696c04c37a8442a03538"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/fa/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/fa/firefox-52.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "b7df64d26a1155616ef70a8cb99192ab5d9624a4b0649f5829dccdd2fe833cf4aac3aaff86939adb228487b9a75e7fbddd6bbecb3345a3a42113863cf466cb0f"; + sha512 = "c31fc76bb460b0a18a8b8acbccd0e09491da203a8c88d238026192d2ce0c0b0b744286ed84363b6b1199c3d6bb92a2ae69c4897b82c6d4c46864d1a03fe6502d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ff/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ff/firefox-52.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "1341979a105df3a1cd5beca0e99ed6cf177e5245ee550decb2df3b06c867cf629522fda9826a69826a1e5676d728d16315e3822a71f523691d68a5114e68fb6d"; + sha512 = "0349ff6ae8df062abbcb7a98d5d832c30b7abb8a2c9e9bb87d1646612ce81b7932a4ad1cef77e853bbe644bbd1285fb8aa156417209fbb20020e9b92b5c30ccc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/fi/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/fi/firefox-52.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "01347d4f9d4cf31b3d2c2bca5206ef80123ef4f3b96cab6d9aaee503c497df2ae0a8099e28e9de410a3baee4d7b950f2c840056b690b528dbae5759fdad7e3cf"; + sha512 = "b3ca267bb15fc2351164b2b561a399c7063d5e391a263f4a62bd7706de85e8720461a05b715fc3eb472ca3ff959464d0ceb20f86628553c6c39e74388c8b1722"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/fr/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/fr/firefox-52.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "6d5eb134e9b75cdc0f0e4f4119c74f7aa73bd5c4512ebd0371c4ec330ca0c5414b9e6d398ae67284d73011e42ce6ab6e8ef4014cb7d6133d284abae159eae2cf"; + sha512 = "f66d0139e7ab051e06fe73c11b2d2cf88ec1587fdd6787a4eaf6cc53358e4dacda5dba41dac46aa0eee2362740ba37a0fc728445d4182eea53d69dc4dc24bedd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/fy-NL/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/fy-NL/firefox-52.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "71e9ad99c3bfe723285ce4437a9b1a5506279186b8f144520e3479ff463d792ce3a53b7681a03de055d69849382616986f383ddc5e59eecd5502fd6a6f745819"; + sha512 = "e0dd7577c12a669259204157d2a65ec00eac52beb91a1fe3d69bcd92705c9b27ea0010bb4a50dbb7f9e87e1161eb089e966b60f4db304b24ba4929468d7d62a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ga-IE/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ga-IE/firefox-52.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "9fae8bdc0b63bc38672f9f7cd3fe6d995d2f2131d4d4ca5f18dca0be21294e8e2328dcca6e630467929764a300f6fd9b82c080afe02a072d4e81f1874894e1b6"; + sha512 = "10c7729dc2a774f09e44a3dfdc6635892efc7d9ed3e57ae5e6455c9221201d47f9228311c11d7220eaa5d40bc1e6af81fd1933c1b93f2a29cc37b5913ccbd366"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/gd/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/gd/firefox-52.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "750dfe9668cc811e9b72e792223640bda908e5273f03b46e2af68614a070fee1fad999119d750e74eb42c6118dd5b4212c0cd75b3d8f9dc842c6af907938390e"; + sha512 = "1a957c457be0b85b5623e730513c006d6ac5d783e8d6ff714ef6a46e89b4e4779f32ba6705b35da9c65949de433ac261653515adcc8ba7ff68dc6b727687f71a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/gl/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/gl/firefox-52.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "dda00c0b6f88dc20516f65781ff9d96e45934c1f92138a1444aa83264a2aea85ea075376af91f71c5311c684a5f9aa9cccb63d67b4a3f2a96045540a161d36df"; + sha512 = "75142b0a03d075938e1a221fb78b9d7833e70d55982f3b710ee6e9c664b44289c7b34d883e20cef27376c8836f26abfb15d8078bc6536f9fbdbbb085c101c04d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/gn/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/gn/firefox-52.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "4638c96bb72a53c2c8add3c7f767d58a9dc62ac812665aaa1c46ce840d3f4367a9cd7024794b38ab7e8c2e21ecd2bc94ceb38606dbd1f53b8b2dc1751fd1bb5e"; + sha512 = "41809ce36cb357a0bb82ab5f22c747ce234ffb670fafc7dc695b75675f6192d5b251ca060d3f54c16ccfe9680939313c32a00cc2551d376420c2b7240654c7c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/gu-IN/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/gu-IN/firefox-52.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "41af30d770df6c5dde5e55e61ac4f5ac8a6b28bac27c554ab023171ad5eaa973c3b80f64e3ca9fb5db9c7d7943c9c9438ab7b37880f673a1a418e70ddde74624"; + sha512 = "c6608688782cea5f8c96250590dd71659c80918b1219a6bd95c6825abe19fb2310e16a275018be1b828a2c49fc1b457ba922e504e9794d6ffde0a940d4569708"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/he/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/he/firefox-52.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "023359000792e3ad54764abbb46c3708f248730e5f1c8c067b1bdb81d1fbde83ef44233ab3177fad322b50329c5663aa7a0c89e820a2c8efdafe5b92f134a0e8"; + sha512 = "bde85d84e3a52c2ff7345b5f1fafb9badc4ced0ab53cf46e2376d0fbd2a73deacdf48a2a874f09937761a9242c8a95836441332fbd2b8c26ce62835f0da621dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/hi-IN/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/hi-IN/firefox-52.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "c2f26a610fec1c18333a01a5e7d44af1303366e9bb071ee945588b5886ce17670ea34c5bda3be647b4067dbb9a6e3f7c9c0751f7a39cc8463bf6c690e2460198"; + sha512 = "3ab61abee1275844f906c09d17b986d0ec22345a0c49fd6ce262098495ad90a754cd671df65b2669193b24601eb037e3241d49ddaf29fc3b755c58ad9d6d7280"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/hr/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/hr/firefox-52.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "68c04f03fe526b16552a734bc2ddad6dbbe276572586a3ffbe0ad90b8bda7f943fc107eccc9679f0778ca1fc61c475a3b519581c105ff526ff4d4896a6c41eaf"; + sha512 = "5036e514a41103bc880ae6d6ac16da37570230026f9301c6d831ac88461783072149a252d647b0d8bc6af9e22b5c8845e368cb3d986c8a9020af56f29bfc2094"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/hsb/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/hsb/firefox-52.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "b07a88ad8c041444a46ae81608de6048e05366fa0756270b4266c2a613246eaba0d7993e589556a92425558a106aa5e7a18d69423d680cd44cfaea6c64a64fc7"; + sha512 = "ae110953078579fcf38d3ed24b6ecdade9e4de270ad77d757a1a4a413766b50a9d1ee9faee3986d30f18b9702d25a097e491c5a9d4f33ffa195bb9a52c3ca77c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/hu/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/hu/firefox-52.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "14ac0e6a21bed1fd94f67bd04e4b93133c7a1e37b66b84effd2212df0561b88762dc1f4a218487077c060f72fa13cac14d5f8d0d70e016bcef624b6a2c2cef0b"; + sha512 = "e236dc28c60ce2958557bc76dd80fc8f5dad8aaa9a1fd89aba168d1f84ec15512fd5b5967b5d518b8d1ddaf7399ec1cbc775774cd46480c5ea345ca6f0e12476"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/hy-AM/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/hy-AM/firefox-52.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "8d7808b549c8faee13a06671bd81c46fd896ea479a15723af0e8c70874c70993df3bab9a6013efddc2932cce910a0b52ed5a3ba853bf44fb0b18da6d4251755f"; + sha512 = "ae7a7ac1bc08280552efa232a83f571319c4a0a1ce54b8876100dfbc6c4e43d1b461d92ab98764c6ce7d450a6a84a13845a3e972fedf7fb32ba04ae36083951f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/id/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/id/firefox-52.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "ac3929a73f46bdc6ebc1d185fc53368590beadd0614e8447f390c52ee213459e49eb05a822128572fa2d4c4b128b93e7c1a4b94dfa4c2a4c071ea679d495db72"; + sha512 = "96404c291b4bb1d3e57e811f3fe12bbb49f4d3c69a68c903f00c83f284da2c1843e2d045b1fe6f0de784850aeb1e828007a1baa7c7aeaac479611979ecb416ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/is/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/is/firefox-52.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "e9b49b02dfa2ca87a273803c6a84c981d731e0320fce30a4580fa31d93c9ff06ea4d55f49efe771b008a5af3539a3c8e0fb9ccbd855bef951846dc687219ea4e"; + sha512 = "da23804164392edf96728a18e21e53a4951a5122f22c867fa61a72db16f3dd697f48a099c91c3609fd555a20dd3e6f2221e0379f8d2a4f9b312359d1630c3225"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/it/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/it/firefox-52.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "4fe510002bdd30d0d713ea112819365f55fc41de024877dfc02b217fe7ce825e5283838f81acdd0456418b5cfa70c42f071ca36668908b257ada23659042cb12"; + sha512 = "74c4c4fe5ec6af0ccda964194e080657d294e237631ba90ea4378ee3f2eb1cab6338829c81b419994da181e696606617c1b617e0664f887e1cc45288b2854c1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ja/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ja/firefox-52.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "a56937787b4f6fe0fe079ee13a362a6cbbcf8160e0ce08d57d58bca7f14ca4fa34ea62c7ec1081aeefeb271c6f010a31a00ff31bb8d3d913b41382fceb9a3e3d"; + sha512 = "8cc5accbdd64fe2cf725af09a5a6677033eac513a831793347d1c8a9eb3b78236e3311aa330c1a4c23f17df2dcd9ec78218ab6b478a0d0baff08fe9d1d8bee2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ka/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ka/firefox-52.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "3138f39d4a346f1c38ac28c498bd27c34b541c1b389eb0bfcc1957e1da098fe9b2209d46e362eba66eb833a07e77e056e44c179651b7daa88e706c20f26ab0c4"; + sha512 = "5b3023d30f70652409074a2507bdc998fccbfadf1d94b5ef3896fb18cd934eb4c0b21a8448042cc5950434cd1bdbf004207823b2416684f599cb5e9a7b425bce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/kab/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/kab/firefox-52.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "8539be22d54dee4a51207bf686260a85c66eabc19efb17d397604d19711776c310f1ceb2bb7e67be797216ba52b8eb6fbafbc63561db8dbff1d62b02baafd6ae"; + sha512 = "cc9bce1b5ae317fa4e6f6e33440f4c0aa7beec036d27f36e8cfd17df34d4c78ebfea9d7bacad2c0805e5808a311adb6d573ef81c3230de99d6a51efc51d07f26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/kk/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/kk/firefox-52.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "4df849e9011631763f6a16ebe2e1bee6a0dfc25acebdee417b0b023e1c6279f91ec73ed2703c206b66a55e220425037ed11bf0a4d022d5a94ba8506537c26fd4"; + sha512 = "d5ed3e9b0542076370df94fdcd2eb924d07dbaeb4763bca3452b156ef1d9d75e43a4c7d202e70cab018e9de5ce40f7e9702864c120fa6fd8f0833dc916d9d205"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/km/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/km/firefox-52.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "b9d063f695030b801502265ff5f93bd56a0812c45c032cfaba2354ff103e8e5c5ecc3ea43a23922c27b36e68887a9180746fe173de428c48c9a9069ab07e3c7a"; + sha512 = "bbd78525f8871f115e64bb225e8b62f89a446f1df19521b364ef8a3d8fce2c44c4cf4f36130fab12b60d9db8e127604c08491b91e34fd9cdb21b4eab56728e0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/kn/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/kn/firefox-52.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "bad628d1438caaf285d14cd68ccd1f7d7021d1a7cbd28f6b86f3368e8eb7dd4c5eb60d5b75b645fa41b88ece5925e09b87eb69f2b187a1ce63e813537e0baaca"; + sha512 = "63b06655503229444c03170141962374ea469398b55a154965c3d3e062016ee6004203a22575c0f737bb21a8271d70c9a816cd8150f72cf03ecf6ddea2717c59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ko/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ko/firefox-52.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "d1069067daaee4a20eb41efaaeb211554e110b9ff35d3a71e48248eaa1da6c12242fe66f41a1e38bc53dceb731e1f46e0b77b25a128c4546b2103e817a895ceb"; + sha512 = "c96616dfe9abd66d8b92ac3c6e80cf93733587ba9facdc397136504b3532b014b9d43393e623cc6a0f44a0a719172da09f807a08ce0b82f00d21e6dd9731f43c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/lij/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/lij/firefox-52.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "eacc7cb06e9d2bf006c5de5ff52063d76198f0444e66e0352a5cf337f722ec7648baf8555ac5da115254f35471ba176d2f7f5ba3a166005534327481a3c566d0"; + sha512 = "615cb07855818b741c59fc7fee38f31052042e65962e809e46d75aae5dfd7ef13b77462c51c0956915631fb9979f4ecb093248825399cb6c3c6af98c112ccec8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/lt/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/lt/firefox-52.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "04e2984a9060fbb5315aea2f6cc822fb56c6bb73f44e95b410aea0e2748e15f31ff3e6ad869215d13df881300cf1caf55c6fdaf47fbc14472d103772d3ed06c4"; + sha512 = "bc8ae3fc1989e400ac6f8baf251e2c9f43c457668e474a25f7c57cb0e55469a3b7c2cba51fe17a29bd2e8bd9287bfc9a8f39c811a63104f4af017ad7998c0d31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/lv/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/lv/firefox-52.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "2dfba1438c807e6f19bf659e17a6847f3d84cb6e1afde89026a5b54083ec5a040366a81a9a3d2653f121ab3ddaa8f2d9bf7c5d49d61370f29bad2f0c705137aa"; + sha512 = "9bcffbc83770a25f2b44d4a89eea71de92a62fbe654abac762bda4db6075bca20f786b99b1942fce7b9a7a24b99ff129e3349938ee4ea9e06770d02326487cd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/mai/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/mai/firefox-52.0.2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "44ef596b16c11621b9064cef9c441be0d2a859429d59b7f6bdd760eeaaa7c487071da0610f1f2723ab1784a41931dcea31681ed91f9f5075b6dee3657e69feb5"; + sha512 = "2d89a6b43bc9bc3096cd4e6c8537edf86fc9baca3e07e062bba03580c1c3321ac07024a904da27d6dbb246d0d9a691f2669f789f9a7b53332dd323bedfc23991"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/mk/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/mk/firefox-52.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "52246cd03b0b9157a641ac25bd159a605ee2ae799c795f61fd5987b5057f0c364df07339e67cbe475fc0c053d1bb5f2244accdefb1e705b5201702272d210712"; + sha512 = "09c763ee3657545eaa095acc2cd3df82b5d4d61afec274dfd026b2fec670f75fe0948854ace5ecbecdb1c32bbc3916cbdb0073dce83e004e6d36b84b177df7da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ml/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ml/firefox-52.0.2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "a5548a153520fe7b930aa2f5645c3b6c73a957d564aa811b548fcc4a4814357fa2f1ca701948aadc2109f0c6ecf5117cda0f0752fbf981f3f65a46ee71543234"; + sha512 = "db6b7d35faa8c0b37fc46b73e4af09ed3e297a70e21fe25496a36aabac41ae39f2ccc060c84ee6134855078f8ef3099f4a727ca8e6631960d72fee080646e2f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/mr/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/mr/firefox-52.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "863e5c767b9c071f4cd24562b6259fd758b834f091d3e22be26ed7e81d242861fb6a0d401fcd1156b1a3d750243e37bdc4f0ff716024d3eff1dd783bf2153e06"; + sha512 = "95690e4b71eb853d5482b28f0acddaad6bbdda466650b691836e07bf48ffc1005794f783dcf64620390936fcd77db352a0585abcaae796dcf9e60b93084d44be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ms/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ms/firefox-52.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "a60877264b3ff2d2b0343f6030f2da7b07f6c21a4d805cf1d125297f49c7bc2b93980293e428c6cbc955b39407def434e503654084e8f1054290786734d89cd4"; + sha512 = "e98d53dcc9af968211a81a97bb749b308139d35403ab221c7f36e0b291e8b429b7db6c7531a2c261bf90b81373430fa1e54cff75f88546586f808c8784f868d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/nb-NO/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/nb-NO/firefox-52.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "2fbff650d3881898e6feb998bb00a77d320ac11d4974bc9ef3f77b6df0bdd07ba2486bf358691163e5cd11d11444c63aca728316bbb3e4ba15b1067d3a9b7962"; + sha512 = "b7c34ba0d7fd0259637e650d2bc251dbf1b3ca2c365549f34928f7fe30c663b8b54c2cf7c587120df5586fbaa770c8b7482a53881339e2ce3b947b3866f4ef43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/nl/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/nl/firefox-52.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "9ebf1a1fbd185f1992793b8c13cacd4ef26b7b51c239d69395c02903ba412382bdf21638fb60723f1b3a407ff2591fcf95836a75d4f4d1a660968b9aac513708"; + sha512 = "85c57bd3bb2e8b89fbef5f2ec59130ab16d723fb79fbd91e1a4f3c056ec9dbe8ca5dc293d34730603af60015aff94b43eac581f9bc2bf462512762232ff445b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/nn-NO/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/nn-NO/firefox-52.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "9e9fa5784fb5d5f1239f511cdbbcebb7b2dce412f7a038d9dc4a3c5890764621d8949d788de1fd83a2f7bc83e909f0f60591ae1cdcf26d6c09600877cc540a5e"; + sha512 = "ddac997563c6cb2c2fb9096e85aade6645667b6c719b7743a405f4390c91222a9955432cc314a5fb2cabf2a80988dcdc491708dba7c507d658a4a8ca78eca688"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/or/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/or/firefox-52.0.2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "aba2e5b466aa4f84453937f7750933be5bd0d2005843d4d3c4589fe8a08c622432ad63f59c2fd9150c47591a949a7d1da565cafb6e835ade711f882a4d21114a"; + sha512 = "ba0f16f2b3be5c76f8d84ab92b1297597ebb6a7f33a83c37568dd0107b653678309f1eb5e5c0e48ecbfc1dd2af01854c49261cb21f264a4fbaefd25f256187ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/pa-IN/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/pa-IN/firefox-52.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "698d2541b460bbda27aa1295d790e7c452d372ae32ddb311b6d80e3f90e298a836f86c4c26778ec5060913f716bf8d5bce2364d5d4df8ba74ca883a80770d461"; + sha512 = "0bf04494a4515064cbe2a125d64c3caec94521744770337598685766266d0076316d786292e1ebda62450103d67ee13a0d99995b9eaa0d10532a71b2bf3c928b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/pl/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/pl/firefox-52.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "bf1025eed0a522a8fb9c05c08750d4c471c56181ade3bb3424e8031ca1510d3890484b4e911da8df5ed78956059f4d7bbffc1c82ea40864f96ec4bdc79f550e6"; + sha512 = "d11d76ce3f088e56e882a9cf6c49997e01efc9f79635c75d1272fdb06f484ae9a634b3c52c9d15c938a657611552b54a26b67134e8c5396e6d74ad83fb3a9a69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/pt-BR/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/pt-BR/firefox-52.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "07dd9bfe0e4f5d1ed239d512b2af4b4153f86c5f94f6464898263e6688daec1b4da5a9e8758f819034f17857a57417afd7a5fc67439fbad1153d5d2d9cafe28b"; + sha512 = "1a4de780de9105009d4f9549ea1be3e389e9a01ea32db30b72aaec7d90d522edae3c6ccb1061edefd2ae95f3610b7839e115e3b53884819088c70387990cc77b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/pt-PT/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/pt-PT/firefox-52.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "7a21921dc0a45a2967e7ece3177f014b8d84e0e08634882785f30f28860a3d56b1b5b224da101bf1bdbd322a6ce354db566a1c51e99d7266a7f532509bc21688"; + sha512 = "29417545e0523bdcb980cb1be1a70bc3808360076f1e1a862ddecf10665a7a0e83e6f0ac29fc18a8d3b90ac9729aaae64236a091511ce930021808b4de3f6b65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/rm/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/rm/firefox-52.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "2fdc2e2ec175a6df36a26b5eb7be11455d51ef4d0d66b52f6036f4c743cbe95894aa6c9b904a3911801a798e4f7e53002879ba2f2aca3da14f23cc481276f7b4"; + sha512 = "99a1820c89ee96bc90404d732874be0a136441d97c5302e74d5dfb38a734bdb1373f48c7af0232ab66dcde528a1480c161c0a3b8aac4a016dbeeea3c744efdd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ro/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ro/firefox-52.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "ac4731507c44d65eaf156a4a783e1dd3603e0c86b735c3a488f8b4a7ea4f506db42ceb068a917e1a8f4452213f68ad9779a894180ab7f7856b5e55791660bb14"; + sha512 = "4ba5a9ba9fe3839ac8ca0d7428b2d1dcf05b1325d62c88ea833759f663a9cc45fd2c88e29bedb29a00e68d787e6fab6b1b5b9906acfd5b02c0cee9e18f701372"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ru/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ru/firefox-52.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "8b67edacf0fc53168074da44c7a8b2452b0e22cef093b6573333e04df9fc2402d2a55b14ec3139e4cce6eb90d611ac1bb22e4f9f548aa65523941b9786ea23bd"; + sha512 = "2e2db4238f73f8b27e8011ba528fb3d108da5a5d59de43b38f5aaa89740cf2b6ca655446ae28b31c6c22011777bb8c13ac43cd9a2ac234e3bba729daa426c3d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/si/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/si/firefox-52.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "15b24357e2cbcc2d3903da8cac5179cf56e1b4bd68b693a154960614cca39ac0c55129905448c94f5adea063455c3edbc9b32f5f530c8979fbf48347c7fb359f"; + sha512 = "af65f79352fb6435b0e7b37f6d88988d08f5966b406d903eb03d9ef2c6b393e7516ea3fa3150059ff0c33437f68fa3cd28528e46144f8cd2c59721d5e0d593e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/sk/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/sk/firefox-52.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "5d5b398b8f0157cb84ac8dd8a0bb091504ad34d1ba4b6daa02b9082fd900878d8dbdd5a8069df7d8e8938d4062145132bce9edbc81238362f761a92d6bbcbe5f"; + sha512 = "cc0649946cd9cd2395fa399b2ee6aa9a469237cefed0db6dd65cb80ed12a18e572c33bd932985309a649b75665d4b8d65c241d0f5f9d92886315ca0cec6425cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/sl/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/sl/firefox-52.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "0add0946e185b8f926115f0699227b661784a94afc56b2c9c9e03f27b790da8d73748016e86ea9260b16278699cdd72b4603a5bca72e0d9955ccff2807ff82f1"; + sha512 = "c2f746ae453ff8c3160784eb853c20a3cc48ac4ae28fe231dbcccd24b41f003d38e8e13a1fdc269e7a4ce6d77c02f9a15c7e237b35c46d22256779844638c5ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/son/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/son/firefox-52.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "97140c16c3b77352c2e3f56b4afd61c575d6e302dd98c333375a01e75a487297bbf429ff42a88e291f1dd2883d4119611a7e524e535b73ccf6de3215de29dead"; + sha512 = "d0751c793f839cb6f334027217f164a0fca2861d62ab1d9c9c7a81fe1daf54b3fa6df03564b5d83fc3eb0bb3586f331ac7728d6dd6d2ebafeb614823088ec9b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/sq/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/sq/firefox-52.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "9c97f6df5b0393ce34f33ee3ec06d21a70e6221c2aee65ff7c115ca5a7f7e82e3e3ccaef5e41c33d72281109ee03664f63240f20c15f6de254a712ad8a0187c3"; + sha512 = "31edb40d07ce79679b84ced2ec867873a73adb0439e74260934fd415789f8703b1cff717241657bebf5411592d2c12aaf0aae3fd58cc7a37112dec33b68e1d9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/sr/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/sr/firefox-52.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "dbe2f803ef838ea0da7188a566619cc547e272d458a138b5d3b7d1109e708d3d1c72901276f745bec2ad65ec68112ad88523400f805dad48841b9f2e6266aac5"; + sha512 = "f670f25b2a9fefa7b8667b3d2655a80283610da9aacfcff71c0ee133513f7f21e7521e1f767748896604fb9a69a84e1c6a56063e1db9b344b9e7cd7ea2a9fa26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/sv-SE/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/sv-SE/firefox-52.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "555206c262c0ffd953937ffd58ed840585345739ff2868fee0e81df93d2b7bcd8b22ae567a13ea5f67cf06f7065fdc09dcd321a326e974f58f86225dbae93627"; + sha512 = "72a2e2ccb76b6d8490d209c086c4748cc242dce4683a64d0ab30279dab09c608b9ec9d73f900f3816d00ad8d7543124624bffd51e8059a4175dfdc980a0e98e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ta/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/ta/firefox-52.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "fd577c71ec42c92a88fd05fc723fba543eeee80114e90b5939d053080574ebfefb2c9d31bd6f0d2625bd4113ec4ed94aa9dcf637a17a7bc0eeb5289552f41d01"; + sha512 = "806d6a7f1094a84b6d9408dc9a4917291af9d1b42211d5562579200231ca77fc210aefdb93ac942aa28e16f089aec9cc6e8fadc4c410716dbf43287f5dd93ca3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/te/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/te/firefox-52.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "9b9f893c25394102f026d0be65173802aeee0999031cdf4a7c3e4964df5075bec2a1a3ebf029014b4a50623f8265672992ad78214a551fcaf776adf659ed5fb6"; + sha512 = "3f2c06162eed155c1c75a4706ff4133791f7d39026936e67e320cd678e1fe843f620be8c01b822f16b4a6b51c3a42884d6015e98b1a43dcd328f01cb8cca7df5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/th/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/th/firefox-52.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "6511ec6a5c1229181849af9040fb2cdf12d13907731522312bc130880c78d698d3b8d0ec8bb31d080399de7f3beb29c2fe45b6d9d9d3a9c550996c1cf9496607"; + sha512 = "487d30a850048207015b880ad6762181a66121002820d88d1c5629c19abdb121af6b6ad703227c8ef143786a6f9d5a5f550388703e314368562de09de54fd9c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/tr/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/tr/firefox-52.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "26a076902a0eefed3f893ea72da54e233dc13d5bc0abcbb95cd75c68778526eb961d23315018456539811548ee66030d7b1ba02049574b6b2f6eed9bac16b8be"; + sha512 = "07ea2cb754b6433d25820b5da3c388ac6d6441b15a1dbd12c442e4bb744ea94e51cd95d8147eafb57eeb6d1f689d9373425d25f3ffa67987017a98c6cc13dff7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/uk/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/uk/firefox-52.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "d9f4cc9900a77e7de0cc0859af7ed1c83447b9a3cac52c4453a6294a6b85bb3b95b6c6385b65014a73fd92fdc4b014eb5c28ed0ca1aa60a75eaccd3272f67157"; + sha512 = "167993a0fdceec4630f6fd60f28f9f060e7449f7c514893e35ee4a6f406dfe9e330f738cd32a94c109e858a9f0a62952a4b4213774a2703e061a7dbd2c2d5f25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/uz/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/uz/firefox-52.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "a7cf647e57651ceee739af19008877b409791f86d75592e240dadeb0559cbce6316cca3c396f044a5b4d8daa3e0a11e96cc61e3f6c9addf3a22ef59dcaaf370f"; + sha512 = "86d34713424a1a610a4d6955fb606d672705d4cb770a73705819600665a06c58f305ceb6eecf4f93f813a3ac8372050799c6d0c67943f5e8458ce7afc9eaead3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/vi/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/vi/firefox-52.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "84e91aa0f8e92b0bb24ff53742e19869c3757343e1c05cbf2fc90aa14bf3917d3ec357f4757dc2932ffb1dd823104c42d6020e0f156a1f7cc21e696462c5d05d"; + sha512 = "b05f36dc75e5bb6621e430bba274a98e8d780f5491a77cb1279855582f09861f340457a2c03c69eab89f8a1b84ef0f9638434877e65bb5bf9dc101930cd73af5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/xh/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/xh/firefox-52.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "cf97e6aac1723263608a29df8df9e67c9ddeea18f3043f10a4c8f22331f519e6a30d76f2e2b2d42e1f5e24a31812e57387198391b14d726c6c5dd2488e94a820"; + sha512 = "339310357c9fe6fdb0bee54975b3a870efd687f504f0e1ca9eb1cabef2ec410100b7b6a6ce1ea0fef245220b8c8eb4a255c605c54919782c45b9a4524edbae73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/zh-CN/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/zh-CN/firefox-52.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "74e10d0cf2e47f4133b25a9351a3a13cd634a4a17986dc896c32accd25fb4f09dab7c141faba5574015da83bb193087b64434a51fdd820b1ca6af82a2672beeb"; + sha512 = "74b84acff05c34ed24addfc038f5273416164f635516c188787b61e1cf44b929307d01412093a861a1ca73d8a26ae192e40e89a764e285fb332690ccc1451433"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/zh-TW/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-x86_64/zh-TW/firefox-52.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "2f024be661d830f179c5e19bb36415becefcdb2a98a750a09cd80f9a3a9e09f9c3ab113e51ac16ce185f42e3e4d00bfa906f7597f58b0282f3d5a98c690fc981"; + sha512 = "4da030da94ca0d889ccfd8192d4812231be0c075f4de5e0f1cc1d1fef2ea2c960e447a73c7dbd141130315f886843cf66b463d8cfd0261ccea55b17b76dfc7ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ach/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ach/firefox-52.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "520a791d0c86a60a7f789451f690fde6cab934e536b5acce4b47e56e95c8d775c9bb5bdeec32e4a694ddfc7bb0301758fbda5b575ca1baec6d134df39b6861ff"; + sha512 = "ca8ffe68361681aed552bccc3141fe49fee7645865344afdac4b08aa8b8d950b5a36773495c827e0ab1095e8541cae406912dc4e539483001cfc7550b59e7194"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/af/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/af/firefox-52.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "4fa7361db2a87f5c133e262e7006844f9d734765c589f97843fdd3b95127c37e040f9634e11f295ab67a1ceb08fefafc8592658e3730be7d1be7680decdecf61"; + sha512 = "1e08575a3727eecdfcd5a8e04a3b6667077bc7dfcf5d3b22a76dee6d09d54bf97100dcb478ff451999ad4d0fde1cbe12e2b248b7a3112b0a29d1b19a93e46228"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/an/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/an/firefox-52.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "8cd72218d6b9eff75cc009224ca28da2b668c786b111f2761190eb85e5467f980b3ff577cb1de30806b049d92a820aebb854572489140c22e4509f165fb53943"; + sha512 = "20d6a18d4e203b016d40162e67f2f438d20f18bb923395b63c1b5b1064900ea38ef21038b6765c34dda7afed6c3463fd16cdb4506fcaa13bc963d7d9c104598a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ar/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ar/firefox-52.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "a7fcfe0d20d28d15d40f15c6af83e1bef20db2ca8f74e669fb1912b3d7b411b83b8f2081e653048fcce0914800f71f3b07c8119c01f9ea9cc039f94c47681279"; + sha512 = "a3e6088eea7a569ba3520813667d858b4073a6b4d5d0fe725539139d6747ff30e1a053bc3af37ea72ad12438db9f842ce4cae8bbe08629cdc33600a795cc84ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/as/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/as/firefox-52.0.2.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "ad2cd9bbfb85458108a2b32aa07a090d05554cf8d60e113035cd92ac877e0a0a7fa2f7ed6a3061bb17977464d635843c4e1902071496b1ba898c74458c2878b3"; + sha512 = "9bde92cb7625e37ad287d54bdf3dc876105ab8b026d3dea2ce7121385c61d3c44c3cb7ea931e2805ecb8e345cab1d26db50075b31c19a09eb4e38a185db17c32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ast/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ast/firefox-52.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "2fa3f46e646ab0a4774f827de282b8a54f324dd801d30b256988bab79bf2356723f0e0a1d401c04e429e8e4cf91a0a4b4c0b5ac0c793cb3d2fcf82b6bb311832"; + sha512 = "6c6ad98afd3ad8cc2ffba9bf19282efcaca160e51ad74f1c7121ca5ca44dd8cd661ed206837ad79d924c1cdb9d2e749f9edd6c9d2dff976439231568df00f785"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/az/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/az/firefox-52.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "0d63c772859254b591e62ab45c542247eca411a8230afd8b0dea6b358d6db6e0dfdde43e05337be554c922caa40f13ff6db38e0526572531f32c9f0baa400bd8"; + sha512 = "3591e35e7627d12f27ee03f98bc05adb88d048b742e386931ae8b01fa34b977b865cb6990cad41bcc336f94b9d40d0ccb1c493d2cd5b0e3d5f413568160c5318"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/bg/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/bg/firefox-52.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "2eb0521db20b5cd659c733a18cbb04cf4c15ffdd89482e12df2886d388a85634848108b2ec6508637afae9e36b5ad0ae7b9ee611ba531605db4cae60f1e61ed2"; + sha512 = "28a9646f6c135b4ad1b52a4b61fec8762d16f4f1ab9471226c88e0958cbde5a094d7a91bbd4e7385f57f45953de62b6efd943ef74899da7b7566402e1c5ef68c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/bn-BD/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/bn-BD/firefox-52.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "f0d2ff957dfb93a11c2a374a30dfb800e39ffa309f2b50419fea33488d4098fcc7e1429d434825c4854a5d27240625f2c1643496d15eaa58853fdcc91a93a601"; + sha512 = "a9d2e14f9218986603d4215e4b28534f60ec208898446bf5e798d921189b045bb8d9954a900545ab4c01a56d23bd21bf0075fc9eb0cacc913b7c66d4dbf20fae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/bn-IN/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/bn-IN/firefox-52.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "2ed01637decdc6e11c686665aaaf1628793590352d804b3f524778c7fc5f1af6e866d28dd1a90acdec105fca392f6aad3e37a4a8d32264e790436df401d60005"; + sha512 = "1e3e883c9df8982809f699b176dba7176c63b9ccfc7ecd2552f1147a197f0c22671fd11be05a455c9619152f6783a95f4167547d556903b1756e458804de3483"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/br/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/br/firefox-52.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "19172c0112eb0ddd67da1f2bd8b759a901f9ce29ee6a85b889317e6f8aa9ea85a9ca6bdab6bfefaa8d65a9b7081300acc5b4eb3bf69b8ffea2eb7de4ba448636"; + sha512 = "a0bec7977f03803b29bb1ef818c0efeaeb17d0c679ad35c00357dca1c29da6a294da352d2aae751763d1c5e20d385f51bb0841c61bdb8f7dcdddf92b3774f1b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/bs/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/bs/firefox-52.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "eb4bf2dc8c9d74775a227254f0895d9b10c5e3f72a6c37bf9709eaef555a208b6b455e35e8122e5f96ade59956b7481df5807f4787092b642a6affaf870b8d52"; + sha512 = "c741b54422602932086e903fe8aa1fcfa91b705236ca223a24b23eedbe4034279111eb3a4a1fbf1a431cee7f6ce8333ac01efa3cc5e3a52768bdd93bc3099359"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ca/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ca/firefox-52.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "7bea06ab95279b5daba518d8d30a506f0f79c3b54f36796318213ac1c2e19aa0763774a0746315f564501930e4930105affacd4997b19f6142c1063b45e5427c"; + sha512 = "f2f4ad205d9b256871a5252c488deb8b9dd2714d843eff0d815f3e9f5495da3269ed47cb2d1cc21aa67220ae06b4958f120be0a8bebcad296a8cb7612fd21ae0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/cak/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/cak/firefox-52.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "c5366697fa4d91ea125bf16073191174158497e548453c310292851fc582b05a70768339397a4076b5347c8f9b4d2ef0ff62a03217295f4eb8717a4027c8562a"; + sha512 = "22a1d0d1010d93720123661599d2b259a72135637692a95ee6bcaafb32677bfda139f4265fb541f5cf571d31d23f6996594710c2d3e6c9fad7f744c443b851c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/cs/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/cs/firefox-52.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "80fa7b6e3bff168c3b82d3fc188ec7dd33bac07d4d2629df205ebacd7b795638d4fca0ea80aed5d2ff9128d1bbd66ee48512a6b19c8934a8949db7e85f444642"; + sha512 = "255ad178324900c33ba15721553ec145d6045115462424c58592c2fd4572bfcd5168f3a8035da068bebc0f81c7c9a9fad29739fb09d927a2258a1e7b77139b8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/cy/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/cy/firefox-52.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "5d7e8741b2880f96c9778e84a07e905ce5c31df4db703ead9f5a8aa23b6ec2a478b760adc02a6747adbcb1f8098716ab0bce2a0cd00de1379961f41682e980a3"; + sha512 = "4f5a3d8e2bf5bb88122b8593e3f97026878a5c70b9366cad2ed8f723770c583ce32b29177360ef7307bf6bde99caf1179c50fae60b2f817e84a9b4d0579ee94a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/da/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/da/firefox-52.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "ca122f0ab79a17d7c07df8607fb9b0018197319f8a644aec4b56328193009e2fa7f9f0b4a9b4a78027f13702c25061443e3412f9be62bbf4eaf793676b1e7fd5"; + sha512 = "988080ba24f31c90ee293b48def58706e08598341f274bdb378aa1f7e8a437dc2deaf7c36394d4df2043cf07494a4c30d69573afa2c12c962207521cd13febf6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/de/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/de/firefox-52.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "a813a51c347d34fd9c34d9d65289644946008000d8d93fc3df7ff3f7de66f3cb7fca134af2c6e139dbcb58bf5deecfbdb4b10208bd2f7c424fc00a1d48ece9ac"; + sha512 = "a144a9d9d3f7b6e4d57c73b7d3dfb558cae47aeee0bea8a445739a1ee610d44b99aef8d1a6eea4f49dafd03677dbae637902a8c225ea31b0189da392ed3b827a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/dsb/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/dsb/firefox-52.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "bf2a32dc433dcfcf44d205ce54fe8e2697f1485abacf11fb4cb2b7a1a24d149f85b07684f3127db3a44f83b652db1d56fb416d1f809eaef83383a70dbff5bbbe"; + sha512 = "4fa7bdf38c7c96b599243d653a0570882fc9ab704515d362fe96a56b44b863fa09b895f9be496bbbaffd10bd12dcd77839a906db81176509bcc1af05fe92b3ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/el/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/el/firefox-52.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "7d7192af4849b104c7b0c410ef27b708ecaac96fabed438baad76d086dcd2bd46e364a163f59b545d941510fbffa82c39785d9957f6cd6d99f0b3786b3d14a35"; + sha512 = "2ab698be0d304d66b29c52f37077fabb8d9a74a4819cefd51d09e217ee38959250f92c31a9966adbc8cbbf1217f25953cadc634a385e6d956447887df869e9ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/en-GB/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/en-GB/firefox-52.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "d19127e4e8ef347b50cff1c1960d0e6ad9e248810d9b346a9fa04b9ebcb8fd6207d3b313aa5ac3fb69fce1f096d5594584e9458f061948ca5efd242d779fcd33"; + sha512 = "c97a29ff79db2ebf58370f0ae259c66dd1b275bb7bdc8dd60844bba658a4fd1f9d605f43fa9a3e3af44d1c7830b75e3a5bb18f2aa3e0b3920854fa3d455fa2af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/en-US/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/en-US/firefox-52.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "10a22069e479cf6bb63c4ddaf796b557bc3ab557e17b88fbf4acad26280df5ad46af32d1d39ab85f5d16b58b5d4be5a9b79f5a081cb23a1c4ef9bf6ff69a054b"; + sha512 = "0b7a25e0df55a7607aa9e6478b5aa188fb545842a6a8ef2279f7997faa725555d966b276aa1201cc1be45b1428faee846d59e0af39cbadb8ae4dee92d9dbb2c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/en-ZA/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/en-ZA/firefox-52.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "d716e7f3b435234477c68c9ec92c8f1912db6d9e10b8d77519f4731e2423143ee2974fe187f69532e93d0994257844e374e05ee5829e8ffb9d73915eee8dd67d"; + sha512 = "0124f925185f4ff2a0517dfb3b2d41c66a808dce1d3ff3cf95d90ec99892cfd7db6ecf9f8812759a91ac9123d8e1b2a1184b22306e50e1cf42dddec5a36932fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/eo/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/eo/firefox-52.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "088fae14d0ccac9b243e0457ee842b260051a802d3b47318b4b9d6d723af8b272a0c0c0541deca98459c928c5b271e22cc500c70992d3b2e64655ab15bb397b5"; + sha512 = "76e0d3669243bc75abd77c0c9691291726a23346ef1facee97065e8d2dd8a99a2fd4c86d48e642877a90ae229ec5ffaee398fb8d67e77cb293ad8a4abfb12b06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/es-AR/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/es-AR/firefox-52.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "aff8ffd7a042f1ef80ba7fd725efdd022b5a8862714888af1e736a1d08ca1df5974ff39f3b465061c3f6c60bdc975432f04dde651165309f9095ef98b51a53b9"; + sha512 = "ceb1b2a454c9c53f159bfc3e04802ffea0c0a799ccbeaac15d792c382b92037c0d447c14e373c9601a1ae22ddf6a7cc47e84f34f27c6bf36ccd107048c003db0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/es-CL/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/es-CL/firefox-52.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "d8042352f0e54257ce7c96233832cd63d0cb4a0e4d6988a1299a81c9cad01190545c254045f993bff5ae5b2330a6b81baeff582a204674ec236e43ba6492e629"; + sha512 = "5c62daf105158ab03823fc146ee58d5c0bd41f96cd2e725540992153cc8e2f0065bf0f38050f9125b4ac0fa17f5d0897fd4c9c3776eb8b7bc1dd107608a2b253"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/es-ES/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/es-ES/firefox-52.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "5e6d4473335146bfdc9655b4d610ae94e5cda83e2411c495c4196690c029d7ad37775e727afebcca0ef3325f27278508fb51c61cb978392bee7723eb2e501b8d"; + sha512 = "0365d4fdb398fb75c6b3bfde89d47f24b09224d9f2325cdb1c587519e09299fc9838c5eef96a69b5511ef384e2abef1428e51b22e8404d65e13448ea0dcf4c9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/es-MX/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/es-MX/firefox-52.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "c59952163414d8a1147ea182ad70af0c2223c2f8497248e7e9585c378b95247c88a89c5c08fa6a80fd39bf71f7bbc60126fc9c103f4d8f4eb6dfd400675666b5"; + sha512 = "b374f2437fa7319bf621a39d13c398e798e9f2e1d1bca8212bc8431d455e6b61f1f15d9ba3a853306952a8e489b37758cc68ee7e72bd7184d1b61866e4384b04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/et/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/et/firefox-52.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "a2f17512791b57a94f23a5581978517a9bdf817d313fb8378e7e4e34347fe67ac525ea50d19a73436dd0d8de7ca6a227d16bbbf5458c669fffd5731b868c9854"; + sha512 = "3372452da795fcc8bca30a370dc6c18c159e1ecc195857b6a6603f2187069ce692be96df7376136e68c92c3105795f559599a2c9d8e01ef0bb036a748ee86202"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/eu/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/eu/firefox-52.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "df4cc75f28a3a0f58b2baa78505e4a9624301e42c3f263f0f46c73a5c36915488de98e8eeaa36544de6881a21fde33c8cb78500dd335a6e904c5fb30df3b6a85"; + sha512 = "66c02a00d2b17dcf158be576c937aa4c74a7a341f6ab0a108bb494dacffe09141a6060431c95e92d26ceea000fb97a103044df899759c549f4dc50808277454d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/fa/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/fa/firefox-52.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "faf68fba10608a010bec43cc0bd994fab084de47ed7dd4908bf33fbf90369f115ab6964481558763a06ef603ce6ffc4d97db48006a3dfc92fefaf13b8c97e6d3"; + sha512 = "850457906736be46b827ae4efe2db44235b485f86a4b0b749be9715182f1a964c3b06703b9a0a710011f74c86f6ce6f146320cd21077da1070d80d25d8bf073b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ff/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ff/firefox-52.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "199159e04b958f9e485a5d643dce371fc19840bd7e9a4f95d7f1281d5eb860e30950583e569e806e0eae90c757917d6bf1bd32d8cadf07ce7b3c82b5771e0f55"; + sha512 = "3e81a45db8c20d46e511a94f4a59649b4949c160c4bcd4f1e9d1746c1a00bb870d5ac10d8659fa94cbca5d481ee9f589b625804276b2a29ff27cc57314391b84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/fi/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/fi/firefox-52.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "a5ae3dd65552ddc5c8bb843c9860ce070e793ecf67b35a77e005e54c5bfef1174beb0df114b7fb380ad3635465f84e4167f2b247c34a82b9a2208cdfe55986b6"; + sha512 = "976920e06a5417dccc81fe44df54ec159935452c4a364a8e59772732e7cafbd99602bf38c4020d9e6e24b80c58723255e532c4a96b1500b00438a7a80561d717"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/fr/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/fr/firefox-52.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "a6f0d89b4a6d52fddbac39db1947f8671544bea26b8ed0b2759030398fa5d1e7865fa1200b67da6a8400a470e402bac0dcb97afc49c20de6a101c224ec9d00ea"; + sha512 = "ae997ed56e309ea4d084a05ec9be2548fedff29a4b91574326c04bb0f871aa84feaab64e1f9b9b1810288b4518aab45ed0823e3c3dc66ef19960dea1e31eaed5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/fy-NL/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/fy-NL/firefox-52.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "0facf3356011c6300283eff40bd8311f7e3f75f0eaf46a673f06a0aab807498758d943adc8015e4e649f66041d35107509de402a2514d108075d4398e0201300"; + sha512 = "cc6007ecb609d9ec48c45a7ffd51a5f86fa5615f281221cc709166c56262dfe702566773a84e196abef08d2168efaec46fb8531f9d65b053252506925f45d103"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ga-IE/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ga-IE/firefox-52.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "7023456136343eb9aaf5ead84df355c03f5cf7d02928ae3ec8e7ba6d7ada3e6aa020bd8b79f9dbf8f8b5d9c2ea15a37d136cbcff215f77452ad75f40a3ff8001"; + sha512 = "26e3eaa12931d9df39f23c0b32cd75c3a4b59e7e72a35836f2182775a21dd59714acaf6a598046d59b4f9e89a78dd1bb52bbebb115f68fc2fc03c011c4b2176b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/gd/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/gd/firefox-52.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "342b1ee75b201661fb588a5f6d8530014378512465ed9beb69608fb9fb32fc7f9308cfe4592ff16f325952b3224c27c16a6c5f0e2236b9eabf048f6b096c8510"; + sha512 = "99684a6628291e8e4549ddd6ccbc8d53d450eeafe15d06d6aee97fa16ffe10d3c2acb3f39ec1e2f7821bef783e0551f8b4b225745ac1e015a0b504e05d300e98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/gl/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/gl/firefox-52.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "af25290d169e7b0a4a52e71bbfd2b635347410cd1405a3433dbd14e500d16a8ffc311c25787c2a736abab0361dd1f601de770d8080b023544573e66a14652971"; + sha512 = "e22599c9126cf546d039ad6a3a6504791b3f29108b4936098f577142bcb29035b8a75ecaf3558601a3cedcccfbe4fe7d4d1e0a6dd5ffd6171f4fcefa4678b45e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/gn/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/gn/firefox-52.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "124f5bce4eecd640618e62707b16f8def80fc045c20fceba65a2dad488d60bc8a5ce2e112cb766dc2b463e3d6bd72b4eda612d7c66e727f36c4f3b85cec2b5af"; + sha512 = "b7b174da4feea6503c3a37d676f916c199a16449854b97f8c3f8417511c8e24317e3cd93edce7702b170a35c48dcf71ec0d8566e6da335707a1bc826720c0043"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/gu-IN/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/gu-IN/firefox-52.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "17d6e909835cfec67f1e3dd4971e1bdd80c07488e5390a21525604ed923be9b7bb3eae18c3d011cc85d83d10d124041c14af2cb49b79b4e8df94f6f38012963b"; + sha512 = "2385ba4859ff208965a274d4d23fcb4fd27006b1f73cc2af057ec813d2ee1ba584d532dcbf69f581421e3070847774b0e5bb414db5aa9dcf735315cf1c293a76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/he/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/he/firefox-52.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "70de0d3266df3f9665706f693faebd8c3c29fe1fd7e8c1f391d1366cb094c1178f18baa3947593a3674c2d3c21e1713a5161118c4f241e6c88c47e9b1ec818ba"; + sha512 = "c56a2a4da1c01a891e0eb6d11f176ad2a428fede830fcaace386c9387a11f93f0636fccbeb78ea8e2c92a20ca568a848bf24a34c270cf278c23fd76f2ae5dfb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/hi-IN/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/hi-IN/firefox-52.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "fd8a3250fc495115b83b1b4d360c24ad263fe52f6333dccc527807c6a30060b1afbeda1b95e2a86b0f9ae8b6f63165e4c6c8b58f443bbc89f4c9291870a4d2de"; + sha512 = "22645937b5d1b0e302b4facee5396685d498441d48610dff428a77645ca2a9e9b5a790fae89ee75014446d424f33fbd3ac8aa3a25d18cc92cbec9121f32951c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/hr/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/hr/firefox-52.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "561996e2fc7a3c2b9450b87e57cb6cdb6bcf7f454b6736c7d9ca764a85834dea40673f7142513c58624c95ee4f70c21122e54d678c1b9d5edb7273ac3d63cb6d"; + sha512 = "41a43b8f79447d42b1c2261924955d6c0f463cadc4133069c27b865a14b73fe665104e9de21e1681402dca67ead1e80438cbf9043ce9f0e389e94feb2cfd25e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/hsb/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/hsb/firefox-52.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "0ef7119929a28c267e94c5fa7afe583b5da6571753a437a7213c84cbfc18c6459da36595dade5187d7e7b8cfb83efd9430ef43400b85318b661512bc8c12a1bd"; + sha512 = "5641092c539d0d61fc550a0c49992ea8618d245da33e4091bf83f2b85f74078a7037301697430adbde85b3682c99bd6f7ecaa7b933ed7c8f3c58dad9ce8f3a16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/hu/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/hu/firefox-52.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "2f27911819f6a625ddf77e02da900f219563e6b070aca76f2c08b9f432c1f15b83eaf09558df4cc1e8a0186938ac4a328f1ceaafa109411dcd270db66f189099"; + sha512 = "14427a52743b9619d7e675cdcdf00d59d435c0adaa25acbce79fe127670be0d8a8f6dcb909f1d8107cc0381c53688cbe691d074d0c4368bae951abe05f0980e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/hy-AM/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/hy-AM/firefox-52.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "dde5aede668eda9fbc212f3b18a2326b24a50f399bc70e2c21f65a1f4df574c614d95be6ef55642829c78507d1ae360fc476e599521a39419e2eede1b6cad586"; + sha512 = "b12a676c274bea2408a885598fca845a558bf0216a680e15e10e07da4dc45a583378c1fb76f95207fdb9ebe98b11cf956811496fcf0fa280f0d27d34b0d4045b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/id/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/id/firefox-52.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "63155285ab64209dfbd71bd5357d754889414b99ff45e9eb393b0ca8938c17152ade97251e3ef48d1d3f197cfa9f2ab1cb57000940216748c43a08174f7d9447"; + sha512 = "a50d2c3a234c6576909b1327ad60e4a6b93cb8ded5f8e42f66947d5ca55b6eba6601a7da5d65e14c06b58aaeb6c426b839585db670cc8a1502bb0d0c1037b9b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/is/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/is/firefox-52.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "d01c9eaa33cba50f6fef6da0313eff25e2d45c025d0ed3694abaeed833cd84590ecf6d9b7bd7ee5dcfcbdf678b4ec0f39c6a8eddec670124c9a4d79711cd6d4e"; + sha512 = "9225d6e5ef21ab486c054cfed58bb2b38cd1c4d32cbe827e221c777959db31bb5b29b6c04a072547fe0cc361e12cfe46b5d5ed44c285316bb1907a97915708bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/it/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/it/firefox-52.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "40a3934d0c9ee388f80d20ccd38a718ee782aa0a8c1e02d14d68eda8c84454c05dcb944396f5c1b092c3fe8820176314e46f232f734079f84bfd04e4b7767618"; + sha512 = "30507cd7dbbff0871575d9dd61ca646f1e187ecb921cae1e8340f2535adcb47c96b99a84683eadc7d0ab72c3aa30b98fcc9361d2dc27f4dcc891e7bfc59ac52f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ja/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ja/firefox-52.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "506302d0fe4d1198d10f6a12a38e7266585830d2648e1a4a8d5bd58c21836fcc55682137c3b706f4a3c6feee37f88828df8de850a8fba40d3d572e84381c8a1c"; + sha512 = "1151ef2192ff26ba790243d8fad92f43eec6afaa2a4f76d0fbf0c6cb82b1a57f7e5fc361bcff8f3c2ec178bcb2039320dd9fedc6d31d0f61dbedf90852d5935b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ka/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ka/firefox-52.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "4d2719f82d245067f7c90da659081e7a5a9f083fae6456911aaeb042863a3796d739b08ff912a6c6ce163121e9b124d96ffd3e557afd2cc238ced8c62fdd4ea5"; + sha512 = "884090864f90ad4dae20de7a366507d7d65dad097c8e0485c07bae0d343671e578024cd338cfa030f3560b4a4248d8b1cf55930b7e23ad81de6c71d3a3478cb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/kab/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/kab/firefox-52.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "8c173f08c9d83877fe96c270a22ed96dd101d5e7be0eb0225f592457f5a201946a4582147851058ee8c6bcf03890277ae225e145b7b6a824b412cb8ac3643a2f"; + sha512 = "c8fb0910d031f92c898924457cc5c8062d1048eb73ee3f4136382abec6f33314a936607fd29073a9d07379f49df825bde0073dce8cacab0f84be832f757018a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/kk/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/kk/firefox-52.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "e08260dbd8c179eccf7ecf0fd036e94542652856360ce927a9430d7c9cd8e966c9b71496ac9b98dcf1a0f10b54800bb84b382b797e2d1daf5ea3742692dc6d5c"; + sha512 = "015f3a8266dd17fb022cb08b4e5e6a0cf250d841b43157b030af54da2acaa80100a7424df172acad78839bfa4485164d81e14f0efb15ed532eaf91dd81a78bae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/km/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/km/firefox-52.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "1bb1d99790cbe604e7c6ffc00b9e29b971391257ff3a04787bdce35d79c2c2ebde81037d4597d5f854fccebf9d8e13b73eb3caa11ec2cc50ed82a7db1da6213f"; + sha512 = "e9c56276434897bcdff5b7895cab82b46b17f8be871ca6ec0ca36b99783da3db448fad7487093119fb0bbb3d08a6d074295684d83d5104b214c7a63b679acd21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/kn/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/kn/firefox-52.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "426b524506c6d50a7b4625fb3cb0737bfc0f40f1d620f8d59ca60f642d6d5072abeb279722916d285a32653c9d3dffdea480ed7b76bbe81b199082c3af88e3d0"; + sha512 = "ce79495e3afdff69816007f4f7cd6046f7864579e0699dfc09ac19ef26790ea8fa13fdfd20ea1fe5755f0a7fc11b7588fe860306ab68ad2ba72cb5bb44edebfd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ko/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ko/firefox-52.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "f24bb055650deb5bafc50105e5eccd1dfd09cd114175ca727c7f955b9e7fecf2be1e9e43df80ca1b986e43c991b6e960281c33654b08ea10e1a7612306253a4b"; + sha512 = "3c0541e19f7e5970f8e7115f66a1722af768997dfdd65fde8b36ffc938c8a241185f7d68f9e8d954c0323fb57b4662c9f6b1cba68c0171c0045bb1922def4499"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/lij/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/lij/firefox-52.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "d53e5e7b56c38f514de40215304982fce5f1d6600ee18fb3cb1f7b9da41b419c74ce1afa2c27bc6b93fa77b7240a3eb020b016dc4f40c744c775626939982686"; + sha512 = "3ff3966fad4e30e2132113450d31ceae884a430950a91a27b1259e287ceec1a02c67777a1576c45e7e4c40725f7114c96b714d47e1f6cf408121e23765369d06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/lt/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/lt/firefox-52.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "0c8fe608177aa128573ee86e15788878ba431fb7436c041754d6107189bb46a323b8966402c31175089ab2b343bb44c4dceaf11ee170503817ffb0e2905fef9a"; + sha512 = "e5191997323d0f21ce7dc50694b1fbabefbb203920de4c56e6b6374de9b59354cbcaaa8e7ef2292eadb8c70d3428aa4f237cd8e61a5eb6d8783979acde87c86e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/lv/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/lv/firefox-52.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "e3d831a73ced3e2e5bc41657c1d0628209f464884d44c242948e3a3c56c956af6f06e6cdd2e85b2ee25300a28aef09c755324db928ba6f7ba3582348afa44c73"; + sha512 = "b0e5dc0f277e8764632074086dbf67238b62435fb198a0ef70c18fc45c20647f945caf9ee68f0ebb791ce5bad11002c326bd90c8810e54db29061a5cf16ba8cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/mai/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/mai/firefox-52.0.2.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "74cde9da097068a888894d61bcaba89ff61efa003586e01083ca06f6d69aeda1831ca68d88b7e00b9eb917e0c2c7085c6486f50190ce50879a431670e347c0e6"; + sha512 = "8b3279e34bb0b45682e27f7db1b3a56f1abca16c16b0a852ddd70b3f614977c9d03af8dcdd84d82cfb2b29c8426382606e9469c673449859f99fe96f6d3f0476"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/mk/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/mk/firefox-52.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "8c9394b7a4ec6cf251071eeee4ffb60ae74c2c0b0cc77ed7b87ed1933220503a9e24438d7f286bca8d667d174f0669573c55dbab961875fead0be92ac5a2ab10"; + sha512 = "6daf8cb7e9786472872203b98f15a44bb0de1e14cd85be9547ef35e262392df1ad35d9074be0574a4df99a38668e97c8edd7f78b93bde3b227ee86c06e6c16b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ml/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ml/firefox-52.0.2.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "68c76f6b39c4e43f618aaab34dde32c0ce35c846d0992098606d0103998a0f8ebd15c296569c7afba7bc85f8916f36a3ab0142a226f2468b74b588af1ffb9bb8"; + sha512 = "2c214f629f2549aeb145901dd79d71410fadab25f6e1f9000fc0f3710af71ddbf756275e5e491e4c9d703a7458a5444d4b6e4f7c5d2666460d0ff9399c8c45c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/mr/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/mr/firefox-52.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "b9732c556ef495c208dc45287d578fc508436365f067f930a9ec44e8cd0c6a9b0e668a07d206d56a9234e37bb80edd1a3b86f97e8b97f102c9b665eb95f58e3c"; + sha512 = "5126ea191ae20227e208287b3196aed4210514cd3fcb244916f39c614cff287a011d9154f09652a92cae2cfc1a3ff2b090747864205ef8376d55a165faf4ff80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ms/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ms/firefox-52.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "4c87190253012cdf66129820d50c7e039ae846e4d22564582f9e653847e99a17c4225e3dca222e4d88ae4971756e9e6a116c00bd3d54642709d0935212880ebc"; + sha512 = "1d24a4f378b2515a0cef0b0e83153b1ac13da2366ed43465c68b173f5d108b07953073043e23a736af9dd87616b2549f54db74bb6be6134a797eaf9704a493c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/nb-NO/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/nb-NO/firefox-52.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "3e2b6d33fa7bb6d955781e33c09d36db223baec583ee84bf96d5cac1ea6adad8cde1c929dab075eb1ba44e425c6bb199028536ce1da9f49583508549a806155e"; + sha512 = "7f3d8036be432dd56ce421d0fcc9ea18ebe6a829e77cd9982e3eb461d66151ddbabb50266eecd832bfa4fcc934bca4650f9180fe7341e7dd24436ca410c5cd46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/nl/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/nl/firefox-52.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "d13f5483c76d27b10a1b6f95d8c6f45c1d46b606f10b73ea0f8fe182eb1e07e3a708eaf6c5f8e1cbaa8b8832f98613362f7b781f45be4ccb529e48bf25444408"; + sha512 = "865e3793198f3a6184be1189d45a59f7fc927e461c419177419b24064b22f026c2472043fa94d5d0bf31f4766a3c7c9aa8fb0ac941e539f7a599d3057616eb63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/nn-NO/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/nn-NO/firefox-52.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "1e44236fe14462c0922114fc39d45c3b7ffc1d1f51a247d403447dc406820c66b4617f7646b358fb240d220ecda3317d05bb46f127f1bca0460e7be687671c1b"; + sha512 = "146ad9571d8aa517f6f36a9e74250bc2fd18854686153b84a5e365f8a850d06fabd2d220bd99b0aeb51522fbe03f48f9021efbd157d3be32b84be1f028c4ad60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/or/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/or/firefox-52.0.2.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "609ed1aae8c84d2aa1e4c4ce034dee90aee36a01599855b91949e422d63a39aecfe3a7a7038130a9cb93e1874cd0036ad809641c84bfde2ad8893f7c46cb6d39"; + sha512 = "1e6eea8ac94645a6d7137a841b5335cca9c018eb2c3df2685357c8003856846d06401d07417ea7cf2197a06f99ff9ef2865b200bd50607368ea062f3093f5143"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/pa-IN/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/pa-IN/firefox-52.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "3c5689b2a6d594ceee2b52eedf22ef73fa9138a36abaf9f873b4cead3473dc51e2c53c436fcbeaf247d2b74cb7a880dce72086a99a24a3e19be8f37521d2a8ca"; + sha512 = "1c96db3314794c5a2840fc4fbbcc46af424b45da9a7a25a47f84a6db22896094f87d523d9828e424507bef6394002c6f585aca9f0b21687957bbbae9ad6d2b5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/pl/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/pl/firefox-52.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "3222b352e3f9bc05fa1e5cd96c763cc6b4b7b119cee94886bb6191657789f30f31a49e786b3c46607129c639de658c0d3c53494d556d7d31a17204ec338868a6"; + sha512 = "9748ccfdceff346c1b9fd888f3b50281e1b32030446bd9e8d1fc2b3931903ecbef15d2fb6bbb895f10a66a2d103a640d8a9610d8b4e91fd6558b0608a3b9ffb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/pt-BR/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/pt-BR/firefox-52.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "e2ec0b35ad75c2e8f4d8fea32ea84b59fcdc939d83aec878d84c1d5140d1884fa977fb767be203068a4073b5752f5a1a9b646ded10ad87a47bf8f14f8aa8bd09"; + sha512 = "4403ed0cc168740b92bca6e24243f6797a6d604ef159fce37459d0d6a56aab57d1feddf5e382931d17cb388ce98a2f0cfb1b21f877dd4bc72d666e6e9d390d7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/pt-PT/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/pt-PT/firefox-52.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "bff1ff7109c1da0954685031a25c397828b2ab299f82447a46f773179bda440ab35dd687375b12524d03c48ee46f24ef54ebf02449e332fcef20c84bed7c6394"; + sha512 = "25a08eec03fc6d09258c4c0bb545a86e0e762dfedc47551da51b35c9eae61732726a4484b44e0124fabdf4e89f5148cc435019a253d4f35740155e7c272d3516"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/rm/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/rm/firefox-52.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "98771e89b0747de5da54878fc112b4686006891dba3e213c1460f8ad4b8a97d16f68f6969105c4f6e920e78d0fba09326aaf1d4a5f3d3acb9c5aff699e3ffd73"; + sha512 = "d378a1fa02ee8976c1545d31a3914745777c0a9246004d127d7beb5764643d1f57a237e1039d85388f9f8e4b987d2e9a2bd1b95bda2d11ff319c3bc7bf992243"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ro/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ro/firefox-52.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "87445f515ab98e5363fd613e50c920d8545feb6e8dbd18eda15fd0e383e4d1525c7d80d6ea50ecae0fde1cb9880a6daabbdded058d009da6fedd3df8d224576c"; + sha512 = "4776dea591426d6d42c1aa9d64988b57d0b691348185e1656a6363d1ad30495601501546600bfd375513773d5b2fa2030c475254f430facfd30f54dae039fc18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ru/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ru/firefox-52.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "8f7d007fbc550731a42817ae2a9e71eae660fa016e868ec076ef32404e2720d20edc9e56b54d1dff41b2d6771a96bca3052e178e8620646b9a798077135dd498"; + sha512 = "aedb429d9cc396b71bc2eb4ee4a48fb3a35b1e3a8d0a4cd92514a864243527aadb443c3419841128253bc8700a154808281b6d54d5a455c9e8a0a986219da09c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/si/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/si/firefox-52.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "01ac64cd7a60d606ac9974b7ed1cf6a33d5ee7c99d3afd0514bad6580560e55cf5466c83b8309f09188a68335a556d9e2d5ed5e3d35da4d53fe34c31d4054f26"; + sha512 = "5626afbbacc76c688c887e5554fe68c75ad966b1a2d968fbeab1113626e014699c7e3eb88c6cf57a79fb3167cf00132188b842e78cdace2edf6268246c0bb616"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/sk/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/sk/firefox-52.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "516342913ad7e38f0f4ee2baeeb5cb0640a46d9aaa0d0f4fb9d0762cabb88639efaabe158bbdf1a22afed05f99b77271cb5e432eed2ff606f79fdb754d5a553e"; + sha512 = "e923b6bff6772e85d5e92517ffdeac5fe69cafdc0253e5cdbe7e0bf8d7796048e85609cab00c68a81953dd61fee5a45cfd962efb365c1aafc2fb331d04d499df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/sl/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/sl/firefox-52.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "239c2137bf2b2f873874f5d58d245179b55687e69f6d170c2f6d2acdfd90d0cc1a95383ea2a03de2a6a93dae6145651fbc18aefaf4a34ffbafdb9fb6fd30b7f3"; + sha512 = "1d719fa0a38859ce974d18288a80e4e39d2d7ac445503d1ff199087e584e716da27682a557989178fcf9ac5ffeafec520d33be467a8011ae182f1403219cb5da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/son/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/son/firefox-52.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "a4f896919679ae68abace99a38a44b0b4c97ec190fd076fb732c5f4fdaf37dcebc0ba8d8ce79273fc1118f010bdefb304a6d1d6de0aecd7404795d31501af511"; + sha512 = "41a431f673bf3b50fc881f4f038728493204e54c01b381f65709515966457629805ee74cbcc29b15790e01e0cca12d04f1dbe89ddbb02864f771ef3afe764e29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/sq/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/sq/firefox-52.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "9cab63ca40a6389d55ea3cc3fed3efb545784f7f3a257b79f440b72ac891e800f52aaf02e732ad2ecf99aa1810db7b88900f1f6b77cb2c6d2daa3a61210df62e"; + sha512 = "723b08e56396dc0a6d5de76c8740da5ce05a3cad52bd82d07b7acfc0796f24c92c9f1906788728a0c40779dd5a0370643da8f9a3b661227e0587032c7b8d0003"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/sr/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/sr/firefox-52.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "22ac168005c7675d32f2e9524d0356e2de305289dffd0be60334663adbcab48584fdf1dc0990381561aca65711d01b4b007546152d30716fec97bf1486fb788d"; + sha512 = "9d217e36877985e1b16dfaef3b8d38139611c9b69ef9b6b8195c7848b7422eb8c1473ae1afbe0c72a78c7210ea1230be3f61690a691a1bdef5afa000c81d4dd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/sv-SE/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/sv-SE/firefox-52.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "a958aebdaaf7737000a4a6ce7d86b299287bdcfa810a230334ace7a25a277cb17193d373d54724dfb5acf64e78e3c573d2d0c2ce0921ca545e133bfdb20c167d"; + sha512 = "32d937a075de2a2e82fcd8577f5675e1021b6790188c96e236501491fc01fef8ddee119efefa6285f3453fd4b769386c3f5bb5a9768b72c113636ca209f37d8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ta/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/ta/firefox-52.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "107e51b9990dd0438d6fd45fe02582474f5c14dc3a07a8fa2598cca25cacedcf7f7580f8f80c7094eeb7af9cfbda125d469d4da4c2091d8d7a6ae0eeb80fdbc2"; + sha512 = "64950279283837ff0bc154c24f83923c5744e9373554393d7be3fcee3064677d52ac40851bdb44a5dc42ddb504b75d0f7f48ba3af85eeb0e9a227a4c4700e90e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/te/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/te/firefox-52.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "13f611011ee3c82df3aca2dfa4e6c4edf933bebe394f162e30af7c5bd27db3e141fdbb34e3491130605c6af9913a2a95d41d2b3a74cc4f31264e0bc7893bdb45"; + sha512 = "645c17713775bb33636b67d6390e4ba419a409dc9b26c66644a61df96dba9ce1b921fdacb179a711826b71124c71d65acd64bd6f8633d26b524bc97850bab68f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/th/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/th/firefox-52.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "f7d474dbd9cec1c84406ff1f56249896c37e0d7f4c2e7b513dae1e2d2f1278c88cdfa56dd291e4d63746060f0d8e9a71d34f4e5b3004165b70e274e5bfa7e1b8"; + sha512 = "96131590a5d6c0bd06e319a35466873c08b90f7922499827e84044f5b69b10ef0d79435652487761ebad0740348244204bc5deed707b6c293e15f7b48ba254fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/tr/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/tr/firefox-52.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "51a785b556800301ad6a3dde8fee0606d74f00bab1b75fe188d83cfba67a4de2dde402e542cef62eae04059217d5e5acf29f62691c03d4e024f85264778872aa"; + sha512 = "5b290f2e223f943b9b7c7df43df6ec01dbb5744d7db8c35256896ac5c4ae216fe0af72ffa6797d7a4b7c69eb9e742b48e2242914b52d02a99ed1c8a384030bc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/uk/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/uk/firefox-52.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "76f12345ce05edfebd0c5c14b894a0affdcae45899c46a229eeff1930bbd1302f7e1d80f007f0e3b831d8b1460b86a7f607924c24c39160768cf254825178a39"; + sha512 = "112741b2048410a65d7070b2d7c8a6cc0ae2bef812d626aaf3efd907afe50bba496bd6af06edbd433140040722fc6b7999695f7e2a9cfd3049eb105219a1004f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/uz/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/uz/firefox-52.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "7d6ec5c13514721741cfb569769137ea28516279b494b77fc066be89ebdef629d5c15f878ad62d794e5c1e345bc8e2851dbdfb9575f09c8d848d1a61c638463a"; + sha512 = "1cbc2e527e928d4afaf138ae0515e9d6c3c2b7bb95f097c88a697c14988b84f765eb328509f451b024e2b62596f93c85ef298d5ffc76c4a8244cc77c10d9db05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/vi/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/vi/firefox-52.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "c27e0109761f2199c7013abbd206abb24bc33a60d1b87f39ca50a05fc44c4436507b94cf72c7cac9dd30ee0613bf2b32b27272878a446185166f3c83e35ca1db"; + sha512 = "925658b5946201243ebbb6c1a92537702e0afc1e67f990ecdc8b17c976791e671907c314b0681fef7eacd63a9ec554af25862f6a98c1b1508bc1c0fc2a282d35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/xh/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/xh/firefox-52.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "8c46324dd71f3ef17e998911100c451701fdcbecc460facffd1ea43074ceec54b1b84070168496ef38706fd52a69306de76709ba100214c3c9d11252c1fe7d9a"; + sha512 = "0ff098e6fc96238a475cbd209f03d888bc3a23fdeb45497e2ba86f52f6aad6d69b679af83f559d9b9086f01c0fcf894025138dafe6d9250b1851769a1b262e64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/zh-CN/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/zh-CN/firefox-52.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "6bb1e84bdea7b61ac4cc4b145478a167993bc843a4171d97bc9f6a06969eee72f527c25f3b2add2ba5341aa1aa5995b3cfe6d691a4e1ed315cec0df522911313"; + sha512 = "cc0bca5885820769253613f851159e91e2a982616cc84fde27d57ed0064b0e650a6239bfb8c291e2889cb2e5d1fd29de6d8e828e9e6defd65fff030d79d2ef3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/zh-TW/firefox-52.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.2/linux-i686/zh-TW/firefox-52.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "172364ccbacf6918571440cb9910eabb43457deba65449d95adfff550ac3d56b3118d21f862050a6df97ff173f079e8f2c48b41a01ec160da263bf7903c737b3"; + sha512 = "f40191f32c211314a6ee4bbae6675eeeb70dddb10cf770c197440969487722ecf1543a2479cd18b3e55d927d642b54d06722822ac99851d2e1d400d9784baa38"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 66004787542..1ca50ec8954 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -61,6 +61,7 @@ common = { pname, version, sha512, updateScript }: stdenv.mkDerivation rec { "--with-system-libvpx" "--with-system-png" # needs APNG support "--with-system-icu" + "--enable-alsa" "--enable-system-ffi" "--enable-system-hunspell" "--enable-system-pixman" @@ -152,8 +153,8 @@ in { firefox-unwrapped = common { pname = "firefox"; - version = "52.0.1"; - sha512 = "535e2cc0ee645d4ebe9f1d2d1f4fbb16ff5d1745ce493add6b2e323ca3b0907c3054705c5a15eaadb314d5d6474ba1825554fd1ff0780ab7f76fd3f9672a6974"; + version = "52.0.2"; + sha512 = "15668625d212acf874b560d0adf738faf3e0df532c549ab94e1d91944542e13bf16265f08fca1eded42820f9b7ad3f0ff70a8b5bc9adde0a79d11e022bb1158e"; updateScript = import ./update.nix { attrPath = "firefox-unwrapped"; inherit writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl; @@ -162,8 +163,8 @@ in { firefox-esr-unwrapped = common { pname = "firefox-esr"; - version = "52.0.1esr"; - sha512 = "c1f0aea279254e7788f62bba7892840edd2b667f385a649d374c9e783b93ec7faf9e5ebfccd04cd94f46da37aeb6bd7785d17faca2ad441a0b6e8587917faab2"; + version = "52.0.2esr"; + sha512 = "a0f31479e5265c7f40d3013c3dc8368c6bdf03f21f1c9054fb2ae5557065584da433b288b493680d6147a3b11155f41bd33ad2a5d53c6eaa507258c7e00d7335"; updateScript = import ./update.nix { attrPath = "firefox-esr-unwrapped"; versionSuffix = "esr"; diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index befe3cb21f9..f504c3c2b33 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://links.twibright.com/; description = "A small browser with some graphics support"; - maintainers = with maintainers; [ raskin urkud viric ]; + maintainers = with maintainers; [ raskin viric ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 30e8af85b2a..2863ee876e7 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -37,7 +37,7 @@ let mirror = https://get.geo.opera.com/pub/opera/desktop; - version = "43.0.2442.991"; + version = "44.0.2510.857"; rpath = stdenv.lib.makeLibraryPath [ @@ -91,12 +91,12 @@ in stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "${mirror}/${version}/linux/opera-stable_${version}_i386.deb"; - sha256 = "0gd30b5gs2n4ypyn2ky2dlz648akmss2kixb8dqsy4yfd0mz7xqr"; + sha256 = "1589phaxbzmsr70afzqkrlm4fy4nwf2c0gn4rbv2ah2bq62bcp36"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb"; - sha256 = "1pj2d3zhzyavv2gj3v5w07m14679k2vlbfk6sd9bjdy6g7fb5f7x"; + sha256 = "1fah9pm42ljdcdqgxjikb03c8393smhh3g2rbkhrvmjwknba05ym"; } else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)"; diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index b167b59f03c..bd334356df5 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -3,21 +3,21 @@ , dbus, dbus_glib, file, fontconfig, freetype , gstreamer, gst-plugins-base, gst_all_1 , gtk2, hunspell, icu, libevent, libjpeg, libnotify -, libstartup_notification, libvpx, makeWrapper, mesa -, nspr, nss, pango, perl, python, libpulseaudio, sqlite +, libstartup_notification, libvpx, makeWrapper, mesa +, nspr, nss, pango, perl, python, libpulseaudio, sqlite , unzip, xlibs, which, yasm, zip, zlib }: stdenv.mkDerivation rec { name = "palemoon-${version}"; - version = "27.1.1"; + version = "27.2.1"; src = fetchFromGitHub { name = "palemoon-src"; owner = "MoonchildProductions"; repo = "Pale-Moon"; - rev = "a35936746069e6591181eb67e5f9ea094938bae5"; - sha256 = "0hns5993dh93brwz3z4xp1zp8n90x1hajxylv17zybpysax64jsk"; + rev = version + "_Release"; + sha256 = "1yyipxd5lmavf4aca4vrcnp7hb8zkn4sv2zp6n2cm6w4pxlza0g4"; }; desktopItem = makeDesktopItem { @@ -79,6 +79,8 @@ stdenv.mkDerivation rec { ''; installPhase = '' + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications cd $builddir $src/mach install ''; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index a07fc04b02e..eb26811cfb8 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchurl, unzip, buildPythonApplication, makeQtWrapper, wrapGAppsHook +{ stdenv, lib, fetchurl, unzip, buildPythonApplication, makeQtWrapper, wrapGAppsHook , qtbase, pyqt5, jinja2, pygments, pyyaml, pypeg2, cssutils, glib_networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt , gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav -, qtwebkit-plugins }: +, qtwebkit-plugins +, withWebEngineDefault ? false +}: let pdfjs = stdenv.mkDerivation rec { @@ -73,7 +75,8 @@ in buildPythonApplication rec { postFixup = '' mv $out/bin/qutebrowser $out/bin/.qutebrowser-noqtpath - makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser + makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser \ + ${lib.optionalString withWebEngineDefault ''--add-flags "--backend webengine"''} sed -i 's/\.qutebrowser-wrapped/qutebrowser/g' $out/bin/..qutebrowser-wrapped-wrapped ''; diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index ae6ce3dd2c3..04d475f36f0 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -1,42 +1,36 @@ -{stdenv, fetchurl, makeWrapper, gtk2, webkit, pkgconfig, glib, glib_networking, libsoup, gsettings_desktop_schemas, patches ? null}: +{ stdenv, fetchurl +, pkgconfig, wrapGAppsHook +, glib, glib_networking, gsettings_desktop_schemas, gtk, libsoup, webkitgtk +, patches ? null +}: stdenv.mkDerivation rec { name = "surf-${version}"; - version="0.7"; + version = "2.0"; src = fetchurl { url = "http://dl.suckless.org/surf/surf-${version}.tar.gz"; - sha256 = "0jj93izd8fizxfa6ln9w1h9bwki81sz5dhskh5x1rl34zd38aq4m"; + sha256 = "07cmajyafljigy10d21kkyvv5jf3hxkx06pz3rwwk3y3c9x4rvps"; }; - buildInputs = [ gtk2 makeWrapper webkit gsettings_desktop_schemas pkgconfig glib libsoup ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + buildInputs = [ glib glib_networking gsettings_desktop_schemas gtk libsoup webkitgtk ]; - # Allow users set their own list of patches inherit patches; - buildPhase = " make "; - - # `-lX11' to make sure libX11's store path is in the RPATH - NIX_LDFLAGS = "-lX11"; - preConfigure = ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk''; installFlags = [ "PREFIX=/" "DESTDIR=$(out)" ]; - preFixup = '' - wrapProgram "$out/bin/surf" \ - --prefix GIO_EXTRA_MODULES : ${glib_networking.out}/lib/gio/modules \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = { - description = "Simple web browser"; + meta = with stdenv.lib; { + description = "A simple web browser based on WebKit/GTK+"; longDescription = '' Surf is a simple web browser based on WebKit/GTK+. It is able to display websites and follow links. It supports the XEmbed protocol which makes it possible to embed it in another application. Furthermore, one can point surf to another URI by setting its XProperties. - ''; + ''; homepage = http://surf.suckless.org; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + platforms = webkitgtk.meta.platforms; + maintainers = with maintainers; [ joachifm ]; }; } diff --git a/pkgs/applications/networking/browsers/surf/webkit2.nix b/pkgs/applications/networking/browsers/surf/webkit2.nix deleted file mode 100644 index 4a7b3d44e79..00000000000 --- a/pkgs/applications/networking/browsers/surf/webkit2.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchzip -, pkgconfig, wrapGAppsHook -, glib, glib_networking, gsettings_desktop_schemas, gtk2, libsoup, webkitgtk -, patches ? null -}: - -let - # http://git.suckless.org/surf/log/?h=surf-webkit2 - rev = "37e43501d80710533f3ec0bd61ee84916c8524a4"; - sha256 = "1q388rzm4irpaam4z8xycbyh5dgkjlar5jn1iw7zfls1pbpzr5br"; - date = "2017-03-06"; -in - -stdenv.mkDerivation rec { - name = "surf-webkit2-${date}"; - - src = fetchzip { - url = "http://git.suckless.org/surf/snapshot/surf-${rev}.tar.gz"; - inherit sha256; - }; - - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ glib glib_networking gsettings_desktop_schemas gtk2 libsoup webkitgtk ]; - - inherit patches; - - installFlags = [ "PREFIX=/" "DESTDIR=$(out)" ]; - - meta = with stdenv.lib; { - description = "A simple web browser based on WebKit/GTK+"; - longDescription = '' - Surf is a simple web browser based on WebKit/GTK+. It is able to display - websites and follow links. It supports the XEmbed protocol which makes it - possible to embed it in another application. Furthermore, one can point - surf to another URI by setting its XProperties. - ''; - homepage = http://surf.suckless.org; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ joachifm ]; - }; -} diff --git a/pkgs/applications/networking/browsers/torbrowser/default.nix b/pkgs/applications/networking/browsers/torbrowser/default.nix new file mode 100644 index 00000000000..5ce7c4780c8 --- /dev/null +++ b/pkgs/applications/networking/browsers/torbrowser/default.nix @@ -0,0 +1,329 @@ +{ stdenv +, fetchurl +, makeDesktopItem + +# Common run-time dependencies +, zlib + +# libxul run-time dependencies +, alsaLib +, atk +, cairo +, dbus +, dbus_glib +, fontconfig +, freetype +, gdk_pixbuf +, glib +, gtk2 +, libX11 +, libXext +, libXrender +, libXt +, pango + +# Pulseaudio support +, pulseaudioSupport ? mediaSupport +, libpulseaudio + +# Media support (implies pulseaudio support) +, mediaSupport ? false +, gstreamer +, gst-plugins-base +, gst-plugins-good +, gst-ffmpeg +, gmp +, ffmpeg + +# Pluggable transport dependencies +, python27 +}: + +with stdenv.lib; + +let + libPath = makeLibraryPath ([ + alsaLib + atk + cairo + dbus + dbus_glib + fontconfig + freetype + gdk_pixbuf + glib + gtk2 + libX11 + libXext + libXrender + libXt + pango + stdenv.cc.cc + zlib + ] + ++ optionals pulseaudioSupport [ libpulseaudio ] + ++ optionals mediaSupport [ + gstreamer + gst-plugins-base + gmp + ffmpeg + ]); + + gstPluginsPath = concatMapStringsSep ":" (x: + "${x}/lib/gstreamer-0.10") [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-ffmpeg + ]; + + # Library search path for the fte transport + fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; + + # Upstream source + version = "6.5.1"; + + lang = "en-US"; + + srcs = { + "x86_64-linux" = fetchurl { + url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; + sha256 = "1p2bgavvyzahqpjg9vp14c0s50rmha3v1hs1c8zvz6fj8fgrhn0i"; + }; + + "i686-linux" = fetchurl { + url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; + sha256 = "1zfghr01bhpn39wqaw7hyx7yap7xyla4m3mrgz2vi9a5qsyxmbcr"; + }; + }; +in + +stdenv.mkDerivation rec { + name = "tor-browser-${version}"; + inherit version; + + src = srcs."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); + + preferLocalBuild = true; + + desktopItem = makeDesktopItem { + name = "torbrowser"; + exec = "tor-browser"; + icon = "torbrowser"; + desktopName = "Tor Browser"; + genericName = "Web Browser"; + comment = meta.description; + categories = "Network;WebBrowser;Security;"; + }; + + buildCommand = '' + # For convenience ... + TBB_IN_STORE=$out/share/tor-browser + interp=$(< $NIX_CC/nix-support/dynamic-linker) + + # Unpack & enter + mkdir -p "$TBB_IN_STORE" + tar xf "${src}" -C "$TBB_IN_STORE" --strip-components=2 + pushd "$TBB_IN_STORE" + + # Set ELF interpreter + for exe in firefox TorBrowser/Tor/tor ; do + patchelf --set-interpreter "$interp" "$exe" + done + + # The final libPath. Note, we could split this into firefoxLibPath + # and torLibPath for accuracy, but this is more convenient ... + libPath=${libPath}:$TBB_IN_STORE:$TBB_IN_STORE/TorBrowser/Tor + + # Fixup paths to pluggable transports. + sed -i TorBrowser/Data/Tor/torrc-defaults \ + -e "s,./TorBrowser,$TBB_IN_STORE/TorBrowser,g" + + # Fixup obfs transport. Work around patchelf failing to set + # interpreter for pre-compiled Go binaries by invoking the interpreter + # directly. + sed -i TorBrowser/Data/Tor/torrc-defaults \ + -e "s|\(ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit\) exec|\1 exec $interp|" \ + + # Fixup fte transport + # + # Note: the script adds its dirname to search path automatically + sed -i TorBrowser/Tor/PluggableTransports/fteproxy.bin \ + -e "s,/usr/bin/env python,${python27.interpreter}," + + patchelf --set-rpath "${fteLibPath}" TorBrowser/Tor/PluggableTransports/fte/cDFA.so + + # Prepare for autoconfig. + # + # See https://developer.mozilla.org/en-US/Firefox/Enterprise_deployment + cat >defaults/pref/autoconfig.js <mozilla.cfg <fonts,$TBB_IN_STORE/fonts," + + # Move default extension overrides into distribution dir, to avoid + # having to synchronize between local state and store. + mv TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js defaults/pref/torbrowser.js + + # Hard-code paths to geoip data files. TBB resolves the geoip files + # relative to torrc-defaults_path but if we do not hard-code them + # here, these paths end up being written to the torrc in the user's + # state dir. + cat >>TorBrowser/Data/Tor/torrc-defaults < "$out/bin/tor-browser" << EOF + #! ${stdenv.shell} + set -o errexit -o nounset + + # Enter local state directory. + REAL_HOME=\$HOME + TBB_HOME=\''${TBB_HOME:-''${XDG_DATA_HOME:-\$REAL_HOME/.local/share}/tor-browser} + HOME=\$TBB_HOME + + mkdir -p "\$HOME" + cd "\$HOME" + + # Initialize empty TBB local state directory hierarchy. We + # intentionally mirror the layout that TBB would see if executed from + # the unpacked bundle dir. + mkdir -p "\$HOME/TorBrowser" "\$HOME/TorBrowser/Data" + + # Initialize the Tor data directory. + mkdir -p "\$HOME/TorBrowser/Data/Tor" + + # Initialize the browser profile state. Note that the only data + # copied from the Store payload is the initial bookmark file, which is + # never updated once created. All other files under user's profile + # dir are generated by TBB. + mkdir -p "\$HOME/TorBrowser/Data/Browser/profile.default" + cp -u --no-preserve=mode,owner "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/bookmarks.html" \ + "\$HOME/TorBrowser/Data/Browser/profile.default/bookmarks.html" + + # Clear out some files that tend to capture store references but are + # easily generated by firefox at startup. + rm -f "\$HOME/TorBrowser/Data/Browser/profile.default"/{compatibility.ini,extensions.ini,extensions.json} + + # Ensure that we're always using the up-to-date extensions. + ln -snf "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/extensions" \ + "\$HOME/TorBrowser/Data/Browser/profile.default/extensions" + + ${optionalString pulseaudioSupport '' + # Figure out some envvars for pulseaudio + : "\''${XDG_RUNTIME_DIR:=/run/user/\$(id -u)}" + : "\''${XDG_CONFIG_HOME:=\$REAL_HOME/.config}" + : "\''${PULSE_SERVER:=\$XDG_RUNTIME_DIR/pulse/native}" + : "\''${PULSE_COOKIE:=\$XDG_CONFIG_HOME/pulse/cookie}" + ''} + + # Font cache files capture store paths; clear them out on the off + # chance that TBB would continue using old font files. + rm -rf "\$HOME/.cache/fontconfig" + + # Lift-off + # + # XAUTHORITY and DISPLAY are required for TBB to work at all. + # + # DBUS_SESSION_BUS_ADDRESS is inherited to avoid auto-launch; to + # prevent that, set it to an empty/invalid value prior to running + # tor-browser. + # + # PULSE_SERVER is necessary for audio playback. + # + # Setting FONTCONFIG_FILE is required to make fontconfig read the TBB + # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024 + # indicates the system fonts.conf being used instead. + exec env -i \ + HOME="\$HOME" \ + XAUTHORITY="\$XAUTHORITY" \ + DISPLAY="\$DISPLAY" \ + DBUS_SESSION_BUS_ADDRESS="\$DBUS_SESSION_BUS_ADDRESS" \ + \ + PULSE_SERVER="\''${PULSE_SERVER:-}" \ + PULSE_COOKIE="\''${PULSE_COOKIE:-}" \ + \ + GST_PLUGIN_SYSTEM_PATH="${optionalString mediaSupport gstPluginsPath}" \ + GST_REGISTRY="/dev/null" \ + GST_REGISTRY_UPDATE="no" \ + \ + FONTCONFIG_FILE="$FONTCONFIG_FILE" \ + \ + LD_LIBRARY_PATH="$libPath" \ + \ + "$TBB_IN_STORE/firefox" \ + --class "Tor Browser" \ + -no-remote \ + -profile "\$HOME/TorBrowser/Data/Browser/profile.default" \ + "\''${@}" + EOF + chmod +x $out/bin/tor-browser + + # Easier access to docs + mkdir -p $out/share/doc + ln -s $TBB_IN_STORE/TorBrowser/Docs $out/share/doc/tor-browser + + # Install .desktop item + mkdir -p $out/share/applications + cp $desktopItem/share/applications"/"* $out/share/applications + sed -i $out/share/applications/torbrowser.desktop \ + -e "s,Exec=.*,Exec=$out/bin/tor-browser," + + # Install icons + mkdir -p $out/share/pixmaps + cp browser/icons/mozicon128.png $out/share/pixmaps/torbrowser.png + + # Check installed apps + echo "Checking bundled Tor ..." + LD_LIBRARY_PATH=$libPath $TBB_IN_STORE/TorBrowser/Tor/tor --version >/dev/null + + echo "Checking tor-browser wrapper ..." + DISPLAY="" XAUTHORITY="" DBUS_SESSION_BUS_ADDRESS="" TBB_HOME=$(mktemp -d) \ + $out/bin/tor-browser --version >/dev/null + ''; + + meta = with stdenv.lib; { + description = "Tor Browser Bundle"; + homepage = https://www.torproject.org/; + platforms = attrNames srcs; + maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm ]; + hydraPlatforms = []; + # MPL2.0+, GPL+, &c. While it's not entirely clear whether + # the compound is "libre" in a strict sense (some components place certain + # restrictions on redistribution), it's free enough for our purposes. + license = licenses.free; + }; +} diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index f5496457157..31ed8946529 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -4,12 +4,12 @@ let then "linux-amd64" else "darwin-amd64"; checksum = if stdenv.isLinux - then "8bb6f9d336ca7913556e463c5b65eb8d69778c518df2fab0d20be943fbf0efc1" - else "94c9f2d511aec3d4b7dcc5f0ce6f846506169b4eb7235e1dc137d08edf408098"; + then "fa434644d1afd92637369a033fd65b717d8dfa910127d335e8a82c8fad74cc35" + else "64420d467e03ceb666a4f22b89e08b93c06f76f5917fe539860b04cd5e5e515f"; in stdenv.mkDerivation rec { pname = "helm"; - version = "2.1.3"; + version = "2.2.3"; name = "${pname}-${version}"; src = fetchurl { diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index bf69eac318d..69fe6a1730a 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -18,13 +18,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.5.4"; + version = "1.5.6"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1xhz6m6ly6ffj60id9ms1liijlrik8n2pxyzb5m77ym3zf7rxlpl"; + sha256 = "0mkg4vgz9szgq1k5ignkdr5gmg703xlq8zsrr422a1qfqb8zp15w"; }; buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index bdcb0a84625..837447fe60f 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchzip, makeWrapper, jre, pythonPackages +, RSupport? true, R , mesosSupport ? true, mesos , version }: let versionMap = { - "1.6.0" = { + "1.6.3" = { hadoopVersion = "cdh4"; - sparkSha256 = "19ycx1r8g82vkvzmn9wxkssmv2damrg72yfmrgzpc6xyh071g91c"; + sparkSha256 = "00il083cjb9xqzsma2ifphq9ggichwndrj6skh2z5z9jk3z0lgyn"; }; "2.1.0" = { hadoopVersion = "hadoop2.4"; @@ -30,6 +31,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ] + ++ optional RSupport R ++ optional mesosSupport mesos; untarDir = "${name}-bin-${hadoopVersion}"; @@ -46,6 +48,9 @@ stdenv.mkDerivation rec { export SPARK_HOME="$out/lib/${untarDir}" export PYSPARK_PYTHON="${pythonPackages.python}/bin/${pythonPackages.python.executable}" export PYTHONPATH="\$PYTHONPATH:$PYTHONPATH" + ${optionalString RSupport + ''export SPARKR_R_SHELL="${R}/bin/R" + export PATH=$PATH:"${R}/bin/R"''} ${optionalString mesosSupport ''export MESOS_NATIVE_LIBRARY="$MESOS_NATIVE_LIBRARY"''} EOF @@ -57,7 +62,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Lightning-fast cluster computing"; + description = "Apache Spark is a fast and general engine for large-scale data processing"; homepage = "http://spark.apache.org"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/networking/cluster/terraform/0.8.5.nix b/pkgs/applications/networking/cluster/terraform/0.8.5.nix deleted file mode 100644 index 7f927b58670..00000000000 --- a/pkgs/applications/networking/cluster/terraform/0.8.5.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - name = "terraform-${version}"; - version = "0.8.5"; - - goPackagePath = "github.com/hashicorp/terraform"; - - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "terraform"; - rev = "v${version}"; - sha256 = "1cxwv3652fpsbm2zk1akw356cd7w7vhny1623ighgbz9ha8gvg09"; - }; - - postInstall = '' - # remove all plugins, they are part of the main binary now - for i in $bin/bin/*; do - if [[ $(basename $i) != terraform ]]; then - rm "$i" - fi - done - ''; - - meta = with stdenv.lib; { - description = "Tool for building, changing, and versioning infrastructure"; - homepage = "https://www.terraform.io/"; - license = licenses.mpl20; - maintainers = with maintainers; [ - jgeerds - zimbatm - ]; - }; -} diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 7e5a1121be9..93a9894ba6b 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -1,43 +1,44 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchpatch, fetchFromGitHub }: let - generic = { version, sha256 }: - buildGoPackage rec { - name = "terraform-${version}"; + goPackagePath = "github.com/hashicorp/terraform"; - goPackagePath = "github.com/hashicorp/terraform"; + generic = { version, sha256, ... }@attrs: + let attrs' = builtins.removeAttrs attrs ["version" "sha256"]; in + buildGoPackage ({ + name = "terraform-${version}"; - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "terraform"; - rev = "v${version}"; - inherit sha256; - }; + inherit goPackagePath; - postInstall = '' - # remove all plugins, they are part of the main binary now - for i in $bin/bin/*; do - if [[ $(basename $i) != terraform ]]; then - rm "$i" - fi - done - ''; + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "terraform"; + rev = "v${version}"; + inherit sha256; + }; - preCheck = '' - export HOME=$TMP - ''; + postInstall = '' + # remove all plugins, they are part of the main binary now + for i in $bin/bin/*; do + if [[ $(basename $i) != terraform ]]; then + rm "$i" + fi + done + ''; - doCheck = true; + preCheck = '' + export HOME=$TMP + ''; - meta = with stdenv.lib; { - description = "Tool for building, changing, and versioning infrastructure"; - homepage = https://www.terraform.io/; - license = licenses.mpl20; - maintainers = with maintainers; [ jgeerds zimbatm peterhoeg ]; - }; - }; + meta = with stdenv.lib; { + description = "Tool for building, changing, and versioning infrastructure"; + homepage = https://www.terraform.io/; + license = licenses.mpl20; + maintainers = with maintainers; [ jgeerds zimbatm peterhoeg ]; + }; + } // attrs'); -in rec { +in { terraform_0_8_5 = generic { version = "0.8.5"; sha256 = "1cxwv3652fpsbm2zk1akw356cd7w7vhny1623ighgbz9ha8gvg09"; @@ -48,12 +49,21 @@ in rec { sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb"; }; - terraform_0_9_0 = generic { - version = "0.9.0"; - sha256 = "1v96qgc6pd1bkwvkz855625xdcy7xb5lk60lg70144idqmwfjb9g"; - }; + terraform_0_9_2 = generic { + version = "0.9.2"; + sha256 = "1yj5x1d10028fm3v3gjyjdn128ps0as345hr50y8x3vn86n70lxl"; - terraform_0_8 = terraform_0_8_8; - terraform_0_9 = terraform_0_9_0; - terraform = terraform_0_9; + patches = [ + (fetchpatch { + url = "https://github.com/hashicorp/terraform/pull/13237.patch"; + sha256 = "03c2nq12gvqqp12znvl3lmiviwsqksx4nrplv09fns2kz2gyfnbm"; + }) + (fetchpatch { + url = "https://github.com/hashicorp/terraform/pull/13248.patch"; + sha256 = "0awj8gaic0j7a69is95f2rll3yip4n6avai1jh20b1x7dybdrp5m"; + }) + ]; + + doCheck = true; + }; } diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix index 07d89b53fa4..b4197a12db3 100644 --- a/pkgs/applications/networking/corebird/default.nix +++ b/pkgs/applications/networking/corebird/default.nix @@ -3,14 +3,14 @@ , glib_networking }: stdenv.mkDerivation rec { - version = "1.3.3"; + version = "1.4.2"; name = "corebird-${version}"; src = fetchFromGitHub { owner = "baedert"; repo = "corebird"; rev = version; - sha256 = "09k0jrhjqrmpvyz5pf1g7wkidflkhpvw5869a95vnhfxjd45kzs3"; + sha256 = "0s28q9c7p4p4jyhb1g6gdwdphlf6yhi6yg4yn8bkd0gmyf9acakb"; }; preConfigure = '' @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ automake autoconf libtool pkgconfig wrapGAppsHook ]; buildInputs = [ - gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.rest gnome3.dconf glib_networking + gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.rest gnome3.dconf gnome3.gspell glib_networking ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav ]); meta = { diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix index 8be5ee3c775..93ff39bde64 100644 --- a/pkgs/applications/networking/droopy/default.nix +++ b/pkgs/applications/networking/droopy/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Mini Web server that let others upload files to your computer"; homepage = http://stackp.online.fr/droopy; license = licenses.bsd3; - maintainers = maintainers.profpatsch; + maintainers = [ maintainers.profpatsch ]; }; } diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix index 892d8fa3300..18c55c80fc0 100644 --- a/pkgs/applications/networking/dropbox-cli/default.nix +++ b/pkgs/applications/networking/dropbox-cli/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation { installPhase = '' mkdir -p "$out/bin/" "$out/share/applications" cp data/dropbox.desktop "$out/share/applications" + cp -a data/icons "$out/share/icons" + find "$out/share/icons" -type f \! -name '*.png' -delete substitute "dropbox.in" "$out/bin/dropbox" \ --replace '@PACKAGE_VERSION@' ${version} \ --replace '@DESKTOP_FILE_DIR@' "$out/share/applications" \ diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 3721f7ed4af..097ff84a704 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -3,7 +3,7 @@ , libdrm, libffi, libICE, libSM , libX11, libXcomposite, libXext, libXmu, libXrender, libxcb , libxml2, libxslt, ncurses, zlib -, qtbase, qtdeclarative, qtwebkit +, qtbase, qtdeclarative, qtwebkit, makeQtWrapper }: # this package contains the daemon version of dropbox @@ -23,11 +23,11 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "21.4.25"; + version = "22.4.24"; sha256 = { - "x86_64-linux" = "1pgab1ah6rl30rm4dj0biq5714pfzd5jjd2bp0nmhdqn1hm5vmhv"; - "i686-linux" = "05kn8qman8ghknb0chrlmcxrxg7w6l79frkaqj6blgnhanh13h4n"; + "x86_64-linux" = "1353mwk8hjqfc9a87zrp12klsc4anrxr7ccai4cffnq0yw2pnbfp"; + "i686-linux" = "07gpdxq61qkj3c4aywh61zwj34w7j24gcv5y2xf2qgcwn8bykks2"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = @@ -68,31 +68,23 @@ in stdenv.mkDerivation { sourceRoot = ".dropbox-dist"; - nativeBuildInputs = [ makeWrapper patchelf ]; - dontPatchELF = true; # patchelf invoked explicitly below + nativeBuildInputs = [ makeQtWrapper patchelf ]; dontStrip = true; # already done installPhase = '' mkdir -p "$out/${appdir}" cp -r --no-preserve=mode "dropbox-lnx.${arch}-${version}"/* "$out/${appdir}/" + # Vendored libraries interact poorly with our graphics drivers rm "$out/${appdir}/libdrm.so.2" rm "$out/${appdir}/libffi.so.6" rm "$out/${appdir}/libGL.so.1" rm "$out/${appdir}/libX11-xcb.so.1" - rm "$out/${appdir}/libQt5Core.so.5" - rm "$out/${appdir}/libQt5DBus.so.5" - rm "$out/${appdir}/libQt5Gui.so.5" - rm "$out/${appdir}/libQt5Network.so.5" - rm "$out/${appdir}/libQt5OpenGL.so.5" - rm "$out/${appdir}/libQt5PrintSupport.so.5" - rm "$out/${appdir}/libQt5Qml.so.5" - rm "$out/${appdir}/libQt5Quick.so.5" - rm "$out/${appdir}/libQt5Sql.so.5" - rm "$out/${appdir}/libQt5WebKit.so.5" - rm "$out/${appdir}/libQt5WebKitWidgets.so.5" - rm "$out/${appdir}/libQt5XcbQpa.so.5" + # Cannot use vendored Qt libraries due to problem with xkbcommon + rm "$out/${appdir}/"libQt5*.so.5 + rm "$out/${appdir}/qt.conf" + rm -fr "$out/${appdir}/plugins" mkdir -p "$out/share/applications" cp "${desktopItem}/share/applications/"* $out/share/applications @@ -102,7 +94,7 @@ in stdenv.mkDerivation { mkdir -p "$out/bin" RPATH="${ldpath}:$out/${appdir}" - makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \ + makeQtWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \ --prefix LD_LIBRARY_PATH : "$RPATH" chmod 755 $out/${appdir}/dropbox @@ -112,33 +104,22 @@ in stdenv.mkDerivation { INTERP=$(cat $NIX_CC/nix-support/dynamic-linker) RPATH="${ldpath}:$out/${appdir}" getType='s/ *Type: *\([A-Z]*\) (.*/\1/' - find "$out/${appdir}" -type f -a -perm -0100 -print | while read obj; do + find "$out/${appdir}" -type f -print | while read obj; do dynamic=$(readelf -S "$obj" 2>/dev/null | grep "DYNAMIC" || true) - if [[ -n "$dynamic" ]]; then - type=$(readelf -h "$obj" 2>/dev/null | grep 'Type:' | sed -e "$getType") - - if [[ "$type" == "EXEC" ]]; then + if readelf -l "$obj" 2>/dev/null | grep "INTERP" >/dev/null; then echo "patching interpreter path in $type $obj" patchelf --set-interpreter "$INTERP" "$obj" + fi + + type=$(readelf -h "$obj" 2>/dev/null | grep 'Type:' | sed -e "$getType") + if [ "$type" == "EXEC" ] || [ "$type" == "DYN" ]; then echo "patching RPATH in $type $obj" oldRPATH=$(patchelf --print-rpath "$obj") patchelf --set-rpath "''${oldRPATH:+$oldRPATH:}$RPATH" "$obj" - echo "shrinking RPATH in $type $obj" - patchelf --shrink-rpath "$obj" - - elif [[ "$type" == "DYN" ]]; then - - echo "patching RPATH in $type $obj" - oldRPATH=$(patchelf --print-rpath "$obj") - patchelf --set-rpath "''${oldRPATH:+$oldRPATH:}$RPATH" "$obj" - - echo "shrinking RPATH in $type $obj" - patchelf --shrink-rpath "$obj" - else echo "unknown ELF type \"$type\"; not patching $obj" diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix new file mode 100644 index 00000000000..6b92db9efa5 --- /dev/null +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -0,0 +1,29 @@ +{ pythonPackages, fetchurl, lib }: + +with pythonPackages; + +buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "rss2email"; + version = "3.9"; + + propagatedBuildInputs = [ feedparser beautifulsoup4 html2text ]; + + src = fetchurl { + url = "mirror://pypi/r/rss2email/${name}.tar.gz"; + sha256 = "02wj9zhmc2ym8ba1i0z9pm1c622z2fj7fxwagnxbvpr1402ahmr5"; + }; + + postInstall = '' + install -Dm 644 r2e.1 $out/share/man/man1/r2e.1 + # an alias for better finding the manpage + ln -s -T r2e.1 $out/share/man/man1/rss2email.1 + ''; + + meta = with lib; { + description = "A tool that converts RSS/Atom newsfeeds to email."; + homepage = "https://pypi.python.org/pypi/rss2email"; + license = licenses.gpl2; + maintainers = with maintainers; [ jb55 profpatsch ]; + }; +} diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 95e0c502749..ffc22429d1e 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext , pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }: -let version = "3.25.0"; in +let version = "3.25.1"; in stdenv.mkDerivation { name = "filezilla-${version}"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; - sha256 = "1b1lb1zvm887xy3q9i5ziqvwk4ww2pd81a1msbwjrxzy5lq5ykhh"; + sha256 = "1h9g26i16wvc3yjavd39lxifr8d21q9mvfidnwjp9ksrc1qvwww8"; }; configureFlags = [ diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index 64519ce17d5..674cf60161d 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib -, ocaml, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }: +, ocaml, ocamlbuild, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }: stdenv.mkDerivation rec { name = "google-drive-ocamlfuse-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1ldja7080pnjaibrbdvfqwakp4mac8yw1lkb95f7lgldmy96lxas"; }; - buildInputs = [ zlib ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl]; + buildInputs = [ zlib ocaml ocamlbuild ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl]; configurePhase = "ocaml setup.ml -configure --prefix \"$out\""; buildPhase = "ocaml setup.ml -build"; diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 5dc4294ba3b..90b2695f003 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig , cairo, mpg123, gstreamer, gst-ffmpeg, gst-plugins-base, gst-plugins-bad , gst-plugins-good, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg -, gsm, speex, portaudio, spandsp, libuuid, ccache +, gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx }: stdenv.mkDerivation rec { version = "0.5.1"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [zlib openssl libre librem pkgconfig cairo mpg123 gstreamer gst-ffmpeg gst-plugins-base gst-plugins-bad gst-plugins-good alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid - ccache + ccache libvpx ]; makeFlags = [ "LIBRE_MK=${libre}/share/re/re.mk" @@ -24,21 +24,22 @@ stdenv.mkDerivation rec { "USE_VIDEO=1" "CCACHE_DISABLE=1" - "USE_ALSA=1" "USE_AMR=1" "USE_CAIRO=1" "USE_CELT=1" - "USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1" "USE_GSM=1" "USE_GST=1" - "USE_L16=1" "USE_MPG123=1" "USE_OSS=1" "USE_PLC=1" - "USE_PORTAUDIO=1" "USE_SDL=1" "USE_SNDFILE=1" "USE_SPEEX=1" - "USE_SPEEX_AEC=1" "USE_SPEEX_PP=1" "USE_SPEEX_RESAMP=1" "USE_SRTP=1" + "USE_ALSA=1" "USE_AMR=1" "USE_CAIRO=1" "USE_CELT=1" + "USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1" "USE_GSM=1" "USE_GST=1" + "USE_L16=1" "USE_MPG123=1" "USE_OSS=1" "USE_PLC=1" "USE_VPX=1" + "USE_PORTAUDIO=1" "USE_SDL=1" "USE_SNDFILE=1" "USE_SPEEX=1" + "USE_SPEEX_AEC=1" "USE_SPEEX_PP=1" "USE_SPEEX_RESAMP=1" "USE_SRTP=1" "USE_STDIO=1" "USE_SYSLOG=1" "USE_UUID=1" "USE_V4L2=1" "USE_X11=1" "USE_BV32=" "USE_COREAUDIO=" "USE_G711=1" "USE_G722=1" "USE_G722_1=" - "USE_ILBC=" "USE_OPUS=" "USE_SILK=" + "USE_ILBC=" "USE_OPUS=" "USE_SILK=" ] ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" ; + NIX_CFLAGS_COMPILE='' -I${librem}/include/rem -I${gsm}/include/gsm - -DHAVE_INTTYPES_H -D__GLIBC__ + -DHAVE_INTTYPES_H -D__GLIBC__ -D__need_timeval -D__need_timespec -D__need_time_t ''; meta = { homepage = "http://www.creytiv.com/baresip.html"; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix index bfd4e11ccac..5645e1cebaa 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -2,16 +2,19 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "bitlbee-facebook-2015-08-27"; + name = "bitlbee-facebook-${version}"; + version = "1.1.0"; src = fetchFromGitHub { - rev = "094a11b542e2cd8fac4f00fe01870ecd1cb4c062"; + rev = "v${version}"; owner = "jgeboski"; repo = "bitlbee-facebook"; - sha256 = "1dvbl1z6fl3wswvqbs82vkqlggk24dyi8w7cmm5jh1fmaznmwqrl"; + sha256 = "0qclyc2zz8144dc42bhfv2xxrahpiv9j2iwq9h3cmfxszvkb8r3s"; }; - buildInputs = [ bitlbee autoconf automake libtool pkgconfig glib json_glib ]; + nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; + + buildInputs = [ bitlbee glib json_glib ]; preConfigure = '' export BITLBEE_PLUGINDIR=$out/lib/bitlbee diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 30fedec1a4b..c4cb25dfe98 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -6,7 +6,6 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "jitsi-${version}"; version = "2.10.5550"; @@ -15,7 +14,6 @@ stdenv.mkDerivation rec { sha256 = "11vjchc3dnzj55x7c62wsm6masvwmij1ifkds917r1qvil1nzz6d"; }; - patches = [ ./jitsi.patch ]; jitsiItem = makeDesktopItem { @@ -42,7 +40,8 @@ stdenv.mkDerivation rec { xorg.libXv ]); - buildInputs = [unzip ant jdk]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ ant jdk ]; buildPhase = ''ant make''; @@ -55,11 +54,11 @@ stdenv.mkDerivation rec { cp resources/install/generic/run.sh $out/bin/jitsi chmod +x $out/bin/jitsi substituteInPlace $out/bin/jitsi \ - --subst-var-by JAVA ${jdk}/bin/java \ - --subst-var-by EXTRALIBS ${gtk2.out}/lib + --subst-var-by JAVA ${jdk}/bin/java \ + --subst-var-by EXTRALIBS ${gtk2.out}/lib + sed -e 's,^java\ ,${jdk}/bin/java ,' -i $out/bin/jitsi patchShebangs $out - - libPath="$libPath:${jdk.jre.home}/lib/${jdk.architecture}" + libPath="$libPath:${jdk.home}/lib/${jdk.architecture}" find $out/ -type f -name '*.so' | while read file; do patchelf --set-rpath "$libPath" "$file" && \ patchelf --shrink-rpath "$file" @@ -71,7 +70,6 @@ stdenv.mkDerivation rec { description = "Open Source Video Calls and Chat"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = [ maintainers.khumba ]; + maintainers = with maintainers; [ khumba ndowens ]; }; - } diff --git a/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix b/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix new file mode 100644 index 00000000000..f12a14c5c92 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix @@ -0,0 +1,104 @@ +{ + stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, curl, dbus, expat, + fontconfig, freetype, glib, gnome2, libnotify, nspr, nss, systemd, xorg +}: + +with stdenv.lib; + +let + + version = "2.0.6"; + + rpath = makeLibraryPath [ + alsaLib + atk + cairo + cups + curl + dbus + expat + fontconfig + freetype + glib + gnome2.GConf + gnome2.gdk_pixbuf + gnome2.gtk + gnome2.pango + libnotify + nspr + nss + stdenv.cc.cc + systemd + + xorg.libxkbfile + xorg.libX11 + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libXScrnSaver + ] + ":${stdenv.cc.cc.lib}/lib64"; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "https://github.com/aluxian/Messenger-for-Desktop/releases/download/v2.0.6/messengerfordesktop-2.0.6-linux-amd64.deb"; + sha256 = "bf3f3ed9ac46ceb4b7dffbeb33c7d15bbcbfcdd141c4dbfbb620e8bfefae906b"; + } + else + throw "Messenger for Desktop is not supported on ${stdenv.system}"; + +in stdenv.mkDerivation { + name = "messenger-for-desktop-${version}"; + + inherit src; + + buildInputs = [ dpkg ]; + unpackPhase = "true"; + buildCommand = '' + mkdir -p $out + dpkg -x $src $out + + mv $out/usr/share $out/share + mv $out/opt/messengerfordesktop $out/libexec + rmdir $out/usr $out/opt + + chmod -R g-w $out + + # patch the binaries + for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true + patchelf --set-rpath ${rpath}:$out/libexec $file || true + done + + # add symlink to bin + mkdir -p $out/bin + ln -s $out/libexec/messengerfordesktop $out/bin/messengerfordesktop + + # Fix the desktop link + substituteInPlace $out/share/applications/messengerfordesktop.desktop \ + --replace /opt/messengerfordesktop/messengerfordesktop $out/bin/messengerfordesktop + ''; + + meta = { + description = "Bring messenger.com to your Linux desktop."; + longDescription = '' + A simple & beautiful desktop client for Facebook Messenger. Chat without + distractions on OS X, Windows and Linux. Not affiliated with Facebook. + This is NOT an official product. + ''; + homepage = https://messengerfordesktop.org; + license = licenses.mit; + maintainers = [ + maintainers.shawndellysse + ]; + platforms = [ + "x86_64-linux" + ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/oneteam/default.nix b/pkgs/applications/networking/instant-messengers/oneteam/default.nix deleted file mode 100644 index 3d70990f462..00000000000 --- a/pkgs/applications/networking/instant-messengers/oneteam/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv, fetchFromGitHub -, perl, xulrunner, cmake, perlPackages, zip, unzip, pkgconfig -, libpulseaudio, glib, gtk2, pixman, nspr, nss, libXScrnSaver -, scrnsaverproto -}: - -stdenv.mkDerivation rec { - name = "oneteam-unstable-2013-02-21"; - - src = fetchFromGitHub { - repo = "oneteam"; - owner = "processone"; - rev = "c51bc545c3a32db4ea8b96e43b84fcfc6b8d3d2a"; - sha256 = "19104fwdaf0nnsr5w755fg8wwww5sh96wmn939gxa5ah155nf2w3"; - }; - - nativeBuildInputs = [ pkgconfig cmake zip unzip ]; - - buildInputs = - [ perl xulrunner libpulseaudio glib gtk2 pixman nspr - nss libXScrnSaver scrnsaverproto - ] ++ [ perlPackages.SubName gtk2 glib ]; - - postPatch = '' - sed -e '1i#include ' -i src/rtp/otRTPDecoder.cpp src/rtp/otRTPEncoder.cpp - ''; - - cmakeBuildDir = "cmake-build"; - cmakeFlags = ["-D XPCOM_GECKO_SDK=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"]; - - buildPhase = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr" - cd src/components - perl build.pl XULAPP 1 - cd ../../ - ''; - - installPhase = '' - TARGET_DIR="$out/share/oneteam/app" - BUILD_DIR="$PWD" - mkdir -p "$TARGET_DIR" - cd "$TARGET_DIR" - unzip "$BUILD_DIR/oneteam.xulapp" - mkdir -p "$out/bin" - echo "#! ${stdenv.shell}" > "$out/bin/oneteam" - echo "\"${xulrunner}/bin/xulrunner\" \"$TARGET_DIR/application.ini\"" > "$out/bin/oneteam" - chmod a+x "$out/bin/oneteam" - mkdir -p "$out/share/doc" - cp -r "$BUILD_DIR/docs" "$out/share/doc/oneteam" - ''; - - meta = { - description = "An XMPP client"; - maintainers = with stdenv.lib.maintainers; [ raskin ]; - license = stdenv.lib.licenses.gpl2; - homepage="http://oneteam.im"; - }; - - passthru = { - updateInfo = { - downloadPage = "git://github.com/processone/oneteam"; - }; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix index 36be2517fbd..6693550bd3b 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pidgin, intltool, libxml2, nss, nspr }: -let version = "1.20.0"; in +let version = "1.22.0"; in stdenv.mkDerivation { name = "pidgin-sipe-${version}"; src = fetchurl { url = "mirror://sourceforge/sipe/pidgin-sipe-${version}.tar.gz"; - sha256 = "14d8q9by531hfssm6ydn75xkgidka3ar4sy3czjdb03s1ps82srs"; + sha256 = "1aeb348e2ba79b82b1fd102555f86cdc42eaa6f9e761b771d74c4f9c9cf15fc3"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix new file mode 100644 index 00000000000..c4d13ac7643 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, cmake +, qt5, libidn, qca2-qt5, libXScrnSaver, hunspell +, libgcrypt, libotr, html-tidy, libgpgerror +}: + +stdenv.mkDerivation rec { + name = "psi-plus-${version}"; + version = "0.16.575.639"; + + src = fetchFromGitHub { + owner = "psi-plus"; + repo = "psi-plus-snapshots"; + rev = "${version}"; + sha256 = "0mn24y3y4qybw81rjy0hr46y7y96dvwdl6kk61kizwj32z1in8cg"; + }; + + resources = fetchFromGitHub { + owner = "psi-plus"; + repo = "resources"; + rev = "8f5038380e1be884b04b5a1ad3cc3385e793f668"; + sha256 = "1b8a2aixg966fzjwp9hz51rc31imyvpx014mp2fsm47k8na4470d"; + }; + + postUnpack = '' + cp -a "${resources}/iconsets" "$sourceRoot" + ''; + + cmakeFlags = [ + "-DENABLE_PLUGINS=ON" + ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + qt5.qtbase qt5.qtmultimedia qt5.qtx11extras qt5.qttools qt5.qtwebkit + libidn qca2-qt5 libXScrnSaver hunspell + libgcrypt libotr html-tidy libgpgerror + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "XMPP (Jabber) client"; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 036d7fb3ce5..41286331eb1 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "qtox-${version}"; - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "tux3"; repo = "qTox"; rev = "v${version}"; - sha256 = "073kwfaw5n7vvcpwrpdbw5mlswbbwjipx7yy4a95r9z0gjljqnhq"; + sha256 = "0l008mzrs1wsv5cbzxjkv3k48lghlcdsp8blqrkihjv5gcn3psml"; }; buildInputs = [ @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeQtWrapper pkgconfig ]; + cmakeFlags = [ + "-DGIT_DESCRIBE=${version}" + ]; + installPhase = '' runHook preInstall diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix index f0c99841c1b..d05ff845ebb 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ profpatsch AndersonTorres ]; platforms = platforms.linux; + broken = true; }; } #TODO: appindicator, for system tray plugin (by @profpatsch) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 67d86571b88..d64b5be816a 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,144 +1,92 @@ { stdenv, lib, fetchFromGitHub, fetchgit, pkgconfig, gyp, cmake -, qtbase, qtimageformats, qtwayland -, breakpad, ffmpeg, openalSoft, openssl, zlib, libexif, lzma, libopus -, gtk2, glib, cairo, pango, gdk_pixbuf, atk, libappindicator-gtk2 -, libwebp, libunity, dee, libdbusmenu-glib, libva-full, wayland -, xcbutilrenderutil, icu, libSM, libICE, libproxy, libvdpau - -, libxcb, xcbutilwm, xcbutilimage, xcbutilkeysyms, libxkbcommon -, libpng, libjpeg, freetype, harfbuzz, pcre16, xproto, libX11 -, inputproto, sqlite, dbus +, qtbase, qtimageformats, makeQtWrapper +, breakpad, gtk3, libappindicator-gtk3, dee +, ffmpeg, openalSoft, minizip }: -let - system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64; - packagedQt = "5.6.2"; - # Hacky: split "1.2.3-4" into "1.2.3" and "4" - systemQt = (builtins.parseDrvName qtbase.version).name; - qtLibs = [ qtbase qtimageformats qtwayland ]; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "telegram-desktop-${version}"; - version = "1.0.2"; - qtVersion = lib.replaceStrings ["."] ["_"] packagedQt; + version = "1.0.27"; - src = fetchFromGitHub { - owner = "telegramdesktop"; - repo = "tdesktop"; - rev = "v${version}"; - sha256 = "1pakxzs28v794x9mm7pb2m0phkfrwq19shz8a6lfyidb6ng85hy2"; + # Submodules + src = fetchgit { + url = "https://github.com/telegramdesktop/tdesktop"; + rev = "refs/tags/v${version}"; + sha256 = "05g88g6h2a7f9biliicg81fqssx0y3akd3y5r2q2b5h8q3igqrfc"; }; tgaur = fetchgit { - url = "https://aur.archlinux.org/telegram-desktop.git"; - rev = "957a76f9fb691486341bcf4781ad0ef3d16f6b69"; - sha256 = "01nrvvq0mrdyvamjgqr4z5aahyd1wrf28jyddpfsnixp2w5kxqj8"; + url = "https://aur.archlinux.org/telegram-desktop-systemqt.git"; + rev = "b4d169076ed12ec01941a95499774d5caa6fc00e"; + sha256 = "0pmm6slabg9xazgs0ffnp8v0hx3vnpdfgymvapwqpm3h9mwk22x9"; }; buildInputs = [ - breakpad ffmpeg openalSoft openssl zlib libexif lzma libopus - gtk2 glib libappindicator-gtk2 libunity cairo pango gdk_pixbuf atk - dee libdbusmenu-glib libva-full xcbutilrenderutil icu libproxy - libSM libICE - # Qt dependencies - libxcb xcbutilwm xcbutilimage xcbutilkeysyms libxkbcommon - libpng libjpeg freetype harfbuzz pcre16 xproto libX11 - inputproto sqlite dbus libwebp wayland libvdpau + gtk3 libappindicator-gtk3 dee qtbase qtimageformats ffmpeg openalSoft minizip ]; - nativeBuildInputs = [ pkgconfig gyp cmake ]; + nativeBuildInputs = [ pkgconfig gyp cmake makeQtWrapper ]; - patches = [ "${tgaur}/aur-fixes.diff" ]; + patches = [ "${tgaur}/aur-build-fixes.patch" ]; enableParallelBuilding = true; - qtSrcs = builtins.map (x: x.src) qtLibs; - qtNames = builtins.map (x: (builtins.parseDrvName x.name).name) (lib.tail qtLibs); - qtPatches = qtbase.patches; + GYP_DEFINES = lib.concatStringsSep "," [ + "TDESKTOP_DISABLE_CRASH_REPORTS" + "TDESKTOP_DISABLE_AUTOUPDATE" + "TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME" + ]; - buildCommand = '' - unpackPhase - cd "$sourceRoot" - - patchPhase - - sed -i Telegram/gyp/Telegram.gyp \ - -e 's,/usr/include/breakpad,${breakpad}/include/breakpad,g' + NIX_CFLAGS_COMPILE = [ + "-DTDESKTOP_DISABLE_AUTOUPDATE" + "-DTDESKTOP_DISABLE_CRASH_REPORTS" + "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME" + "-I${minizip}/include/minizip" + # See Telegram/gyp/qt.gypi + "-I${qtbase.dev}/mkspecs/linux-g++" + ] ++ lib.concatMap (x: [ + "-I${qtbase.dev}/include/${x}" + "-I${qtbase.dev}/include/${x}/${qtbase.version}" + "-I${qtbase.dev}/include/${x}/${qtbase.version}/${x}" + ]) [ "QtCore" "QtGui" ]; + CPPFLAGS = NIX_CFLAGS_COMPILE; + preConfigure = '' sed -i Telegram/gyp/telegram_linux.gypi \ -e 's,/usr,/does-not-exist,g' \ + -e 's,appindicator-0.1,appindicator3-0.1,g' \ -e 's,-flto,,g' sed -i Telegram/gyp/qt.gypi \ - -e 's,${packagedQt},${systemQt},g' + -e "s,/usr/bin/moc,moc,g" + sed -i Telegram/gyp/qt_rcc.gypi \ + -e "s,/usr/bin/rcc,rcc,g" - gypFlagsArray=( - "-Dlinux_path_qt=$PWD/../qt" - "-Dlinux_lib_ssl=-lssl" - "-Dlinux_lib_crypto=-lcrypto" - "-Dlinux_lib_icu=-licuuc -licutu -licui18n" - ) + gyp \ + -Gconfig=Release \ + --depth=Telegram/gyp \ + --generator-output=../.. \ + -Goutput_dir=out \ + --format=cmake \ + Telegram/gyp/Telegram.gyp - export QMAKE=$PWD/../qt/bin/qmake - ( mkdir -p ../Libraries - cd ../Libraries - for i in $qtSrcs; do - tar -xaf $i - done - cd qtbase-* - # This patch is often outdated but the fixes doesn't feel very important - patch -p1 < ../../$sourceRoot/Telegram/Patches/qtbase_${qtVersion}.diff || true - for i in $qtPatches; do - patch -p1 < $i - done - ${qtbase.postPatch} - cd .. + cd out/Release - export configureFlags="-prefix "$PWD/../qt" -release -opensource -confirm-license -system-zlib \ - -system-libpng -system-libjpeg -system-freetype -system-harfbuzz -system-pcre -system-xcb \ - -system-xkbcommon-x11 -no-eglfs -no-gtkstyle -static -nomake examples -nomake tests \ - -no-directfb -system-proxies -openssl-linked -dbus-linked -system-sqlite -verbose \ - ${lib.optionalString (!system-x86_64) "-no-sse2"} -no-sse3 -no-ssse3 \ - -no-sse4.1 -no-sse4.2 -no-avx -no-avx2 -no-mips_dsp -no-mips_dspr2" - export dontAddPrefix=1 - export MAKEFLAGS=-j$NIX_BUILD_CORES + NUM=$((`wc -l < CMakeLists.txt` - 2)) + sed -i "$NUM r $tgaur/CMakeLists.inj" CMakeLists.txt - ( cd qtbase-* - configurePhase - buildPhase - make install - ) - for i in $qtNames; do - ( cd $i-* - $QMAKE - buildPhase - make install - ) - done - ) + export ASM=$(type -p gcc) + ''; - ( cd Telegram/gyp - gyp "''${gypFlagsArray[@]}" --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=cmake - ) - - ( cd out/Release - export ASM=$(type -p gcc) - cmake . - # For some reason, it can't find stdafx.h -- we need to build dependencies till it fails and then retry. - buildPhase || true - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -include stdafx.h" - buildPhase - ) - - install -Dm755 out/Release/Telegram $out/bin/telegram-desktop + installPhase = '' + install -Dm755 Telegram $out/bin/telegram-desktop mkdir -p $out/share/applications $out/share/kde4/services sed "s,/usr/bin,$out/bin,g" $tgaur/telegramdesktop.desktop > $out/share/applications/telegramdesktop.desktop sed "s,/usr/bin,$out/bin,g" $tgaur/tg.protocol > $out/share/kde4/services/tg.protocol for icon_size in 16 32 48 64 128 256 512; do - install -Dm644 "Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png" + install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png" done - - fixupPhase + wrapQtProgram $out/bin/telegram-desktop ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix index 592fc2b5934..0a5a309c27d 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix @@ -54,7 +54,7 @@ let meta = { inherit (kdelibs4.meta) platforms; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } ); diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 2ade2fd3edd..4cf0d2a0449 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Logger service for Telepathy framework"; homepage = http://telepathy.freedesktop.org/wiki/Logger ; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # Arbitrary choice }; } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix deleted file mode 100644 index 7d06d57ca9a..00000000000 --- a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfigUpstream, libxslt, telepathy_glib, libxml2, dbus_glib -, sofia_sip }: - -stdenv.mkDerivation rec { - pname = "telepathy-rakia"; - name = "${pname}-0.8.0"; - - src = fetchurl { - url = "${meta.homepage}/releases/${pname}/${name}.tar.gz"; - sha256 = "18dxffa8hhjyvqkhhac05rrkx81vnncjrakg5ygikfp0j79vrbhv"; - }; - - nativeBuildInputs = [pkgconfigUpstream libxslt ]; - buildInputs = [ libxml2 dbus_glib telepathy_glib sofia_sip telepathy_glib.python ]; - - meta = { - homepage = http://telepathy.freedesktop.org; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix deleted file mode 100644 index b4403a780ed..00000000000 --- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ stdenv, fetchurl, tcl, tk, tcllib, tcltls, tclgpg -, bwidget, makeWrapper, xlibsWrapper -, withSitePlugins ? true -, theme ? null -}: - -with stdenv.lib; - -let - version = "1.1"; - - main = { - name = "tkabber"; - sha256 = "1ip0mi2icqkjxiam4qj1qcynnz9ck1ggzcbcqyjj132hakd855a2"; - }; - - plugins = { - name = "tkabber-plugins"; - sha256 = "1dr12rh4vs1w1bga45k4ijgxs39801c1k4z3b892pn1dwv84il5y"; - }; - - tclLibraries = [ bwidget tcllib tcltls tclgpg ]; - - getTclLibPath = p: "${p}/lib/${p.libPrefix}"; - - tclLibPaths = stdenv.lib.concatStringsSep " " - (map getTclLibPath tclLibraries); - - mkTkabber = attrs: stdenv.mkDerivation (rec { - name = "${attrs.name}-${version}"; - - src = fetchurl { - url = "http://files.jabber.ru/tkabber/${name}.tar.xz"; - inherit (attrs) sha256; - }; - - prePatch = '' - sed -e "s@/usr/local@$out@" -i Makefile - ''; - } // removeAttrs attrs [ "name" "sha256" ]); - -in mkTkabber (main // { - postPatch = optionalString (theme != null) '' - themePath="$out/share/doc/tkabber/examples/xrdb/${theme}.xrdb" - sed -i '/^if.*load_default_xrdb/,/^}$/ { - s@option readfile \(\[fullpath [^]]*\]\)@option readfile "'"$themePath"'"@ - }' tkabber.tcl - ''; - - postInstall = '' - for prog in $out/bin/*; do - wrapProgram "$prog" \ - --prefix PATH : "${tk}/bin" \ - --set TCLLIBPATH '${tclLibPaths}' \ - ${optionalString withSitePlugins '' - --set TKABBER_SITE_PLUGINS '${mkTkabber plugins}/share/tkabber-plugins' - ''} - done - ''; - - buildInputs = [ tcl tk xlibsWrapper makeWrapper ] ++ tclLibraries; - - meta = { - homepage = "http://tkabber.jabber.ru/"; - description = "A GUI XMPP (Jabber) client written in Tcl/Tk"; - license = stdenv.lib.licenses.gpl2; - }; -}) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix deleted file mode 100644 index 067b1c7884a..00000000000 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ alsaLib -, fetchurl -, gcc -, glib -, gst-plugins-base -, gstreamer -, icu -, libpulseaudio -, libuuid -, libxml2 -, libxslt -, makeQtWrapper -, qt56 -, sqlite -, stdenv -, xlibs -, xorg -, zlib -}: - -stdenv.mkDerivation rec { - name = "zoom-us"; - meta = { - homepage = http://zoom.us; - description = "zoom.us instant messenger"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - }; - - version = "2.0.81497.0116"; - src = fetchurl { - url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "1lq59l5vxirjgcsrl6r4nqgvjr519gkn69alffv1f1fwq5vzif7j"; - }; - - phases = [ "unpackPhase" "installPhase" ]; - nativeBuildInputs = [ makeQtWrapper ]; - buildInputs = [ - alsaLib - gcc.cc - glib - gst-plugins-base - gstreamer - icu - libpulseaudio - libuuid - libxml2 - libxslt - qt56.qtbase - qt56.qtdeclarative - qt56.qtlocation - qt56.qtscript - qt56.qtwebchannel - qt56.qtwebengine - sqlite - xlibs.xcbutilkeysyms - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXext - xorg.libXfixes - xorg.libXrender - xorg.xcbutilimage - zlib - ]; - - libPath = stdenv.lib.makeLibraryPath buildInputs; - - installPhase = '' - mkdir -p $out/share - cp -r \ - application-x-zoom.png \ - audio \ - imageformats \ - config-dump.sh \ - dingdong1.pcm \ - dingdong.pcm \ - doc \ - Droplet.pcm \ - Droplet.wav \ - platforminputcontexts \ - platforms \ - platformthemes \ - leave.pcm \ - ring.pcm \ - ring.wav \ - version.txt \ - xcbglintegrations \ - zcacert.pem \ - zoom \ - Zoom.png \ - ZXMPPROOT.cer \ - $out/share - - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath ${libPath} \ - $out/share/zoom - paxmark m $out/share/zoom - wrapQtProgram "$out/share/zoom" - mkdir -p $out/bin - ln -s $out/share/zoom $out/bin/zoom-us - ''; - } diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index a00aebef296..2be39df6147 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "ipfs-${version}"; - version = "0.4.6"; - rev = "ed729423ce548785834cdcaa21aab11ebc3a1b1a"; + version = "0.4.8"; + rev = "8e7484ed794d1aecb3e773e9003ae64c7b78bb87"; goPackagePath = "github.com/ipfs/go-ipfs"; extraSrcPaths = [ (fetchgx { inherit name src; - sha256 = "1wwzbps3ry3vlrr0iqhvxd44x0wi99dcp5hlxvh79dc0g9r7myfk"; + sha256 = "1h4n74n65z4sw3fqz8nfcrwisbvvwwfq69909w3kgrjsxs7505s5"; }) ]; @@ -18,7 +18,7 @@ buildGoPackage rec { owner = "ipfs"; repo = "go-ipfs"; inherit rev; - sha256 = "1b262k1lhb1g68l8hghly4pdrxx1c6wbv6ij6dg399zdwqzczl13"; + sha256 = "15jcg0wbm7g82fsmhc1vxrsszbxcghls3rsyv35n1hv5k5r5d5nh"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index d46539a88b7..7ab6a4438f3 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }: stdenv.mkDerivation rec { - version = "1.0.1"; + version = "1.0.2"; name = "irssi-${version}"; src = fetchurl { url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz"; - sha256 = "1nqrm376bipvh4x483vygydjzs05n4fmfzip1gfakq1vfqqfhshr"; + sha256 = "1fas6dqz6g8m2400spvkhfxihj3w06qb917h4vhcb716g9wpjkwf"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/irc/shout/default.nix b/pkgs/applications/networking/irc/shout/default.nix index 9d3e3ba449c..bf041a8845a 100644 --- a/pkgs/applications/networking/irc/shout/default.nix +++ b/pkgs/applications/networking/irc/shout/default.nix @@ -11,7 +11,7 @@ let in nodePackages.buildNodePackage rec { name = "shout-${version}"; - version = "0.51.1"; + version = "0.53.0"; src = fetchFromGitHub { owner = "erming"; diff --git a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix index 17d66ba6043..c008c478d22 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, notmuch, openssl, pkgconfig, sqlite, xapian +, notmuch, openssl, pkgconfig, sqlite, xapian, zlib }: stdenv.mkDerivation rec { version = "2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { url = "http://www.muchsync.org/src/${name}.tar.gz"; sha256 = "1dqp23a043kkzl0g2f4j3m7r7lg303gz7a0fsj0dm5ag3kpvp5f1"; }; - buildInputs = [ notmuch openssl pkgconfig sqlite xapian ]; + buildInputs = [ notmuch openssl pkgconfig sqlite xapian zlib ]; meta = { description = "Synchronize maildirs and notmuch databases"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index b1cdd509f98..509a2ab0118 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchurl, pkgconfig, gtk2 - , openssl ? null , gpgme ? null , sslSupport ? true @@ -13,15 +12,16 @@ assert gpgSupport -> gpgme != null; stdenv.mkDerivation rec { name = "sylpheed-${version}"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { url = "http://sylpheed.sraoss.jp/sylpheed/v3.5/${name}.tar.bz2"; - sha256 = "0p50cr9h8b7cv1ayxhqxpj3kv0b7k9dga7lmmfb1lvyagg8n42sa"; + sha256 = "11qhbfyvi5hxv1f448zgbzgrdjj3a4mxj2bfpk6k4bqf7ahh8nis"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = - [ pkgconfig gtk2 ] + [ gtk2 ] ++ optional sslSupport openssl ++ optional gpgSupport gpgme; diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 7c773b0db8b..adcfa656eb9 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchgit, pkgconfig , qt4, qmake4Hook, qt5, avahi, boost, libopus, libsndfile, protobuf, speex, libcap -, alsaLib +, alsaLib, python , jackSupport ? false, libjack2 ? null , speechdSupport ? false, speechd ? null , pulseSupport ? false, libpulseaudio ? null @@ -19,7 +19,7 @@ let patches = optional jackSupport ./mumble-jack-support.patch; - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkgconfig python ] ++ { qt4 = [ qmake4Hook ]; qt5 = [ qt5.qmakeHook ]; }."qt${toString source.qtVersion}" ++ (overrides.nativeBuildInputs or [ ]); buildInputs = [ boost protobuf avahi ] @@ -42,6 +42,7 @@ let preConfigure = '' qmakeFlags="$qmakeFlags DEFINES+=PLUGIN_PATH=$out/lib" + patchShebangs scripts ''; makeFlags = [ "release" ]; @@ -69,7 +70,7 @@ let client = source: generic { type = "mumble"; - nativeBuildInputs = optional (source.qtVersion == 5) qt5.qttools; + nativeBuildInputs = optionals (source.qtVersion == 5) [ qt5.qttools qt5.makeQtWrapper ]; buildInputs = [ libopus libsndfile speex ] ++ optional (source.qtVersion == 5) qt5.qtsvg ++ optional stdenv.isLinux alsaLib @@ -90,6 +91,10 @@ let mkdir -p $out/share/icons{,/hicolor/scalable/apps} cp icons/mumble.svg $out/share/icons ln -s $out/share/icon/mumble.svg $out/share/icons/hicolor/scalable/apps + + ${optionalString (source.qtVersion == 5) '' + wrapQtProgram $out/bin/mumble + ''} ''; } source; @@ -132,5 +137,7 @@ in { mumble = client stableSource; mumble_git = client gitSource; murmur = server stableSource; - murmur_git = server gitSource; + murmur_git = (server gitSource).overrideAttrs (old: { + meta = old.meta // { broken = true; }; + }); } diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index b348010c61f..93e10fbe566 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -6,13 +6,13 @@ let pname = "liferea"; - version = "1.12-rc2"; + version = "1.12-rc3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "1q83s900skl0w9pb0afq8z387ynhl0rqn6fmps8wmncj0z1q07wb"; + sha256 = "0dd6hisqvc4ps6dx9ly34qx49ab1qa5h826b7dvf64mjqxa2v3kr"; }; nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ]; diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 1323c312121..ccd1b5cfeae 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4, pkgconfig, qtkeychain, sqlite }: +{ stdenv, fetchurl, cmake, qt5, pkgconfig, qtkeychain, sqlite }: stdenv.mkDerivation rec { name = "owncloud-client-${version}"; @@ -10,10 +10,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ qt4 qtkeychain sqlite]; + buildInputs = [ qt5.qtbase qt5.qtwebkit qtkeychain sqlite ]; cmakeFlags = [ - "-UCMAKE_INSTALL_LIBDIR" + "-UCMAKE_INSTALL_LIBDIR" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 12692b9566f..6feeacc675a 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -10,7 +10,7 @@ let version = "2.92"; in -with { inherit (stdenv.lib) optional optionals optionalString; }; +let inherit (stdenv.lib) optional optionals optionalString; in stdenv.mkDerivation rec { name = "transmission-" + optionalString enableGTK3 "gtk-" + version; diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 89027191654..8e99d5159f8 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,14 +1,17 @@ -{ stdenv, fetchurl, pythonPackages, makeWrapper, nettools, libtorrentRasterbar, imagemagick -, enablePlayer ? false, vlc ? null }: - +{ stdenv, fetchgit, pythonPackages, makeWrapper, nettools, libtorrentRasterbar, imagemagick +, enablePlayer ? true, vlc ? null }: stdenv.mkDerivation rec { - name = "tribler-${version}"; - version = "v6.4.3"; + pname = "tribler"; + name = "${pname}-${version}"; + version = "7.0.0-beta"; + revision = "1d3ddb8"; - src = fetchurl { - url = "https://github.com/Tribler/tribler/releases/download/${version}/Tribler-${version}.tar.xz"; - sha256 = "1n5qi3jlby41w60zg6dvl933ypyiflq3rb0qkwhxi4b26s3vwvgr"; + src = fetchgit { + url = "https://github.com/Tribler/tribler"; + rev = revision; + sha256 = "16mk76qgg7fgca11yvpygicxqbkc0kn6r82x73fly2310pagd845"; + fetchSubmodules = true; }; buildInputs = [ @@ -20,42 +23,56 @@ stdenv.mkDerivation rec { pythonPath = [ libtorrentRasterbar - pythonPackages.wxPython pythonPackages.apsw pythonPackages.twisted - pythonPackages.gmpy pythonPackages.netifaces - pythonPackages.pillow pythonPackages.pycrypto pythonPackages.pyasn1 pythonPackages.requests pythonPackages.setuptools pythonPackages.m2crypto + pythonPackages.pyqt5 + pythonPackages.chardet + pythonPackages.cherrypy + pythonPackages.cryptography + pythonPackages.libnacl + pythonPackages.configobj + pythonPackages.matplotlib + pythonPackages.plyvel + pythonPackages.decorator + pythonPackages.feedparser ]; - installPhase = - '' - find . -name '*.png' -exec convert -strip {} {} \; - # Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH. - wrapPythonPrograms + postPatch = '' + ${stdenv.lib.optionalString enablePlayer '' + substituteInPlace "./TriblerGUI/vlc.py" --replace "ctypes.CDLL(p)" "ctypes.CDLL('${vlc}/lib/libvlc.so')" + substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" --replace "if vlc and vlc.plugin_path" "if vlc" + substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" --replace "os.environ['VLC_PLUGIN_PATH'] = vlc.plugin_path" "os.environ['VLC_PLUGIN_PATH'] = '${vlc}/lib/vlc/plugins'" + ''} + ''; - mkdir -p $out/share/tribler - cp -prvd Tribler $out/share/tribler/ + installPhase = '' + find . -name '*.png' -exec convert -strip {} {} \; + mkdir -pv $out + # Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH. + wrapPythonPrograms + cp -prvd ./* $out/ + makeWrapper ${pythonPackages.python}/bin/python $out/bin/tribler \ + --set _TRIBLERPATH $out \ + --set PYTHONPATH $out:$program_PYTHONPATH \ + --set NO_AT_BRIDGE 1 \ + --run 'cd $_TRIBLERPATH' \ + --add-flags "-O $out/run_tribler.py" \ + ${stdenv.lib.optionalString enablePlayer '' + --prefix LD_LIBRARY_PATH : ${vlc}/lib + ''} + ''; - makeWrapper ${pythonPackages.python}/bin/python $out/bin/tribler \ - --set _TRIBLERPATH $out/share/tribler \ - --set PYTHONPATH $out/share/tribler:$program_PYTHONPATH \ - --run 'cd $_TRIBLERPATH' \ - --add-flags "-O $out/share/tribler/Tribler/Main/tribler.py" \ - ${stdenv.lib.optionalString enablePlayer '' - --prefix LD_LIBRARY_PATH : ${vlc}/lib - ''} - ''; - - meta = { + meta = with stdenv.lib; { + maintainers = with maintainers; [ xvapx ]; homepage = http://www.tribler.org/; description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol"; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl21; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index cf7afc37b8b..c656ff24df8 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -22,14 +22,15 @@ , alsaLib }: -stdenv.mkDerivation rec { +let versionRec = { major = "13"; minor = "4"; patch = "0"; }; +in stdenv.mkDerivation rec { name = "citrix-receiver-${version}"; - version = "13.4.0"; + version = with versionRec; "${major}.${minor}.${patch}"; homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86"; - src = requireFile rec { + src = with versionRec; requireFile rec { name = "${prefixWithBitness}-${version}.10109380.tar.gz"; sha256 = if stdenv.is64bit @@ -41,12 +42,14 @@ stdenv.mkDerivation rec { ${homepage} - (if you do not find version ${version} there, try https://www.citrix.com/downloads/citrix-receiver/) + (if you do not find version ${version} there, try at + https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-latest-${major}-${minor}.html + or at https://www.citrix.com/downloads/citrix-receiver/ under "Earlier Versions of Receiver for Linux") Once you have downloaded the file, please use the following command and re-run the installation: - nix-prefetch-url file://$PWD/${name} + nix-prefetch-url file://\$PWD/${name} ''; }; @@ -135,7 +138,8 @@ stdenv.mkDerivation rec { echo "Wrapping wfica..." mkdir "$out/bin" - makeWrapper "$ICAInstDir/wfica -icaroot $ICAInstDir" "$out/bin/wfica" \ + makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \ + --add-flags "-icaroot $ICAInstDir" \ --set ICAROOT "$ICAInstDir" \ --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 375a948c1f2..c8880e630a6 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt5 != null; with stdenv.lib; let - version = "2.2.4"; + version = "2.2.5"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2"; - sha256 = "049r5962yrajhhz9r4dsnx403dab50d6091y2mw298ymxqszp9s2"; + sha256 = "1j4sc3pmy8l6k41007spglcqiabjlzc7f85pn3jmjr9ksv9qipbm"; }; nativeBuildInputs = [ @@ -35,13 +35,7 @@ in stdenv.mkDerivation { ++ optionals stdenv.isLinux [ libcap libnl ] ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]; - patches = [ ./wireshark-lookup-dumpcap-in-path.patch - (fetchurl { - url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commitdiff_plain;h=c7042bedbb3b12c5f4e19e59e52da370d4ffe62f;hp=bc2b135677110d8065ba1174f09bc7f5ba73b9e9"; - sha256 = "1m70akywf2r52lhlvzr720vl1i7ng9cqbzaiif8s81xs4g4nn2rz"; - name = "wireshark-CVE-2017-6014.patch"; - }) - ]; + patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; postInstall = optionalString (withQt || withGtk) '' ${optionalString withGtk '' diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index adbadba411c..93b4fc76467 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "rclone-${version}"; - version = "1.35"; + version = "1.36"; goPackagePath = "github.com/ncw/rclone"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "ncw"; repo = "rclone"; rev = "v${version}"; - sha256 = "15dmppb7qgr3vg76dsv770l51lmsl8n8k3rvbnhhks5a2cz0kf2i"; + sha256 = "1vx75ihg2j0chml8hwvngjkjw647cai9gicfy8ss6xsrm46w59b3"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 2cb4f0a5922..0f696d78855 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, go, pkgs, removeReferencesTo }: stdenv.mkDerivation rec { - version = "0.14.24"; + version = "0.14.25"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "15jjk49ibry7crc3sw5zg09zsm5ir0ph5c0f3acas66wd02rnvl1"; + sha256 = "1if92y32h1wp5sz2lnlw5fqibzbik7bklq850j9wcxfvr6ahck0w"; }; buildInputs = [ go removeReferencesTo ]; diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 154ff33c844..76027f29a70 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { vector graphics. ''; homepage = http://calligra.org; - maintainers = with maintainers; [ urkud phreedom ebzzry ]; + maintainers = with maintainers; [ phreedom ebzzry ]; inherit (kdelibs4.meta) platforms; license = licenses.gpl2; }; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 59389a69e7c..c43a06838b8 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -22,7 +22,7 @@ let primary-src = import ./default-primary-src.nix { inherit fetchurl; }; in -with { inherit (primary-src) major minor subdir version; }; +let inherit (primary-src) major minor subdir version; in let lib = stdenv.lib; diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index b973a4192bb..7a2174b557e 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -22,7 +22,7 @@ let primary-src = import ./still-primary-src.nix { inherit fetchurl; }; in -with { inherit (primary-src) major minor subdir version; }; +let inherit (primary-src) major minor subdir version; in let lib = stdenv.lib; diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix index 9a59bef617b..0e53d58a083 100644 --- a/pkgs/applications/office/marp/default.nix +++ b/pkgs/applications/office/marp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "marp-${version}"; - version = "0.0.9"; + version = "0.0.10"; src = fetchurl { url = "https://github.com/yhatt/marp/releases/download/v${version}/${version}-Marp-linux-x64.tar.gz"; - sha256 = "142c35d88rkgjy85f4204givgx0p1qyfpipbrsa11lp3cb6jzhn2"; + sha256 = "0x4qldbyvq88cs12znxv33bb0nxr3wxcwhyr97pkjrjc2cn7nphx"; }; sourceRoot = "."; diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index d24c59b87d9..0a14a87cf56 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -36,14 +36,14 @@ let then "i386" else "amd64"; - shortVersion = "1.17.8-stable"; + shortVersion = "1.17.9-stable"; version = "${shortVersion}_${arch}"; url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb"; sha256 = if stdenv.system == arch32 - then "0j2hi0kd3cjjs47fxdzilc3rh02kzkdhvh70yyv7j8n58lnyjnx7" - else "0pi1bis0jmy618c1jn6b61mn666w7546xzicbqv1g6c4l8s3wgm5"; + then "0z04r3ipwp2vca3qhp3b1zj0m12h023ynmbjsz4sysnd1bb5f2yr" + else "0h3m6s3s5283g9w3sm4fszhhnzgmqw49nr0ihvdwyxrgawxmz4vg"; deps = [ qt5.qtbase diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix new file mode 100644 index 00000000000..d8e6cdd86ea --- /dev/null +++ b/pkgs/applications/office/treesheets/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchFromGitHub, wxGTK, makeWrapper }: + +stdenv.mkDerivation rec { + name = "treesheets-${version}"; + version = "2017-03-27"; + + src = fetchFromGitHub { + owner = "aardappel"; + repo = "treesheets"; + rev = "1d1d6b214e3ae88445eb1ec0032d5fef14160f32"; + sha256 = "0np91c4skq3yxq76c4zi33w73qb1w2nrcin490kkvrxk53jspklb"; + }; + + buildInputs = [ wxGTK makeWrapper ]; + + preConfigure = "cd src"; + + postInstall = '' + mkdir "$out/share" -p + cp -av ../TS "$out/share/libexec" + + mkdir "$out/bin" -p + makeWrapper "$out/share/libexec/treesheets" "$out/bin/treesheets" + + mkdir "$out/share/doc" -p + + for f in readme.html docs examples + do + mv -v "$out/share/libexec/$f" "$out/share/doc" + ln -sv "$out/share/doc/$f" "$out/share/libexec/$f" + done + + mkdir "$out/share/applications" -p + mv -v "$out/share/libexec/treesheets.desktop" "$out/share/applications" + substituteInPlace "$out/share/applications/treesheets.desktop" \ + --replace "Icon=images/treesheets.svg" "Icon=$out/share/libexec/images/treesheets.svg" + ''; + + meta = with stdenv.lib; { + description = "Free Form Data Organizer"; + + longDescription = '' + The ultimate replacement for spreadsheets, mind mappers, outliners, + PIMs, text editors and small databases. + + Suitable for any kind of data organization, such as Todo lists, + calendars, project management, brainstorming, organizing ideas, + planning, requirements gathering, presentation of information, etc. + ''; + + homepage = http://strlen.com/treesheets/; + maintainers = with maintainers; [ obadz ]; + platforms = platforms.linux; + license = licenses.zlib; + }; +} diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix index 71f38bb8d3c..0cf85840db6 100644 --- a/pkgs/applications/office/zanshin/default.nix +++ b/pkgs/applications/office/zanshin/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "GTD for KDE"; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; inherit (kdelibs4.meta) platforms; }; } diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix index bdb93c99226..9c79bfe1a55 100644 --- a/pkgs/applications/science/astronomy/xplanet/default.nix +++ b/pkgs/applications/science/astronomy/xplanet/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "Renders an image of the earth or other planets into the X root window"; homepage = http://xplanet.sourceforge.net; license = "GPL"; - maintainers = [ stdenv.lib.maintainers.sander stdenv.lib.maintainers.urkud ]; + maintainers = [ stdenv.lib.maintainers.sander ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/applications/science/biology/bedtools/default.nix index cd5c980b001..d6e00659c1a 100644 --- a/pkgs/applications/science/biology/bedtools/default.nix +++ b/pkgs/applications/science/biology/bedtools/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ zlib python ]; - buildPhase = "make prefix=$out SHELL=${stdenv.shell} -j $NIX_BUILD_CORES"; - installPhase = "make prefix=$out SHELL=${stdenv.shell} install"; + cc = if stdenv.cc.isClang then "clang++" else "g++"; + buildPhase = "make prefix=$out SHELL=${stdenv.shell} CXX=${cc} -j $NIX_BUILD_CORES"; + installPhase = "make prefix=$out SHELL=${stdenv.shell} CXX=${cc} install"; meta = with stdenv.lib; { description = "A powerful toolset for genome arithmetic."; diff --git a/pkgs/applications/science/biology/ncbi-tools/default.nix b/pkgs/applications/science/biology/ncbi-tools/default.nix index 775e2ec3cc8..e9d99aeb254 100644 --- a/pkgs/applications/science/biology/ncbi-tools/default.nix +++ b/pkgs/applications/science/biology/ncbi-tools/default.nix @@ -9,16 +9,14 @@ stdenv.mkDerivation rec { name = "ncbi_tools"; - ncbi_version="Dec_31_2008"; + ncbi_version = "Dec_31_2008"; src = fetchurl { url = "ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools++/2008/${ncbi_version}/ncbi_cxx--${ncbi_version}.tar.gz"; sha256 = "1b2v0dcdqn3bysgdkj57sxmd6s0hc9wpnxssviz399g6plhxggbr"; }; configureFlags = "--without-debug --with-bin-release --with-dll --without-static"; - # PIC flag (position independent code for shared libraries) - NIX_CXXFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; - buildInputs = [cpio]; + buildInputs = [ cpio ]; meta = { description = ''NCBI Bioinformatics toolbox (incl. BLAST)''; @@ -26,5 +24,6 @@ stdenv.mkDerivation rec { homepage = http://www.ncbi.nlm.nih.gov/IEB/ToolBox/; license = "GPL"; priority = "5"; # zlib.so gives a conflict with zlib + broken = true; }; } diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 5d69b1f29e7..136fba47eb7 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, fetchurl +{ stdenv +, fetchurl , pkgconfig , automake , autoconf @@ -7,14 +7,14 @@ , ncurses , readline , which -, python ? null +, python ? null , mpi ? null }: stdenv.mkDerivation rec { name = "neuron-${version}"; version = "7.4"; - + nativeBuildInputs = [ which pkgconfig automake autoconf libtool ]; buildInputs = [ ncurses readline python mpi ]; @@ -25,23 +25,32 @@ stdenv.mkDerivation rec { patches = (stdenv.lib.optional (stdenv.isDarwin) [ ./neuron-carbon-disable.patch ]); + # With LLVM 3.8 and above, clang (really libc++) gets upset if you attempt to redefine these... + postPatch = stdenv.lib.optionalString stdenv.cc.isClang '' + substituteInPlace src/gnu/neuron_gnu_builtin.h \ + --replace 'double abs(double arg);' "" \ + --replace 'float abs(float arg);' "" \ + --replace 'short abs(short arg);' "" \ + --replace 'long abs(long arg);' "" + ''; + enableParallelBuilding = true; ## neuron install by default everything under prefix/${host_arch}/* - ## override this to support nix standard file hierarchy + ## override this to support nix standard file hierarchy ## without issues: install everything under prefix/ preConfigure = '' ./build.sh - export prefix="''${prefix} --exec-prefix=''${out}" + export prefix="''${prefix} --exec-prefix=''${out}" ''; configureFlags = with stdenv.lib; [ "--without-x" "--with-readline=${readline}" ] ++ optionals (python != null) [ "--with-nrnpython=${python.interpreter}" ] - ++ (if mpi != null then ["--with-mpi" "--with-paranrn"] + ++ (if mpi != null then ["--with-mpi" "--with-paranrn"] else ["--without-mpi"]); - - + + postInstall = stdenv.lib.optionals (python != null) [ '' ## standardise python neuron install dir if any if [[ -d $out/lib/python ]]; then @@ -49,22 +58,22 @@ stdenv.mkDerivation rec { mv ''${out}/lib/python/* ''${out}/${python.sitePackages}/ fi '']; - - propagatedBuildInputs = [ readline ncurses which libtool ]; + + propagatedBuildInputs = [ readline ncurses which libtool ]; meta = with stdenv.lib; { description = "Simulation environment for empirically-based simulations of neurons and networks of neurons"; - longDescription = "NEURON is a simulation environment for developing and exercising models of - neurons and networks of neurons. It is particularly well-suited to problems where - cable properties of cells play an important role, possibly including extracellular - potential close to the membrane), and where cell membrane properties are complex, + longDescription = "NEURON is a simulation environment for developing and exercising models of + neurons and networks of neurons. It is particularly well-suited to problems where + cable properties of cells play an important role, possibly including extracellular + potential close to the membrane), and where cell membrane properties are complex, involving many ion-specific channels, ion accumulation, and second messengers"; license = licenses.bsd3; homepage = http://www.neuron.yale.edu/neuron; maintainers = [ maintainers.adev ]; platforms = platforms.all; - }; + }; } diff --git a/pkgs/applications/science/biology/platypus/default.nix b/pkgs/applications/science/biology/platypus/default.nix index 868540fcbc3..2947515652e 100644 --- a/pkgs/applications/science/biology/platypus/default.nix +++ b/pkgs/applications/science/biology/platypus/default.nix @@ -33,6 +33,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl3; homepage = https://github.com/andyrimmer/Platypus; maintainers = with maintainers; [ jbedo ]; - platforms = platforms.unix; + platforms = platforms.x86_64; }; } diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index 1e9f3ee521b..878dfde8f4e 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Molecule editor and visualizer"; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/applications/science/logic/redprl/default.nix b/pkgs/applications/science/logic/redprl/default.nix index 0cbe1d1cb37..49245c73f2c 100644 --- a/pkgs/applications/science/logic/redprl/default.nix +++ b/pkgs/applications/science/logic/redprl/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchgit, mlton }: stdenv.mkDerivation { - name = "redprl-2016-09-22"; + name = "redprl-2017-03-28"; src = fetchgit { url = "https://github.com/RedPRL/sml-redprl.git"; - rev = "3215faf0d494f4ac14d6e10172329a161df192c4"; - sha256 = "0pcq4q9xy34j7ziwbly4qxccpkcrl92r9y11bv6hdkbzwm1g2a77"; + rev = "bdf027de732e4a8d10f9f954389dfff0c822f18b"; + sha256 = "0cihwnd78d3ksxp6mppifm7xpi3fsii5mixvicajy87ggw8z305c"; fetchSubmodules = true; }; buildInputs = [ mlton ]; diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index aee4831034d..d37d5c16091 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "geogebra-${version}"; - version = "5-0-338-0"; + version = "5-0-350-0"; preferLocalBuild = true; src = fetchurl { url = "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"; - sha256 = "1namwib3912zjizgl9swan0fwgmq9kvfq5k5y8lz818vh4lv88kx"; + sha256 = "0lr2calglad5d17p5sl1jbjdfsdsmn4dxgy8s89lyh0d4aihy54d"; }; srcIcon = fetchurl { diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 9ea43023d57..ee67af62bb1 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GiNaC is Not a CAS"; homepage = http://www.ginac.de/; - maintainers = with maintainers; [ lovek323 urkud ]; + maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 85a13f7ac37..5a19f73d9cf 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation ({ platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.peti ]; + broken = ecl != null; }; } // (stdenv.lib.optionalAttrs ecl-fasl { preConfigure = '' diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index af4cda87473..e6630815ba1 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { homepage = "http://www.sagemath.org"; description = "A free open source mathematics software system"; license = stdenv.lib.licenses.gpl2Plus; + broken = true; }; } diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 6cd66c62a0a..9cd72c2fd50 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -44,9 +44,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A CAS for polynomial computations"; - maintainers = with maintainers; - [ raskin ]; - platforms = platforms.linux; + maintainers = with maintainers; [ raskin ]; + platforms = subtractLists platforms.i686 platforms.linux; license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 homepage = "http://www.singular.uni-kl.de/index.php"; downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/"; diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix index 334423660a0..33de9cd0d97 100644 --- a/pkgs/applications/science/math/speedcrunch/default.nix +++ b/pkgs/applications/science/math/speedcrunch/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { ''; maintainers = with maintainers; [ gebner ]; platforms = platforms.all; + broken = builtins.compareVersions qtbase.version "5.8.0" >= 0; }; - } diff --git a/pkgs/applications/science/misc/golly/beta.nix b/pkgs/applications/science/misc/golly/beta.nix new file mode 100644 index 00000000000..5fe72e44842 --- /dev/null +++ b/pkgs/applications/science/misc/golly/beta.nix @@ -0,0 +1,59 @@ +{stdenv, fetchurl, fetchgit +, wxGTK, perl, python2, zlib, mesa, libX11 +, automake, autoconf +}: +let + s = # Generated upstream information + rec { + baseName="golly"; + version="2.8"; + name="${baseName}-${version}"; + hash="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204"; + }; +in +stdenv.mkDerivation rec { + name = "golly-${version}"; + version = "2.8.99.2.20161122"; + #src = fetchurl { + # url="mirror://sourceforge/project/golly/golly/golly-2.8/golly-2.8-src.tar.gz"; + # sha256="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204"; + #}; + src = fetchgit { + url = "git://git.code.sf.net/p/golly/code"; + rev = "93495edf3c9639332c6eb43ca7149c69629ee5d8"; + sha256 = "1j308s9zlqkr3wnl1l32s5zk7r3g4ijwawkkysl8j5ik9sibi2gk"; + }; + + setSourceRoot = '' + export sourceRoot="$(echo */gui-wx/configure)" + ''; + + nativeBuildInputs = [autoconf automake]; + + buildInputs = [ + wxGTK perl python2 zlib mesa libX11 + ]; + + # Link against Python explicitly as it is needed for scripts + makeFlags=[ + "AM_LDFLAGS=" + ]; + NIX_LDFLAGS="-lpython${python2.majorVersion} -lperl"; + preConfigure='' + export NIX_LDFLAGS="$NIX_LDFLAGS -L$(dirname "$(find ${perl} -name libperl.so)")" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE + -DPYTHON_SHLIB=$(basename "$( + readlink -f ${python2}/lib/libpython*.so)")" + + sh autogen.sh + ''; + + meta = { + inherit version; + description = "Cellular automata simulation program"; + license = stdenv.lib.licenses.gpl2; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + downloadPage = "http://sourceforge.net/projects/golly/files/golly"; + }; +} diff --git a/pkgs/applications/science/misc/golly/default.upstream b/pkgs/applications/science/misc/golly/default.upstream index 24032de5668..ab9fb03e7b1 100644 --- a/pkgs/applications/science/misc/golly/default.upstream +++ b/pkgs/applications/science/misc/golly/default.upstream @@ -2,3 +2,4 @@ url http://sourceforge.net/projects/golly/files/golly/ version_link '[-][0-9.]+/$' SF_version_tarball 'src' SF_redirect +minimize_overwrite diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 98567c340bc..e323b42d7ae 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -89,5 +89,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ pxc ]; + broken = true; # relies improperly on private Qt 5.5 headers }; } diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 345b1341c0f..649b34e7569 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -7,16 +7,14 @@ assert stdenv.system != "powerpc-linux"; stdenv.mkDerivation rec { - ver = "1.21.3"; + ver = "1.23.1"; name = "recoll-${ver}"; src = fetchurl { url = "http://www.lesbonscomptes.com/recoll/${name}.tar.gz"; - sha256 = "66f039f08b149d5e4840664d4a636f6b55145b02072f87aab83282ebe0cd593a"; + sha256 = "0si407qm47ndy0l6zv57lqb5za4aiv0lyghnzb211g03szjkfpg8"; }; - patches = [ ./nodeblayout.patch ./versionawk.patch ]; - configureFlags = [ "--with-inotify" ]; buildInputs = [ qt4 xapian file python bison]; @@ -61,6 +59,6 @@ stdenv.mkDerivation rec { homepage = http://www.lesbonscomptes.com/recoll/; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ jcumming ]; + maintainers = [ maintainers.jcumming ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index aa4b83c59b5..3b1837d16f1 100644 --- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { name = "diff-so-fancy-${version}"; - version = "0.11.1"; - - # perl is needed here so patchShebangs can do its job - buildInputs = [perl makeWrapper]; + version = "0.11.4"; src = fetchFromGitHub { owner = "so-fancy"; repo = "diff-so-fancy"; rev = "v${version}"; - sha256 = "1dw32c5i9mry6zr2a6h1369fhp1qbqimx04qgdmdnmn1imyck1h3"; + sha256 = "1za2rm8jzcdc6bkpl198nrqf5bc05nw53vlkk15nmmb9snnb69ig"; }; + # Perl is needed here for patchShebangs + nativeBuildInputs = [ perl makeWrapper ]; + buildPhase = null; installPhase = '' @@ -34,16 +34,14 @@ stdenv.mkDerivation rec { --prefix PATH : "${ncurses.out}/bin" ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/so-fancy/diff-so-fancy; description = "Good-looking diffs filter for git"; - license = stdenv.lib.licenses.mit; - + license = licenses.mit; + platforms = platforms.all; longDescription = '' diff-so-fancy builds on the good-lookin' output of git contrib's diff-highlight to upgrade your diffs' appearances. ''; - - platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index cf7f6b82ce2..2a9ea0715e0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -1,33 +1,21 @@ -{ stdenv, fetchurl, pythonPackages, makeWrapper, gettext, git }: +{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper, gettext, git }: let inherit (pythonPackages) buildPythonApplication pyqt4 sip pyinotify python mock; in buildPythonApplication rec { name = "git-cola-${version}"; - version = "2.8"; + version = "2.10"; - src = fetchurl { - url = "https://github.com/git-cola/git-cola/archive/v${version}.tar.gz"; - sha256 = "19ff7i0h5fznrkm17lp3xkxwkq27whhiil6y6bm16b1wny5hjqlr"; + src = fetchFromGitHub { + owner = "git-cola"; + repo = "git-cola"; + rev = "v${version}"; + sha256 = "067g0yya6718kxagf5qm59zizp0lizca4m3ih85y732i6rqpgwv8"; }; - buildInputs = [ git makeWrapper gettext ]; + buildInputs = [ git gettext ]; propagatedBuildInputs = [ pyqt4 sip pyinotify ]; - # HACK: wrapPythonPrograms adds 'import sys; sys.argv[0] = "git-cola"', but - # "import __future__" must be placed above that. This removes the argv[0] line. - postFixup = '' - wrapPythonPrograms - - sed -i "$out/bin/.git-dag-wrapped" -e '{ - /import sys; sys.argv/d - }' - - sed -i "$out/bin/.git-cola-wrapped" -e '{ - /import sys; sys.argv/d - }' - ''; - doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix index 91180b33cde..49856552aa3 100644 --- a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix @@ -1,22 +1,20 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchFromGitHub, pythonPackages }: stdenv.mkDerivation rec { name = "git-imerge-${version}"; - version = "0.7.0"; + version = "1.0.0"; - src = fetchurl { - url = "https://github.com/mhagger/git-imerge/archive/${version}.tar.gz"; - sha256 = "00nwn3rfhf15wsv01lfji5412d7yz827ric916lnyp662d6gx206"; + src = fetchFromGitHub { + owner = "mhagger"; + repo = "git-imerge"; + rev = "v${version}"; + sha256 = "1ylzxmbjfrzzxmcrbqzy1wv21npqj1r6cgl77a9n2zvsrz8zdb74"; }; buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; - installPhase = '' - mkdir -p $out/bin - make install PREFIX=$out - wrapPythonPrograms - ''; - + makeFlags = "PREFIX= DESTDIR=$(out)" ; + meta = with stdenv.lib; { homepage = https://github.com/mhagger/git-imerge; description = "Perform a merge between two branches incrementally"; diff --git a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix index f61f9fe6d2a..3b10c3305ef 100644 --- a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "git-radar-${version}"; - version = "0.3.2"; + version = "0.5"; phases = [ "unpackPhase" "installPhase" ]; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "michaeldfallen"; repo = "git-radar"; rev = "v${version}"; - sha256 = "1028462b4kqxx66vjv7r8nnr6bi3kw11fixpqyg2srqriha6447p"; + sha256 = "1915aqx8bfc4xmvhx2gfxv72p969a6rn436kii9w4yi38hibmqv9"; }; installPhase = '' @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/michaeldfallen/git-radar; license = licenses.mit; - description = "Git-radar is a tool you can add to your prompt to provide at-a-glance information on your git repo"; + description = "A tool you can add to your prompt to provide at-a-glance information on your git repo"; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ kamilchm ]; }; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index af5fc8a8be4..e1e01c1ed28 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -11,7 +11,7 @@ }: let - version = "2.12.0"; + version = "2.12.2"; svn = subversionClient.override { perlBindings = true; }; in @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "09r0lcjj5v2apj39f0ziqzjq2bi1jpnhszc9q4n0ab86g5j7c88q"; + sha256 = "0jlccxx7l4c76h830y8lhrxr4kqksrxqlnmj3xb8sqbfa0irw6nj"; }; hardeningDisable = [ "format" ]; @@ -30,7 +30,6 @@ stdenv.mkDerivation { ./symlinks-in-bin.patch ./git-sh-i18n.patch ./ssh-path.patch - ./ssl-cert-file.patch ]; postPatch = '' diff --git a/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch b/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch deleted file mode 100644 index bafd65e8c93..00000000000 --- a/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru git-2.7.4-orig/http.c git-2.7.4/http.c ---- git-2.7.4-orig/http.c 2016-03-17 21:47:59.000000000 +0100 -+++ git-2.7.4/http.c 2016-04-12 11:38:33.187070848 +0200 -@@ -544,6 +544,7 @@ - #if LIBCURL_VERSION_NUM >= 0x070908 - set_from_env(&ssl_capath, "GIT_SSL_CAPATH"); - #endif -+ set_from_env(&ssl_cainfo, "SSL_CERT_FILE"); - set_from_env(&ssl_cainfo, "GIT_SSL_CAINFO"); - - set_from_env(&user_agent, "GIT_HTTP_USER_AGENT"); diff --git a/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/pkgs/applications/version-management/git-and-tools/subgit/default.nix index 0774bbc9a62..7b36a142d15 100644 --- a/pkgs/applications/version-management/git-and-tools/subgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/subgit/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, makeWrapper, jre }: -stdenv.mkDerivation { - name = "subgit-3.1.0"; +stdenv.mkDerivation rec { + name = "subgit-3.2.4"; meta = { description = "A tool for a smooth, stress-free SVN to Git migration"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.all; }; - buildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ unzip makeWrapper ]; installPhase = '' mkdir $out; @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; src = fetchurl { - url = http://old.subgit.com/download/subgit-3.1.0.zip; - sha256 = "08qhpg6y2ziwplm0z1ghh1wfp607sw4hyb53a7qzfn759j5kcdrg"; + url = "http://subgit.com/download/${name}.zip"; + sha256 = "13r6hi2zk46bs3j17anfc85kszlwliv2yc16qx834b3v4w68hajw"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix index 36d81ae9c44..6238cf9c975 100644 --- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "transcrypt-${version}"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "elasticdog"; repo = "transcrypt"; rev = "v${version}"; - sha256 = "12n8714my9i93lysqa3dj1z5xgi10iv5y1mnsqki9zn5av3lgqkq"; + sha256 = "05q0rgcsphrkavmcsm3qghsl1pkgshvhdf6zpwkn1qcj288h8gkc"; }; buildInputs = [ git makeWrapper openssl ]; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 28d89fb32d0..b02da41f9d6 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,19 +1,22 @@ -{stdenv, lib, libXcomposite, libgnome_keyring, makeWrapper, udev, curl, alsaLib - ,libXfixes, atk, gtk2, libXrender, pango, gnome2, cairo, freetype, fontconfig - ,libX11, libXi, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst - ,nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus +{ stdenv, lib, libXcomposite, libgnome_keyring, makeWrapper, udev, curl, alsaLib +, libXfixes, atk, gtk2, libXrender, pango, gnome2, cairo, freetype, fontconfig +, libX11, libXi, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst +, nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus +, dpkg, makeDesktopItem }: +with stdenv.lib; + stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "2.2.0"; + version = "2.3.3"; src = fetchurl { - url = "https://release.gitkraken.com/linux/v${version}.tar.gz"; - sha256 = "0a3ed917e6e937af4dd180144fbb4ad8b99b35b5d8c1f0684a55de38189a812d"; + url = "https://release.gitkraken.com/linux/v${version}.deb"; + sha256 = "a6e235ab1a4c1da755af8218ad819fcac6bc89b1a324aa2c0e430f3805cb1a16"; }; - libPath = stdenv.lib.makeLibraryPath [ + libPath = makeLibraryPath [ stdenv.cc.cc.lib curl udev @@ -47,24 +50,46 @@ stdenv.mkDerivation rec { libgnome_keyring ]; - phases = [ "unpackPhase" "installPhase" ]; + nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ makeWrapper ]; + dontBuild = true; + + desktopItem = makeDesktopItem { + name = "gitkraken"; + exec = "gitkraken"; + icon = "app"; + desktopName = "GitKraken"; + genericName = "Git Client"; + categories = "Application;Development;"; + comment = "Graphical Git client from Axosoft"; + }; + + buildInputs = [ dpkg ]; + + unpackPhase = "dpkg-deb -x $src ."; installPhase = '' mkdir -p "$out/opt/gitkraken" - cp -r ./* "$out/opt/gitkraken" - fixupPhase + cp -r usr/share/gitkraken/* "$out/opt/gitkraken" + + mkdir -p "$out/share/applications" + cp $desktopItem/share/applications/* "$out/share/applications" + + mkdir -p "$out/share/pixmaps" + cp usr/share/pixmaps/app.png "$out/share/pixmaps" + ''; + + postFixup = '' patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath "$libPath:$out/opt/gitkraken" "$out/opt/gitkraken/gitkraken" wrapProgram $out/opt/gitkraken/gitkraken \ - --prefix LD_PRELOAD : "${stdenv.lib.makeLibraryPath [ curl ]}/libcurl.so.4" \ - --prefix LD_PRELOAD : "${stdenv.lib.makeLibraryPath [ libgnome_keyring ]}/libgnome-keyring.so.0" + --prefix LD_PRELOAD : "${makeLibraryPath [ curl ]}/libcurl.so.4" \ + --prefix LD_PRELOAD : "${makeLibraryPath [ libgnome_keyring ]}/libgnome-keyring.so.0" mkdir "$out/bin" ln -s "$out/opt/gitkraken/gitkraken" "$out/bin/gitkraken" ''; - meta = with stdenv.lib; { + meta = { homepage = https://www.gitkraken.com/; description = "The downright luxurious and most popular Git client for Windows, Mac & Linux"; license = licenses.unfree; diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile index 6d6564ea5f9..db1ac67a666 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile +++ b/pkgs/applications/version-management/gitlab/Gemfile @@ -7,7 +7,6 @@ gem 'rails-deprecated_sanitizer', '~> 1.0.3' gem 'responders', '~> 2.0' gem 'sprockets', '~> 3.7.0' -gem 'sprockets-es6', '~> 0.9.2' # Default values for AR models gem 'default_value_for', '~> 3.0.0' @@ -36,7 +35,7 @@ gem 'omniauth-twitter', '~> 1.2.0' gem 'omniauth_crowd', '~> 2.2.0' gem 'omniauth-authentiq', '~> 0.2.0' gem 'rack-oauth2', '~> 1.2.1' -gem 'jwt' +gem 'jwt', '~> 1.5.6' # Spam and anti-bot protection gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails' @@ -48,6 +47,9 @@ gem 'rqrcode-rails3', '~> 0.1.7' gem 'attr_encrypted', '~> 3.0.0' gem 'u2f', '~> 0.2.1' +# GitLab Pages +gem 'validates_hostname', '~> 1.0.6' + # Browser detection gem 'browser', '~> 2.2' @@ -109,7 +111,7 @@ gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 1.5.2' -gem 'asciidoctor-plantuml', '0.0.6' +gem 'asciidoctor-plantuml', '0.0.7' gem 'rouge', '~> 2.0' gem 'truncato', '~> 0.7.8' @@ -219,10 +221,12 @@ gem 'oj', '~> 2.17.4' gem 'chronic', '~> 0.10.2' gem 'chronic_duration', '~> 0.10.6' +gem 'webpack-rails', '~> 0.9.9' +gem 'rack-proxy', '~> 0.6.0' + gem 'sass-rails', '~> 5.0.6' gem 'coffee-rails', '~> 4.1.0' gem 'uglifier', '~> 2.7.2' -gem 'gitlab-turbolinks-classic', '~> 2.5', '>= 2.5.6' gem 'addressable', '~> 2.3.8' gem 'bootstrap-sass', '~> 3.3.0' @@ -280,6 +284,7 @@ group :development, :test do gem 'rspec-retry', '~> 0.4.5' gem 'spinach-rails', '~> 0.2.1' gem 'spinach-rerun-reporter', '~> 0.0.2' + gem 'rspec_profiling' # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) gem 'minitest', '~> 5.7.0' @@ -291,13 +296,9 @@ group :development, :test do gem 'capybara-screenshot', '~> 1.0.0' gem 'poltergeist', '~> 1.9.0' - gem 'teaspoon', '~> 1.1.0' - gem 'teaspoon-jasmine', '~> 2.2.0' - gem 'spring', '~> 1.7.0' gem 'spring-commands-rspec', '~> 1.0.4' gem 'spring-commands-spinach', '~> 1.1.0' - gem 'spring-commands-teaspoon', '~> 0.0.2' gem 'rubocop', '~> 0.46.0', require: false gem 'rubocop-rspec', '~> 1.9.1', require: false diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock index 80cdf9d3258..1916267bb89 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -56,7 +56,7 @@ GEM faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.0) asciidoctor (1.5.3) - asciidoctor-plantuml (0.0.6) + asciidoctor-plantuml (0.0.7) asciidoctor (~> 1.5) ast (2.3.0) attr_encrypted (3.0.3) @@ -74,10 +74,6 @@ GEM descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) thread_safe (~> 0.3, >= 0.3.1) - babel-source (5.8.35) - babel-transpiler (0.7.0) - babel-source (>= 4.0, < 6) - execjs (~> 2.0) babosa (1.0.2) base32 (0.3.2) bcrypt (3.1.11) @@ -268,8 +264,6 @@ GEM mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) gitlab-markup (1.5.1) - gitlab-turbolinks-classic (2.5.6) - coffee-rails gitlab_omniauth-ldap (1.2.1) net-ldap (~> 0.9) omniauth (~> 1.0) @@ -381,7 +375,7 @@ GEM json (1.8.3) json-schema (2.6.2) addressable (~> 2.3.8) - jwt (1.5.4) + jwt (1.5.6) kaminari (0.17.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -550,6 +544,8 @@ GEM rack (>= 1.1) rack-protection (1.5.3) rack + rack-proxy (0.6.0) + rack rack-test (0.6.3) rack (>= 1.0) rails (4.2.7.1) @@ -644,6 +640,11 @@ GEM rspec-retry (0.4.5) rspec-core rspec-support (3.5.0) + rspec_profiling (0.0.4) + activerecord + pg + rails + sqlite3 rubocop (0.46.0) parser (>= 2.3.1.1, < 3.0) powerpack (~> 0.1) @@ -662,7 +663,7 @@ GEM sexp_processor (~> 4.1) rubyntlm (0.5.2) rubypants (0.2.0) - rubyzip (1.2.0) + rubyzip (1.2.1) rufus-scheduler (3.1.10) rugged (0.24.0) safe_yaml (1.0.4) @@ -732,19 +733,14 @@ GEM spring (>= 0.9.1) spring-commands-spinach (1.1.0) spring (>= 0.9.1) - spring-commands-teaspoon (0.0.2) - spring (>= 0.9.1) sprockets (3.7.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-es6 (0.9.2) - babel-source (>= 5.8.11) - babel-transpiler - sprockets (>= 3.0.0) sprockets-rails (3.1.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) + sqlite3 (1.3.11) stackprof (0.2.10) state_machines (0.4.0) state_machines-activemodel (0.4.0) @@ -757,10 +753,6 @@ GEM sys-filesystem (1.1.6) ffi sysexits (1.2.0) - teaspoon (1.1.5) - railties (>= 3.2.5, < 6) - teaspoon-jasmine (2.2.0) - teaspoon (>= 1.0.0) temple (0.7.7) test_after_commit (1.1.0) activerecord (>= 3.2) @@ -795,6 +787,9 @@ GEM get_process_mem (~> 0) unicorn (>= 4, < 6) uniform_notifier (1.10.0) + validates_hostname (1.0.6) + activerecord (>= 3.0) + activesupport (>= 3.0) version_sorter (2.1.0) virtus (1.0.5) axiom-types (~> 0.1) @@ -812,6 +807,8 @@ GEM webmock (1.21.0) addressable (>= 2.3.6) crack (>= 0.3.2) + webpack-rails (0.9.9) + rails (>= 3.2.0) websocket-driver (0.6.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) @@ -838,7 +835,7 @@ DEPENDENCIES allocations (~> 1.0) asana (~> 0.4.0) asciidoctor (~> 1.5.2) - asciidoctor-plantuml (= 0.0.6) + asciidoctor-plantuml (= 0.0.7) attr_encrypted (~> 3.0.0) awesome_print (~> 1.2.0) babosa (~> 1.0.2) @@ -888,7 +885,6 @@ DEPENDENCIES github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) gitlab-markup (~> 1.5.1) - gitlab-turbolinks-classic (~> 2.5, >= 2.5.6) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.2) @@ -909,7 +905,7 @@ DEPENDENCIES jquery-rails (~> 4.1.0) jquery-ui-rails (~> 5.0.0) json-schema (~> 2.6.2) - jwt + jwt (~> 1.5.6) kaminari (~> 0.17.0) knapsack (~> 1.11.0) kubeclient (~> 2.2.0) @@ -952,6 +948,7 @@ DEPENDENCIES rack-attack (~> 4.4.1) rack-cors (~> 0.4.0) rack-oauth2 (~> 1.2.1) + rack-proxy (~> 0.6.0) rails (= 4.2.7.1) rails-deprecated_sanitizer (~> 1.0.3) rainbow (~> 2.1.0) @@ -968,6 +965,7 @@ DEPENDENCIES rqrcode-rails3 (~> 0.1.7) rspec-rails (~> 3.5.0) rspec-retry (~> 0.4.5) + rspec_profiling rubocop (~> 0.46.0) rubocop-rspec (~> 1.9.1) ruby-fogbugz (~> 0.2.1) @@ -992,15 +990,11 @@ DEPENDENCIES spring (~> 1.7.0) spring-commands-rspec (~> 1.0.4) spring-commands-spinach (~> 1.1.0) - spring-commands-teaspoon (~> 0.0.2) sprockets (~> 3.7.0) - sprockets-es6 (~> 0.9.2) stackprof (~> 0.2.10) state_machines-activerecord (~> 0.4.0) sys-filesystem (~> 1.1.6) - teaspoon (~> 1.1.0) - teaspoon-jasmine (~> 2.2.0) - test_after_commit (~> 0.4.2) + test_after_commit (~> 1.1) thin (~> 1.7.0) timecop (~> 0.8.0) truncato (~> 0.7.8) @@ -1010,12 +1004,14 @@ DEPENDENCIES unf (~> 0.1.4) unicorn (~> 5.1.0) unicorn-worker-killer (~> 0.4.4) + validates_hostname (~> 1.0.6) version_sorter (~> 2.1.0) virtus (~> 1.0.1) vmstat (~> 2.3.0) web-console (~> 2.0) webmock (~> 1.21.0) + webpack-rails (~> 0.9.9) wikicloth (= 0.8.1) BUNDLED WITH - 1.13.7 + 1.14.5 diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 60921fc5488..442edc04fa2 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, bundler, fetchFromGitHub, bundlerEnv, libiconv, ruby -, tzdata, git, nodejs, procps +{ stdenv, lib, bundler, fetchurl, fetchFromGitHub, bundlerEnv, libiconv, ruby +, tzdata, git, nodejs, procps, dpkg }: /* When updating the Gemfile add `gem "activerecord-nulldb-adapter"` @@ -18,19 +18,27 @@ let }; }; + version = "8.17.5"; + + gitlabDeb = fetchurl { + url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download"; + sha256 = "1ga5ki1bh66sdk5yizjy0dqcg85hrzkdp0ag3si942yv28sjy1xk"; + }; + in stdenv.mkDerivation rec { name = "gitlab-${version}"; - version = "8.16.6"; - buildInputs = [ env ruby bundler tzdata git nodejs procps ]; + buildInputs = [ + env ruby bundler tzdata git nodejs procps dpkg + ]; src = fetchFromGitHub { owner = "gitlabhq"; repo = "gitlabhq"; rev = "v${version}"; - sha256 = "03rzms2frwx4c09l2rig1amlxj965s2iq421i52j8wj2khb7pd7g"; + sha256 = "0wvszxm28c80qwx6np5mi36saxzzg4n7jcp4ckvhhr3jvczn9m8g"; }; patches = [ @@ -64,9 +72,15 @@ stdenv.mkDerivation rec { buildPhase = '' mv config/gitlab.yml.example config/gitlab.yml - GITLAB_DATABASE_ADAPTER=nulldb \ - SKIP_STORAGE_VALIDATION=true \ - rake assets:precompile RAILS_ENV=production + + dpkg -x ${gitlabDeb} . + mv -v opt/gitlab/embedded/service/gitlab-rails/public/assets public + rm -rf opt + + export GITLAB_DATABASE_ADAPTER=nulldb + export SKIP_STORAGE_VALIDATION=true + rake assets:precompile RAILS_ENV=production + mv config/gitlab.yml config/gitlab.yml.example rm config/secrets.yml mv config config.dist @@ -77,6 +91,10 @@ stdenv.mkDerivation rec { cp -r . $out/share/gitlab ln -sf /run/gitlab/uploads $out/share/gitlab/public/uploads ln -sf /run/gitlab/config $out/share/gitlab/config + + # rake tasks to mitigate CVE-2017-0882 + # see https://about.gitlab.com/2017/03/20/gitlab-8-dot-17-dot-4-security-release/ + cp ${./reset_token.rake} $out/share/gitlab/lib/tasks/reset_token.rake ''; passthru = { diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix index 1ebb7c5b1fa..4bc57f6bd08 100644 --- a/pkgs/applications/version-management/gitlab/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gemset.nix @@ -146,10 +146,10 @@ asciidoctor-plantuml = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0rd8yh0by5sxhg1c3cb1mzkp4jp3j8v6vzbyv1mx492s9ml451fx"; + sha256 = "00ax9r822n4ykl6jizaxp03wqzknr7nn20mmqjpiwajy9j0zvr88"; type = "gem"; }; - version = "0.0.6"; + version = "0.0.7"; }; ast = { source = { @@ -207,22 +207,6 @@ }; version = "0.1.1"; }; - babel-source = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ncq8h82k6hypzfb5dk7z95mmcdwnhsxmc53xz17m1nbklm25vvr"; - type = "gem"; - }; - version = "5.8.35"; - }; - babel-transpiler = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0w0minwxj56w96xps1msm6n75fs0y7r1vqcr9zlsn74fksnz81jc"; - type = "gem"; - }; - version = "0.7.0"; - }; babosa = { source = { remotes = ["https://rubygems.org"]; @@ -944,14 +928,6 @@ }; version = "1.5.1"; }; - gitlab-turbolinks-classic = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zfqwa1pahhcz1yxvwigg94bck2zsqk2jsrc0wdcybhr0iwi5jra"; - type = "gem"; - }; - version = "2.5.6"; - }; gitlab_omniauth-ldap = { source = { remotes = ["https://rubygems.org"]; @@ -1235,10 +1211,10 @@ jwt = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0s5llb4mhpy0phzbrc4jd2jd2b91h1axy4bhci7g1bdz1w2m3a2i"; + sha256 = "124zz1142bi2if7hl5pcrcamwchv4icyr5kaal9m2q6wqbdl6aw4"; type = "gem"; }; - version = "1.5.4"; + version = "1.5.6"; }; kaminari = { source = { @@ -1848,6 +1824,14 @@ }; version = "1.5.3"; }; + rack-proxy = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bpbcb9ch94ha2q7gdri88ry7ch0z6ian289kah9ayxyqg19j6f4"; + type = "gem"; + }; + version = "0.6.0"; + }; rack-test = { source = { remotes = ["https://rubygems.org"]; @@ -2152,6 +2136,14 @@ }; version = "3.5.0"; }; + rspec_profiling = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qrs189r0q08ys8vax269ff858q9ypsc94n1d700m9da44zi3wg"; + type = "gem"; + }; + version = "0.0.4"; + }; rubocop = { source = { remotes = ["https://rubygems.org"]; @@ -2227,10 +2219,10 @@ rubyzip = { source = { remotes = ["https://rubygems.org"]; - sha256 = "10a9p1m68lpn8pwqp972lv61140flvahm3g9yzbxzjks2z3qlb2s"; + sha256 = "06js4gznzgh8ac2ldvmjcmg9v1vg9llm357yckkpylaj6z456zqz"; type = "gem"; }; - version = "1.2.0"; + version = "1.2.1"; }; rufus-scheduler = { source = { @@ -2464,14 +2456,6 @@ }; version = "1.1.0"; }; - spring-commands-teaspoon = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1g7n4m2s9d0frh7y1xibzpphqajfnx4fvgfc66nh545dd91w2nqz"; - type = "gem"; - }; - version = "0.0.2"; - }; sprockets = { source = { remotes = ["https://rubygems.org"]; @@ -2480,14 +2464,6 @@ }; version = "3.7.0"; }; - sprockets-es6 = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0508h3vnjz08c64k11za6cqnbvvifka9pmdrycamzzjd4dmf10y3"; - type = "gem"; - }; - version = "0.9.2"; - }; sprockets-rails = { source = { remotes = ["https://rubygems.org"]; @@ -2496,6 +2472,14 @@ }; version = "3.1.1"; }; + sqlite3 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19r06wglnm6479ffj9dl0fa4p5j2wi6dj7k6k3d0rbx7036cv3ny"; + type = "gem"; + }; + version = "1.3.11"; + }; stackprof = { source = { remotes = ["https://rubygems.org"]; @@ -2552,22 +2536,6 @@ }; version = "1.2.0"; }; - teaspoon = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xz5f1w8jm2fg1g194kf17gh36imd7sgs9cx0adqx1l22p7jrkvv"; - type = "gem"; - }; - version = "1.1.5"; - }; - teaspoon-jasmine = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00wygrv1jm4aj15p1ab9d5fdrj6y83kv26xgp52mx4lp78h2ms9q"; - type = "gem"; - }; - version = "2.2.0"; - }; temple = { source = { remotes = ["https://rubygems.org"]; @@ -2728,6 +2696,14 @@ }; version = "1.10.0"; }; + validates_hostname = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04p1l0v98j4ffvaks1ig9mygx5grpbpdgz7haq3mygva9iy8ykja"; + type = "gem"; + }; + version = "1.0.6"; + }; version_sorter = { source = { remotes = ["https://rubygems.org"]; @@ -2776,6 +2752,14 @@ }; version = "1.21.0"; }; + webpack-rails = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02jxkpdbi48yhcgldgl5jxnhnad83rdgpkkcwh8w1h6iyg04d42j"; + type = "gem"; + }; + version = "0.9.9"; + }; websocket-driver = { source = { remotes = ["https://rubygems.org"]; diff --git a/pkgs/applications/version-management/gitlab/reset_token.rake b/pkgs/applications/version-management/gitlab/reset_token.rake new file mode 100644 index 00000000000..705b5830edf --- /dev/null +++ b/pkgs/applications/version-management/gitlab/reset_token.rake @@ -0,0 +1,43 @@ +# Taken from: +# https://about.gitlab.com/2017/03/20/gitlab-8-dot-17-dot-4-security-release/ + +# lib/tasks/reset_token.rake +require_relative '../../app/models/concerns/token_authenticatable.rb' + +STDOUT.sync = true + +namespace :tokens do + desc "Reset all GitLab user auth tokens" + task reset_all: :environment do + reset_all_users_token(:reset_authentication_token!) + end + + desc "Reset all GitLab email tokens" + task reset_all_email: :environment do + reset_all_users_token(:reset_incoming_email_token!) + end + + def reset_all_users_token(token) + TmpUser.find_in_batches do |batch| + puts "Processing batch starting with user ID: #{batch.first.id}" + + batch.each(&token) + end + end +end + +class TmpUser < ActiveRecord::Base + include TokenAuthenticatable + + self.table_name = 'users' + + def reset_authentication_token! + write_new_token(:authentication_token) + save!(validate: false) + end + + def reset_incoming_email_token! + write_new_token(:incoming_email_token) + save!(validate: false) + end +end diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index b9a1f2e7a84..4ab97cc06d2 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -3,25 +3,26 @@ , sqliteSupport ? true }: +with stdenv.lib; + buildGoPackage rec { name = "gogs-${version}"; - version = "0.9.113"; + version = "0.10.18"; src = fetchFromGitHub { owner = "gogits"; repo = "gogs"; rev = "v${version}"; - sha256 = "1zk83c9jiazfw3221yi2sidp7917q3dxb2xb7wrjg4an18gj46j7"; + sha256 = "1f1dlickjpdilf4j295i9v2h4ig4pf5d2mnpbr59wh14bby4bh0y"; }; patchPhase = '' - substituteInPlace models/repo.go \ - --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' - ''; + patchShebangs . + ''; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; - buildFlags = stdenv.lib.optionalString sqliteSupport "-tags sqlite"; + buildFlags = optionalString sqliteSupport "-tags sqlite"; outputs = [ "bin" "out" "data" ]; @@ -30,7 +31,7 @@ buildGoPackage rec { cp -R $src/{public,templates} $data wrapProgram $bin/bin/gogs \ - --prefix PATH : ${stdenv.lib.makeBinPath [ bash git gzip openssh ]} \ + --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} \ --run 'export GOGS_WORK_DIR=''${GOGS_WORK_DIR:-$PWD}' \ --run 'mkdir -p "$GOGS_WORK_DIR" && cd "$GOGS_WORK_DIR"' \ --run "ln -fs $data/{public,templates} ." @@ -42,7 +43,7 @@ buildGoPackage rec { meta = { description = "A painless self-hosted Git service"; homepage = "https://gogs.io"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ schneefux ]; + license = licenses.mit; + maintainers = [ maintainers.schneefux ]; }; } diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 034eb534423..1c97f7252f5 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -7,8 +7,9 @@ let version = "3.9.2"; name = "mercurial-${version}"; inherit (python2Packages) docutils hg-git dulwich python; -in python2Packages.mkPythonDerivation { +in python2Packages.buildPythonApplication { inherit name; + format = "other"; src = fetchurl { url = "https://mercurial-scm.org/release/${name}.tar.gz"; diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix new file mode 100644 index 00000000000..134e6998670 --- /dev/null +++ b/pkgs/applications/version-management/pijul/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, rustPlatform, perl, darwin }: + +with rustPlatform; + +buildRustPackage rec { + name = "pijul-${version}"; + version = "0.4.1"; + + src = fetchurl { + url = "https://pijul.org/releases/${name}.tar.gz"; + sha256 = "e492fde1bea839f474f5b91bb762a0fab5ff6a9bc2b8f20eb91a253ca6feda5a"; + }; + + sourceRoot = "${name}/pijul"; + + buildInputs = [ perl ]++ stdenv.lib.optionals stdenv.isDarwin + (with darwin.apple_sdk.frameworks; [ Security ]); + + doCheck = false; + + depsSha256 = "17n66clr31s49gbbcsii0f31s63rncc9mmz4wwdi0yl4r6ykv9h7"; + + meta = with stdenv.lib; { + description = "A distributed version control system"; + homepage = https://pijul.org; + license = with licenses; [ gpl2Plus ]; + maintainers = [ maintainers.gal_bolle ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index 9397aa8a1e1..7b3c7aafa44 100644 --- a/pkgs/applications/version-management/rapidsvn/default.nix +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -1,11 +1,12 @@ -{stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python}: +{ stdenv, fetchurl, fetchpatch, wxGTK, subversion, apr, aprutil, python }: -stdenv.mkDerivation { - name = "rapidsvn-0.12.0-1"; +stdenv.mkDerivation rec { + name = "rapidsvn-${version}"; + version = "0.12.1"; src = fetchurl { - url = http://www.rapidsvn.org/download/release/0.12/rapidsvn-0.12.0-1.tar.gz; - sha256 = "1i3afjmx99ljw1bj54q47fs0g1q9dmxxvr4ciq7ncp5s52shszgg"; + url = "http://www.rapidsvn.org/download/release/${version}/${name}.tar.gz"; + sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p"; }; buildInputs = [ wxGTK subversion apr aprutil python ]; @@ -13,6 +14,10 @@ stdenv.mkDerivation { configureFlags = [ "--with-svn-include=${subversion.dev}/include" "--with-svn-lib=${subversion.out}/lib" ]; + patches = [ + ./fix-build.patch + ]; + meta = { description = "Multi-platform GUI front-end for the Subversion revision system"; homepage = http://rapidsvn.tigris.org/; diff --git a/pkgs/applications/version-management/rapidsvn/fix-build.patch b/pkgs/applications/version-management/rapidsvn/fix-build.patch new file mode 100644 index 00000000000..ca4bc394c2c --- /dev/null +++ b/pkgs/applications/version-management/rapidsvn/fix-build.patch @@ -0,0 +1,122 @@ +--- a/src/svncpp/client_ls.cpp ++++ b/src/svncpp/client_ls.cpp +@@ -25,6 +25,7 @@ + #include "svn_client.h" + #include "svn_path.h" + #include "svn_sorts.h" ++#include "svn_version.h" + //#include "svn_utf.h" + + // svncpp +@@ -35,6 +36,7 @@ + #include "m_is_empty.hpp" + + ++#if SVN_VER_MAJOR == 1 && SVN_VER_MINOR < 8 + static int + compare_items_as_paths(const svn_sort__item_t *a, const svn_sort__item_t *b) + { +@@ -84,6 +86,72 @@ namespace svn + } + } + ++#else ++ ++#include ++ ++static svn_error_t* store_entry( ++ void *baton, ++ const char *path, ++ const svn_dirent_t *dirent, ++ const svn_lock_t *, ++ const char *abs_path, ++ const char *, ++ const char *, ++ apr_pool_t *scratch_pool) ++{ ++ svn::DirEntries *entries = reinterpret_cast(baton); ++ if (path[0] == '\0') { ++ if (dirent->kind == svn_node_file) { ++ // for compatibility with svn_client_ls behaviour, listing a file ++ // stores that file name ++ entries->push_back(svn::DirEntry(svn_path_basename(abs_path, scratch_pool), dirent)); ++ } ++ } else { ++ entries->push_back(svn::DirEntry(path, dirent)); ++ } ++ return SVN_NO_ERROR; ++} ++ ++static bool sort_by_path(svn::DirEntry const& a, svn::DirEntry const& b) ++{ ++ return svn_path_compare_paths(a.name(), b.name()) < 0; ++} ++ ++namespace svn ++{ ++ DirEntries ++ Client::list(const char * pathOrUrl, ++ svn_opt_revision_t * revision, ++ bool recurse) throw(ClientException) ++ { ++ Pool pool; ++ DirEntries entries; ++ ++ svn_error_t * error = ++ svn_client_list3(pathOrUrl, ++ revision, ++ revision, ++ SVN_DEPTH_INFINITY_OR_IMMEDIATES(recurse), ++ SVN_DIRENT_ALL, ++ FALSE, // fetch locks ++ FALSE, // include externals ++ &store_entry, ++ &entries, ++ *m_context, ++ pool); ++ ++ if (error != SVN_NO_ERROR) ++ throw ClientException(error); ++ ++ std::sort(entries.begin(), entries.end(), &sort_by_path); ++ ++ return entries; ++ } ++} ++ ++#endif ++ + /* ----------------------------------------------------------------- + * local variables: + * eval: (load-file "../../rapidsvn-dev.el") +--- a/src/svncpp/dirent.cpp 2017-03-19 15:48:58.956827337 +0100 ++++ b/src/svncpp/dirent.cpp 2017-03-19 15:50:19.111527279 +0100 +@@ -47,7 +47,7 @@ + { + } + +- Data(const char * _name, svn_dirent_t * dirEntry) ++ Data(const char * _name, const svn_dirent_t * dirEntry) + : name(_name), kind(dirEntry->kind), size(dirEntry->size), + hasProps(dirEntry->has_props != 0), + createdRev(dirEntry->created_rev), time(dirEntry->time) +@@ -78,7 +78,7 @@ + { + } + +- DirEntry::DirEntry(const char * name, svn_dirent_t * DirEntry) ++ DirEntry::DirEntry(const char * name, const svn_dirent_t * DirEntry) + : m(new Data(name, DirEntry)) + { + } +--- a/include/svncpp/dirent.hpp 2017-03-19 15:50:54.860506116 +0100 ++++ b/include/svncpp/dirent.hpp 2017-03-19 15:50:58.314407598 +0100 +@@ -41,7 +41,7 @@ + /** + * constructor for existing @a svn_dirent_t entries + */ +- DirEntry(const char * name, svn_dirent_t * dirEntry); ++ DirEntry(const char * name, const svn_dirent_t * dirEntry); + + /** + * copy constructor diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix index 2bff15adc69..e75223c6c36 100644 --- a/pkgs/applications/version-management/src/default.nix +++ b/pkgs/applications/version-management/src/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, python, rcs, git }: +{ stdenv, fetchurl, python, rcs, git, makeWrapper }: stdenv.mkDerivation rec { - name = "src-1.11"; + name = "src-${version}"; + version = "1.13"; src = fetchurl { url = "http://www.catb.org/~esr/src/${name}.tar.gz"; - sha256 = "07kj0ri0s0vn8s54yvkyzaag332spxs0379r718b80y31c4mgbyl"; + sha256 = "0l13ld8nxm1c720ns22lyx3q1bq2c2zn78vi5w92b7nl6p2nncy8"; }; - buildInputs = [ python rcs git ]; + buildInputs = [ python rcs git makeWrapper ]; preConfigure = '' patchShebangs . @@ -16,10 +17,16 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; - meta = { + postInstall = '' + wrapProgram $out/bin/src \ + --suffix PATH ":" "${rcs}/bin" + ''; + + meta = with stdenv.lib; { description = "Simple single-file revision control"; homepage = http://www.catb.org/~esr/src/; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ calvertvl ]; }; } diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index eddbc0e56dd..17ff3e4b19f 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -26,8 +26,8 @@ let inherit sha256; }; - # Can't do separate $lib and $bin, as libs reference bins - outputs = [ "out" "dev" "man" ]; + # Can't do separate $lib and $bin, as libs reference bins + outputs = [ "out" "dev" "man" ]; buildInputs = [ zlib apr aprutil sqlite openssl ] ++ stdenv.lib.optional httpSupport serf @@ -75,7 +75,7 @@ let mkdir -p $out/share/bash-completion/completions cp tools/client-side/bash_completion $out/share/bash-completion/completions/subversion - for f in $out/lib/*.la; do + for f in $out/lib/*.la $out/lib/python*/site-packages/*/*.la; do substituteInPlace $f \ --replace "${expat.dev}/lib" "${expat.out}/lib" \ --replace "${zlib.dev}/lib" "${zlib.out}/lib" \ diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index f87d81bd8fb..6587b25ef94 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchFromGitHub }: -let version = "1.05"; in +let version = "1.07"; in stdenv.mkDerivation { name = "yadm-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { owner = "TheLocehiliosan"; repo = "yadm"; rev = "${version}"; - sha256 = "11bqgz28qzgb3iz8xvda9z0mh5r1a9m032pqm772ypiixsfz8hdd"; + sha256 = "0kkxrvw17pmrx1dq0dq53jb9pm545firakrxc48znfw54n2036fw"; }; buildCommand = '' diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index b8a16164988..f62e274874c 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -8,87 +8,93 @@ # making licenses more clear and reducing compile time/install size. # # Only tested on Linux -# -# TODO: package and use libappindicator -{ stdenv, config, fetchurl, - python2, pkgconfig, yasm, - autoconf, automake, libtool, m4, - libass, libsamplerate, fribidi, libxml2, bzip2, - libogg, libtheora, libvorbis, libdvdcss, a52dec, fdk_aac, +{ stdenv, lib, fetchFromGitHub, + python2, pkgconfig, yasm, harfbuzz, zlib, + autoconf, automake, cmake, libtool, m4, jansson, + libass, libiconv, libsamplerate, fribidi, libxml2, bzip2, + libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec, fdk_aac, lame, ffmpeg, libdvdread, libdvdnav, libbluray, mp4v2, mpeg2dec, x264, x265, libmkv, fontconfig, freetype, hicolor_icon_theme, glib, gtk3, intltool, libnotify, gst_all_1, dbus_glib, udev, libgudev, libvpx, - wrapGAppsHook, - useGtk ? true + useGtk ? true, wrapGAppsHook ? null, libappindicator-gtk3 ? null }: stdenv.mkDerivation rec { - version = "0.10.5"; + version = "1.0.3"; name = "handbrake-${version}"; - buildInputsX = stdenv.lib.optionals useGtk [ - glib gtk3 intltool libnotify - gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus_glib udev - libgudev - wrapGAppsHook - ]; - - nativeBuildInputs = [ python2 pkgconfig yasm autoconf automake libtool m4 ]; - buildInputs = [ - fribidi fontconfig freetype hicolor_icon_theme - libass libsamplerate libxml2 bzip2 - libogg libtheora libvorbis libdvdcss a52dec libmkv fdk_aac - lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 x265 libvpx - ] ++ buildInputsX; - - src = fetchurl { - url = "http://download.handbrake.fr/releases/${version}/HandBrake-${version}.tar.bz2"; - sha256 = "1w720y3bplkz187wgvy4a4xm0vpppg45mlni55l6yi8v2bfk14pv"; + src = fetchFromGitHub { + owner = "HandBrake"; + repo = "HandBrake"; + rev = "${version}"; + sha256 = "1r8yzs0xih03p5ybx5096zkvlwxhcmg34047awmda1wq3z3rdjh5"; }; + nativeBuildInputs = [ + cmake python2 pkgconfig yasm autoconf automake libtool m4 + ] ++ (lib.optionals useGtk [ + intltool wrapGAppsHook + ]); + + buildInputs = [ + fribidi fontconfig freetype jansson zlib + libass libiconv libsamplerate libxml2 bzip2 + libogg libopus libtheora libvorbis libdvdcss a52dec libmkv fdk_aac + lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 x265 libvpx + ] ++ (lib.optionals useGtk [ + glib gtk3 libappindicator-gtk3 libnotify + gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus_glib udev + libgudev + ]); + + dontUseCmakeConfigure = true; + preConfigure = '' - # Fake wget to prevent downloads - mkdir wget - echo "#!/bin/sh" > wget/wget - echo "echo ===== Not fetching \$*" >> wget/wget - echo "exit 1" >> wget/wget - chmod +x wget/wget - export PATH=$PATH:$PWD/wget + patchShebangs scripts + + echo 'TAG=${version}' > version.txt + + # `configure` errors out when trying to read the current year which is too low + substituteInPlace make/configure.py \ + --replace developer release \ + --replace 'repo.date.strftime("%Y-%m-%d %H:%M:%S")' '""' + + substituteInPlace libhb/module.defs \ + --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2 # Force using nixpkgs dependencies sed -i '/MODULES += contrib/d' make/include/main.defs sed -i '/PKG_CONFIG_PATH=/d' gtk/module.rules - - patch -p1 -R < ${./handbrake-0.10.3-nolibav.patch} ''; configureFlags = [ + "--disable-df-fetch" + "--disable-df-verify" "--enable-fdk-aac" (if useGtk then "--disable-gtk-update-checks" else "--disable-gtk") ]; + NIX_LDFLAGS = [ + "-lx265" + ]; + preBuild = '' cd build ''; - LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ x265 ]; - preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}") - ''; - - meta = { + meta = with stdenv.lib; { homepage = http://handbrake.fr/; description = "A tool for ripping DVDs into video files"; longDescription = '' Handbrake is a versatile transcoding DVD ripper. This package provides the cli HandbrakeCLI and the GTK+ version ghb. ''; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.wmertens ]; + license = licenses.gpl2; + maintainers = with maintainers; [ wmertens ]; # Not tested on anything else - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index d7625b8ebac..9c421e0c828 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -44,12 +44,12 @@ let sha256 = "14jicb26s20nr3qmfpazszpc892yjwjn81zbsb8szy3a5xs19y81"; }; in stdenv.mkDerivation rec { - name = "kodi-" + version; - version = "17.0"; + name = "kodi-${version}"; + version = "17.1"; src = fetchurl { url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz"; - sha256 = "0ib59x733yf8ivsw82qlsq43jn5214n668nrn5df2flpjcjgmzsb"; + sha256 = "1vmvrq0qdjnphw34yils2b5jnm05cmsg777hc4lwqz5mrc1kjgrh"; }; buildInputs = [ @@ -97,9 +97,18 @@ in stdenv.mkDerivation rec { ''; preConfigure = '' + patchShebangs . ./bootstrap + # tests here fail + sed -i '/TestSystemInfo.cpp/d' xbmc/utils/test/{Makefile,CMakeLists.txt} + # tests here trigger a segfault in kodi.bin + sed -i '/TestWebServer.cpp/d' xbmc/network/test/{Makefile,CMakeLists.txt} ''; + enableParallelBuild = true; + + doCheck = true; + configureFlags = [ "--enable-libcec" ] ++ lib.optional (!sambaSupport) "--disable-samba" ++ lib.optional vdpauSupport "--enable-vdpau" @@ -110,19 +119,17 @@ in stdenv.mkDerivation rec { postInstall = '' for p in $(ls $out/bin/) ; do wrapProgram $out/bin/$p \ - --prefix PATH ":" "${python2}/bin" \ - --prefix PATH ":" "${glxinfo}/bin" \ - --prefix PATH ":" "${xdpyinfo}/bin" \ + --prefix PATH ":" "${lib.makeBinPath + [ python2 glxinfo xdpyinfo ]}" \ --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath - [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass SDL2 ] - }" + [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass SDL2 ]}" done ''; meta = with stdenv.lib; { homepage = http://kodi.tv/; description = "Media center"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ domenkozar titanous edwtjo ]; }; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 60625412617..ba02583a274 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -198,7 +198,7 @@ stdenv.mkDerivation rec { description = "A movie player that supports many video formats"; homepage = "http://mplayerhq.hu"; license = "GPL"; - maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.urkud ]; + maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index a6238d9e808..539314867ab 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -27,12 +27,10 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "jp9000"; repo = "obs-studio"; - rev = "${version}"; - sha256 = "0mvjmkq5zlcppjqy18933w7r7rz1mpr2jpf8ipd0famdlgyacix6"; + rev = "624aa2a5"; + sha256 = "1bs82rqyq7wjjg99mh23ap8z5bmrhjfnza5iyjx808fzqc0bgzaj"; }; - patches = [ ./segfault-patch-systray.patch ]; - nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/obs-studio/segfault-patch-systray.patch b/pkgs/applications/video/obs-studio/segfault-patch-systray.patch deleted file mode 100644 index c66b07bb57a..00000000000 --- a/pkgs/applications/video/obs-studio/segfault-patch-systray.patch +++ /dev/null @@ -1,40 +0,0 @@ -From c31e0f682431508ccd2d3c0f74e6e16fc71445d8 Mon Sep 17 00:00:00 2001 -From: Cray Elliott -Date: Fri, 10 Mar 2017 03:48:36 -0800 -Subject: [PATCH] Fix segfault in Linux when no system tray exists - -previously, switching workspaces while obs-studio is running resulted in a -segfault if no system tray was available ---- - UI/window-basic-main.cpp | 16 +++++++++------- - 1 file changed, 9 insertions(+), 7 deletions(-) - -diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp -index 8590dd75..024854d6 100644 ---- a/UI/window-basic-main.cpp -+++ b/UI/window-basic-main.cpp -@@ -2916,13 +2916,15 @@ void OBSBasic::closeEvent(QCloseEvent *event) - - void OBSBasic::changeEvent(QEvent *event) - { -- if (event->type() == QEvent::WindowStateChange && -- isMinimized() && -- trayIcon->isVisible() && -- sysTrayMinimizeToTray()) { -- -- ToggleShowHide(); -- } -+ if (trayIcon) { -+ if (event->type() == QEvent::WindowStateChange && -+ isMinimized() && -+ trayIcon->isVisible() && -+ sysTrayMinimizeToTray()) { -+ -+ ToggleShowHide(); -+ } -+ } - } - - void OBSBasic::on_actionShow_Recordings_triggered() --- -2.12.0 diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index ca44742b046..3232e9c089b 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -1,29 +1,24 @@ -{stdenv, fetchurl, fetchFromGitHub, callPackage, makeWrapper, doxygen -, ffmpeg, python3Packages, qt55}: +{ stdenv, fetchFromGitHub +, doxygen, python3Packages, ffmpeg, libopenshot +, qtbase, qtmultimedia, makeQtWrapper }: with stdenv.lib; - -let - libopenshot = callPackage ./libopenshot.nix {}; -in stdenv.mkDerivation rec { name = "openshot-qt-${version}"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "OpenShot"; repo = "openshot-qt"; rev = "v${version}"; - sha256 = "1cyr5m1n6qcb9bzkhh3v6ka91a6x9c50dl5j0ilrc8vj0mb43g8c"; + sha256 = "0dg4fkkci1rz49yrdd4fa1whv10c1pgm3cl4i49452ckqa7qg037"; }; + + buildInputs = + [ python3Packages.python ffmpeg libopenshot qtbase qtmultimedia ]; - buildInputs = [doxygen python3Packages.python makeWrapper ffmpeg]; - - propagatedBuildInputs = [ - qt55.qtbase - qt55.qtmultimedia - libopenshot - ]; + nativeBuildInputs = + [ doxygen makeQtWrapper ]; installPhase = '' mkdir -p $(toPythonPath $out) @@ -32,17 +27,24 @@ stdenv.mkDerivation rec { echo "#/usr/bin/env sh" >$out/bin/openshot-qt echo "exec ${python3Packages.python.interpreter} $(toPythonPath $out)/launch.py" >>$out/bin/openshot-qt chmod +x $out/bin/openshot-qt - wrapProgram $out/bin/openshot-qt \ + wrapQtProgram $out/bin/openshot-qt \ --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${libopenshot}):$(toPythonPath ${python3Packages.pyqt5}):$(toPythonPath ${python3Packages.sip}):$(toPythonPath ${python3Packages.httplib2}):$(toPythonPath ${python3Packages.pyzmq}):$PYTHONPATH" ''; doCheck = false; meta = { - homepage = "http://openshot.org/"; + homepage = http://openshot.org/; description = "Free, open-source video editor"; - license = licenses.gpl3Plus; - maintainers = []; - platforms = platforms.linux; + longDescription = '' + OpenShot Video Editor is a free, open-source video editor for Linux. + OpenShot can take your videos, photos, and music files and help you + create the film you have always dreamed of. Easily add sub-titles, + transitions, and effects, and then export your film to DVD, YouTube, + Vimeo, Xbox 360, and many other common formats. + ''; + license = with licenses; gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix index 069c3ba7800..82c7f247189 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix @@ -1,8 +1,7 @@ -{stdenv, fetchurl, fetchFromGitHub, cmake, doxygen -, libX11, libXft, libXrandr, libXinerama, libXext, libXcursor, alsaLib}: +{ stdenv, fetchFromGitHub, pkgconfig, cmake, doxygen, alsaLib +, libX11, libXft, libXrandr, libXinerama, libXext, libXcursor }: with stdenv.lib; - stdenv.mkDerivation rec { name = "libopenshot-audio-${version}"; version = "0.1.2"; @@ -14,18 +13,24 @@ stdenv.mkDerivation rec { sha256 = "0dxyhnqkjc5y4hra8s17q9lafll6fx0pgibmmjznjm70whqcj8a6"; }; - buildInputs = [ - cmake doxygen - libX11 libXft libXrandr libXinerama libXext libXcursor alsaLib - ]; + nativeBuildInputs = + [ pkgconfig cmake doxygen ]; + + buildInputs = + [ alsaLib libX11 libXft libXrandr libXinerama libXext libXcursor ]; doCheck = false; meta = { - homepage = "http://openshot.org/"; - description = "Free, open-source video editor"; - license = licenses.gpl3Plus; - maintainers = []; - platforms = platforms.linux; + homepage = http://openshot.org/; + description = "High-quality sound editing library"; + longDescription = '' + OpenShot Audio Library (libopenshot-audio) is a program that allows the + high-quality editing and playback of audio, and is based on the amazing + JUCE library. + ''; + license = with licenses; gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index b0891a3d69f..dd141043169 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -1,22 +1,20 @@ -{stdenv, fetchurl, fetchFromGitHub, callPackage, cmake, doxygen -, imagemagick, ffmpeg, qt55, swig, python3, ruby, unittest-cpp -, cppzmq, czmqpp -}: +{ stdenv, fetchFromGitHub +, pkgconfig, cmake, doxygen +, libopenshot-audio, imagemagick, ffmpeg +, swig, python3, ruby +, unittest-cpp, cppzmq, czmqpp +, qtbase, qtmultimedia }: with stdenv.lib; - -let - libopenshot_audio = callPackage ./libopenshot-audio.nix {}; -in stdenv.mkDerivation rec { name = "libopenshot-${version}"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot"; rev = "v${version}"; - sha256 = "00051ipb8y4z9j5m5smwm1ahv755k0glarwic8fv5b9fzryfbrdm"; + sha256 = "0slszl6w96rhxhi6agw85dc4gmpab2qw03mq32g4qrirz68anz6f"; }; patchPhase = '' @@ -27,22 +25,27 @@ stdenv.mkDerivation rec { export RUBY_VENDOR_ARCH_DIR=$out/lib/ruby/site-packages ''; - buildInputs = [ - cmake doxygen - imagemagick ffmpeg qt55.qtbase qt55.qtmultimedia swig python3 ruby - unittest-cpp cppzmq czmqpp - ]; + nativeBuildInputs = [ pkgconfig cmake doxygen ]; - LIBOPENSHOT_AUDIO_DIR = "${libopenshot_audio}"; + buildInputs = + [ imagemagick ffmpeg swig python3 ruby unittest-cpp + cppzmq czmqpp qtbase qtmultimedia ]; + + LIBOPENSHOT_AUDIO_DIR = "${libopenshot-audio}"; "UNITTEST++_INCLUDE_DIR" = "${unittest-cpp}/include/UnitTest++"; doCheck = false; meta = { - homepage = "http://openshot.org/"; - description = "Free, open-source video editor"; - license = licenses.gpl3Plus; - maintainers = []; - platforms = platforms.linux; + homepage = http://openshot.org/; + description = "Free, open-source video editor library"; + longDescription = '' + OpenShot Library (libopenshot) is an open-source project dedicated to + delivering high quality video editing, animation, and playback solutions + to the world. API currently supports C++, Python, and Ruby. + ''; + license = with licenses; gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/virtualization/docker-distribution/default.nix b/pkgs/applications/virtualization/docker-distribution/default.nix index 4850d7d9f5f..c3c0de14966 100644 --- a/pkgs/applications/virtualization/docker-distribution/default.nix +++ b/pkgs/applications/virtualization/docker-distribution/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "distribution-${version}"; - version = "2.5.1"; + version = "2.6.0"; rev = "v${version}"; goPackagePath = "github.com/docker/distribution"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "docker"; repo = "distribution"; inherit rev; - sha256 = "08nxcsl9bc3k9gav2mkqccm5byrlfcgy6qaqaywiyza0b0cn4kdc"; + sha256 = "1yg2zrikn3vkvkx5mn51p6bfjk840qdkn7ahhhvvcsc8mpigrjc6"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index b8667997b16..6f3feddfda0 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -6,134 +6,166 @@ }: # https://github.com/docker/docker/blob/master/project/PACKAGERS.md +# https://github.com/docker/docker/blob/TAG/hack/dockerfile/binaries-commits with lib; -stdenv.mkDerivation rec { - name = "docker-${version}"; - version = "17.03.0-ce"; - rev = "60ccb22"; # should match the version commit +rec { + dockerGen = { + version, rev, sha256 + , runcRev, runcSha256 + , containerdRev, containerdSha256 + , tiniRev, tiniSha256 + } : stdenv.mkDerivation rec { + inherit version rev; - src = fetchFromGitHub { - owner = "docker"; - repo = "docker"; - rev = "v${version}"; - sha256 = "0ml9aan8x4w8kfz7dm9vvl8b1a0vq09si9b7z50xz84040cjhnr9"; - }; + name = "docker-${version}"; - docker-runc = runc.overrideAttrs (oldAttrs: rec { - name = "docker-runc"; src = fetchFromGitHub { owner = "docker"; - repo = "runc"; - rev = "a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70"; - sha256 = "0n7vr47fhpyxx5vdnp453qp4cq50w4hwgq3ldyj5878d91iir7l1"; - }; - # docker/runc already include these patches / are not applicable - patches = []; - }); - docker-containerd = containerd.overrideAttrs (oldAttrs: rec { - name = "docker-containerd"; - src = fetchFromGitHub { - owner = "docker"; - repo = "containerd"; - rev = "977c511eda0925a723debdc94d09459af49d082a"; - sha256 = "0hmcj8i70vv3a3bbdawrgi84a442m09x5mpc7fgn8dd3v031lcbc"; - }; - }); - docker-tini = tini.overrideAttrs (oldAttrs: rec { - name = "docker-init"; - src = fetchFromGitHub { - owner = "krallin"; - repo = "tini"; - rev = "949e6facb77383876aeff8a6944dde66b3089574"; - sha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; + repo = "docker"; + rev = "v${version}"; + sha256 = sha256; }; - # Do not remove static from make files as we want a static binary - patchPhase = '' + docker-runc = runc.overrideAttrs (oldAttrs: rec { + name = "docker-runc"; + src = fetchFromGitHub { + owner = "docker"; + repo = "runc"; + rev = runcRev; + sha256 = runcSha256; + }; + # docker/runc already include these patches / are not applicable + patches = []; + }); + docker-containerd = containerd.overrideAttrs (oldAttrs: rec { + name = "docker-containerd"; + src = fetchFromGitHub { + owner = "docker"; + repo = "containerd"; + rev = containerdRev; + sha256 = containerdSha256; + }; + }); + docker-tini = tini.overrideAttrs (oldAttrs: rec { + name = "docker-init"; + src = fetchFromGitHub { + owner = "krallin"; + repo = "tini"; + rev = tiniRev; + sha256 = tiniSha256; + }; + + # Do not remove static from make files as we want a static binary + patchPhase = '' + ''; + + NIX_CFLAGS_COMPILE = [ + "-DMINIMAL=ON" + ]; + }); + + buildInputs = [ + makeWrapper removeReferencesTo pkgconfig go-md2man go + sqlite devicemapper btrfs-progs systemd + ]; + + dontStrip = true; + + DOCKER_BUILDTAGS = [] + ++ optional (systemd != null) [ "journald" ] + ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs" + ++ optional (devicemapper == null) "exclude_graphdriver_devicemapper"; + + # systemd 230 no longer has libsystemd-journal as a separate entity from libsystemd + postPatch = '' + substituteInPlace ./hack/make.sh --replace libsystemd-journal libsystemd + substituteInPlace ./daemon/logger/journald/read.go --replace libsystemd-journal libsystemd ''; - NIX_CFLAGS_COMPILE = [ - "-DMINIMAL=ON" - ]; - }); + buildPhase = '' + patchShebangs . + export AUTO_GOPATH=1 + export DOCKER_GITCOMMIT="${rev}" + ./hack/make.sh dynbinary + ''; - buildInputs = [ - makeWrapper removeReferencesTo pkgconfig go-md2man go - sqlite devicemapper btrfs-progs systemd - ]; + outputs = ["out" "man"]; - dontStrip = true; + extraPath = makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ]; - DOCKER_BUILDTAGS = [] - ++ optional (systemd != null) [ "journald" ] - ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs" - ++ optional (devicemapper == null) "exclude_graphdriver_devicemapper"; + installPhase = '' + install -Dm755 ./bundles/${version}/dynbinary-client/docker-${version} $out/libexec/docker/docker + install -Dm755 ./bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd + makeWrapper $out/libexec/docker/docker $out/bin/docker \ + --prefix PATH : "$out/libexec/docker:$extraPath" + makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \ + --prefix PATH : "$out/libexec/docker:$extraPath" - # systemd 230 no longer has libsystemd-journal as a separate entity from libsystemd - postPatch = '' - substituteInPlace ./hack/make.sh --replace libsystemd-journal libsystemd - substituteInPlace ./daemon/logger/journald/read.go --replace libsystemd-journal libsystemd - ''; + # docker uses containerd now + ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/docker-containerd + ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/docker-containerd-shim + ln -s ${docker-runc}/bin/runc $out/libexec/docker/docker-runc + ln -s ${docker-proxy}/bin/docker-proxy $out/libexec/docker/docker-proxy + ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init - buildPhase = '' - patchShebangs . - export AUTO_GOPATH=1 - export DOCKER_GITCOMMIT="${rev}" - ./hack/make.sh dynbinary - ''; + # systemd + install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service - outputs = ["out" "man"]; + # completion + install -Dm644 ./contrib/completion/bash/docker $out/share/bash-completion/completions/docker + install -Dm644 ./contrib/completion/fish/docker.fish $out/share/fish/vendor_completions.d/docker.fish + install -Dm644 ./contrib/completion/zsh/_docker $out/share/zsh/site-functions/_docker - extraPath = makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ]; - - installPhase = '' - install -Dm755 ./bundles/${version}/dynbinary-client/docker-${version} $out/libexec/docker/docker - install -Dm755 ./bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd - makeWrapper $out/libexec/docker/docker $out/bin/docker \ - --prefix PATH : "$out/libexec/docker:$extraPath" - makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \ - --prefix PATH : "$out/libexec/docker:$extraPath" - - # docker uses containerd now - ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/docker-containerd - ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/docker-containerd-shim - ln -s ${docker-runc}/bin/runc $out/libexec/docker/docker-runc - ln -s ${docker-proxy}/bin/docker-proxy $out/libexec/docker/docker-proxy - ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init - - # systemd - install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service - - # completion - install -Dm644 ./contrib/completion/bash/docker $out/share/bash-completion/completions/docker - install -Dm644 ./contrib/completion/fish/docker.fish $out/share/fish/vendor_completions.d/docker.fish - install -Dm644 ./contrib/completion/zsh/_docker $out/share/zsh/site-functions/_docker - - # Include contributed man pages - man/md2man-all.sh -q - manRoot="$man/share/man" - mkdir -p "$manRoot" - for manDir in man/man?; do - manBase="$(basename "$manDir")" # "man1" - for manFile in "$manDir"/*; do - manName="$(basename "$manFile")" # "docker-build.1" - mkdir -p "$manRoot/$manBase" - gzip -c "$manFile" > "$manRoot/$manBase/$manName.gz" + # Include contributed man pages + man/md2man-all.sh -q + manRoot="$man/share/man" + mkdir -p "$manRoot" + for manDir in man/man?; do + manBase="$(basename "$manDir")" # "man1" + for manFile in "$manDir"/*; do + manName="$(basename "$manFile")" # "docker-build.1" + mkdir -p "$manRoot/$manBase" + gzip -c "$manFile" > "$manRoot/$manBase/$manName.gz" + done done - done - ''; + ''; - preFixup = '' - find $out -type f -exec remove-references-to -t ${go} -t ${stdenv.cc.cc} -t ${stdenv.glibc.dev} '{}' + - ''; + preFixup = '' + find $out -type f -exec remove-references-to -t ${go} -t ${stdenv.cc.cc} -t ${stdenv.glibc.dev} '{}' + + ''; - meta = { - homepage = http://www.docker.com/; - description = "An open source project to pack, ship and run any application as a lightweight container"; - license = licenses.asl20; - maintainers = with maintainers; [ offline tailhook ]; - platforms = platforms.linux; + meta = { + homepage = http://www.docker.com/; + description = "An open source project to pack, ship and run any application as a lightweight container"; + license = licenses.asl20; + maintainers = with maintainers; [ offline tailhook ]; + platforms = platforms.linux; + }; + }; + + docker_17_03 = dockerGen rec { + version = "17.03.1-ce"; + rev = "c6d412e"; # git commit + sha256 = "1h3hkg15c3isfgaqpkp3mr7ys5826cz24hn3f3wz07jmismq98q7"; + runcRev = "54296cf40ad8143b62dbcaa1d90e520a2136ddfe"; + runcSha256 = "0ylymx7pi4jmvbqj94j2i8qspy8cpq0m91l6a0xiqlx43yx6qi2m"; + containerdRev = "4ab9917febca54791c5f071a9d1f404867857fcc"; + containerdSha256 = "06f2gsx4w9z4wwjhrpafmz6c829wi8p7crj6sya6x9ii50bkn8p6"; + tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; + tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; + }; + + docker_17_04 = dockerGen rec { + version = "17.04.0-ce"; + rev = "4845c56"; # git commit + sha256 = "04farary19ws7xzsyack0sbrxjzp5xwjh26frxbpdd0a88pxnbj7"; + runcRev = "9c2d8d184e5da67c95d601382adf14862e4f2228"; + runcSha256 = "131jv8f77pbdlx88ar0zjwdsp0a5v8kydaw0w0cl3i0j3622ydjl"; + containerdRev = "422e31ce907fd9c3833a38d7b8fdd023e5a76e73"; + containerdSha256 = "1g0k82f1mk3vn57k130q776wp5c226d06qbiq1q148pqxxhym2r2"; + tiniRev = "949e6facb77383876aeff8a6944dde66b3089574"; + tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; }; } diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index bd003df57f8..9bc2bc3db08 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,33 +1,35 @@ -{ stdenv, fetchurl, python2Packages, intltool, curl -, wrapGAppsHook, virtinst, gtkvnc, vte -, gtk3, gobjectIntrospection, libvirt-glib, gsettings_desktop_schemas, glib -, avahi, dconf, spiceSupport ? true, spice_gtk, libosinfo, gnome3, system-libvirt +{ stdenv, fetchurl, python2Packages, intltool, file +, wrapGAppsHook, virtinst, gtkvnc, vte, avahi, dconf +, gobjectIntrospection, libvirt-glib, system-libvirt +, gsettings_desktop_schemas, glib, libosinfo, gnome3 +, spiceSupport ? true, spice_gtk ? null }: with stdenv.lib; -with python2Packages; -buildPythonApplication rec { +python2Packages.buildPythonApplication rec { name = "virt-manager-${version}"; - version = "1.4.0"; + version = "1.4.1"; namePrefix = ""; src = fetchurl { url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz"; - sha256 = "1jnawqjmcqd2db78ngx05x7cxxn3iy1sb4qfgbwcn045qh6a8cdz"; + sha256 = "0i1rkxz730vw1nqghrp189jhhp53pw81k0h71hhxmyqlkyclkig6"; }; - propagatedBuildInputs = - [ eventlet greenlet gflags netaddr carrot routes - PasteDeploy m2crypto ipy twisted - distutils_extra simplejson glanceclient cheetah lockfile httplib2 - urlgrabber virtinst pyGtkGlade dbus-python /*gnome_python FIXME*/ pygobject3 - libvirt libxml2 ipaddr vte libosinfo gobjectIntrospection gtk3 mox - gtkvnc libvirt-glib glib gsettings_desktop_schemas gnome3.defaultIconTheme - wrapGAppsHook + nativeBuildInputs = [ wrapGAppsHook intltool file ]; + + buildInputs = + [ libvirt-glib vte virtinst dconf gtkvnc gnome3.defaultIconTheme avahi + gsettings_desktop_schemas libosinfo ] ++ optional spiceSupport spice_gtk; - buildInputs = [ dconf avahi intltool ]; + propagatedBuildInputs = with python2Packages; + [ eventlet greenlet gflags netaddr carrot routes PasteDeploy + m2crypto ipy twisted distutils_extra simplejson glanceclient + cheetah lockfile httplib2 urlgrabber pyGtkGlade dbus-python + pygobject3 ipaddr mox libvirt libxml2 + ]; patchPhase = '' sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py @@ -35,7 +37,7 @@ buildPythonApplication rec { ''; postConfigure = '' - ${python.interpreter} setup.py configure --prefix=$out + ${python2Packages.python.interpreter} setup.py configure --prefix=$out ''; postInstall = '' @@ -54,6 +56,6 @@ buildPythonApplication rec { manages Xen and LXC (linux containers). ''; license = licenses.gpl2; - maintainers = with maintainers; [qknight offline]; + maintainers = with maintainers; [ qknight offline fpletz ]; }; } diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index b8de872d6ff..3b8d0a7cf63 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp -, libgcrypt, gnupg, cyrus_sasl, shared_mime_info, libvirt, libcap_ng, yajl -, gsettings_desktop_schemas, makeWrapper, xen, numactl, libvirt-glib -, spiceSupport ? true, spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null +, libgcrypt, gnupg, cyrus_sasl, shared_mime_info, libvirt, yajl, xen +, gsettings_desktop_schemas, makeWrapper, libvirt-glib, libcap_ng, numactl +, libapparmor +, spiceSupport ? true +, spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null }: assert spiceSupport -> @@ -19,12 +21,12 @@ stdenv.mkDerivation rec { sha256 = "0blbp1wkw8ahss9va0bmcz2yx18j0mvm6fzrzhh2ly3sja5ysb8b"; }; + nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ - pkgconfig intltool glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl - shared_mime_info libvirt libcap_ng yajl gsettings_desktop_schemas makeWrapper - numactl libvirt-glib - ] ++ optionals spiceSupport [ spice_gtk spice_protocol libcap gdbm - ] ++ optional (stdenv.system == "x86_64-linux") xen; + glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared_mime_info + libvirt yajl gsettings_desktop_schemas makeWrapper libvirt-glib + libcap_ng numactl libapparmor xen + ] ++ optionals spiceSupport [ spice_gtk spice_protocol libcap gdbm ]; postInstall = '' for f in "$out"/bin/*; do diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 14121660fa8..6c49e95b6b9 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -18,10 +18,10 @@ let python = python2; buildType = "release"; - extpack = "baddb7cc49224ecc1147f82d77fce2685ac39941ac9b0aac83c270dd6570ea85"; - extpackRev = 112924; - main = "8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a"; - version = "5.1.14"; + extpack = "996f783996a597d3936fc5f1ccf56edd31ae1f8fb4d527009647d9a2c8c853cd"; + extpackRev = "114002"; + main = "7ed0959bbbd02826b86b3d5dc8348931ddfab267c31f8ed36ee53c12f5522cd9"; + version = "5.1.18"; # See https://github.com/NixOS/nixpkgs/issues/672 for details extensionPack = requireFile rec { @@ -58,7 +58,7 @@ in stdenv.mkDerivation { ++ optional pythonBindings python # Python is needed even when not building bindings ++ optional pulseSupport libpulseaudio ++ optionals (headless) [ libXrandr ] - ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras libXinerama SDL ]; + ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras qt5.makeQtWrapper libXinerama SDL ]; hardeningDisable = [ "fortify" "pic" "stackprotector" ]; @@ -72,15 +72,17 @@ in stdenv.mkDerivation { ''} -i configure ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2 - sed -i -e ' - s@"libdbus-1\.so\.3"@"${dbus.lib}/lib/libdbus-1.so.3"@g - s@"libasound\.so\.2"@"${alsaLib.out}/lib/libasound.so.2"@g - ${optionalString pulseSupport '' - s@"libpulse\.so\.0"@"${libpulseaudio.out}/lib/libpulse.so.0"@g - ''} - ' src/VBox/Main/xml/Settings.cpp \ - src/VBox/Devices/Audio/{alsa,pulse}_stubs.c \ - include/VBox/dbus-calls.h + + grep 'libpulse\.so\.0' src include -rI --files-with-match | xargs sed -i -e ' + ${optionalString pulseSupport + ''s@"libpulse\.so\.0"@"${libpulseaudio.out}/lib/libpulse.so.0"@g''}' + + grep 'libdbus-1\.so\.3' src include -rI --files-with-match | xargs sed -i -e ' + s@"libdbus-1\.so\.3"@"${dbus.lib}/lib/libdbus-1.so.3"@g' + + grep 'libasound\.so\.2' src include -rI --files-with-match | xargs sed -i -e ' + s@"libasound\.so\.2"@"${alsaLib.out}/lib/libasound.so.2"@g' + export USER=nix set +x ''; @@ -153,7 +155,12 @@ in stdenv.mkDerivation { # Create wrapper script mkdir -p $out/bin - for file in VirtualBox VBoxManage VBoxSDL VBoxBalloonCtrl VBoxBFE VBoxHeadless; do + ${optionalString (!headless) '' + makeQtWrapper "$libexec/VirtualBox" $out/bin/VirtualBox + ''} + for file in ${optionalString (!headless) "VBoxSDL rdesktop-vrdp"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do + echo "Linking $file to /bin" + test -x "$libexec/$file" ln -s "$libexec/$file" $out/bin/$file done diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 6e58d42a1cb..df59f3e0e2e 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "1b206b76050dccd3ed979307230f9ddea79551e1c0aba93faee77416733cdc8a"; + sha256 = "f2951b49f48a560fbc1afe9d135d1f3f82a3e158b9002278d05d978428adca8a"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; diff --git a/pkgs/applications/window-managers/2bwm/default.nix b/pkgs/applications/window-managers/2bwm/default.nix new file mode 100644 index 00000000000..50c342269c7 --- /dev/null +++ b/pkgs/applications/window-managers/2bwm/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, patches +, libxcb, xcbutilkeysyms, xcbutilwm +, libX11, xcbutil, xcbutilxrm }: + +stdenv.mkDerivation rec { + version = "0.2"; + name = "2bwm-${version}"; + + src = fetchFromGitHub { + owner = "venam"; + repo = "2bwm"; + rev = "v${version}"; + sha256 = "1la1ixpm5knsj2gvdcmxzj1jfbzxvhmgzps4f5kbvx5047xc6ici"; + }; + + # Allow users set their own list of patches + inherit patches; + + buildInputs = [ libxcb xcbutilkeysyms xcbutilwm libX11 xcbutil xcbutilxrm ]; + + installPhase = "make install DESTDIR=$out PREFIX=\"\""; + + meta = with stdenv.lib; { + homepage = "https://github.com/venam/2bwm"; + description = "A fast floating WM written over the XCB library and derived from mcwm"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 0a1256d67a4..eccb1a19538 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf +{ stdenv, fetchurl, fetchFromGitHub, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf , xorg, libstartup_notification, libxdg_basedir, libpthreadstubs , xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm @@ -9,10 +9,13 @@ with luaPackages; stdenv.mkDerivation rec { name = "awesome-${version}"; - version = "4.0"; - src = fetchurl { - url = "http://github.com/awesomeWM/awesome-releases/raw/master/${name}.tar.xz"; - sha256 = "0czkcz67sab63gf5m2p2pgg05yinjx60hfb9rfyzdkkg28q9f02w"; + version = "4.1"; + + src = fetchFromGitHub { + owner = "awesomewm"; + repo = "awesome"; + rev = "v${version}"; + sha256 = "1qik8h5nwjq4535lpdpal85vas1k7am3s6l5r763kpdzxhfcyyaj"; }; nativeBuildInputs = [ @@ -22,8 +25,10 @@ with luaPackages; stdenv.mkDerivation rec { imagemagick makeWrapper pkgconfig - xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs + xmlto docbook_xml_dtd_45 + docbook_xsl findXMLCatalogs ]; + propagatedUserEnvPkgs = [ hicolor_icon_theme ]; buildInputs = [ cairo dbus gdk_pixbuf gobjectIntrospection git lgi libpthreadstubs libstartup_notification @@ -33,6 +38,13 @@ with luaPackages; stdenv.mkDerivation rec { xorg.xcbutilrenderutil xorg.xcbutilwm libxkbcommon xcbutilxrm ]; + patches = [ + (fetchurl { + url = "https://patch-diff.githubusercontent.com/raw/awesomeWM/awesome/pull/1639.patch"; + sha256 = "00piynmbxajd2xbg960gmf0zlqn7m489f4ww482y49ravfy1jhsj"; + }) + ]; + #cmakeFlags = "-DGENERATE_MANPAGES=ON"; LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ cairo pango gobjectIntrospection ]}"; diff --git a/pkgs/applications/window-managers/bevelbar/default.nix b/pkgs/applications/window-managers/bevelbar/default.nix new file mode 100644 index 00000000000..582f9cb61f8 --- /dev/null +++ b/pkgs/applications/window-managers/bevelbar/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, libX11, libXrandr, libXft }: + +stdenv.mkDerivation rec { + name = "bevelbar-${version}"; + version = "16.11"; + + src = fetchFromGitHub { + owner = "vain"; + repo = "bevelbar"; + rev = "v${version}"; + sha256 = "1hbwg3vdxw9fyshy85skv476p0zr4ynvhcz2xkijydpzm2j3rmjm"; + }; + + buildInputs = [ libX11 libXrandr libXft ]; + + installFlags = [ "prefix=$(out)" ]; + + meta = with stdenv.lib; { + description = "An X11 status bar with fancy schmancy 1985-ish beveled borders"; + inherit (src.meta) homepage; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.neeasade ]; + }; +} diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix index b374c982931..f8c8a59f6f6 100644 --- a/pkgs/applications/window-managers/fvwm/default.nix +++ b/pkgs/applications/window-managers/fvwm/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { description = "A multiple large virtual desktop window manager"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ edanaher ]; }; } diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index dd781143d86..aa4001f62de 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -2,17 +2,19 @@ , xcbutilimage, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }: stdenv.mkDerivation rec { - rev = "c8e1aece7301c3c6481bf2f695734f8d273f252e"; - version = "2.7-2016-09-17"; + version = "2.7-2017-04-01"; name = "i3lock-color-${version}"; + src = fetchFromGitHub { owner = "chrjguill"; repo = "i3lock-color"; - inherit rev; - sha256 = "07fpvwgdfxsnxnf63idrz3n1kbyayr53lsfns2q775q93cz1mfia"; + rev = "61f6428aedbe4829d3e0f51d137283c8aec1e206"; + sha256 = "0h4nzx46kcsp6b1i2lm9y4d1w1icrpvjl8g1h3wbpa5x4crh4703"; }; - buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11 + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which libxcb xcbutilkeysyms xcbutilimage pam libX11 libev cairo libxkbcommon libxkbfile ]; + makeFlags = "all"; preInstall = '' mkdir -p $out/share/man/man1 diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 79077b477b4..f392945b36d 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchFromGitHub, pango, libinput , makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl, cairo , wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs, libcap +, xwayland }: let - version = "0.11"; + version = "0.12.2"; in stdenv.mkDerivation rec { name = "sway-${version}"; @@ -13,12 +14,12 @@ in owner = "Sircmpwn"; repo = "sway"; rev = "${version}"; - sha256 = "01k01f72kh90fwgqh2hgg6dv9931x4v18bzz11b47mn7p9z68ddv"; + sha256 = "1hkr6pmz45xa5w5y21ijz7i2dwb62rifhcy28r8kh5r2hwbil2hs"; }; nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ]; - buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput libcap ]; + buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput libcap xwayland ]; patchPhase = '' sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt; diff --git a/pkgs/applications/window-managers/way-cooler/default.nix b/pkgs/applications/window-managers/way-cooler/default.nix new file mode 100755 index 00000000000..d9d84e83430 --- /dev/null +++ b/pkgs/applications/window-managers/way-cooler/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig +, wayland, xwayland, wlc, dbus_libs, dbus_glib, cairo, libxkbcommon }: + +with rustPlatform; + +buildRustPackage rec { + name = "way-cooler-${version}"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "way-cooler"; + repo = "way-cooler"; + rev = "v${version}"; + sha256 = "10s01x54kwjm2c85v57i6g3pvj5w3wpkjblj036mmd865fla1brb"; + }; + + depsSha256 = "1k5xbw2zhm5z650mxdbxixr90im53wlpjdvq2pbnx2snqm84idlc"; + + buildInputs = [ wlc dbus_libs dbus_glib cairo libxkbcommon ]; + + nativeBuildInputs = [ pkgconfig ]; + + meta = with stdenv.lib; { + description = "Customizable Wayland compositor (window manager)"; + longDescription = '' + Way Cooler is a customizable tiling window manager written in Rust + for Wayland and configurable using Lua. It is heavily inspired by + the tiling and extensibility of both i3 and awesome. While Lua is + used for the configuration, like awesome, extensions for Way Cooler + are implemented as totally separate client programs using D-Bus. + This means that you can use virtually any language to extend the + window manager, with much better guarantees about interoperability + between extensions. + ''; + homepage = http://way-cooler.org/; + license = with licenses; [ mit ]; + maintainers = [ maintainers.miltador ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix index a8b5be83234..d83c4493acc 100644 --- a/pkgs/applications/window-managers/windowmaker/default.nix +++ b/pkgs/applications/window-managers/windowmaker/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { name = "windowmaker-${version}"; - version = "0.95.7"; + version = "0.95.8"; srcName = "WindowMaker-${version}"; src = fetchurl { url = "http://windowmaker.org/pub/source/release/${srcName}.tar.gz"; - sha256 = "1acph0nq6fsb452sl7j7a7kcc87zqqaw7qms1p8ijar19dn4hbc4"; + sha256 = "12p8kljqgx5hnic0zvs5mxwp7kg21sb6qjagb2qw8ydvf5amrgwx"; }; nativeBuildInputs = [ pkgconfig ]; @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { contributions being made by programmers from around the world. ''; license = licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; + maintainers = [ maintainers.AndersonTorres ]; }; } diff --git a/pkgs/applications/window-managers/wtftw/default.nix b/pkgs/applications/window-managers/wtftw/default.nix new file mode 100644 index 00000000000..0ff3367e3ae --- /dev/null +++ b/pkgs/applications/window-managers/wtftw/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, rustPlatform, cargo, libXinerama, libX11, xlibs, pkgconfig }: + +rustPlatform.buildRustPackage rec { + name = "wtftw-0.0pre20161001"; + src = fetchFromGitHub { + owner = "kintaro"; + repo = "wtftw"; + rev = "b72a1bd24430a614d953d6ecf61732805277cc0c"; + sha256 = "1ajxkncqh4azyhmsdyk07r1kbhwv81vl1ix3w4iaz8cyln4gs0kp"; + }; + + depsSha256 = "0z7h8ybh2db3xl8qxbzby5lncdaijixzmbn1j8a45lbky1xiix71"; + + buildInputs = [ libXinerama libX11 pkgconfig ]; + libPath = stdenv.lib.makeLibraryPath [ libXinerama libX11 ]; + + preInstall = '' + cargo update + ''; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/xsessions + cp -p target/release/wtftw $out/bin/ + echo "[Desktop Entry] + Name=wtftw + Exec=/bin/wtftw + Type=XSession + DesktopName=wtftw" > $out/share/xsessions/wtftw.desktop + ''; + + meta = with stdenv.lib; { + description = "A tiling window manager in Rust"; + homepage = https://github.com/Kintaro/wtftw; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/build-support/build-dotnet-package/default.nix b/pkgs/build-support/build-dotnet-package/default.nix index 3d24f6fb434..2b1b34429c5 100644 --- a/pkgs/build-support/build-dotnet-package/default.nix +++ b/pkgs/build-support/build-dotnet-package/default.nix @@ -102,8 +102,9 @@ attrsOrig @ mkdir -p "$out"/bin commandName="$(basename -s .exe "$(echo "$exe" | tr "[A-Z]" "[a-z]")")" makeWrapper \ - "${mono}/bin/mono \"$exe\"" \ + "${mono}/bin/mono" \ "$out"/bin/"$commandName" \ + --add-flags "\"$exe\"" \ ''${makeWrapperArgs} done done diff --git a/pkgs/build-support/emacs/buffer.nix b/pkgs/build-support/emacs/buffer.nix index 1cbac0709a6..6c5e0570fd0 100644 --- a/pkgs/build-support/emacs/buffer.nix +++ b/pkgs/build-support/emacs/buffer.nix @@ -39,6 +39,8 @@ (make-local-variable 'process-environment) (put 'process-environment 'permanent-local t) (inherit-local 'process-environment) + ; setenv modifies in place, so copy the environment first + (setq process-environment (copy-tree process-environment)) (setenv "PATH" (concat "${lib.makeSearchPath "bin" pkgs}:" (getenv "PATH"))) (inherit-local-permanent exec-path (append '(${builtins.concatStringsSep " " (map (p: "\"${p}/bin\"") pkgs)}) exec-path)) diff --git a/pkgs/build-support/fetchdarcs/default.nix b/pkgs/build-support/fetchdarcs/default.nix index 3c2e0524eea..2644a20d0a5 100644 --- a/pkgs/build-support/fetchdarcs/default.nix +++ b/pkgs/build-support/fetchdarcs/default.nix @@ -1,13 +1,16 @@ {stdenv, darcs, nix}: {url, rev ? null, context ? null, md5 ? "", sha256 ? ""}: +if md5 != "" then + throw "fetchdarcs does not support md5 anymore, please use sha256" +else stdenv.mkDerivation { name = "fetchdarcs"; builder = ./builder.sh; buildInputs = [darcs]; - outputHashAlgo = if sha256 == "" then "md5" else "sha256"; + outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = if sha256 == "" then md5 else sha256; - + outputHash = sha256; + inherit url rev context; } diff --git a/pkgs/build-support/fetchegg/default.nix b/pkgs/build-support/fetchegg/default.nix index 3e0d5d566ad..41d2c936e01 100644 --- a/pkgs/build-support/fetchegg/default.nix +++ b/pkgs/build-support/fetchegg/default.nix @@ -4,14 +4,17 @@ { stdenv, chicken }: { name, version, md5 ? "", sha256 ? "" }: +if md5 != "" then + throw "fetchegg does not support md5 anymore, please use sha256" +else stdenv.mkDerivation { name = "chicken-${name}-export"; builder = ./builder.sh; buildInputs = [ chicken ]; - outputHashAlgo = if sha256 == "" then "md5" else "sha256"; + outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = if sha256 == "" then md5 else sha256; + outputHash = sha256; inherit version; diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index e40b460d390..d85d2c893c5 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -39,18 +39,20 @@ in server admins start using the new version? */ -assert md5 != "" || sha256 != ""; assert deepClone -> leaveDotGit; +if md5 != "" then + throw "fetchgit does not support md5 anymore, please use sha256" +else stdenv.mkDerivation { inherit name; builder = ./builder.sh; fetcher = "${./nix-prefetch-git}"; # This must be a string to ensure it's called with bash. buildInputs = [git]; - outputHashAlgo = if sha256 == "" then "md5" else "sha256"; + outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = if sha256 == "" then md5 else sha256; + outputHash = sha256; inherit url rev leaveDotGit fetchSubmodules deepClone branchName; diff --git a/pkgs/build-support/fetchgx/default.nix b/pkgs/build-support/fetchgx/default.nix index c72bbec6632..6d209cec254 100644 --- a/pkgs/build-support/fetchgx/default.nix +++ b/pkgs/build-support/fetchgx/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { buildPhase = '' export GOPATH=$(pwd)/vendor - mkdir vendor + mkdir -p vendor gx install ''; diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix index 79f610166a7..aba12317963 100644 --- a/pkgs/build-support/fetchhg/default.nix +++ b/pkgs/build-support/fetchhg/default.nix @@ -1,5 +1,8 @@ {stdenv, mercurial, nix}: {name ? null, url, rev ? null, md5 ? null, sha256 ? null, fetchSubrepos ? false}: +if md5 != null then + throw "fetchhg does not support md5 anymore, please use sha256" +else # TODO: statically check if mercurial as the https support if the url starts woth https. stdenv.mkDerivation { name = "hg-archive" + (if name != null then "-${name}" else ""); @@ -8,14 +11,11 @@ stdenv.mkDerivation { impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; - # Nix <= 0.7 compatibility. - id = md5; - subrepoClause = if fetchSubrepos then "S" else ""; - outputHashAlgo = if md5 != null then "md5" else "sha256"; + outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = if md5 != null then md5 else sha256; + outputHash = sha256; inherit url rev; preferLocalBuild = true; diff --git a/pkgs/build-support/fetchnuget/default.nix b/pkgs/build-support/fetchnuget/default.nix index 95bb7b7cd8d..62b700dd81b 100644 --- a/pkgs/build-support/fetchnuget/default.nix +++ b/pkgs/build-support/fetchnuget/default.nix @@ -8,9 +8,12 @@ attrs @ , md5 ? "" , ... }: +if md5 != "" then + throw "fetchnuget does not support md5 anymore, please use sha256" +else buildDotnetPackage ({ src = fetchurl { - inherit url sha256 md5; + inherit url sha256; name = "${baseName}.${version}.zip"; }; diff --git a/pkgs/build-support/fetchrepoproject/default.nix b/pkgs/build-support/fetchrepoproject/default.nix new file mode 100644 index 00000000000..8c55db5372d --- /dev/null +++ b/pkgs/build-support/fetchrepoproject/default.nix @@ -0,0 +1,73 @@ +{ stdenv, git, gitRepo, gnupg ? null, cacert, copyPathsToStore }: + +{ name, manifest, rev ? "HEAD", sha256, repoRepoURL ? "", repoRepoRev ? "", referenceDir ? "" +, localManifests ? [], createMirror ? false, useArchive ? !createMirror +}: + +assert repoRepoRev != "" -> repoRepoURL != ""; +assert createMirror -> !useArchive; + +with stdenv.lib; + +let + repoInitFlags = [ + "--manifest-url=${manifest}" + "--manifest-branch=${rev}" + "--depth=1" + #TODO: fetching clone.bundle seems to fail spectacularly inside a sandbox. + "--no-clone-bundle" + (optionalString createMirror "--mirror") + (optionalString useArchive "--archive") + (optionalString (repoRepoURL != "") "--repo-url=${repoRepoURL}") + (optionalString (repoRepoRev != "") "--repo-branch=${repoRepoRev}") + (optionalString (referenceDir != "") "--reference=${referenceDir}") + ]; + + local_manifests = copyPathsToStore localManifests; + +in + +with stdenv.lib; + +let + extraRepoInitFlags = [ + (optionalString (repoRepoURL != "") "--repo-url=${repoRepoURL}") + (optionalString (repoRepoRev != "") "--repo-branch=${repoRepoRev}") + (optionalString (referenceDir != "") "--reference=${referenceDir}") + ]; +in + +stdenv.mkDerivation { + buildCommand = '' + mkdir .repo + ${optionalString (local_manifests != []) '' + mkdir ./.repo/local_manifests + for local_manifest in ${concatMapStringsSep " " toString local_manifests} + + do + cp $local_manifest ./.repo/local_manifests/$(stripHash $local_manifest; echo $strippedName) + done + ''} + + export HOME=.repo + repo init ${concatStringsSep " " repoInitFlags} + + repo sync --jobs=$NIX_BUILD_CORES --current-branch + ${optionalString (!createMirror) "rm -rf $out/.repo"} + ''; + + GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars ++ [ + "GIT_PROXY_COMMAND" "SOCKS_SERVER" + ]; + + buildInputs = [git gitRepo cacert] ++ optional (gnupg != null) [gnupg] ; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = sha256; + + preferLocalBuild = true; + enableParallelBuilding = true; + inherit name cacert manifest rev repoRepoURL repoRepoRev referenceDir; +} diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix index 05ed0505f81..6ed34ec0276 100644 --- a/pkgs/build-support/fetchsvn/default.nix +++ b/pkgs/build-support/fetchsvn/default.nix @@ -8,7 +8,9 @@ let fst = head; snd = l: head (tail l); trd = l: head (tail (tail l)); - path_ = reverseList (splitString "/" url); + path_ = + (p: if head p == "" then tail p else p) # ~ drop final slash if any + (reverseList (splitString "/" url)); path = [ (removeSuffix "/" (head path_)) ] ++ (tail path_); in # ../repo/trunk -> repo @@ -23,15 +25,18 @@ let name_ = if name == null then "${repoName}-r${toString rev}" else name; in +if md5 != "" then + throw "fetchsvn does not support md5 anymore, please use sha256" +else stdenv.mkDerivation { name = name_; builder = ./builder.sh; buildInputs = [subversion]; - outputHashAlgo = if sha256 == "" then "md5" else "sha256"; + outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = if sha256 == "" then md5 else sha256; - + outputHash = sha256; + inherit url rev sshSupport openssh ignoreExternals ignoreKeywords; impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; diff --git a/pkgs/build-support/fetchsvnssh/default.nix b/pkgs/build-support/fetchsvnssh/default.nix index 6c6c03d6873..a6f3d3469f0 100644 --- a/pkgs/build-support/fetchsvnssh/default.nix +++ b/pkgs/build-support/fetchsvnssh/default.nix @@ -1,16 +1,20 @@ {stdenv, subversion, sshSupport ? false, openssh ? null, expect}: {username, password, url, rev ? "HEAD", md5 ? "", sha256 ? ""}: + +if md5 != "" then + throw "fetchsvnssh does not support md5 anymore, please use sha256" +else stdenv.mkDerivation { name = "svn-export-ssh"; builder = ./builder.sh; buildInputs = [subversion expect]; - outputHashAlgo = if sha256 == "" then "md5" else "sha256"; + outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = if sha256 == "" then md5 else sha256; - + outputHash = sha256; + sshSubversion = ./sshsubversion.exp; - + inherit username password url rev sshSupport openssh; } diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 00f485ce697..1e872fbc57a 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -87,12 +87,14 @@ assert sha512 != "" -> builtins.compareVersions "1.11" builtins.nixVersion <= 0; let hasHash = showURLs || (outputHash != "" && outputHashAlgo != "") - || md5 != "" || sha1 != "" || sha256 != "" || sha512 != ""; + || sha1 != "" || sha256 != "" || sha512 != ""; urls_ = if urls != [] then urls else [url]; in -if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${stdenv.lib.concatStringsSep ", " urls_}" else stdenv.mkDerivation { +if md5 != "" then throw "fetchsvnssh does not support md5 anymore, please use sha256 or sha512" +else if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${stdenv.lib.concatStringsSep ", " urls_}" +else stdenv.mkDerivation { name = if showURLs then "urls" else if name != "" then name @@ -110,9 +112,9 @@ if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${s # New-style output content requirements. outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else - if sha512 != "" then "sha512" else if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5"; + if sha512 != "" then "sha512" else if sha256 != "" then "sha256" else "sha1"; outputHash = if outputHash != "" then outputHash else - if sha512 != "" then sha512 else if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5; + if sha512 != "" then sha512 else if sha256 != "" then sha256 else sha1; outputHashMode = if (recursiveHash || executable) then "recursive" else "flat"; diff --git a/pkgs/build-support/kde/wrapper.nix b/pkgs/build-support/kde/wrapper.nix index f5add12e8ec..228eb696bd9 100644 --- a/pkgs/build-support/kde/wrapper.nix +++ b/pkgs/build-support/kde/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeWrapper, buildEnv }: +{ stdenv, lib, makeWrapper, buildEnv, gtk3, dconf }: packages: @@ -47,10 +47,11 @@ stdenv.mkDerivation { --argv0 '"$0"' \ --suffix PATH : "$env/bin" \ --prefix XDG_CONFIG_DIRS : "$env/etc/xdg" \ - --prefix XDG_DATA_DIRS : "$env/share" \ + --prefix XDG_DATA_DIRS : "$env/share:${gtk3}/share/gsettings-schemas/${gtk3.name}" \ --set QML_IMPORT_PATH "$env/lib/qt5/imports" \ --set QML2_IMPORT_PATH "$env/lib/qt5/qml" \ - --set QT_PLUGIN_PATH "$env/lib/qt5/plugins" + --set QT_PLUGIN_PATH "$env/lib/qt5/plugins" \ + --prefix GIO_EXTRA_MODULES : "${dconf.lib}/lib/gio/modules" good="1" break fi diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index a69ef5c6b07..91569d0c070 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation (args // { echo "Using cargo deps from $cargoDeps" - cp -r "$cargoDeps" deps + cp -a "$cargoDeps" deps chmod +w deps -R # It's OK to use /dev/null as the URL because by the time we do this, cargo diff --git a/pkgs/build-support/setup-systemd-units.nix b/pkgs/build-support/setup-systemd-units.nix new file mode 100644 index 00000000000..4fa2f42c39d --- /dev/null +++ b/pkgs/build-support/setup-systemd-units.nix @@ -0,0 +1,83 @@ +# | Build a script to install and start a set of systemd units on any +# systemd-based system. +# +# Creates a symlink at /etc/systemd-static/${namespace} for slightly +# improved atomicity. +{ writeScriptBin +, bash +, coreutils +, systemd +, runCommand +, lib +}: + { units # : AttrSet String (Either Path { path : Path, wanted-by : [ String ] }) + # ^ A set whose names are unit names and values are + # either paths to the corresponding unit files or a set + # containing the path and the list of units this unit + # should be wanted-by (none by default). + # + # The names should include the unit suffix + # (e.g. ".service") + , namespace # : String + # The namespace for the unit files, to allow for + # multiple independent unit sets managed by + # `setupSystemdUnits`. + }: + let static = runCommand "systemd-static" {} + '' + mkdir -p $out + ${lib.concatStringsSep "\n" (lib.mapAttrsToList (nm: file: + "ln -sv ${file.path or file} $out/${nm}" + ) units)} + ''; + add-unit-snippet = name: file: + '' + oldUnit=$(readlink -f "$unitDir/${name}" || echo "$unitDir/${name}") + if [ -f "$oldUnit" -a "$oldUnit" != "${file.path or file}" ]; then + unitsToStop+=("${name}") + fi + ln -sf "/etc/systemd-static/${namespace}/${name}" \ + "$unitDir/.${name}.tmp" + mv -T "$unitDir/.${name}.tmp" "$unitDir/${name}" + ${lib.concatStringsSep "\n" (map (unit: + '' + mkdir -p "$unitDir/${unit}.wants" + ln -sf "../${name}" \ + "$unitDir/${unit}.wants/.${name}.tmp" + mv -T "$unitDir/${unit}.wants/.${name}.tmp" \ + "$unitDir/${unit}.wants/${name}" + '' + ) file.wanted-by or [])} + unitsToStart+=("${name}") + ''; + in + writeScriptBin "setup-systemd-units" + '' + #!${bash}/bin/bash -e + export PATH=${coreutils}/bin:${systemd}/bin + + unitDir=/etc/systemd/system + if [ ! -w "$unitDir" ]; then + unitDir=/etc/systemd-mutable/system + mkdir -p "$unitDir" + fi + declare -a unitsToStop unitsToStart + + oldStatic=$(readlink -f /etc/systemd-static/${namespace} || true) + if [ "$oldStatic" != "${static}" ]; then + ${lib.concatStringsSep "\n" + (lib.mapAttrsToList add-unit-snippet units)} + if [ ''${#unitsToStop[@]} -ne 0 ]; then + echo "Stopping unit(s) ''${unitsToStop[@]}" >&2 + systemctl stop "''${unitsToStop[@]}" + fi + mkdir -p /etc/systemd-static + ln -sfT ${static} /etc/systemd-static/.${namespace}.tmp + mv -T /etc/systemd-static/.${namespace}.tmp /etc/systemd-static/${namespace} + systemctl daemon-reload + echo "Starting unit(s) ''${unitsToStart[@]}" >&2 + systemctl start "''${unitsToStart[@]}" + else + echo "Units unchanged, doing nothing" >&2 + fi + '' diff --git a/pkgs/data/documentation/rnrs/common.nix b/pkgs/data/documentation/rnrs/common.nix index 8053020a3f2..bd38389eb47 100644 --- a/pkgs/data/documentation/rnrs/common.nix +++ b/pkgs/data/documentation/rnrs/common.nix @@ -24,5 +24,7 @@ stdenv.mkDerivation rec { ''; homepage = http://swiss.csail.mit.edu/~jaffer/Scheme; + + broken = true; }; } diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix new file mode 100644 index 00000000000..16534d4d6cb --- /dev/null +++ b/pkgs/data/fonts/babelstone-han/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation rec { + name = "babelstone-han-${version}"; + version = "9.0.2"; + + src = fetchurl { + url = "http://www.babelstone.co.uk/Fonts/8672/BabelStoneHan.zip"; + sha256 = "09zlrp3mqdsbxpq4sssd8gj5isnxfbr56pcdp7mnr27nv4pvp6ha"; + }; + + buildInputs = [ unzip ]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp -v *.ttf $out/share/fonts/truetype + ''; + + meta = with stdenv.lib; { + description = "Unicode CJK font with over 32600 Han characters"; + homepage = http://www.babelstone.co.uk/Fonts/Han.html; + + license = licenses.free; + platforms = platforms.all; + hydraPlatforms = []; + maintainers = [ maintainers.volth ]; + }; +} diff --git a/pkgs/data/fonts/fontconfig-penultimate/default.nix b/pkgs/data/fonts/fontconfig-penultimate/default.nix new file mode 100644 index 00000000000..a42e5d9109b --- /dev/null +++ b/pkgs/data/fonts/fontconfig-penultimate/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +let version = "0.3.2"; in +stdenv.mkDerivation { + name = "fontconfig-penultimate-${version}"; + + src = fetchFromGitHub { + owner = "ttuegel"; + repo = "fontconfig-penultimate"; + rev = version; + sha256 = "01cgqdmgpqahkg71lnvr3yzsmka9q1kgkbiz6w5ds1fhrpcswj7p"; + }; + + installPhase = '' + mkdir -p $out/etc/fonts/conf.d + cp *.conf $out/etc/fonts/conf.d + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/ttuegel/fontconfig-penultimate; + description = "Sensible defaults for Fontconfig"; + license = licenses.asl20; + maintainers = [ maintainers.ttuegel ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index cbd963e903d..ac7dcea31b1 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { name = "iosevka-${version}"; - version = "1.4.2"; + version = "1.12.1"; - src = fetchFromGitHub { - owner = "be5invis"; - repo = "Iosevka"; - rev = "v${version}"; - sha256 = "1h1lmvjpjk0238bhdhnv2c149s98qpbndc8rxzlk6bhmxcy6rwsk"; + buildInputs = [ unzip ]; + + src = fetchurl { + url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip"; + sha256 = "1rwg06fbizf2cmjwysx4ciz96nh80k48drsyr3rshppycajnaahj"; }; + sourceRoot = "."; + installPhase = '' fontdir=$out/share/fonts/iosevka diff --git a/pkgs/data/fonts/shrikhand/default.nix b/pkgs/data/fonts/shrikhand/default.nix new file mode 100644 index 00000000000..942a284e2c0 --- /dev/null +++ b/pkgs/data/fonts/shrikhand/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "2016-03-03"; + name = "shrikhand-${version}"; + + src = fetchFromGitHub { + owner = "jonpinhorn"; + repo = "shrikhand"; + rev = "c11c9b0720fba977fad7cb4f339ebacdba1d1394"; + sha256 = "1d21bvj4w8i0zrmkdrgbn0rpzac89iazfids1x273gsrsvvi45kk"; + }; + + installPhase = '' + install -D -m644 build/Shrikhand-Regular.ttf $out/share/fonts/truetype/Shrikhand-Regular.ttf + ''; + + meta = with stdenv.lib; { + homepage = https://jonpinhorn.github.io/shrikhand/; + description = "A vibrant and playful typeface for both Latin and Gujarati writing systems"; + maintainers = with maintainers; [ sternenseemann ]; + platforms = platforms.all; + license = licenses.ofl; + }; +} diff --git a/pkgs/data/fonts/source-han-sans/default.nix b/pkgs/data/fonts/source-han-sans/default.nix index 11132710a90..240f0ff5d29 100644 --- a/pkgs/data/fonts/source-han-sans/default.nix +++ b/pkgs/data/fonts/source-han-sans/default.nix @@ -23,10 +23,11 @@ let ''; meta = { - description = "${language} subset of an open source Pan-CJK typeface"; + description = "${language} subset of an open source Pan-CJK sans-serif typeface"; homepage = https://github.com/adobe-fonts/source-han-sans; - license = stdenv.lib.licenses.asl20; + license = stdenv.lib.licenses.ofl; platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ taku0 ]; }; }; in diff --git a/pkgs/data/fonts/source-han-serif/default.nix b/pkgs/data/fonts/source-han-serif/default.nix new file mode 100644 index 00000000000..148f5a4538f --- /dev/null +++ b/pkgs/data/fonts/source-han-serif/default.nix @@ -0,0 +1,59 @@ +{stdenv, fetchurl, unzip}: + +let + makePackage = {variant, language, region, sha256}: stdenv.mkDerivation rec { + version = "1.000R"; + name = "source-han-serif-${variant}-${version}"; + revision = "f6cf97d92b22e7bd77e355a61fe549ae44b6de76"; + + buildInputs = [ unzip ]; + + src = fetchurl { + url = "https://github.com/adobe-fonts/source-han-serif/raw/${revision}/SubsetOTF/SourceHanSerif${region}.zip"; + inherit sha256; + }; + + setSourceRoot = '' + sourceRoot=$( echo SourceHanSerif* ) + ''; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + cp $( find . -name '*.otf' ) $out/share/fonts/opentype + ''; + + meta = { + description = "${language} subset of an open source Pan-CJK serif typeface"; + homepage = https://github.com/adobe-fonts/source-han-sans; + license = stdenv.lib.licenses.ofl; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ taku0 ]; + }; + }; +in +{ + japanese = makePackage { + variant = "japanese"; + language = "Japanese"; + region = "JP"; + sha256 = "0488zxr6jpwinzayrznc4ciy8mqcq9afx80xnp37pl9gcxsv0jp7"; + }; + korean = makePackage { + variant = "korean"; + language = "Korean"; + region = "KR"; + sha256 = "1kwsqrb3s52nminq65n3la540dgvahnhvgwv5h168nrmz881ni9r"; + }; + simplified-chinese = makePackage { + variant = "simplified-chinese"; + language = "Simplified Chinese"; + region = "CN"; + sha256 = "0y6js0hjgf1i8mf7kzklcl02qg0bi7j8n7j1l4awmkij1ix2yc43"; + }; + traditional-chinese = makePackage { + variant = "traditional-chinese"; + language = "Traditional Chinese"; + region = "TW"; + sha256 = "0q52dn0vh3pqpr9gn4r4qk99lkvhf2gl12y99n9423brrqyfbi6h"; + }; +} diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index f20b992ab72..01203f9b0bd 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -1,17 +1,21 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "iana-etc-2.30"; + name = "iana-etc-${version}"; + version = "20170328"; src = fetchurl { - url = "http://sethwklein.net/${name}.tar.bz2"; - sha256 = "03gjlg5zlwsdk6qyw3v85l129rna5bpm4m7pzrp864h0n97qg9mr"; + url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; + sha256 = "0c0zgijmh035wan3pvz8ykkmkdbraml4b9kx36b4j1lj9fhgy1yk"; }; - preInstall = "installFlags=\"PREFIX=$out\""; + installPhase = '' + mkdir -p $out/etc + cp services protocols $out/etc/ + ''; meta = { - homepage = http://sethwklein.net/iana-etc; + homepage = https://github.com/Mic92/iana-etc; description = "IANA protocol and port number assignments (/etc/protocols and /etc/services)"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix index 0c4e5bc2a13..95c66ed029e 100644 --- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.publicDomain; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index beac8105199..59f4724e1be 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { description = "Encoding files for Poppler, a PDF rendering library"; platforms = platforms.all; license = licenses.free; # more free licenses combined - maintainers = with maintainers; [ urkud ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/data/misc/shared-desktop-ontologies/default.nix b/pkgs/data/misc/shared-desktop-ontologies/default.nix index 831028467f4..72895653479 100644 --- a/pkgs/data/misc/shared-desktop-ontologies/default.nix +++ b/pkgs/data/misc/shared-desktop-ontologies/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { are used by projects like KDE or Strigi. ''; platforms = platforms.all; - maintainers = [ maintainers.sander maintainers.urkud ]; + maintainers = [ maintainers.sander ]; }; } diff --git a/pkgs/data/misc/xorg-rgb/default.nix b/pkgs/data/misc/xorg-rgb/default.nix new file mode 100644 index 00000000000..9a3db92adcc --- /dev/null +++ b/pkgs/data/misc/xorg-rgb/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, pkgconfig, xproto}: +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "rgb"; + version = "1.0.6"; + + src = fetchurl { + url = "http://xorg.freedesktop.org/archive/individual/app/rgb-${version}.tar.bz2"; + sha256 = "1c76zcjs39ljil6f6jpx1x17c8fnvwazz7zvl3vbjfcrlmm7rjmv"; + }; + + nativeBuildInputs = [pkgconfig]; + buildInputs = [xproto]; + meta = { + inherit version; + description = "X11 colorname to RGB mapping database"; + license = stdenv.lib.licenses.mit; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = http://xorg.freedesktop.org/; + }; +} diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix index a9bb4514a3a..cb8bf49254b 100644 --- a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib , glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk , spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala_0_32 -, libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg -, desktop_file_utils, mtools, cdrkit, libcdio, numactl, xen -, libusb, libarchive, acl, libgudev, qemu, libsecret +, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop_file_utils +, mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret +, libcap_ng, numactl, xen, libapparmor }: # TODO: ovirt (optional) @@ -15,12 +15,16 @@ stdenv.mkDerivation rec { doCheck = true; + nativeBuildInputs = [ + makeWrapper pkgconfig intltool + ]; + buildInputs = [ - makeWrapper pkgconfig intltool itstool libvirt-glib glib - gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol - libuuid libsoup libosinfo systemd tracker vala_0_32 libcap_ng libcap yajl gmp - gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive - librsvg desktop_file_utils acl libgudev numactl xen libsecret + itstool libvirt-glib glib gobjectIntrospection libxml2 gtk3 gtkvnc + libvirt spice_gtk spice_protocol libuuid libsoup libosinfo systemd + tracker vala_0_32 libcap yajl gmp gdbm cyrus_sasl libusb libarchive + gnome3.defaultIconTheme librsvg desktop_file_utils acl libgudev libsecret + libcap_ng numactl xen libapparmor ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix index f7a0ff473cc..15db270e80c 100644 --- a/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix @@ -1,6 +1,6 @@ -{ stdenv, intltool, fetchurl, vala_0_32, libgtop +{ stdenv, intltool, fetchurl, vala, libgtop , pkgconfig, gtk3, glib -, bash, makeWrapper, itstool, libxml2 +, bash, wrapGAppsHook, itstool, libxml2 , gnome3, librsvg, gdk_pixbuf, file }: stdenv.mkDerivation rec { @@ -10,17 +10,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ vala_0_32 pkgconfig gtk3 glib libgtop intltool itstool libxml2 - gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - - preFixup = '' - wrapProgram "$out/bin/baobab" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; + buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2 + wrapGAppsHook file gdk_pixbuf gnome3.defaultIconTheme librsvg ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Baobab; diff --git a/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix index 02c60256e15..f67dc7e32ae 100644 --- a/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1jaqsr1r0grpd25rbsc2v3vb0sc51lia9w31wlqswgqsncp2k0w6"; }; + outputs = [ "out" "lib" "dev" ]; + buildInputs = [ vala_0_32 libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 intltool docbook_xsl docbook_xsl_ns makeWrapper ]; diff --git a/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix index a4cb3e8c146..d3b2d814b16 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { # ToDo: ldap reported as not found but afterwards reported as supported + outputs = [ "out" "dev" ]; + meta = with stdenv.lib; { homepage = http://projects.gnome.org/gconf/; description = "A system for storing application preferences"; diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix index 7ba3c3734f8..0d8e46aeece 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # Disable Access Control because our X does not support FamilyServerInterpreted yet - patches = [ #./xserver_path.patch # gdm now uses wayland + patches = [ ./xserver_path.patch ./sessions_dir.patch ./gdm-x-session_extra_args.patch ./gdm-session-worker_xserver-path.patch diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix index 3ea108808f5..df47c1a477b 100644 --- a/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt -, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper +, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, wrapGAppsHook , docbook_xsl_ns, docbook_xsl, gnome3 }: stdenv.mkDerivation rec { @@ -7,25 +7,18 @@ stdenv.mkDerivation rec { buildInputs = with gnome3; [ dbus libgcrypt pam python gtk3 gconf libgnome_keyring - pango gcr gdk_pixbuf atk p11_kit makeWrapper + pango gcr gdk_pixbuf atk p11_kit ]; propagatedBuildInputs = [ glib libtasn1 libxslt ]; - nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ]; + nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl wrapGAppsHook ]; configureFlags = [ "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories "--with-pkcs11-modules=$$out/lib/pkcs11/" ]; - preFixup = '' - wrapProgram "$out/bin/gnome-keyring" \ - --prefix XDG_DATA_DIRS : "${glib.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - wrapProgram "$out/bin/gnome-keyring-daemon" \ - --prefix XDG_DATA_DIRS : "${glib.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - meta = with stdenv.lib; { platforms = platforms.linux; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix index 9fad1873fbd..4818d05517b 100644 --- a/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; # fatal error: gio/gunixfdlist.h: No such file or directory - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; + NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0 -Wno-error=format -Wno-error=sign-compare"; configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra --with-xwayland-path=${xwayland}/bin/Xwayland"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; patches = [ - #./x86.patch ./math.patch + ./x86.patch # ./math.patch ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch b/pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch index a997b27540e..93df1e7f283 100644 --- a/pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch +++ b/pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch @@ -18,16 +18,3 @@ MetaRectangle unconstrained_rect; MetaRectangle constrained_rect; MetaMoveResizeResultFlags result = 0; ---- a/src/core/startup-notification.c 2016-06-06 12:13:27.100251933 +0200 -+++ b/src/core/startup-notification.c 2016-06-06 12:13:42.554956773 +0200 -@@ -418,7 +418,7 @@ - elapsed = ctod->now - timestamp; - - meta_topic (META_DEBUG_STARTUP, -- "Sequence used %ld ms vs. %d max: %s\n", -+ "Sequence used %" G_GINT64_FORMAT " ms vs. %d max: %s\n", - elapsed, STARTUP_TIMEOUT, - meta_startup_notification_sequence_get_id (sequence)); - -[?25l[?25h[?1049h[?1h=[?25h[?25l~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ [?25h[?25lType :quit to exit Vim[?25h[?25l[?25h[?25l[?25h[?25l[?25h[?25l[?25h[?25l[?25h[?25l[?25h -[?1l>[?1049l diff --git a/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix index 8f525945a6a..80f2dde534e 100644 --- a/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango -, gnome_doc_utils, intltool, libX11, which, itstool }: +, gnome_doc_utils, intltool, libX11, which, itstool, wrapGAppsHook }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ]; - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ]; + nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which wrapGAppsHook ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix index fbb95efb27a..3024d3ed59f 100644 --- a/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix +++ b/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes }: +{ stdenv, fetchurl, pkgconfig, glib, gtk3, enchant, isocodes, vala }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ pkgconfig glib gtk3 enchant isocodes ]; + buildInputs = [ pkgconfig glib gtk3 enchant isocodes vala ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix index 248e3915152..850e13fb011 100644 --- a/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix +++ b/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix @@ -1,10 +1,10 @@ fetchurl: rec { - major = "1.0"; - minor = "3"; + major = "1.2"; + minor = "1"; name = "gspell-${major}.${minor}"; src = fetchurl { url = "mirror://gnome/sources/gspell/${major}/${name}.tar.xz"; - sha256 = "1m8v4rqaxjsblccc3nnirkbkzgqm90vfpzp3x08lkqriqvk0anfr"; + sha256 = "18zisdrq14my2iq6iv3lhqfn9jg98bqwbzcdidp7hfk915gkw74z"; }; } diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix index 8e11a286284..6678b11df02 100644 --- a/pkgs/desktops/gnustep/back/default.nix +++ b/pkgs/desktops/gnustep/back/default.nix @@ -5,6 +5,7 @@ , x11 , freetype , pkgconfig +, libXmu }: let version = "0.25.0"; @@ -15,7 +16,7 @@ gsmakeDerivation { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz"; sha256 = "14gs1b32ahnihd7mwpjrws2b8hl11rl1wl24a7651d3z2l7f6xj2"; }; - buildInputs = [ cairo base gui freetype pkgconfig x11 ]; + buildInputs = [ cairo base gui freetype pkgconfig x11 libXmu ]; meta = { description = "A generic backend for GNUstep"; }; diff --git a/pkgs/desktops/gnustep/gworkspace/default.nix b/pkgs/desktops/gnustep/gworkspace/default.nix index 67fffd10a0f..210b72292fd 100644 --- a/pkgs/desktops/gnustep/gworkspace/default.nix +++ b/pkgs/desktops/gnustep/gworkspace/default.nix @@ -4,13 +4,13 @@ , system_preferences }: let - version = "0.9.3"; + version = "0.9.4"; in gsmakeDerivation { name = "gworkspace-${version}"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/usr-apps/gworkspace-${version}.tar.gz"; - sha256 = "0jchqwb0dj522j98jqlqlib44jppax39zx2zqyzdwiz4qjl470r3"; + sha256 = "0cjn83m7qmbwdpldlyhs239nwswgip3yaz01ahls130dq5qq7hgk"; }; # additional dependencies: # - PDFKit framework from http://gap.nongnu.org/ diff --git a/pkgs/desktops/kde-4.14/support/akonadi/default.nix b/pkgs/desktops/kde-4.14/support/akonadi/default.nix index 5238744cc7b..ecfb4913a42 100644 --- a/pkgs/desktops/kde-4.14/support/akonadi/default.nix +++ b/pkgs/desktops/kde-4.14/support/akonadi/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "KDE PIM Storage Service"; license = "LGPL"; homepage = http://pim.kde.org/akonadi; - maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ]; + maintainers = [ maintainers.sander maintainers.phreedom ]; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix index dfbd39acaa3..d2faf9c0eee 100644 --- a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix @@ -1,5 +1,5 @@ { - stdenv, fetchFromGitHub, standardPatch, + stdenv, fetchFromGitHub, fetchurl, standardPatch, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid, kguiaddons, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, libsysstat, @@ -49,6 +49,13 @@ stdenv.mkDerivation rec { lxmenu-data ]; + patches = [ + (fetchurl { + url = https://github.com/lxde/lxqt-panel/commit/ec62109e0fa678875a9b10fc6f1975267432712d.patch; + sha256 = "1ywwk8gb6gbvs8z9gwgsnb13z1jvyvjij349nq7ij6iyhyld0jlr"; + }) + ]; + cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; postPatch = standardPatch; diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix new file mode 100644 index 00000000000..aea006fc486 --- /dev/null +++ b/pkgs/desktops/mate/caja/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "caja-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "1fc7dxj9hw8fffrcnwxbj8pq7gl08il68rkpk92rv3qm7siv1606"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + libnotify + libxml2 + libexif + exempi + mate.mate-desktop + ]; + + configureFlags = [ "--disable-update-mimedb" ]; + + meta = { + description = "File manager for the MATE desktop"; + homepage = "http://mate-desktop.org"; + license = with stdenv.lib.licenses; [ gpl2 lgpl2 ]; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index 4d662cf52a9..d9565e8f4d1 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -1,5 +1,6 @@ { callPackage, pkgs }: rec { + caja = callPackage ./caja { }; mate-common = callPackage ./mate-common { }; mate-desktop = callPackage ./mate-desktop { }; mate-icon-theme = callPackage ./mate-icon-theme { }; diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index b020351afe2..7bd7a3f2770 100644 --- a/pkgs/desktops/mate/mate-common/default.nix +++ b/pkgs/desktops/mate/mate-common/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "mate-common-${version}"; version = "${major-ver}.${minor-ver}"; - major-ver = "1.17"; + major-ver = "1.18"; minor-ver = "0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "06pvbi2kk39ysd9dfi6ljkncm53hn02n7dygax6ig4p9qd750sdc"; + sha256 = "1005laf3z1h8qczm7pmwr40r842665cv6ykhjg7r93vldra48z6p"; }; meta = { diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index fcb66c9ad79..2afd700d933 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -1,33 +1,36 @@ -{ stdenv, fetchurl, pkgs, pkgconfig, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gnome3, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-desktop-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.17"; - minor-ver = "2"; + name = "mate-desktop-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1l7aih9hvmnmddwjwyafhz87drd5vdkmjr41m7f24bn5k7abl90g"; + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "12iv2y4dan962fs7vkkxbjkp77pbvjnwfa43ggr0zkdsc3ydjbbg"; }; - propagatedUserEnvPkgs = [ pkgs.gnome3.gnome_themes_standard ]; - - buildInputs = with pkgs; [ - intltool - pkgconfig - - gnome3.dconf - gnome3.gtk - gnome3.defaultIconTheme + propagatedUserEnvPkgs = [ + gnome3.gnome_themes_standard ]; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + buildInputs = [ + gnome3.dconf + gnome3.gtk + gnome3.defaultIconTheme + ]; + + nativeBuildInputs = [ + pkgconfig + intltool + wrapGAppsHook + ]; meta = with stdenv.lib; { description = "Library with common API for various MATE modules"; - homepage = "http://mate-desktop.org"; - license = licenses.gpl2; - platforms = platforms.unix; + homepage = "http://mate-desktop.org"; + license = licenses.gpl2; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index d9370f318d7..3d820553b4a 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "mate-icon-theme-faenza-${version}"; version = "${major-ver}.${minor-ver}"; - major-ver = "1.16"; + major-ver = "1.18"; minor-ver = "0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0p3z3qarbvrhzj2sdw3f8dp0c7wwjkk9a749bq8rh5gm9m66hibg"; + sha256 = "1crfv6s3ljbc7a7m229bvs3qbjzlp8cgvyhqmdaa9npd5lxmk88v"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index ab699c78c0e..e41a1c21710 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "mate-icon-theme-${version}"; version = "${major-ver}.${minor-ver}"; - major-ver = "1.17"; + major-ver = "1.18"; minor-ver = "0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1kxpckaksaz5g3c4jjkh4pdm9yhbjda5835am3wg2iyy2p7rjn8n"; + sha256 = "19bd9zlfc1jfdl7imvfy1vq35a0jvxq5fldmr2c5bq0kyasvww6i"; }; nativeBuildInputs = [ pkgconfig intltool iconnamingutils ]; diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index dd380f39477..fd907c56280 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -1,19 +1,17 @@ -{ stdenv, fetchurl, pkgs, pkgconfig, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, gnome3, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-terminal-${version}"; - version = "${major-ver}.${minor-ver}"; - major-ver = "1.17"; + name = "mate-terminal-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; minor-ver = "0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "0sbncykjf0ifj87rwpdw2ln0wavykiki4zqsw60vch7agh49fw0f"; + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "07z8g8zkc8k6d7xqdlg18cjnwg7zzv5hbgwma5y9mh8zx9xsqz92"; }; - buildInputs = with pkgs; [ - intltool - pkgconfig + buildInputs = [ glib itstool libxml2 @@ -25,12 +23,16 @@ stdenv.mkDerivation rec { gnome3.dconf ]; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ + pkgconfig + intltool + wrapGAppsHook + ]; meta = with stdenv.lib; { description = "The MATE Terminal Emulator"; - homepage = "http://mate-desktop.org"; - license = licenses.gpl3; - platforms = platforms.unix; + homepage = "http://mate-desktop.org"; + license = licenses.gpl3; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 343148da0bc..cf78009708b 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -6,17 +6,15 @@ stdenv.mkDerivation rec { version = "${major-ver}.${minor-ver}"; major-ver = gnome3.version; minor-ver = { - "3.18" = "4"; - "3.20" = "12"; - "3.22" = "3"; + "3.20" = "16"; + "3.22" = "7"; }."${major-ver}"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/themes/${major-ver}/${name}.tar.xz"; sha256 = { - "3.18" = "1h3z705jrg7gng5glf51ksszjz6v81qq83qvmfpv1v69bwn6fy4b"; - "3.20" = "15s2xp2cq9x8iikvbywr5gl8l33i57i1xvbv4jc2qipnkn3c4yca"; - "3.22" = "0p1rf5q2nr1vsab3pljwycclbrnwylvp88d0dhk8as0d6n6fp85k"; + "3.20" = "1dvzljpq6cscr82gnsqagf23inb039q84fnawraj0nhfjif11r7v"; + "3.22" = "1kjchqkds0zj32x7cjfcq96zakcmhva1yg0nxfd6369a5nwkp5k0"; }."${major-ver}"; }; diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index acf7f54f0ed..cf9327d7a60 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/plasma/5.9.3/ -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/plasma/5.9.4/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index 5463e017d23..8759c7d8c1e 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -17,12 +17,15 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ + isocodes libdbusmenu libSM libXcursor pam wayland + ]; + propagatedBuildInputs = [ baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard networkmanager-qt phonon - plasma-framework qtgraphicaleffects qtquickcontrols qtquickcontrols2 - qtscript qtx11extras solid isocodes libdbusmenu libSM libXcursor pam wayland + plasma-framework solid qtgraphicaleffects qtquickcontrols qtquickcontrols2 + qtscript qtx11extras ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index eff7a816a09..c156de40cae 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,323 +3,323 @@ { bluedevil = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/bluedevil-5.9.3.tar.xz"; - sha256 = "0cfk0khcd62ficsmpxhiqwfdgwzv771ndlf0s7b8ghqqyckq6bld"; - name = "bluedevil-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/bluedevil-5.9.4.tar.xz"; + sha256 = "1a31vsaiy7kzbw79kjiia5a966xc9ba3phxhyqmdzvllf9jw5xdc"; + name = "bluedevil-5.9.4.tar.xz"; }; }; breeze = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/breeze-5.9.3.tar.xz"; - sha256 = "0f1h7ky9chsnbm8r85lwipc1sh7kb32jdaj3wl9qd7k0q4j115x0"; - name = "breeze-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/breeze-5.9.4.tar.xz"; + sha256 = "07i13g9iyq9j2vx22z7krnkahil3qljxpzgmqai8m67gwhgvn1zj"; + name = "breeze-5.9.4.tar.xz"; }; }; breeze-grub = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/breeze-grub-5.9.3.tar.xz"; - sha256 = "1hbvmyj1f5f8v0pc70w93ck27xw25m4x70vnbhgqi91y5dd1gh49"; - name = "breeze-grub-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/breeze-grub-5.9.4.tar.xz"; + sha256 = "0rn7dgmw495575lcsnlgvx8r8sjjaaw3b1s0l43d2r186zay0nkr"; + name = "breeze-grub-5.9.4.tar.xz"; }; }; breeze-gtk = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/breeze-gtk-5.9.3.tar.xz"; - sha256 = "12qa4wllgr52ycdprlxq0h4pgykbbs0vbmmmiardpzlrplm0an26"; - name = "breeze-gtk-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/breeze-gtk-5.9.4.tar.xz"; + sha256 = "1xjrhi6cq5dd5qslphdjrg018ni1z9xdac7cg33wl8bsvzcl0xgl"; + name = "breeze-gtk-5.9.4.tar.xz"; }; }; breeze-plymouth = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/breeze-plymouth-5.9.3.tar.xz"; - sha256 = "0vz0hgx3hl03h4rkfrcaydaddljam3jbg6gd7n600a068p74s2mm"; - name = "breeze-plymouth-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/breeze-plymouth-5.9.4.tar.xz"; + sha256 = "1vwlvnbsc67xzqvrpgkva1rlim075x9ffjlsxfk38gmq00b7s88g"; + name = "breeze-plymouth-5.9.4.tar.xz"; }; }; discover = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/discover-5.9.3.tar.xz"; - sha256 = "0xkf08k4jz5ym406bpnjf3xsx0il9wka4jp2k38bkl3sxh2s900f"; - name = "discover-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/discover-5.9.4.tar.xz"; + sha256 = "1pf2qawa32x94ljqscfbpmkbxk5awlqbf9jw9w7rfqwd5z9cgzzf"; + name = "discover-5.9.4.tar.xz"; }; }; kactivitymanagerd = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/kactivitymanagerd-5.9.3.tar.xz"; - sha256 = "0ywby3ijq4hjljy5qwd7rybpk2x4scairjffiy5n1jg7lq6sm44r"; - name = "kactivitymanagerd-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/kactivitymanagerd-5.9.4.tar.xz"; + sha256 = "04i4zmbblsx3xz3vq4m88qd3ky0r5v26ivjchzpcpgkczqv85x1j"; + name = "kactivitymanagerd-5.9.4.tar.xz"; }; }; kde-cli-tools = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/kde-cli-tools-5.9.3.tar.xz"; - sha256 = "1p9zjp9jmknyh82d6av3xhy461fsdppjxrxbmrlm9z6nsjyp0m0a"; - name = "kde-cli-tools-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/kde-cli-tools-5.9.4.tar.xz"; + sha256 = "1a2ssv7mphqnzwphd8nkh0g0g4w9b2r0ah0a9wd5ssnr5xg3izm8"; + name = "kde-cli-tools-5.9.4.tar.xz"; }; }; kdecoration = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/kdecoration-5.9.3.tar.xz"; - sha256 = "1z37llaqf9mrb4aif75dfvbhr51rrgfpncv70v916jddcf90q4i9"; - name = "kdecoration-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/kdecoration-5.9.4.tar.xz"; + sha256 = "12cfp4svhxfygbjhymnmwyryx6r117mkdy2iq9adbq5af3gak972"; + name = "kdecoration-5.9.4.tar.xz"; }; }; kde-gtk-config = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/kde-gtk-config-5.9.3.tar.xz"; - sha256 = "1wxk3brwq105258ndx5l98n78q2h2idigkpp5s2xzmzw05m3gg6r"; - name = "kde-gtk-config-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/kde-gtk-config-5.9.4.tar.xz"; + sha256 = "0cg3myr3jr9i4vxpqbd8gs7yrscxn15a96zqvgsbjczlfmxanq86"; + name = "kde-gtk-config-5.9.4.tar.xz"; }; }; kdeplasma-addons = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/kdeplasma-addons-5.9.3.tar.xz"; - sha256 = "1k3fsrafrd72qymyi2ij36al7k92mnssz90kmmh830pszif16js3"; - name = "kdeplasma-addons-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/kdeplasma-addons-5.9.4.tar.xz"; + sha256 = "019d3d3pkw1c6l7dggasr7g7yj9kl3xd2hsawch1s9ba420fd6fp"; + name = "kdeplasma-addons-5.9.4.tar.xz"; }; }; kgamma5 = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/kgamma5-5.9.3.tar.xz"; - sha256 = "02s3j1c5gjcv7b79448sizs6hdw91jysq9prkzznprw6jbb615v1"; - name = "kgamma5-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/kgamma5-5.9.4.tar.xz"; + sha256 = "0qwgjdrjfc48d8j62iwz6d61nxd7ddcsxn7wmxgbgl3l36p5j0jv"; + name = "kgamma5-5.9.4.tar.xz"; }; }; khotkeys = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/khotkeys-5.9.3.tar.xz"; - sha256 = "0jv77rpx01cl15qf9vzndpks2q2lgq8dhjq4pg34zh8khr03snlf"; - name = "khotkeys-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/khotkeys-5.9.4.tar.xz"; + sha256 = "0lhgkvnrzsxpw6vpn0xam1a4dgkfb0k9h3nchaf93fyl8745j4q0"; + name = "khotkeys-5.9.4.tar.xz"; }; }; kinfocenter = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/kinfocenter-5.9.3.tar.xz"; - sha256 = "14zaqrjf77008dc5c071hw75vd4dwvvmgkyz74vhs94i7bspzy6a"; - name = "kinfocenter-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/kinfocenter-5.9.4.tar.xz"; + sha256 = "14vf27s501r6ac2gxashwi3ynlcncjp03rahz61wry1dsm9wsc4x"; + name = "kinfocenter-5.9.4.tar.xz"; }; }; kmenuedit = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/kmenuedit-5.9.3.tar.xz"; - sha256 = "1m7naiy6jq031psdx4jsxq7vsldn9j4girq820m24inh2ky105zk"; - name = "kmenuedit-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/kmenuedit-5.9.4.tar.xz"; + sha256 = "1lx7g67qc7amx8jsna7b13hhq85pv4969d9824qfciwywj19sx4x"; + name = "kmenuedit-5.9.4.tar.xz"; }; }; kscreen = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/kscreen-5.9.3.tar.xz"; - sha256 = "1z3cihgjqrkg5h4y4gm1ah60r0vfpxrngry10fcc6343arbyk1bb"; - name = "kscreen-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/kscreen-5.9.4.tar.xz"; + sha256 = "1g4i4rwnmni3q3crbywkp0s199bp0bl8cx97d37cp9qh6drsgrxx"; + name = "kscreen-5.9.4.tar.xz"; }; }; kscreenlocker = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/kscreenlocker-5.9.3.tar.xz"; - sha256 = "0ccpgfp1gz07yiw98sqjlc097cac4z9qdcrwxm65bvqjj777by1a"; - name = "kscreenlocker-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/kscreenlocker-5.9.4.tar.xz"; + sha256 = "0cn194bmab7qgv1x7gg81l0mj3k9x1is9whn8h7g02pzn5c6gqlj"; + name = "kscreenlocker-5.9.4.tar.xz"; }; }; ksshaskpass = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/ksshaskpass-5.9.3.tar.xz"; - sha256 = "0jk6k5bn2aqjjl3li5qpmihk57d5hc197cpqjaj61a0bapab42hw"; - name = "ksshaskpass-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/ksshaskpass-5.9.4.tar.xz"; + sha256 = "1w1m55i8i9f3npcczqiy1knarbh2j4cp8ispif1s4j6k3vixqnka"; + name = "ksshaskpass-5.9.4.tar.xz"; }; }; ksysguard = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/ksysguard-5.9.3.tar.xz"; - sha256 = "0paypcwah41p2ygmfwzhw8mdfh47a6x0190yngxn8j0jhzfyllca"; - name = "ksysguard-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/ksysguard-5.9.4.tar.xz"; + sha256 = "04hzqkna22vsa12z04cy50s2jzglllfhd5vz33vk2wj6zgghwd0h"; + name = "ksysguard-5.9.4.tar.xz"; }; }; kwallet-pam = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/kwallet-pam-5.9.3.tar.xz"; - sha256 = "1pmsfp6pn1r3crg5z5v7sz413v9qvn0j4n9l88zbw538lz2scpna"; - name = "kwallet-pam-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/kwallet-pam-5.9.4.tar.xz"; + sha256 = "0l6ganmp2ml0icfkrqcq4vngm8f4pl76p6w13a3m8x2k2wrsbynw"; + name = "kwallet-pam-5.9.4.tar.xz"; }; }; kwayland-integration = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/kwayland-integration-5.9.3.tar.xz"; - sha256 = "1r3cryv10lkvl1nrpq21w4kj9jd270m3p3dw07d888b891rgmzb7"; - name = "kwayland-integration-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/kwayland-integration-5.9.4.tar.xz"; + sha256 = "11vqi293azv5cpz2rrngxsqqaj7swcmxivgm688yz6wzbm8gyd1x"; + name = "kwayland-integration-5.9.4.tar.xz"; }; }; kwin = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/kwin-5.9.3.tar.xz"; - sha256 = "119cy472x5ssrr54v14pbs85gfrsjhz99ms8flb1xp38jb14xxhk"; - name = "kwin-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/kwin-5.9.4.tar.xz"; + sha256 = "0qckhk6vd31mwhawb0i636l4vx99v0v84nam2dhpd0rcdk2b0dm1"; + name = "kwin-5.9.4.tar.xz"; }; }; kwrited = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/kwrited-5.9.3.tar.xz"; - sha256 = "0liqspd4m6xly48vv85abnaxfvsjcbgg58843j9fpnzkk9nlj98q"; - name = "kwrited-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/kwrited-5.9.4.tar.xz"; + sha256 = "1prbn0f6a1cywn2ivzv39bxfc5nxmgxp7gqlxqg87ajig43gvdb7"; + name = "kwrited-5.9.4.tar.xz"; }; }; libkscreen = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/libkscreen-5.9.3.tar.xz"; - sha256 = "1nxhbxmr0kmyp745bf3vd21xcjpv7jac9bdagraiqfcmwj4f86gb"; - name = "libkscreen-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/libkscreen-5.9.4.tar.xz"; + sha256 = "1h39910ry59wd179fk02ck10ydaby3il4q3rnxlnn9qph0kiy3pv"; + name = "libkscreen-5.9.4.tar.xz"; }; }; libksysguard = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/libksysguard-5.9.3.tar.xz"; - sha256 = "0fj7rycawarg7iydml0xw20nkyxlwa2nl5chxbbcs5mnmvpfv6ig"; - name = "libksysguard-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/libksysguard-5.9.4.tar.xz"; + sha256 = "1gpfqr8prk96vwy9dkxlgf4lc3ck04a31src9mix8a6wrr01ppqm"; + name = "libksysguard-5.9.4.tar.xz"; }; }; milou = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/milou-5.9.3.tar.xz"; - sha256 = "1pmk9czmpz0mfqmkv7gl9wdlj8b7wwixv1zb43q24a471qby2xf3"; - name = "milou-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/milou-5.9.4.tar.xz"; + sha256 = "18xzx99ml6gcglly9p98rscs6dxhdgn9pkc5mn7apwnp7865kbfw"; + name = "milou-5.9.4.tar.xz"; }; }; oxygen = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/oxygen-5.9.3.tar.xz"; - sha256 = "1v529wp9ll1hzb48xswigzf2r23k84f4cd7am2fnj73p3a0rg5ia"; - name = "oxygen-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/oxygen-5.9.4.tar.xz"; + sha256 = "0fmysq3j0v18hz6hfp7qgrj3ghmaf3c1gam9c9263sf9q1dghk0q"; + name = "oxygen-5.9.4.tar.xz"; }; }; plasma-desktop = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/plasma-desktop-5.9.3.tar.xz"; - sha256 = "0582n21nd15834mxc54pq1nx9a5z8ds3yz0x0lc5m35ps7abh7im"; - name = "plasma-desktop-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/plasma-desktop-5.9.4.tar.xz"; + sha256 = "1p3iq5rmfznsi4174zjavs945wysf763ha46vd83mz0w7583j6cd"; + name = "plasma-desktop-5.9.4.tar.xz"; }; }; plasma-integration = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/plasma-integration-5.9.3.tar.xz"; - sha256 = "1yq3i0sqsn0m2y62npyad1nv17hgc0fm35cfq5fdjd96sr356znl"; - name = "plasma-integration-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/plasma-integration-5.9.4.tar.xz"; + sha256 = "1mk59p214184m2q8wfik8gkfxxikrvric0v8c09lamybg15pas8m"; + name = "plasma-integration-5.9.4.tar.xz"; }; }; plasma-nm = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/plasma-nm-5.9.3.tar.xz"; - sha256 = "1i5djnbimkwcbjh6bi0cdw98qskli4jd1c8a8dbwqqh5pyqbrf66"; - name = "plasma-nm-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/plasma-nm-5.9.4.tar.xz"; + sha256 = "0sbvyyhx7gxg1li5y1h7jv1s3krp2ch6zzhm9ad1l17w589kij9x"; + name = "plasma-nm-5.9.4.tar.xz"; }; }; plasma-pa = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/plasma-pa-5.9.3.tar.xz"; - sha256 = "0br83bnm6g7lzw4hwkppk8l6scbzblr3m3mi64a852lnxxvdwn01"; - name = "plasma-pa-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/plasma-pa-5.9.4.tar.xz"; + sha256 = "0hincgm6x613sw3mywq64i27laahqzy7qjiv24g8h3ppw75a32i8"; + name = "plasma-pa-5.9.4.tar.xz"; }; }; plasma-sdk = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/plasma-sdk-5.9.3.tar.xz"; - sha256 = "104rhybchdjqnglzp3bpjv8052n2gi44bn58nyb6wz6gkzg3xzrb"; - name = "plasma-sdk-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/plasma-sdk-5.9.4.tar.xz"; + sha256 = "0nw49kaw7323dmaq8hh4zrhvy6ga6svg2g0zhxj0cjjwgbk31pfw"; + name = "plasma-sdk-5.9.4.tar.xz"; }; }; plasma-tests = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/plasma-tests-5.9.3.tar.xz"; - sha256 = "1wpbfna9yjvzc5fhgnw2hwnq04vzb3qfy42zrwbijy8sl6csgzzp"; - name = "plasma-tests-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/plasma-tests-5.9.4.tar.xz"; + sha256 = "0m6dlx29785kh1pxm0xyym85k475s8gdjds6ywgpblj9lh5rm4v5"; + name = "plasma-tests-5.9.4.tar.xz"; }; }; plasma-workspace = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/plasma-workspace-5.9.3.tar.xz"; - sha256 = "0lnb36qnkw5z7w1y5ykiz6xfhc4h21dzlbhddipvd97bxycad6vg"; - name = "plasma-workspace-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/plasma-workspace-5.9.4.tar.xz"; + sha256 = "0pazgn45a445wknd3xp7jnsg6k5ddqv4pjrz2ggkbaz9mrllgbqm"; + name = "plasma-workspace-5.9.4.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/plasma-workspace-wallpapers-5.9.3.tar.xz"; - sha256 = "1ikjj41nn5hn9r3glfhqsizawhkpw3cvybqq0ym4zky9lvbxzxb0"; - name = "plasma-workspace-wallpapers-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/plasma-workspace-wallpapers-5.9.4.tar.xz"; + sha256 = "0jngl7a86xr09g87iydw8fi4ggh6hmz5vaznx4xqh403xf9pl281"; + name = "plasma-workspace-wallpapers-5.9.4.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.9.3"; + version = "1-5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/polkit-kde-agent-1-5.9.3.tar.xz"; - sha256 = "0kfafag3bqp03aaa5dn7f8mkc174s80mwn98linl1dn12np2wv2q"; - name = "polkit-kde-agent-1-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/polkit-kde-agent-1-5.9.4.tar.xz"; + sha256 = "10x3vgdjkvzmnv5zl65q0mj6gxlcl620kyva1cx3qhq93w68jfjc"; + name = "polkit-kde-agent-1-5.9.4.tar.xz"; }; }; powerdevil = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/powerdevil-5.9.3.tar.xz"; - sha256 = "1sphmngckfns5sx0n95njf39m02fg3q7bdafwrw8i4lv2svb1axj"; - name = "powerdevil-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/powerdevil-5.9.4.tar.xz"; + sha256 = "1fpp06criw51lpg21f3xm4gd9yzjj08lr5j8908qz2dywqlp91rv"; + name = "powerdevil-5.9.4.tar.xz"; }; }; sddm-kcm = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/sddm-kcm-5.9.3.tar.xz"; - sha256 = "142na2cnx5v459798fq6gx30k9v0i10myfyvgv562n1x79nbkyl0"; - name = "sddm-kcm-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/sddm-kcm-5.9.4.tar.xz"; + sha256 = "1zrda4vzvqh6vs93yl2g4b63siqb5cqhrp4kknzm571djiar26ll"; + name = "sddm-kcm-5.9.4.tar.xz"; }; }; systemsettings = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/systemsettings-5.9.3.tar.xz"; - sha256 = "15ihvbkp91dz1z1z5dqgqyziiklzq2zkl3ns8dqzs3pbpki7jbqc"; - name = "systemsettings-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/systemsettings-5.9.4.tar.xz"; + sha256 = "03h5dagghjg6qhjbf0fnlhwh2v1nh7w22g00g1qzi8yrads1icy1"; + name = "systemsettings-5.9.4.tar.xz"; }; }; user-manager = { - version = "5.9.3"; + version = "5.9.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.9.3/user-manager-5.9.3.tar.xz"; - sha256 = "1s91zgh1rcqrpyh9fiklwqj2m78ify5fv83kh9zvyl4bapgyb0gn"; - name = "user-manager-5.9.3.tar.xz"; + url = "${mirror}/stable/plasma/5.9.4/user-manager-5.9.4.tar.xz"; + sha256 = "1cjwkxb5qzj8sbkhcyyzw1axzddb2pwbd16wmaqpiz9qh2k4mr64"; + name = "user-manager-5.9.4.tar.xz"; }; }; } diff --git a/pkgs/desktops/xfce/art/xfwm4-themes.nix b/pkgs/desktops/xfce/art/xfwm4-themes.nix new file mode 100644 index 00000000000..80cf7dd28c5 --- /dev/null +++ b/pkgs/desktops/xfce/art/xfwm4-themes.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + p_name = "xfwm4-themes"; + ver_maj = "4.10"; + ver_min = "0"; + + src = fetchurl { + url = "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2"; + sha256 = "0xfmdykav4rf6gdxbd6fhmrfrvbdc1yjihz7r7lba0wp1vqda51j"; + }; + name = "${p_name}-${ver_maj}.${ver_min}"; + + meta = with stdenv.lib; { + homepage = http://www.xfce.org/; + description = "Themes for Xfce"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.volth ]; + }; +} diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 36ef85aeb12..c6ac8973404 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -73,6 +73,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od #### ART from "mirror://xfce/src/art/${p_name}/${ver_maj}/${name}.tar.bz2" xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { }; + xfwm4themes = callPackage ./art/xfwm4-themes.nix { }; #### PANEL PLUGINS from "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.{bz2,gz}" diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix index 0c8b0f5ce60..15c51af005f 100644 --- a/pkgs/development/compilers/aliceml/default.nix +++ b/pkgs/development/compilers/aliceml/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation { homepage = http://www.ps.uni-saarland.de/alice/; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.doublec ]; + broken = true; }; } diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 1721eba325b..3e9104a82fb 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -74,7 +74,11 @@ let version = "5.4.0"; # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its # target libraries and tools. ++ optional langAda ../gnat-cflags.patch - ++ optional langFortran ../gfortran-driving.patch; + ++ optional langFortran ../gfortran-driving.patch + + # This could be applied unconditionally but I don't want to cause a full + # Linux rebuild. + ++ optional stdenv.cc.isClang ./libcxx38-and-above.patch; javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at @@ -231,6 +235,13 @@ stdenv.mkDerivation ({ libc_dev = stdenv.cc.libc_dev; + # This should kill all the stdinc frameworks that gcc and friends like to + # insert into default search paths. + prePatch = if stdenv.isDarwin then '' + substituteInPlace gcc/config/darwin-c.c \ + --replace 'if (stdinc)' 'if (0)' + '' else null; + postPatch = if (stdenv.isGNU || (libcCross != null # e.g., building `gcc.crossDrv' diff --git a/pkgs/development/compilers/gcc/5/libcxx38-and-above.patch b/pkgs/development/compilers/gcc/5/libcxx38-and-above.patch new file mode 100644 index 00000000000..ee48901a6d0 --- /dev/null +++ b/pkgs/development/compilers/gcc/5/libcxx38-and-above.patch @@ -0,0 +1,46 @@ +This is a slightly modified version of https://svnweb.freebsd.org/ports/head/lang/gcc5/files/patch-libc%2B%2B?revision=432958&view=co&pathrev=432958, +which doesn't apply cleanly due to them using a slightly different format of patch from us. I just replaced the .orig file references with a/b paths. + +--- a/gcc/auto-profile.c 2015-01-18 02:25:42 UTC ++++ b/gcc/auto-profile.c +@@ -19,11 +19,9 @@ along with GCC; see the file COPYING3. + . */ + + #include "config.h" +-#include "system.h" +- +-#include + #include + #include ++#include "system.h" + + #include "coretypes.h" + #include "hash-set.h" +--- a/gcc/graphite-isl-ast-to-gimple.c 2017-01-19 21:02:12 UTC ++++ b/gcc/graphite-isl-ast-to-gimple.c +@@ -38,6 +38,7 @@ extern "C" { + #endif + #endif + ++#include + #include "system.h" + #include "coretypes.h" + #include "hash-set.h" +@@ -75,7 +76,6 @@ extern "C" { + #include "tree-scalar-evolution.h" + #include "gimple-ssa.h" + #include "tree-into-ssa.h" +-#include + + #ifdef HAVE_isl + #include "graphite-poly.h" +--- a/gcc/system.h 2015-01-05 12:33:28 UTC ++++ b/gcc/system.h +@@ -217,6 +217,7 @@ extern int errno; + #ifdef __cplusplus + # include + # include ++# include + # include + #endif + diff --git a/pkgs/development/compilers/gcc/6/darwin-const-correct.patch b/pkgs/development/compilers/gcc/6/darwin-const-correct.patch new file mode 100644 index 00000000000..a9b9b85acab --- /dev/null +++ b/pkgs/development/compilers/gcc/6/darwin-const-correct.patch @@ -0,0 +1,25 @@ +From 5972cd58bde3bc8bacfe994e5b127c411241f255 Mon Sep 17 00:00:00 2001 +From: law +Date: Tue, 3 Jan 2017 05:36:40 +0000 +Subject: [PATCH] * config/darwin-driver.c (darwin_driver_init): + Const-correctness fixes for first_period and second_period variables. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@244010 138bc75d-0d04-0410-961f-82ee72b054a4 +--- +diff --git a/gcc/config/darwin-driver.c b/gcc/config/darwin-driver.c +index 0c4f0cd..e3ed79d 100644 +--- a/gcc/config/darwin-driver.c ++++ b/gcc/config/darwin-driver.c +@@ -299,10 +299,10 @@ darwin_driver_init (unsigned int *decoded_options_count, + if (vers_string != NULL) + { + char *asm_major = NULL; +- char *first_period = strchr(vers_string, '.'); ++ const char *first_period = strchr(vers_string, '.'); + if (first_period != NULL) + { +- char *second_period = strchr(first_period+1, '.'); ++ const char *second_period = strchr(first_period+1, '.'); + if (second_period != NULL) + asm_major = xstrndup (vers_string, second_period-vers_string); + else diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index c6fac16a76c..b4e588f6b14 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -73,7 +73,8 @@ let version = "6.3.0"; # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its # target libraries and tools. ++ optional langAda ../gnat-cflags.patch - ++ optional langFortran ../gfortran-driving.patch; + ++ optional langFortran ../gfortran-driving.patch + ++ optional stdenv.isDarwin ./darwin-const-correct.patch; # Kill this after 6.3.0 javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at diff --git a/pkgs/development/compilers/gcc/gfortran-darwin.nix b/pkgs/development/compilers/gcc/gfortran-darwin.nix deleted file mode 100644 index 48caeea5f1f..00000000000 --- a/pkgs/development/compilers/gcc/gfortran-darwin.nix +++ /dev/null @@ -1,52 +0,0 @@ -# This is a derivation specific to OS X (Darwin) -{gmp, mpfr, libmpc, isl_0_14, cloog, zlib, fetchurl, stdenv - -, Libsystem -}: - -stdenv.mkDerivation rec { - name = "gfortran-${version}"; - version = "5.1.0"; - - buildInputs = [ gmp mpfr libmpc isl_0_14 cloog zlib ]; - - src = fetchurl { - url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; - sha256 = "1bd5vj4px3s8nlakbgrh38ynxq4s654m6nxz7lrj03mvkkwgvnmp"; - }; - - patches = ./gfortran-darwin.patch; - - hardeningDisable = [ "format" ]; - - configureFlags = '' - --disable-bootstrap - --disable-cloog-version-check - --disable-isl-version-check - --disable-multilib - --enable-checking=release - --enable-languages=fortran - --with-cloog=${cloog} - --with-gmp=${gmp.dev} - --with-isl=${isl_0_14} - --with-mpc=${libmpc} - --with-mpfr=${mpfr.dev} - --with-native-system-header-dir=${Libsystem}/include - --with-system-zlib - ''; - - postConfigure = '' - export DYLD_LIBRARY_PATH=`pwd`/`uname -m`-apple-darwin`uname -r`/libgcc - ''; - - makeFlags = [ "CC=clang" ]; - - passthru.cc = stdenv.cc.cc; - - meta = with stdenv.lib; { - description = "GNU Fortran compiler, part of the GNU Compiler Collection"; - homepage = "https://gcc.gnu.org/fortran/"; - license = licenses.gpl3Plus; - platforms = platforms.darwin; - }; -} diff --git a/pkgs/development/compilers/gcc/gfortran-darwin.patch b/pkgs/development/compilers/gcc/gfortran-darwin.patch deleted file mode 100644 index 73c5d35153b..00000000000 --- a/pkgs/development/compilers/gcc/gfortran-darwin.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/gcc/config/darwin-c.c 2015-01-09 22:18:42.000000000 +0200 -+++ b/gcc/config/darwin-c.c 2015-06-27 04:17:58.000000000 +0300 -@@ -490,8 +490,7 @@ - - static const char *framework_defaults [] = - { -- "/System/Library/Frameworks", -- "/Library/Frameworks", -+// stdenvDarwinPure - }; - - /* Register the GNU objective-C runtime include path if STDINC. */ - - /* Register the GNU objective-C runtime include path if STDINC. */ ---- a/gcc/cppdefault.c 2015-01-05 14:33:28.000000000 +0200 -+++ b/gcc/cppdefault.c 2015-06-27 04:16:15.000000000 +0300 -@@ -35,6 +35,9 @@ - # undef CROSS_INCLUDE_DIR - #endif - -+// stdenvDarwinPure -+# undef LOCAL_INCLUDE_DIR -+ - const struct default_include cpp_include_defaults[] - #ifdef INCLUDE_DEFAULTS - = INCLUDE_DEFAULTS; diff --git a/pkgs/development/compilers/ghcjs/head.nix b/pkgs/development/compilers/ghcjs/head.nix index 1c347655ebe..e045dc67a50 100644 --- a/pkgs/development/compilers/ghcjs/head.nix +++ b/pkgs/development/compilers/ghcjs/head.nix @@ -1,22 +1,26 @@ { fetchgit, fetchFromGitHub, bootPkgs }: bootPkgs.callPackage ./base.nix { - version = "0.2.020161101"; + version = "0.2.020170323"; # deprecated on HEAD, directly included in the distribution ghcjs-prim = null; inherit bootPkgs; ghcjsSrc = fetchFromGitHub { - owner = "ghcjs"; + # TODO: switch back to the regular ghcjs repo + # when https://github.com/ghcjs/ghcjs/pull/573 is merged. + owner = "basvandijk"; repo = "ghcjs"; - rev = "2dc14802e78d7d9dfa35395d5dbfc9c708fb83e6"; - sha256 = "0cvmapbrwg0h1pbz648isc2l84z694ylnfm8ncd1g4as28lmj0pz"; + rev = "e6cdc71964a1c2e4184416a493e9d384c408914c"; + sha256 = "00fk9qwyx4vpvr0h9jbqxwlrvl6w63l5sq8r357prsp6xyv5zniz"; }; ghcjsBootSrc = fetchgit { - url = git://github.com/ghcjs/ghcjs-boot.git; - rev = "b000a4f4619b850bf3f9a45c9058f7a51e7709c8"; - sha256 = "164v0xf33r6mnympp6s70v8j6g7ccyg7z95gjp43bq150ppvisbq"; + # TODO: switch back to git://github.com/ghcjs/ghcjs-boot.git + # when https://github.com/ghcjs/ghcjs-boot/pull/41 is merged. + url = git://github.com/basvandijk/ghcjs-boot.git; + rev = "19a3b157ecb807c2224daffda5baecc92b76af35"; + sha256 = "16sgr8vfr1nx5ljnk8gckgjk70zpa67ix4dbr9aizkwyz41ilfrb"; fetchSubmodules = true; }; diff --git a/pkgs/development/compilers/ghcjs/head_stage2.nix b/pkgs/development/compilers/ghcjs/head_stage2.nix index 765a384bf63..5808891d430 100644 --- a/pkgs/development/compilers/ghcjs/head_stage2.nix +++ b/pkgs/development/compilers/ghcjs/head_stage2.nix @@ -2,107 +2,117 @@ { async = callPackage - ({ mkDerivation, base, HUnit, stdenv, stm, test-framework - , test-framework-hunit - }: - mkDerivation { - pname = "async"; - version = "2.1.0"; - src = "${ghcjsBoot}/boot/async"; - doCheck = false; - libraryHaskellDepends = [ base stm ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit - ]; - jailbreak = true; - homepage = "https://github.com/simonmar/async"; - description = "Run IO operations asynchronously and wait for their results"; - license = stdenv.lib.licenses.bsd3; - }) {}; + ({ mkDerivation, base, HUnit, stm, test-framework + , test-framework-hunit, stdenv + }: + mkDerivation { + pname = "async"; + version = "2.1.1"; + src = "${ghcjsBoot}/boot/async"; + doCheck = false; + libraryHaskellDepends = [ base stm ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit + ]; + jailbreak = true; + homepage = "https://github.com/simonmar/async"; + description = "Run IO operations asynchronously and wait for their results"; + license = stdenv.lib.licenses.bsd3; + }) {}; aeson = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq - , dlist, fail, ghc-prim, hashable, HUnit, mtl, QuickCheck, scientific - , stdenv, syb, tagged, template-haskell, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, time - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "aeson"; - version = "0.11.2.0"; - src = "${ghcjsBoot}/boot/aeson"; - doCheck = false; - libraryHaskellDepends = [ - attoparsec base bytestring containers deepseq dlist fail ghc-prim - hashable mtl scientific syb tagged template-haskell text time transformers - unordered-containers vector - ]; - testHaskellDepends = [ - attoparsec base bytestring containers ghc-prim HUnit QuickCheck - template-haskell test-framework test-framework-hunit - test-framework-quickcheck2 text time unordered-containers vector - ]; - jailbreak = true; - homepage = "https://github.com/bos/aeson"; - description = "Fast JSON parsing and encoding"; - license = stdenv.lib.licenses.bsd3; - }) {}; + ({ mkDerivation, attoparsec, base, base-compat, base-orphans + , base16-bytestring, bytestring, containers, deepseq, directory + , dlist, fetchgit, filepath, generic-deriving, ghc-prim, hashable + , hashable-time, HUnit, integer-logarithms, QuickCheck + , quickcheck-instances, scientific, stdenv, tagged + , template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, time-locale-compat + , unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "aeson"; + version = "1.1.1.0"; + src = "${ghcjsBoot}/boot/aeson"; + libraryHaskellDepends = [ + attoparsec base base-compat bytestring containers deepseq dlist + ghc-prim hashable scientific tagged template-haskell text time + time-locale-compat unordered-containers uuid-types vector + ]; + testHaskellDepends = [ + attoparsec base base-compat base-orphans base16-bytestring + bytestring containers directory dlist filepath generic-deriving + ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck + quickcheck-instances scientific tagged template-haskell + test-framework test-framework-hunit test-framework-quickcheck2 text + time time-locale-compat unordered-containers uuid-types vector + ]; + jailbreak = true; + homepage = "https://github.com/bos/aeson"; + description = "Fast JSON parsing and encoding"; + license = stdenv.lib.licenses.bsd3; + }) {}; attoparsec = callPackage - ({ mkDerivation, array, base, bytestring, containers, deepseq - , QuickCheck, quickcheck-unicode, scientific, stdenv - , test-framework, test-framework-quickcheck2, text, transformers - , vector - }: - mkDerivation { - pname = "attoparsec"; - version = "0.13.0.2"; - src = "${ghcjsBoot}/boot/attoparsec"; - doCheck = false; - libraryHaskellDepends = [ - array base bytestring containers deepseq scientific text - transformers - ]; - testHaskellDepends = [ - array base bytestring containers deepseq QuickCheck - quickcheck-unicode scientific test-framework - test-framework-quickcheck2 text transformers vector - ]; - jailbreak = true; - homepage = "https://github.com/bos/attoparsec"; - description = "Fast combinator parsing for bytestrings and text"; - license = stdenv.lib.licenses.bsd3; - }) {}; + ({ mkDerivation, array, base, bytestring, case-insensitive + , containers, criterion, deepseq, directory, filepath, ghc-prim + , http-types, parsec, QuickCheck, quickcheck-unicode, scientific + , tasty, tasty-quickcheck, text, transformers, unordered-containers + , vector, stdenv + }: + mkDerivation { + pname = "attoparsec"; + version = "0.13.1.0"; + src = "${ghcjsBoot}/boot/attoparsec"; + libraryHaskellDepends = [ + array base bytestring containers deepseq scientific text + transformers + ]; + testHaskellDepends = [ + array base bytestring deepseq QuickCheck quickcheck-unicode + scientific tasty tasty-quickcheck text transformers vector + ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers criterion deepseq + directory filepath ghc-prim http-types parsec scientific text + transformers unordered-containers vector + ]; + jailbreak = true; + homepage = "https://github.com/bos/attoparsec"; + description = "Fast combinator parsing for bytestrings and text"; + license = stdenv.lib.licenses.bsd3; + }) {}; case-insensitive = callPackage - ({ mkDerivation, base, bytestring, deepseq, hashable, HUnit, stdenv - , test-framework, test-framework-hunit, text - }: - mkDerivation { - pname = "case-insensitive"; - version = "1.2.0.6"; - src = "${ghcjsBoot}/boot/case-insensitive"; - doCheck = false; - libraryHaskellDepends = [ base bytestring deepseq hashable text ]; - testHaskellDepends = [ - base bytestring HUnit test-framework test-framework-hunit text - ]; - jailbreak = true; - homepage = "https://github.com/basvandijk/case-insensitive"; - description = "Case insensitive string comparison"; - license = stdenv.lib.licenses.bsd3; - }) {}; + ({ mkDerivation, base, bytestring, criterion, deepseq, hashable + , HUnit, test-framework, test-framework-hunit, text, stdenv + }: + mkDerivation { + pname = "case-insensitive"; + version = "1.2.0.8"; + src = "${ghcjsBoot}/boot/case-insensitive"; + doCheck = false; + libraryHaskellDepends = [ base bytestring deepseq hashable text ]; + testHaskellDepends = [ + base bytestring HUnit test-framework test-framework-hunit text + ]; + benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; + jailbreak = true; + homepage = "https://github.com/basvandijk/case-insensitive"; + description = "Case insensitive string comparison"; + license = stdenv.lib.licenses.bsd3; + }) {}; dlist = callPackage ({ mkDerivation, base, Cabal, deepseq, QuickCheck, stdenv }: - mkDerivation { - pname = "dlist"; - version = "0.7.1.2"; - src = "${ghcjsBoot}/boot/dlist"; - doCheck = false; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ base Cabal QuickCheck ]; - jailbreak = true; - homepage = "https://github.com/spl/dlist"; - description = "Difference lists"; - license = stdenv.lib.licenses.bsd3; - }) {}; + mkDerivation { + pname = "dlist"; + version = "0.8.0.2"; + src = "${ghcjsBoot}/boot/dlist"; + doCheck = false; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base Cabal QuickCheck ]; + jailbreak = true; + homepage = "https://github.com/spl/dlist"; + description = "Difference lists"; + license = stdenv.lib.licenses.bsd3; + }) {}; extensible-exceptions = callPackage ({ mkDerivation, base, stdenv }: mkDerivation { @@ -175,29 +185,29 @@ license = stdenv.lib.licenses.bsd3; }) {}; scientific = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq, ghc-prim - , hashable, integer-gmp, QuickCheck, smallcheck, stdenv, tasty - , tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-smallcheck - , text, vector - }: - mkDerivation { - pname = "scientific"; - version = "0.3.4.7"; - src = "${ghcjsBoot}/boot/scientific"; - doCheck = false; - libraryHaskellDepends = [ - base binary bytestring containers deepseq ghc-prim hashable - integer-gmp text vector - ]; - testHaskellDepends = [ - base bytestring QuickCheck smallcheck tasty tasty-ant-xml - tasty-hunit tasty-quickcheck tasty-smallcheck text - ]; - jailbreak = true; - homepage = "https://github.com/basvandijk/scientific"; - description = "Numbers represented using scientific notation"; - license = stdenv.lib.licenses.bsd3; - }) {}; + ({ mkDerivation, base, binary, bytestring, containers, criterion + , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms + , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text, vector, stdenv + }: + mkDerivation { + pname = "scientific"; + version = "0.3.4.10"; + src = "${ghcjsBoot}/boot/scientific"; + libraryHaskellDepends = [ + base binary bytestring containers deepseq ghc-prim hashable + integer-gmp integer-logarithms text vector + ]; + testHaskellDepends = [ + base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml + tasty-hunit tasty-quickcheck tasty-smallcheck text + ]; + benchmarkHaskellDepends = [ base criterion ]; + jailbreak = true; + homepage = "https://github.com/basvandijk/scientific"; + description = "Numbers represented using scientific notation"; + license = stdenv.lib.licenses.bsd3; + }) {}; stm = callPackage ({ mkDerivation, array, base, stdenv }: mkDerivation { @@ -224,6 +234,23 @@ description = "Scrap Your Boilerplate"; license = stdenv.lib.licenses.bsd3; }) {}; + tagged = callPackage + ({ mkDerivation, base, deepseq, template-haskell, transformers + , transformers-compat, stdenv + }: + mkDerivation { + pname = "tagged"; + version = "0.8.5"; + src = "${ghcjsBoot}/boot/tagged"; + doCheck = false; + libraryHaskellDepends = [ + base deepseq template-haskell transformers transformers-compat + ]; + jailbreak = true; + homepage = "http://github.com/ekmett/tagged"; + description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; + license = stdenv.lib.licenses.bsd3; + }) {}; text = callPackage ({ mkDerivation, array, base, binary, bytestring, deepseq, directory , ghc-prim, HUnit, integer-gmp, QuickCheck, quickcheck-unicode @@ -249,25 +276,52 @@ license = stdenv.lib.licenses.bsd3; }) {}; unordered-containers = callPackage - ({ mkDerivation, base, ChasingBottoms, containers, deepseq, hashable - , HUnit, QuickCheck, stdenv, test-framework, test-framework-hunit - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "unordered-containers"; - version = "0.2.7.0"; - src = "${ghcjsBoot}/boot/unordered-containers"; - doCheck = false; - libraryHaskellDepends = [ base deepseq hashable ]; - testHaskellDepends = [ - base ChasingBottoms containers hashable HUnit QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - jailbreak = true; - homepage = "https://github.com/tibbe/unordered-containers"; - description = "Efficient hashing-based container types"; - license = stdenv.lib.licenses.bsd3; - }) {}; + ({ mkDerivation, base, bytestring, ChasingBottoms, containers + , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit + , mtl, QuickCheck, random, test-framework, test-framework-hunit + , test-framework-quickcheck2, stdenv + }: + mkDerivation { + pname = "unordered-containers"; + version = "0.2.7.2"; + src = "${ghcjsBoot}/boot/unordered-containers"; + libraryHaskellDepends = [ base deepseq hashable ]; + testHaskellDepends = [ + base ChasingBottoms containers hashable HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq deepseq-generics + hashable hashmap mtl random + ]; + jailbreak = true; + homepage = "https://github.com/tibbe/unordered-containers"; + description = "Efficient hashing-based container types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + uuid-types = callPackage + ({ mkDerivation, base, binary, bytestring, containers, criterion + , deepseq, hashable, HUnit, QuickCheck, random, stdenv, tasty + , tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "uuid-types"; + version = "1.0.3"; + src = "${ghcjsBoot}/boot/uuid/uuid-types"; + libraryHaskellDepends = [ + base binary bytestring deepseq hashable random text + ]; + testHaskellDepends = [ + base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq random + ]; + jailbreak = true; + homepage = "https://github.com/aslatter/uuid"; + description = "Type definitions for Universally Unique Identifiers"; + license = stdenv.lib.licenses.bsd3; + }) {}; vector = callPackage ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck , random, stdenv, template-haskell, test-framework @@ -328,6 +382,7 @@ version = "1.24.0.0"; src = "${ghcjsBoot}/boot/cabal/Cabal"; doCheck = false; + hyperlinkSource = false; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath pretty process time unix diff --git a/pkgs/development/compilers/ghcjs/stage2.nix b/pkgs/development/compilers/ghcjs/stage2.nix index 8c68b6f15a6..b88051113b5 100644 --- a/pkgs/development/compilers/ghcjs/stage2.nix +++ b/pkgs/development/compilers/ghcjs/stage2.nix @@ -327,6 +327,7 @@ version = "1.22.8.0"; src = "${ghcjsBoot}/boot/cabal/Cabal"; doCheck = false; + hyperlinkSource = false; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath pretty process time unix diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index f60077e8962..2a1944debd9 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, tzdata, iana_etc, libcCross +{ stdenv, lib, fetchurl, fetchpatch, tzdata, iana-etc, libcCross , pkgconfig , pcre , Security }: @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { # ParseInLocation fails the test sed -i '/TestParseInSydney/areturn' src/time/format_test.go - sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go '' + lib.optionalString stdenv.isLinux '' sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix index 52ffbab6dcb..4a777d7b4f1 100644 --- a/pkgs/development/compilers/go/1.6.nix +++ b/pkgs/development/compilers/go/1.6.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, tzdata, iana_etc, go_bootstrap, runCommand +{ stdenv, lib, fetchurl, tzdata, iana-etc, go_bootstrap, runCommand , perl, which, pkgconfig, patch, fetchpatch , pcre , Security, Foundation, bash }: @@ -75,8 +75,8 @@ stdenv.mkDerivation rec { # Remove the timezone naming test sed -i '/TestLoadFixed/areturn' src/time/time_test.go - sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go - sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go + sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go '' + lib.optionalString stdenv.isLinux '' sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go '' + lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix index 7fa35e1fcac..76f6141e2e3 100644 --- a/pkgs/development/compilers/go/1.7.nix +++ b/pkgs/development/compilers/go/1.7.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, tzdata, iana_etc, go_bootstrap, runCommand, writeScriptBin +{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, fetchpatch , pcre, cacert , Security, Foundation, bash }: @@ -69,8 +69,8 @@ stdenv.mkDerivation rec { # Remove the timezone naming test sed -i '/TestLoadFixed/areturn' src/time/time_test.go - sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go - sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go + sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go # Disable cgo lookup tests not works, they depend on resolver rm src/net/cgo_unix_test.go @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.7.patch - ./cacert-1.7.patch + ./ssl-cert-file-1.7.patch ./creds-test.patch # This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { }) ]; - SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; GOOS = if stdenv.isDarwin then "darwin" else "linux"; GOARCH = if stdenv.isDarwin then "amd64" diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix index 6d9ee3de550..60125b2e22a 100644 --- a/pkgs/development/compilers/go/1.8.nix +++ b/pkgs/development/compilers/go/1.8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, tzdata, iana_etc, go_bootstrap, runCommand, writeScriptBin +{ stdenv, fetchFromGitHub, tzdata, iana-etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, fetchpatch , pcre, cacert , Security, Foundation, bash }: @@ -71,8 +71,8 @@ stdenv.mkDerivation rec { # Remove the timezone naming test sed -i '/TestLoadFixed/areturn' src/time/time_test.go - sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go - sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go + sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go # Disable cgo lookup tests not works, they depend on resolver rm src/net/cgo_unix_test.go @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.8.patch - ./cacert-1.8.patch + ./ssl-cert-file-1.8.patch ./creds-test.patch ./remove-test-pie-1.8.patch @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { }) ]; - SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; GOOS = if stdenv.isDarwin then "darwin" else "linux"; GOARCH = if stdenv.isDarwin then "amd64" diff --git a/pkgs/development/compilers/go/cacert-1.7.patch b/pkgs/development/compilers/go/ssl-cert-file-1.7.patch similarity index 92% rename from pkgs/development/compilers/go/cacert-1.7.patch rename to pkgs/development/compilers/go/ssl-cert-file-1.7.patch index 57f09c975d9..e35ad9e4b75 100644 --- a/pkgs/development/compilers/go/cacert-1.7.patch +++ b/pkgs/development/compilers/go/ssl-cert-file-1.7.patch @@ -13,7 +13,7 @@ index a4b33c7..9700b75 100644 func loadSystemRoots() (*CertPool, error) { roots := NewCertPool() -+ if file := os.Getenv("SSL_CERT_FILE"); file != "" { ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { + data, err := ioutil.ReadFile(file) + if err == nil { + roots.AppendCertsFromPEM(data) @@ -36,7 +36,7 @@ index 59b303d..d4a34ac 100644 + roots = NewCertPool() + ) + -+ if file := os.Getenv("SSL_CERT_FILE"); file != "" { ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { + data, err := ioutil.ReadFile(file) + if err == nil { + roots.AppendCertsFromPEM(data) @@ -65,7 +65,7 @@ index 7bcb3d6..3986e1a 100644 func loadSystemRoots() (*CertPool, error) { roots := NewCertPool() -+ if file := os.Getenv("SSL_CERT_FILE"); file != "" { ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { + data, err := ioutil.ReadFile(file) + if err == nil { + roots.AppendCertsFromPEM(data) diff --git a/pkgs/development/compilers/go/cacert-1.8.patch b/pkgs/development/compilers/go/ssl-cert-file-1.8.patch similarity index 92% rename from pkgs/development/compilers/go/cacert-1.8.patch rename to pkgs/development/compilers/go/ssl-cert-file-1.8.patch index bf44e123711..052655eed52 100644 --- a/pkgs/development/compilers/go/cacert-1.8.patch +++ b/pkgs/development/compilers/go/ssl-cert-file-1.8.patch @@ -13,7 +13,7 @@ index a4b33c7..9700b75 100644 func loadSystemRoots() (*CertPool, error) { roots := NewCertPool() -+ if file := os.Getenv("SSL_CERT_FILE"); file != "" { ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { + data, err := ioutil.ReadFile(file) + if err == nil { + roots.AppendCertsFromPEM(data) @@ -43,7 +43,7 @@ index 66cdb5e..bb28036 100644 numVerified int // number of execs of 'security verify-cert', for debug stats ) -+ if file := os.Getenv("SSL_CERT_FILE"); file != "" { ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { + data, err := ioutil.ReadFile(file) + if err == nil { + roots.AppendCertsFromPEM(data) @@ -67,7 +67,7 @@ index 7bcb3d6..3986e1a 100644 func loadSystemRoots() (*CertPool, error) { roots := NewCertPool() -+ if file := os.Getenv("SSL_CERT_FILE"); file != "" { ++ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { + data, err := ioutil.ReadFile(file) + if err == nil { + roots.AppendCertsFromPEM(data) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 33921ef02cd..508ac254f0a 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: stdenv.mkDerivation rec { - version = "1.1"; + version = "1.1.1"; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "179m5y56fi50qvxsm075h0547swib7n2pfdn8a4axk9wpwldni5a"; + sha256 = "1c96l1bkll0l8c82cfzmph0z38f96r3x68zmggq4s8hhdqgwk8mc"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/llvm/3.7/clang/default.nix b/pkgs/development/compilers/llvm/3.7/clang/default.nix index 535dbbc93d5..f27e3f0089e 100644 --- a/pkgs/development/compilers/llvm/3.7/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.7/clang/default.nix @@ -42,6 +42,7 @@ let passthru = { lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both isClang = true; + inherit llvm; } // stdenv.lib.optionalAttrs stdenv.isLinux { inherit gcc; }; diff --git a/pkgs/development/compilers/llvm/3.7/libc++abi.nix b/pkgs/development/compilers/llvm/3.7/libc++abi.nix index 6a62a6256b4..d2be57b1a5f 100644 --- a/pkgs/development/compilers/llvm/3.7/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.7/libc++abi.nix @@ -1,6 +1,12 @@ -{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }: +{ stdenv, cmake, fetch, fetchpatch, libcxx, libunwind, llvm, version }: -stdenv.mkDerivation { +let + # Newer LLVMs (3.8 onwards) have changed how some basic C++ stuff works, which breaks builds of this older version + llvm38-and-above = fetchpatch { + url = "https://trac.macports.org/raw-attachment/ticket/50304/0005-string-Fix-exception-declaration.patch"; + sha256 = "1lm38n7s0l5dbl7kp4i49pvzxz1mcvlr2vgsnj47agnwhhm63jvr"; + }; +in stdenv.mkDerivation { name = "libc++abi-${version}"; src = fetch "libcxxabi" "0ambfcmr2nh88hx000xb7yjm9lsqjjz49w5mlf6dlxzmj3nslzx4"; @@ -16,6 +22,13 @@ stdenv.mkDerivation { export TRIPLE=x86_64-apple-darwin ''; + # I can't use patches directly because this is actually a patch for libc++'s source, which we manually extract + # into the libc++abi build environment above. + prePatch = ''( + cd ../libcxx-* + patch -p1 < ${llvm38-and-above} + )''; + installPhase = if stdenv.isDarwin then '' for file in lib/*.dylib; do diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index 41e515249eb..90b8ea2581e 100644 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -53,6 +53,7 @@ let passthru = { lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both isClang = true; + inherit llvm; } // stdenv.lib.optionalAttrs stdenv.isLinux { inherit gcc; }; diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index 677c4a526ea..91068227110 100644 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -29,12 +29,23 @@ let sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp ''; + outputs = [ "out" "python" ]; + # Clang expects to find LLVMgold in its own prefix # Clang expects to find sanitizer libraries in its own prefix postInstall = '' ln -sv ${llvm}/lib/LLVMgold.so $out/lib ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ ln -sv $out/bin/clang $out/bin/cpp + + mkdir -p $python/bin $python/share/clang/ + mv $out/bin/{git-clang-format,scan-view} $python/bin + if [ -e $out/bin/set-xcode-analyzer ]; then + mv $out/bin/set-xcode-analyzer $python/bin + fi + mv $out/share/clang/*.py $python/share/clang + + rm $out/bin/c-index-test ''; enableParallelBuilding = true; @@ -42,6 +53,7 @@ let passthru = { lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both isClang = true; + inherit llvm; } // stdenv.lib.optionalAttrs stdenv.isLinux { inherit gcc; }; diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 62f1514e231..2c47ec5127f 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -40,8 +40,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" ] ++ stdenv.lib.optional enableSharedLibraries "lib"; buildInputs = [ perl groff cmake libxml2 python libffi ] - ++ stdenv.lib.optionals stdenv.isDarwin - [ libcxxabi darwin.cctools darwin.apple_sdk.libs.xpc ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ]; propagatedBuildInputs = [ ncurses zlib ]; @@ -53,11 +52,15 @@ in stdenv.mkDerivation rec { sha256 = "11sq86spw41v72f676igksapdlsgh7fiqp5qkkmgfj0ndqcn9skf"; }} '' - # hacky fix: New LLVM releases require a newer OS X SDK than - # 10.9. This is a temporary measure until nixpkgs darwin support is - # updated. + # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks + # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra + # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd + # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by + # a flag and turn the flag off during the stdenv build. I realize that this LLVM isn't used in the stdenv but I want to + # keep it consistent with 4.0. We really shouldn't be copying and pasting all this code around... + stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's/os_trace(\(.*\)");$/printf(\1\\n");/g' ./projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc + substituteInPlace ./projects/compiler-rt/cmake/config-ix.cmake \ + --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' '' # Patch llvm-config to return correct library path based on --link-{shared,static}. + stdenv.lib.optionalString (enableSharedLibraries) '' @@ -85,7 +88,6 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" - "-DCMAKE_LIBTOOL=${darwin.cctools}/bin/libtool" ]; postBuild = '' diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index 6ce63209935..c9387159283 100644 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ b/pkgs/development/compilers/llvm/4/clang/default.nix @@ -53,6 +53,7 @@ let passthru = { lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both isClang = true; + inherit llvm; } // stdenv.lib.optionalAttrs stdenv.isLinux { inherit gcc; }; diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix index ba8302919e1..a43826d7a31 100644 --- a/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -10,22 +10,27 @@ stdenv.mkDerivation rec { export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" ''; + # https://github.com/llvm-mirror/libcxx/commit/bcc92d75df0274b9593ebd097fcae60494e3bffc + patches = [ ./pthread_mach_thread_np.patch ]; + + prePatch = '' + substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++" + ''; + preConfigure = '' # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR") ''; - patchPhase = '' - substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++" - ''; + nativeBuildInputs = [ cmake ]; - buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" - "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" - ]; + "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" + "-DLIBCXX_LIBCPPABI_VERSION=2" + "-DLIBCXX_CXX_ABI=libcxxabi" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/4/libc++/pthread_mach_thread_np.patch b/pkgs/development/compilers/llvm/4/libc++/pthread_mach_thread_np.patch new file mode 100644 index 00000000000..8c71f1b815d --- /dev/null +++ b/pkgs/development/compilers/llvm/4/libc++/pthread_mach_thread_np.patch @@ -0,0 +1,41 @@ +From bcc92d75df0274b9593ebd097fcae60494e3bffc Mon Sep 17 00:00:00 2001 +From: Asiri Rathnayake +Date: Thu, 26 Jan 2017 10:40:17 +0000 +Subject: [PATCH] Fix chromium build (libcxx) + +Remove the reference to pthread_mach_thread_np() in libcxx headers. + +git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@293167 91177308-0d34-0410-b5e6-96231b3b80d8 +--- + include/__threading_support | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/include/__threading_support b/include/__threading_support +index 13ab769..dfe7fe1 100644 +--- a/include/__threading_support ++++ b/include/__threading_support +@@ -149,11 +149,6 @@ int __libcpp_execute_once(__libcpp_exec_once_flag *flag, + void (*init_routine)(void)); + + // Thread id +-#if defined(__APPLE__) && !defined(__arm__) +-_LIBCPP_THREAD_ABI_VISIBILITY +-mach_port_t __libcpp_thread_get_port(); +-#endif +- + _LIBCPP_THREAD_ABI_VISIBILITY + bool __libcpp_thread_id_equal(__libcpp_thread_id t1, __libcpp_thread_id t2); + +@@ -297,12 +292,6 @@ int __libcpp_execute_once(__libcpp_exec_once_flag *flag, + } + + // Thread id +-#if defined(__APPLE__) && !defined(__arm__) +-mach_port_t __libcpp_thread_get_port() { +- return pthread_mach_thread_np(pthread_self()); +-} +-#endif +- + // Returns non-zero if the thread ids are equal, otherwise 0 + bool __libcpp_thread_id_equal(__libcpp_thread_id t1, __libcpp_thread_id t2) + { diff --git a/pkgs/development/compilers/manticore/builder.sh b/pkgs/development/compilers/manticore/builder.sh deleted file mode 100755 index ad72f50a1b3..00000000000 --- a/pkgs/development/compilers/manticore/builder.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!@shell@ - -source $stdenv/setup -echo "Building Manticore research compiler." -set -xe - -PATH=$smlnj/bin:$PATH - -mkdir -p $out/bin - -# Manticore seems to use the MLB files from the build tree, -# so for now we copy the whole build tree into the store: -cd $out/ -tar xf $src -mv manticore* repo_checkout -cd repo_checkout/ -# TODO: At the very least, this could probably be cut down to a subset -# of the repo. - -${autoconf}/bin/autoheader -Iconfig -${autoconf}/bin/autoconf -Iconfig -./configure --prefix=$out -make build -j -make install diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix index 7e8312549da..795830e0e70 100644 --- a/pkgs/development/compilers/manticore/default.nix +++ b/pkgs/development/compilers/manticore/default.nix @@ -1,14 +1,41 @@ -{ stdenv, fetchurl, coreutils, autoconf, automake, smlnj }: +{ stdenv, fetchFromGitHub, coreutils, autoreconfHook, smlnj }: -stdenv.mkDerivation rec { +let + rev = "592a5714595b4448b646a7d49df04c285668c2f8"; +in stdenv.mkDerivation rec { name = "manticore-${version}"; version = "2014.08.18"; - builder = ./builder.sh; - src = fetchurl { - url = https://github.com/rrnewton/manticore_temp_mirror/archive/snapshot-20140818.tar.gz; - sha256 = "1x52xpj5gbcpqjqm6aw6ssn901f353zypj3d5scm8i3ad777y29d"; + + src = fetchFromGitHub { + owner = "rrnewton"; + repo = "manticore_temp_mirror"; + sha256 = "1snwlm9a31wfgvzb80y7r7yvc6n0k0bi675lqwzll95as7cdswwi"; + inherit rev; }; - inherit stdenv coreutils autoconf automake smlnj; + + enableParallelBuilding = false; + + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ coreutils smlnj ]; + + autoreconfFlags = "-Iconfig -vfi"; + + unpackPhase = '' + mkdir -p $out + cd $out + unpackFile $src + mv manticore_temp_mirror-${rev}-src repo_checkout + cd repo_checkout + chmod u+w . -R + ''; + + postPatch = '' + patchShebangs . + substituteInPlace configure.ac --replace 'MANTICORE_ROOT=`pwd`' 'MANTICORE_ROOT=$out/repo_checkout' + ''; + + preInstall = "mkdir -p $out/bin"; meta = { description = "A parallel, pure variant of Standard ML"; diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index a30a97ce9ce..eb090e8b38a 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nasm-${version}"; - version = "2.11.08"; + version = "2.12.02"; src = fetchurl { url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2"; - sha256 = "0ialkla6i63j8fpv840jy7k5mdf2wbqr98bvbcq0dp0b38ls18wx"; + sha256 = "097318bjxvmffbjfd1k89parc04xf5jfxg2rr93581lccwf8kc00"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/openjdk-darwin/8.nix b/pkgs/development/compilers/openjdk-darwin/8.nix index 2f3391f70e0..51effd2c784 100644 --- a/pkgs/development/compilers/openjdk-darwin/8.nix +++ b/pkgs/development/compilers/openjdk-darwin/8.nix @@ -7,11 +7,11 @@ let }; jdk = stdenv.mkDerivation { - name = "zulu1.8.0_66-8.11.0.1"; + name = "zulu1.8.0_121-8.20.0.5"; src = fetchurl { - url = "http://cdn.azulsystems.com/zulu/bin/zulu1.8.0_66-8.11.0.1-macosx.zip"; - sha256 = "0pvbpb3vf0509xm2x1rh0p0w4wmx50zf15604p28z1k8ai1a23sz"; + url = "http://cdn.azul.com/zulu/bin/zulu8.20.0.5-jdk8.0.121-macosx_x64.zip"; + sha256 = "2a58bd1d9b0cbf0b3d8d1bcdd117c407e3d5a0ec01e2f53565c9bec5cf9ea78b"; curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/"; }; diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index e70fee3605b..6cd407374db 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.11.3"; + version = "0.12.2"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "08wh8rh17bf043glvn7778bwpxyzpm95kgfll645hf2m65n5ncsh"; + sha256 = "1gp92fwfq9ic43c525p0idap99jq5fkjbijf0s8bxif3kng7rxbp"; }; buildInputs = [ llvm makeWrapper which ]; @@ -79,11 +79,11 @@ stdenv.mkDerivation ( rec { # Stripping breaks linking for ponyc dontStrip = true; - meta = { + meta = with stdenv.lib; { description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language"; homepage = http://www.ponylang.org; - license = stdenv.lib.licenses.bsd2; - maintainers = with stdenv.lib.maintainers; [ doublec kamilchm ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.bsd2; + maintainers = with maintainers; [ doublec kamilchm ]; + platforms = subtractLists platforms.i686 platforms.unix; }; }) diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix index 6e669c97300..9bee8e299c0 100644 --- a/pkgs/development/compilers/ponyc/pony-stable.nix +++ b/pkgs/development/compilers/ponyc/pony-stable.nix @@ -1,13 +1,13 @@ {stdenv, fetchFromGitHub, ponyc }: stdenv.mkDerivation { - name = "pony-stable-unstable-2017-01-03"; + name = "pony-stable-unstable-2017-03-30"; src = fetchFromGitHub { owner = "jemc"; repo = "pony-stable"; - rev = "0054b429a54818d187100ed40f5525ec7931b31b"; - sha256 = "0libx8byzwqjjgxxyiiahiprzzp845xgbk09sx9bzban5cd5j0g5"; + rev = "39890c7f11f79009630de6b551bd076868f7f5a2"; + sha256 = "1w15dg4l03zzncpllwww8jhsj7z1wgvhf89n7agr9f1w9m2zpskc"; }; buildInputs = [ ponyc ]; diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 91d7cda1c00..afab703ae5b 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -1,5 +1,8 @@ -{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, - targets ? [], targetToolchains ? [], targetPatches ? [] }: +{ stdenv, callPackage, recurseIntoAttrs, makeRustPlatform, llvm +, targets ? [] +, targetToolchains ? [] +, targetPatches ? [] +}: let rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {})); @@ -17,6 +20,7 @@ rec { ./patches/darwin-disable-fragile-tcp-tests.patch ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; + inherit llvm; inherit targets; inherit targetPatches; inherit targetToolchains; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index a693afb8b59..f2fe7fbca7a 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -153,6 +153,6 @@ stdenv.mkDerivation { description = "A safe, concurrent, practical language"; maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington retrry ]; license = [ licenses.mit licenses.asl20 ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = subtractLists platforms.i686 (platforms.linux ++ platforms.darwin); }; } diff --git a/pkgs/development/compilers/scala/2.11.nix b/pkgs/development/compilers/scala/2.11.nix index 394b2f9da09..9af3431b8c6 100644 --- a/pkgs/development/compilers/scala/2.11.nix +++ b/pkgs/development/compilers/scala/2.11.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.11.8"; + name = "scala-2.11.9"; src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "1khs7673wca7gnxz2rxphv6v5k94jkpcarlqznsys9cpknhqdz47"; + sha256 = "02rpx0pzr98vla2mgkgf6s8blccnrji5bxw05z36m1iwqmpryx5r"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix index 7f8580f058b..75daad36f76 100644 --- a/pkgs/development/compilers/smlnj/default.nix +++ b/pkgs/development/compilers/smlnj/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation { '' + stdenv.lib.optionalString stdenv.isDarwin (with darwin; '' sed -i '/^[[:space:]]*\*x86-darwin\*)$/,/^[[:space:]]*\*) ;;/ c\ \ \*x86-darwin\*)\ -\ INCLFILE=${osx_sdk}/Developer/SDKs/${osx_sdk.name}/usr/include/unistd.h\ +\ INCLFILE=${apple_sdk.sdk}/include/unistd.h\ \ ;;\ \ \*) ;; ' base/runtime/config/gen-posix-names.sh diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix new file mode 100644 index 00000000000..9764ede7281 --- /dev/null +++ b/pkgs/development/compilers/swift/default.nix @@ -0,0 +1,265 @@ +{ stdenv +, cmake +, coreutils +, glibc +, which +, perl +, libedit +, ninja +, pkgconfig +, sqlite +, swig +, bash +, libxml2 +, llvm +, clang +, python +, ncurses +, libuuid +, libbsd +, icu +, autoconf +, libtool +, automake +, libblocksruntime +, curl +, rsync +, git +, libgit2 +, binutils +, fetchFromGitHub +, paxctl +, findutils +#, systemtap +}: + +let + v_major = "3.1"; + version = "${v_major}-RELEASE"; + version_friendly = "${v_major}"; + + tag = "refs/tags/swift-${version}"; + fetch = { repo, sha256, fetchSubmodules ? false }: + fetchFromGitHub { + owner = "apple"; + inherit repo sha256 fetchSubmodules; + rev = tag; + name = "${repo}-${version}-src"; + }; + +sources = { + # FYI: SourceKit probably would work but currently requires building everything twice + # For more inforation, see: https://github.com/apple/swift/pull/3594#issuecomment-234169759 + clang = fetch { + repo = "swift-clang"; + sha256 = "0820mx1ghfnk4p5595r1f313y1699jwi61zghfbwak5wgwgy7n4x"; + }; + llvm = fetch { + repo = "swift-llvm"; + sha256 = "0zb1zi77b2xdz5szlz2m3j3d92dc0q00dv8py2s6iaq3k435i3sq"; + }; + compilerrt = fetch { + repo = "swift-compiler-rt"; + sha256 = "1gjcr6g3ffs3nhf4a84iwg4flbd7rqcf9rvvclwyq96msa3mj950"; + }; + cmark = fetch { + repo = "swift-cmark"; + sha256 = "0qf2f3zd8lndkfbxbz6vkznzz8rvq5gigijh7pgmfx9fi4zcssqx"; + }; + lldb = fetch { + repo = "swift-lldb"; + sha256 = "17n4whpf3wxw9zaayiq21gk9q3547qxi4rvxld2hybh0k7a1bj5c"; + }; + llbuild = fetch { + repo = "swift-llbuild"; + sha256 = "1l3hnb2s01jby91k1ipbc3bhszq14vyx5pzdhf2chld1yhpg420d"; + }; + pm = fetch { + repo = "swift-package-manager"; + sha256 = "05zijald08z4jbppjawlc0h9n0i4dvn6jnhq0i5b9qq55l7a1lrk"; + }; + xctest = fetch { + repo = "swift-corelibs-xctest"; + sha256 = "0cj5y7wanllfldag08ci567x12aw793c79afckpbsiaxmwy4xhnm"; + }; + foundation = fetch { + repo = "swift-corelibs-foundation"; + sha256 = "0d34clr7n0kfy0l94hmgg1cailg3bml0qzlhy8wh75hrrv3n4g1v"; + }; + libdispatch = fetch { + repo = "swift-corelibs-libdispatch"; + sha256 = "1rka7ijkdk4ybdvyk3map5mc1fm79v848v9nhpfq75m5i63r61bh"; + fetchSubmodules = true; + }; + swift = fetch { + repo = "swift"; + sha256 = "172q84z70z9gpwahmlcifihldrvc3cafy9ajbz4wi5f6ncw7wbmb"; + }; + }; + + devInputs = [ + curl + glibc + icu + libblocksruntime + libbsd + libedit + libuuid + libxml2 + ncurses + sqlite + swig + # systemtap? + ]; + + cmakeFlags = [ + "-DGLIBC_INCLUDE_PATH=${stdenv.cc.libc.dev}/include" + "-DC_INCLUDE_DIRS=${stdenv.lib.makeSearchPathOutput "dev" "include" devInputs}:${libxml2.dev}/include/libxml2" + "-DGCC_INSTALL_PREFIX=${clang.cc.gcc}" + ]; + + builder = '' + $SWIFT_SOURCE_ROOT/swift/utils/build-script \ + --preset=buildbot_linux \ + installable_package=$INSTALLABLE_PACKAGE \ + install_prefix=$out \ + install_destdir=$SWIFT_INSTALL_DIR \ + extra_cmake_options="${stdenv.lib.concatStringsSep "," cmakeFlags}"''; + +in +stdenv.mkDerivation rec { + name = "swift-${version_friendly}"; + + buildInputs = devInputs ++ [ + autoconf + automake + bash + clang + cmake + coreutils + libtool + ninja + perl + pkgconfig + python + rsync + which + findutils + ] ++ stdenv.lib.optional stdenv.needsPax paxctl; + + # TODO: Revisit what's propagated and how + propagatedBuildInputs = [ + libgit2 + python + ]; + propagatedUserEnvPkgs = [ git pkgconfig ]; + + hardeningDisable = [ "format" ]; # for LLDB + + configurePhase = '' + cd .. + + export INSTALLABLE_PACKAGE=$PWD/swift.tar.gz + + mkdir build install + export SWIFT_BUILD_ROOT=$PWD/build + export SWIFT_INSTALL_DIR=$PWD/install + + cd $SWIFT_BUILD_ROOT + + unset CC + unset CXX + + export NIX_ENFORCE_PURITY= + ''; + + unpackPhase = '' + mkdir src + cd src + export sourceRoot=$PWD + export SWIFT_SOURCE_ROOT=$PWD + + cp -r ${sources.clang} clang + cp -r ${sources.llvm} llvm + cp -r ${sources.compilerrt} compiler-rt + cp -r ${sources.cmark} cmark + cp -r ${sources.lldb} lldb + cp -r ${sources.llbuild} llbuild + cp -r ${sources.pm} swiftpm + cp -r ${sources.xctest} swift-corelibs-xctest + cp -r ${sources.foundation} swift-corelibs-foundation + cp -r ${sources.libdispatch} swift-corelibs-libdispatch + cp -r ${sources.swift} swift + + chmod -R u+w . + ''; + + patchPhase = '' + # Just patch all the things for now, we can focus this later + patchShebangs $SWIFT_SOURCE_ROOT + + substituteInPlace swift/stdlib/public/Platform/CMakeLists.txt \ + --replace '/usr/include' "${stdenv.cc.libc.dev}/include" + substituteInPlace swift/utils/build-script-impl \ + --replace '/usr/include/c++' "${clang.cc.gcc}/include/c++" + '' + stdenv.lib.optionalString stdenv.needsPax '' + patch -p1 -d swift -i ${./patches/build-script-pax.patch} + '' + '' + patch -p1 -d swift -i ${./patches/0001-build-presets-linux-don-t-require-using-Ninja.patch} + patch -p1 -d swift -i ${./patches/0002-build-presets-linux-allow-custom-install-prefix.patch} + patch -p1 -d swift -i ${./patches/0003-build-presets-linux-disable-tests.patch} + patch -p1 -d swift -i ${./patches/0004-build-presets-linux-plumb-extra-cmake-options.patch} + + substituteInPlace clang/lib/Driver/ToolChains.cpp \ + --replace ' addPathIfExists(D, SysRoot + "/usr/lib", Paths);' \ + ' addPathIfExists(D, SysRoot + "/usr/lib", Paths); addPathIfExists(D, "${glibc}/lib", Paths);' + patch -p1 -d clang -i ${./purity.patch} + + # Workaround hardcoded dep on "libcurses" (vs "libncurses"): + sed -i 's,curses,ncurses,' llbuild/*/*/CMakeLists.txt + substituteInPlace llbuild/tests/BuildSystem/Build/basic.llbuild \ + --replace /usr/bin/env $(type -p env) + + # This test fails on one of my machines, not sure why. + # Disabling for now. + rm llbuild/tests/Examples/buildsystem-capi.llbuild + + substituteInPlace swift-corelibs-foundation/lib/script.py \ + --replace /bin/cp $(type -p cp) + + PREFIX=''${out/#\/} + substituteInPlace swift-corelibs-xctest/build_script.py \ + --replace usr "$PREFIX" + substituteInPlace swiftpm/Utilities/bootstrap \ + --replace "usr" "$PREFIX" + ''; + + doCheck = false; + + buildPhase = builder; + + installPhase = '' + mkdir -p $out + + # Extract the generated tarball into the store + PREFIX=''${out/#\/} + tar xf $INSTALLABLE_PACKAGE -C $out --strip-components=3 $PREFIX + + paxmark pmr $out/bin/swift + paxmark pmr $out/bin/* + + # TODO: Use wrappers to get these on the PATH for swift tools, instead + ln -s ${clang}/bin/* $out/bin/ + ln -s ${binutils}/bin/ar $out/bin/ar + ''; + + meta = with stdenv.lib; { + description = "The Swift Programming Language"; + homepage = "https://github.com/apple/swift"; + maintainers = with maintainers; [ jb55 dtzWill ]; + license = licenses.asl20; + # Swift doesn't support 32bit Linux, unknown on other platforms. + platforms = [ "x86_64-linux" ]; + }; +} + diff --git a/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch b/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch new file mode 100644 index 00000000000..6ef83754a67 --- /dev/null +++ b/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch @@ -0,0 +1,25 @@ +From 1fc49285c7a198de14005803dfde64bda17f4120 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Tue, 28 Mar 2017 15:01:16 -0500 +Subject: [PATCH 1/4] build-presets: (linux) don't require using Ninja + +--- + utils/build-presets.ini | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/build-presets.ini b/utils/build-presets.ini +index 7ee57ad2df..e6b0af3581 100644 +--- a/utils/build-presets.ini ++++ b/utils/build-presets.ini +@@ -686,7 +686,7 @@ swiftpm + xctest + dash-dash + +-build-ninja ++# build-ninja + install-swift + install-lldb + install-llbuild +-- +2.12.2 + diff --git a/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch b/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch new file mode 100644 index 00000000000..0e18e8812a8 --- /dev/null +++ b/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch @@ -0,0 +1,25 @@ +From fca6624b7a0ad670157105336a737cc95f9ce9fb Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Tue, 28 Mar 2017 15:01:40 -0500 +Subject: [PATCH 2/4] build-presets: (linux) allow custom install prefix + +--- + utils/build-presets.ini | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/build-presets.ini b/utils/build-presets.ini +index e6b0af3581..1095cbaab7 100644 +--- a/utils/build-presets.ini ++++ b/utils/build-presets.ini +@@ -692,7 +692,7 @@ install-lldb + install-llbuild + install-swiftpm + install-xctest +-install-prefix=/usr ++install-prefix=%(install_prefix)s + swift-install-components=autolink-driver;compiler;clang-builtin-headers;stdlib;swift-remote-mirror;sdk-overlay;license + build-swift-static-stdlib + build-swift-static-sdk-overlay +-- +2.12.2 + diff --git a/pkgs/development/compilers/swift/patches/0003-build-presets-linux-disable-tests.patch b/pkgs/development/compilers/swift/patches/0003-build-presets-linux-disable-tests.patch new file mode 100644 index 00000000000..f647d9189dd --- /dev/null +++ b/pkgs/development/compilers/swift/patches/0003-build-presets-linux-disable-tests.patch @@ -0,0 +1,38 @@ +From fcc7c216da6cd255f884b7aa39f361786e3afa6a Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Tue, 28 Mar 2017 15:02:18 -0500 +Subject: [PATCH 3/4] build-presets: (linux) disable tests. + +--- + utils/build-presets.ini | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/utils/build-presets.ini b/utils/build-presets.ini +index 1095cbaab7..1739e91dc2 100644 +--- a/utils/build-presets.ini ++++ b/utils/build-presets.ini +@@ -700,7 +700,7 @@ build-swift-stdlib-unittest-extra + + # Executes the lit tests for the installable package that is created + # Assumes the swift-integration-tests repo is checked out +-test-installable-package ++# test-installable-package + + # Path to the root of the installation filesystem. + install-destdir=%(install_destdir)s +@@ -713,9 +713,9 @@ mixin-preset=mixin_linux_installation + build-subdir=buildbot_linux + lldb + release +-test +-validation-test +-long-test ++#test ++#validation-test ++#long-test + foundation + libdispatch + lit-args=-v +-- +2.12.2 + diff --git a/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch b/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch new file mode 100644 index 00000000000..5493196303c --- /dev/null +++ b/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch @@ -0,0 +1,25 @@ +From 4a46b12f580d0a9779937d07c4f1fd347570c4ef Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Tue, 28 Mar 2017 15:02:37 -0500 +Subject: [PATCH 4/4] build-presets: (linux) plumb extra-cmake-options + +--- + utils/build-presets.ini | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/utils/build-presets.ini b/utils/build-presets.ini +index 1739e91dc2..0608fed9c1 100644 +--- a/utils/build-presets.ini ++++ b/utils/build-presets.ini +@@ -708,6 +708,8 @@ install-destdir=%(install_destdir)s + # Path to the .tar.gz package we would create. + installable-package=%(installable_package)s + ++extra-cmake-options=%(extra_cmake_options)s ++ + [preset: buildbot_linux] + mixin-preset=mixin_linux_installation + build-subdir=buildbot_linux +-- +2.12.2 + diff --git a/pkgs/development/compilers/swift/patches/build-script-pax.patch b/pkgs/development/compilers/swift/patches/build-script-pax.patch new file mode 100644 index 00000000000..9f1976a2d88 --- /dev/null +++ b/pkgs/development/compilers/swift/patches/build-script-pax.patch @@ -0,0 +1,32 @@ +--- swift/utils/build-script-impl 2017-01-23 12:47:20.401326309 -0600 ++++ swift-pax/utils/build-script-impl 2017-01-23 13:24:10.339366996 -0600 +@@ -1823,6 +1823,16 @@ function set_lldb_xcodebuild_options() { + fi + } + ++## XXX: Taken from nixpkgs /pkgs/stdenv/generic/setup.sh ++isELF() { ++ local fn="$1" ++ local magic ++ exec {fd}< "$fn" ++ read -n 4 -u $fd magic ++ exec {fd}<&- ++ if [[ "$magic" =~ ELF ]]; then return 0; else return 1; fi ++} ++ + # + # Configure and build each product + # +@@ -2624,6 +2634,12 @@ for host in "${ALL_HOSTS[@]}"; do + fi + + call "${CMAKE_BUILD[@]}" "${build_dir}" $(cmake_config_opt ${product}) -- "${BUILD_ARGS[@]}" ${build_targets[@]} ++ ++ while IFS= read -r -d $'\0' i; do ++ if ! isELF "$i"; then continue; fi ++ echo "setting pax flags on $i" ++ paxctl -czexm "$i" || true ++ done < <(find "${build_dir}" -executable -type f -wholename "*/bin/*" -print0) + fi + done + done diff --git a/pkgs/development/compilers/swift/purity.patch b/pkgs/development/compilers/swift/purity.patch new file mode 100644 index 00000000000..f5fb4c73af4 --- /dev/null +++ b/pkgs/development/compilers/swift/purity.patch @@ -0,0 +1,16 @@ +--- a/lib/Driver/Tools.cpp 2016-08-25 15:48:05.187553443 +0200 ++++ b/lib/Driver/Tools.cpp 2016-08-25 15:48:47.534468882 +0200 +@@ -9420,13 +9420,6 @@ + if (!Args.hasArg(options::OPT_static)) { + if (Args.hasArg(options::OPT_rdynamic)) + CmdArgs.push_back("-export-dynamic"); +- +- if (!Args.hasArg(options::OPT_shared)) { +- const std::string Loader = +- D.DyldPrefix + ToolChain.getDynamicLinker(Args); +- CmdArgs.push_back("-dynamic-linker"); +- CmdArgs.push_back(Args.MakeArgString(Loader)); +- } + } + + CmdArgs.push_back("-o"); diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 985b4c9b9db..adac53f7828 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -1,4 +1,4 @@ -{ go, govers, parallel, lib, fetchgit, fetchhg, rsync }: +{ go, govers, parallel, lib, fetchgit, fetchhg, rsync, removeReferencesTo }: { name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? "" @@ -41,9 +41,7 @@ let removeReferences = [ ] ++ lib.optional (!allowGoReference) go; - removeExpr = refs: lib.flip lib.concatMapStrings refs (ref: '' - | sed "s,${ref},$(echo "${ref}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" \ - ''); + removeExpr = refs: ''remove-references-to ${lib.concatMapStrings (ref: " -t ${ref}") refs}''; dep2src = goDep: { @@ -70,7 +68,7 @@ go.stdenv.mkDerivation ( (builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // { inherit name; - nativeBuildInputs = [ go parallel ] + nativeBuildInputs = [ removeReferencesTo go parallel ] ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs; buildInputs = [ go ] ++ buildInputs; @@ -186,11 +184,7 @@ go.stdenv.mkDerivation ( ''; preFixup = preFixup + '' - while read file; do - cat $file ${removeExpr removeReferences} > $file.tmp - mv $file.tmp $file - chmod +x $file - done < <(find $bin/bin -type f 2>/dev/null) + find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + ''; shellHook = '' diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 85839b6492a..d84db527951 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -55,6 +55,7 @@ self: super: { # check requires mysql server mysql-simple = dontCheck super.mysql-simple; + mysql-haskell = dontCheck super.mysql-haskell; # Link the proper version. zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; }; @@ -282,6 +283,7 @@ self: super: { etcd = dontCheck super.etcd; fb = dontCheck super.fb; # needs credentials for Facebook fptest = dontCheck super.fptest; # http://hydra.cryp.to/build/499124/log/raw + friday-juicypixels = dontCheck super.friday-juicypixels; #tarball missing test/rgba8.png ghc-events = dontCheck super.ghc-events; # http://hydra.cryp.to/build/498226/log/raw ghc-events-parallel = dontCheck super.ghc-events-parallel; # http://hydra.cryp.to/build/496828/log/raw ghc-imported-from = dontCheck super.ghc-imported-from; @@ -481,17 +483,6 @@ self: super: { # https://github.com/afcowie/locators/issues/1 locators = dontCheck super.locators; - # https://github.com/haskell/haddock/issues/378 - haddock-library = dontCheck super.haddock-library; - - # https://github.com/haskell/haddock/issues/571 - haddock-api = appendPatch (doJailbreak super.haddock-api) (pkgs.fetchpatch { - url = "https://github.com/basvandijk/haddock/commit/f4c5e46ded05a4b8884f5ad6f3102f79ff3bb127.patch"; - sha256 = "01dawvikzw6y43557sbp9q7z9vw2g3wnzvv5ny0f0ks6ccc0vj0m"; - stripLen = 2; - addPrefixes = true; - }); - # https://github.com/anton-k/csound-expression-dynamic/issues/1 csound-expression-dynamic = dontHaddock super.csound-expression-dynamic; @@ -752,6 +743,9 @@ self: super: { # https://github.com/pontarius/pontarius-xmpp/issues/105 pontarius-xmpp = dontCheck super.pontarius-xmpp; + # fails with sandbox + yi-keymap-vim = dontCheck super.yi-keymap-vim; + # https://github.com/bmillwood/applicative-quoters/issues/6 applicative-quoters = doJailbreak super.applicative-quoters; @@ -824,12 +818,6 @@ self: super: { # https://github.com/xmonad/xmonad-extras/issues/3 xmonad-extras = doJailbreak super.xmonad-extras; - # https://github.com/bmillwood/pointfree/issues/21 - pointfree = appendPatch super.pointfree (pkgs.fetchpatch { - url = "https://github.com/bmillwood/pointfree/pull/22.patch"; - sha256 = "04q0b5d78ill2yrpflkphvk2y38qc50si2qff4bllp47wj42aqmp"; - }); - # https://github.com/int-e/QuickCheck-safe/issues/2 QuickCheck-safe = doJailbreak super.QuickCheck-safe; @@ -872,13 +860,13 @@ self: super: { # https://github.com/diagrams/diagrams-lib/issues/288 diagrams-lib = overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; }); - # https://github.com/cartazio/arithmoi/issues/49 - arithmoi = overrideCabal super.arithmoi (drv: { doCheck = !pkgs.stdenv.isi686; }); - # https://github.com/danidiaz/streaming-eversion/issues/1 streaming-eversion = dontCheck super.streaming-eversion; # strict-io is too cautious with it's deepseq dependency # strict-io doesn't have a working bug tracker, the author has been emailed however. strict-io = doJailbreak super.strict-io; + + # https://github.com/danidiaz/tailfile-hinotify/issues/2 + tailfile-hinotify = dontCheck super.tailfile-hinotify; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix index 03a905ea3d1..6be7ae16572 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix @@ -41,7 +41,7 @@ self: super: { unix = null; # These packages are core libraries in GHC 7.10.x, but not here. - binary = self.binary_0_8_4_1; + binary = self.binary_0_8_5_1; deepseq = self.deepseq_1_3_0_1; haskeline = self.haskeline_0_7_3_1; hoopl = self.hoopl_3_10_2_0; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index ee6e59c65ef..18ebe5c8e1a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -42,7 +42,7 @@ self: super: { xhtml = self.xhtml_3000_2_1; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_4_1; process = self.process_1_2_3_0; }; + Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_5_1; process = self.process_1_2_3_0; }; # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index 3bbfa34fb50..111852ab34b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -41,10 +41,10 @@ self: super: { xhtml = self.xhtml_3000_2_1; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_4_1; }; + Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_5_1; }; # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. - cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_4_1; }); + cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_5_1; }); # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; @@ -92,7 +92,8 @@ self: super: { # Needs tagged on pre 7.6.x compilers. reflection = addBuildDepend super.reflection self.tagged; - # Needs nats on pre 7.6.x compilers. - semigroups = addBuildDepend super.semigroups self.nats; + # These builds Need additional dependencies on pre 7.6.x compilers. + semigroups = addBuildDepends super.semigroups (with self; [nats bytestring-builder tagged unordered-containers transformers]); + QuickCheck = addBuildDepends super.QuickCheck (with self; [nats semigroups]); } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index 27fed51e6fc..4ef1aa56211 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -39,11 +39,8 @@ self: super: { transformers = self.transformers_0_4_3_0; xhtml = self.xhtml_3000_2_1; - # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_4_1; }; - # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. - cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_4_1; }); + cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_5_1; }); # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; @@ -101,6 +98,12 @@ self: super: { lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]); distributive = addBuildDepend super.distributive self.semigroups; QuickCheck = addBuildDepend super.QuickCheck self.semigroups; + void = addBuildDepends super.void (with self; [hashable semigroups]); + + # Need a newer version of Cabal to interpret their build instructions. + cmdargs = addSetupDepend super.cmdargs self.Cabal_1_24_2_0; + extra = addSetupDepend super.extra self.Cabal_1_24_2_0; + hlint = addSetupDepend super.hlint self.Cabal_1_24_2_0; # Haddock doesn't cope with the new markup. bifunctors = dontHaddock super.bifunctors; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index 1be8f16a7d5..1a151efcf38 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -139,12 +139,21 @@ self: super: { conduit = addBuildDepend super.conduit self.void; conduit_1_2_5 = addBuildDepend super.conduit_1_2_5 self.void; + # Breaks a dependency cycle between QuickCheck and semigroups + hashable = dontCheck super.hashable; + unordered-containers = dontCheck super.unordered-containers; + # Needs additional inputs on pre 7.10.x compilers. semigroups = addBuildDepends super.semigroups (with self; [nats tagged unordered-containers]); lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]); distributive = addBuildDepend super.distributive self.semigroups; + QuickCheck = addBuildDepends super.QuickCheck (with self; [nats semigroups]); + void = addBuildDepends super.void (with self; [hashable semigroups]); # Haddock doesn't cope with the new markup. bifunctors = dontHaddock super.bifunctors; + # extra-test: : hFlush: invalid argument (Bad file descriptor) + extra = dontCheck super.extra; + } diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index bea914354de..d6d7277cc9d 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -53,6 +53,14 @@ self: super: terminfo = self.terminfo_0_4_0_2; xhtml = self.xhtml_3000_2_1; + # Cabal isn't part of the stage1 packages which form the default package-db + # that GHCJS provides. + # Almost all packages require Cabal to build their Setup.hs, + # but usually they don't declare it explicitly as they don't need to for normal GHC. + # To account for that we add Cabal by default. + mkDerivation = args: + if args.pname == "Cabal" then super.mkDerivation args else super.mkDerivation (args // + { setupHaskellDepends = (args.setupHaskellDepends or []) ++ [ self.Cabal ]; }); ## OTHER PACKAGES @@ -181,8 +189,6 @@ self: super: ] drv.libraryHaskellDepends; }); - semigroups = addBuildDepends super.semigroups [ self.hashable self.unordered-containers self.text self.tagged ]; - transformers-compat = overrideCabal super.transformers-compat (drv: { configureFlags = []; }); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index b693a55de55..2e0b75ce56f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -38,7 +38,7 @@ core-packages: default-package-overrides: - store < 0.4.1 # https://github.com/fpco/store/issues/104 - # LTS Haskell 8.4 + # LTS Haskell 8.8 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -65,7 +65,7 @@ default-package-overrides: - airship ==0.6.0 - alarmclock ==0.4.0.2 - alex ==3.2.1 - - alternators ==0.1.1.0 + - alternators ==0.1.1.1 - ALUT ==2.4.0.2 - amazonka ==1.4.5 - amazonka-apigateway ==1.4.5 @@ -163,7 +163,7 @@ default-package-overrides: - ansi-terminal ==0.6.2.3 - ansi-wl-pprint ==0.6.7.3 - ansigraph ==0.3.0.2 - - app-settings ==0.2.0.10 + - app-settings ==0.2.0.11 - appar ==0.1.4 - arbtt ==0.9.0.12 - arithmoi ==0.4.3.0 @@ -197,7 +197,7 @@ default-package-overrides: - b9 ==0.5.31 - bake ==0.5 - bank-holidays-england ==0.1.0.5 - - base-compat ==0.9.1 + - base-compat ==0.9.2 - base-noprelude ==4.9.1.0 - base-orphans ==0.5.4 - base-prelude ==1.0.1.1 @@ -209,9 +209,11 @@ default-package-overrides: - base64-string ==0.2 - basic-prelude ==0.6.1.1 - bcrypt ==0.0.10 + - bench ==1.0.3 - benchpress ==0.2.2.9 - bencode ==0.6.0.0 - bento ==0.1.0 + - between ==0.11.0.0 - bifunctors ==5.4.1 - bimap ==0.3.2 - bimap-server ==0.1.0.1 @@ -235,12 +237,14 @@ default-package-overrides: - biofastq ==0.1 - biopsl ==0.4 - bitarray ==0.0.1.1 + - bitcoin-api ==0.12.1 + - bitcoin-api-extra ==0.9.1 - bitcoin-block ==0.13.1 - bitcoin-script ==0.11.1 - bitcoin-tx ==0.13.1 - bitcoin-types ==0.9.2 - bits ==0.5 - - bitx-bitcoin ==0.11.0.0 + - bitx-bitcoin ==0.11.0.1 - blake2 ==0.2.0 - blank-canvas ==0.6 - BlastHTTP ==1.2.1 @@ -249,13 +253,15 @@ default-package-overrides: - blaze-builder ==0.4.0.2 - blaze-html ==0.8.1.3 - blaze-markup ==0.7.1.1 - - blaze-svg ==0.3.6 + - blaze-svg ==0.3.6.1 - blaze-textual ==0.2.1.0 - BlogLiterately ==0.8.4.3 - BlogLiterately-diagrams ==0.2.0.5 - bloodhound ==0.12.1.0 - blosum ==0.1.1.4 - bmp ==1.2.6.3 + - boltzmann-samplers ==0.1.0.0 + - bookkeeping ==0.2.1.1 - bool-extras ==0.4.0 - Boolean ==0.2.4 - boolean-like ==0.1.1.0 @@ -266,7 +272,7 @@ default-package-overrides: - boundingboxes ==0.2.3 - bower-json ==1.0.0.1 - boxes ==0.1.4 - - brick ==0.17.1 + - brick ==0.17.2 - broadcast-chan ==0.1.1 - bson ==0.3.2.3 - bson-lens ==0.1.1 @@ -294,13 +300,13 @@ default-package-overrides: - cabal-doctest ==1 - cabal-file-th ==0.2.4 - cabal-helper ==0.7.3.0 - - cabal-rpm ==0.11 + - cabal-rpm ==0.11.1 - cache ==0.1.0.0 - - cacophony ==0.9.1 + - cacophony ==0.9.2 - cairo ==0.13.3.1 - call-stack ==0.1.0 - camfort ==0.901 - - carray ==0.1.6.5 + - carray ==0.1.6.6 - cartel ==0.18.0.2 - case-insensitive ==1.2.0.8 - cased ==0.1.0.0 @@ -362,12 +368,12 @@ default-package-overrides: - clumpiness ==0.17.0.0 - ClustalParser ==1.2.1 - clustering ==0.3.1 - - cmark ==0.5.5 + - cmark ==0.5.5.1 - cmark-highlight ==0.2.0.0 - cmark-lucid ==0.1.0.0 - - cmdargs ==0.10.14 + - cmdargs ==0.10.17 - code-builder ==0.1.3 - - code-page ==0.1.2 + - code-page ==0.1.3 - codo-notation ==0.5.2 - colorful-monoids ==0.2.1.0 - colour ==2.3.3 @@ -382,7 +388,7 @@ default-package-overrides: - concurrent-output ==1.7.9 - concurrent-supply ==0.1.8 - conduit ==1.2.9 - - conduit-combinators ==1.1.0 + - conduit-combinators ==1.1.1 - conduit-connection ==0.1.0.3 - conduit-extra ==1.1.15 - conduit-iconv ==0.1.1.1 @@ -391,9 +397,10 @@ default-package-overrides: - configuration-tools ==0.2.15 - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 - - connection ==0.2.7 + - connection ==0.2.8 + - connection-pool ==0.2.1 - console-style ==0.0.2.1 - - constraints ==0.9 + - constraints ==0.9.1 - consul-haskell ==0.4.2 - containers-unicode-symbols ==0.3.1.1 - contravariant ==1.4 @@ -402,6 +409,10 @@ default-package-overrides: - control-monad-free ==0.6.1 - control-monad-loop ==0.1 - control-monad-omega ==0.3.1 + - conversion ==1.2.1 + - conversion-bytestring ==1.0.1 + - conversion-case-insensitive ==1.0.0.0 + - conversion-text ==1.0.1 - convert-annotation ==0.5.0.1 - convertible ==1.1.1.0 - cookie ==0.4.2.1 @@ -437,6 +448,7 @@ default-package-overrides: - cryptonite ==0.21 - cryptonite-conduit ==0.2.0 - cryptonite-openssl ==0.5 + - csp ==1.3.1 - css-syntax ==0.0.5 - css-text ==0.1.2.2 - csv ==0.1.2 @@ -500,11 +512,13 @@ default-package-overrides: - directory-tree ==0.12.1 - discount ==0.1.1 - disk-free-space ==0.1.0.1 + - disposable ==0.2.0.3 - distance ==0.1.0.0 - - distributed-closure ==0.3.3.0 + - distributed-closure ==0.3.4.0 - distributed-process ==0.6.6 - distributed-process-simplelocalnet ==0.2.3.3 - distributed-static ==0.3.5.0 + - distribution ==1.1.0.0 - distribution-nixpkgs ==1.0.0.1 - distributive ==0.5.2 - diversity ==0.8.0.2 @@ -533,6 +547,7 @@ default-package-overrides: - drifter ==0.2.2 - drifter-postgresql ==0.1.0 - dual-tree ==0.2.0.9 + - dvorak ==0.1.0.0 - dynamic-state ==0.2.2.0 - dyre ==0.8.12 - Earley ==0.11.0.1 @@ -546,12 +561,14 @@ default-package-overrides: - edit-distance ==0.2.2.1 - editor-open ==0.6.0.0 - effect-handlers ==0.1.0.8 + - effin ==0.3.0.2 - either ==4.4.1.1 - either-unwrap ==1.1 - ekg ==0.4.0.12 - ekg-core ==0.1.1.1 - ekg-json ==0.1.0.4 - ekg-statsd ==0.2.1.0 + - ekg-wai ==0.1.0.0 - elerea ==2.9.0 - elm-bridge ==0.4.0 - elm-core-sources ==1.0.0 @@ -561,6 +578,8 @@ default-package-overrides: - emailaddress ==0.2.0.0 - enclosed-exceptions ==1.0.2 - encoding-io ==0.0.1 + - engine-io ==1.2.15 + - engine-io-wai ==1.0.6 - EntrezHTTP ==1.0.3 - entropy ==0.3.7 - enummapset-th ==0.6.1.1 @@ -586,7 +605,7 @@ default-package-overrides: - exceptional ==0.3.0.0 - exceptions ==0.8.3 - executable-hash ==0.2.0.4 - - executable-path ==0.0.3 + - executable-path ==0.0.3.1 - exhaustive ==1.1.3 - exp-pairs ==0.1.5.2 - expiring-cache-map ==0.0.6.1 @@ -594,6 +613,7 @@ default-package-overrides: - extensible-effects ==1.11.0.4 - extensible-exceptions ==0.1.1.4 - extra ==1.5.1 + - extract-dependencies ==0.2.0.1 - fail ==4.9.0.0 - farmhash ==0.1.0.5 - fast-builder ==0.0.0.6 @@ -611,7 +631,7 @@ default-package-overrides: - feature-flags ==0.1.0.1 - feed ==0.3.12.0 - FenwickTree ==0.1.2.1 - - fft ==0.1.8.4 + - fft ==0.1.8.5 - fgl ==5.5.3.1 - fgl-arbitrary ==0.2.0.3 - file-embed ==0.0.10 @@ -637,7 +657,7 @@ default-package-overrides: - focus ==0.1.5 - fold-debounce ==0.2.0.5 - fold-debounce-conduit ==0.1.0.5 - - foldl ==1.2.3 + - foldl ==1.2.4 - foldl-statistics ==0.1.4.2 - folds ==0.7.1 - FontyFruity ==0.5.3.2 @@ -646,10 +666,13 @@ default-package-overrides: - format-numbers ==0.1.0.0 - formatting ==6.2.4 - fortran-src ==0.1.0.4 + - foundation ==0.0.4 - Frames ==0.1.9 - free ==4.12.4 - free-vl ==0.1.4 - freenect ==1.2.1 + - freer ==0.2.4.1 + - freer-effects ==0.3.0.0 - friendly-time ==0.4 - frisby ==0.2 - from-sum ==0.2.1.0 @@ -660,9 +683,10 @@ default-package-overrides: - fuzzcheck ==0.1.1 - gd ==3000.7.3 - Genbank ==1.0.3 + - general-games ==1.0.5 - generic-aeson ==0.2.0.8 - generic-deriving ==1.11.1 - - generic-random ==0.4.0.0 + - generic-random ==0.4.1.0 - generic-xmlpickler ==0.1.0.5 - GenericPretty ==1.2.1 - generics-eot ==0.2.1.1 @@ -672,7 +696,7 @@ default-package-overrides: - getopt-generics ==0.13 - ghc-events ==0.4.4.0 - ghc-exactprint ==0.5.3.0 - - ghc-heap-view ==0.5.7 + - ghc-heap-view ==0.5.9 - ghc-mod ==5.7.0.0 - ghc-paths ==0.1.0.9 - ghc-prof ==1.3.0.2 @@ -682,9 +706,10 @@ default-package-overrides: - ghc-typelits-knownnat ==0.2.3 - ghc-typelits-natnormalise ==0.5.2 - ghcid ==0.6.6 + - ghcjs-base-stub ==0.1.0.2 - ghcjs-codemirror ==0.0.0.1 - ghcjs-hplay ==0.3.4.2 - - ghcjs-perch ==0.3.3.1 + - ghcjs-perch ==0.3.3.2 - gi-atk ==2.0.11 - gi-cairo ==1.0.11 - gi-gdk ==3.0.11 @@ -701,6 +726,7 @@ default-package-overrides: - gio ==0.13.3.1 - gipeda ==0.3.3.1 - giphy-api ==0.5.2.0 + - git ==0.2.0 - github ==0.15.0 - github-release ==1.0.1 - github-types ==0.2.1 @@ -832,6 +858,12 @@ default-package-overrides: - gravatar ==0.8.0 - graylog ==0.1.0.1 - groom ==0.1.2 + - groundhog ==0.8 + - groundhog-inspector ==0.8 + - groundhog-mysql ==0.8 + - groundhog-postgresql ==0.8 + - groundhog-sqlite ==0.8 + - groundhog-th ==0.8 - grouped-list ==0.2.1.2 - groupoids ==4.0 - groups ==0.4.0.0 @@ -851,23 +883,26 @@ default-package-overrides: - hamilton ==0.1.0.0 - hamlet ==1.2.0 - HandsomeSoup ==0.4.2 + - handwriting ==0.1.0.3 - hapistrano ==0.2.1.2 - happstack-authenticate ==2.3.4.7 - happstack-clientsession ==7.3.1 - - happstack-hsp ==7.3.7.1 + - happstack-hsp ==7.3.7.2 - happstack-jmacro ==7.0.11 - - happstack-server ==7.4.6.3 + - happstack-server ==7.4.6.4 - happstack-server-tls ==7.1.6.2 - happy ==1.19.5 + - HaRe ==0.8.4.0 - harp ==0.4.2 - - hasbolt ==0.1.1.1 - - hashable ==1.2.5.0 + - hasbolt ==0.1.1.2 + - hashable ==1.2.6.0 - hashable-time ==0.2 - hashmap ==1.3.2 - - hashtables ==1.2.1.0 + - hashtables ==1.2.1.1 - haskeline ==0.7.3.1 - - haskell-gi ==0.20 - - haskell-gi-base ==0.20 + - haskell-gi ==0.20.1 + - haskell-gi-base ==0.20.1 + - haskell-import-graph ==1.0.1 - haskell-lexer ==1.0.1 - haskell-names ==0.8.0 - haskell-neo4j-client ==0.3.2.4 @@ -916,12 +951,14 @@ default-package-overrides: - heterocephalus ==1.0.4.0 - hex ==0.1.2 - hexml ==0.3.1 + - hexpat ==0.20.10 - hexstring ==0.11.1 - hflags ==0.4.2 - hformat ==0.1.0.1 - hfsevents ==0.1.6 - hid ==0.2.2 - hidapi ==0.1.4 + - hidden-char ==0.1.0.0 - hierarchical-clustering ==0.4.6 - highjson ==0.4.0.0 - highjson-swagger ==0.4.0.0 @@ -938,7 +975,7 @@ default-package-overrides: - hjsonpointer ==1.1.0.2 - hjsonschema ==1.5.0.1 - hlibgit2 ==0.18.0.16 - - hlibsass ==0.1.5.0 + - hlibsass ==0.1.6.0 - hlint ==1.9.41 - hmatrix ==0.18.0.0 - hmatrix-gsl ==0.18.0.1 @@ -953,6 +990,7 @@ default-package-overrides: - hOpenPGP ==2.5.5 - hopenpgp-tools ==0.19.4 - hopenssl ==1.7 + - hopfli ==0.2.1.1 - hosc ==0.15 - hostname ==1.0 - hostname-validate ==1.0.0 @@ -969,7 +1007,7 @@ default-package-overrides: - hruby ==0.3.4.3 - hs-bibutils ==5.5 - hs-GeoIP ==0.3 - - hsass ==0.4.0 + - hsass ==0.4.1 - hsb2hs ==0.3.1 - hscolour ==1.24.1 - hsdns ==1.7 @@ -978,21 +1016,21 @@ default-package-overrides: - hsemail ==1.7.7 - HSet ==0.0.0 - hset ==2.2.0 - - hsexif ==0.6.1.0 + - hsexif ==0.6.1.1 - hsignal ==0.2.7.5 - hsinstall ==1.5 - hslogger ==1.2.10 - hslua ==0.4.1 - hsndfile ==0.8.0 - hsndfile-vector ==0.5.2 - - HsOpenSSL ==0.11.4.1 + - HsOpenSSL ==0.11.4.4 - HsOpenSSL-x509-system ==0.1.0.3 - hsp ==0.10.0 - - hspec ==2.4.2 + - hspec ==2.4.3 - hspec-attoparsec ==0.1.0.2 - hspec-contrib ==0.4.0 - - hspec-core ==2.4.2 - - hspec-discover ==2.4.2 + - hspec-core ==2.4.3 + - hspec-discover ==2.4.3 - hspec-expectations ==0.8.2 - hspec-expectations-pretty-diff ==0.7.2.4 - hspec-golden-aeson ==0.2.0.3 @@ -1015,7 +1053,7 @@ default-package-overrides: - html-conduit ==1.2.1.1 - html-email-validate ==0.2.0.0 - htoml ==1.0.0.3 - - HTTP ==4000.3.5 + - HTTP ==4000.3.6 - http-api-data ==0.3.5 - http-client ==0.5.6.1 - http-client-openssl ==0.2.0.4 @@ -1025,7 +1063,7 @@ default-package-overrides: - http-date ==0.0.6.1 - http-link-header ==1.0.3 - http-media ==0.6.4 - - http-reverse-proxy ==0.4.3.2 + - http-reverse-proxy ==0.4.3.3 - http-streams ==0.8.4.0 - http-types ==0.9.1 - http2 ==1.6.3 @@ -1061,7 +1099,8 @@ default-package-overrides: - hyphenation ==0.6 - ical ==0.0.1 - iconv ==0.4.1.3 - - identicon ==0.2.0 + - identicon ==0.2.1 + - idris ==1.0 - ieee754 ==0.8.0 - if ==0.1.0.0 - IfElse ==0.85 @@ -1099,7 +1138,7 @@ default-package-overrides: - io-memoize ==1.1.1.0 - io-region ==0.1.1 - io-storage ==0.3 - - io-streams ==1.3.6.0 + - io-streams ==1.3.6.1 - io-streams-haproxy ==1.0.0.1 - ip6addr ==0.5.2 - iproute ==1.7.1 @@ -1108,11 +1147,12 @@ default-package-overrides: - irc-client ==0.4.4.1 - irc-conduit ==0.2.2.1 - irc-ctcp ==0.1.3.0 - - irc-dcc ==2.0.0 + - irc-dcc ==2.0.1 - islink ==0.1.0.0 - iso3166-country-codes ==0.20140203.8 - iso639 ==0.1.0.3 - iso8601-time ==0.1.4 + - isotope ==0.4.0.0 - iterable ==3.0 - ix-shapable ==0.1.0 - ixset ==1.0.7 @@ -1132,7 +1172,7 @@ default-package-overrides: - json-rpc-generic ==0.2.1.2 - json-schema ==0.7.4.1 - json-stream ==0.4.1.3 - - JuicyPixels ==3.2.8 + - JuicyPixels ==3.2.8.1 - JuicyPixels-extra ==0.1.1 - JuicyPixels-scale-dct ==0.1.1.2 - jvm ==0.1.2 @@ -1151,11 +1191,11 @@ default-package-overrides: - knob ==0.1.1 - koofr-client ==1.0.0.3 - kraken ==0.0.3 - - l10n ==0.1.0.0 + - l10n ==0.1.0.1 - labels ==0.3.2 - lackey ==0.4.2 - language-c ==0.5.0 - - language-c-quote ==0.11.7.1 + - language-c-quote ==0.11.7.3 - language-dockerfile ==0.3.5.0 - language-ecmascript ==0.17.1.0 - language-fortran ==0.5.1 @@ -1165,10 +1205,10 @@ default-package-overrides: - language-javascript ==0.6.0.9 - language-lua2 ==0.1.0.5 - language-nix ==2.1.0.1 - - language-puppet ==1.3.6 + - language-puppet ==1.3.7 - language-python ==0.5.4 - language-thrift ==0.10.0.0 - - large-hashable ==0.1.0.3 + - large-hashable ==0.1.0.4 - largeword ==1.2.5 - lattices ==1.5.0 - lazy-csv ==0.5.1 @@ -1187,6 +1227,7 @@ default-package-overrides: - leveldb-haskell ==0.6.4 - lexer-applicative ==2.1.0.1 - lhs2tex ==1.19 + - libffi ==0.1 - libgit ==0.3.1 - libinfluxdb ==0.0.4 - libmpd ==0.9.0.6 @@ -1212,7 +1253,7 @@ default-package-overrides: - lmdb ==0.2.5 - loch-th ==0.2.1 - log ==0.7 - - log-base ==0.7 + - log-base ==0.7.1 - log-domain ==0.11 - log-elasticsearch ==0.7 - log-postgres ==0.7 @@ -1229,7 +1270,7 @@ default-package-overrides: - lzma-conduit ==1.1.3.1 - machines ==0.6.1 - machines-binary ==0.3.0.3 - - machines-directory ==0.2.0.10 + - machines-directory ==0.2.1.0 - machines-io ==0.2.0.13 - machines-process ==0.2.0.8 - magic ==1.1 @@ -1240,8 +1281,11 @@ default-package-overrides: - markdown ==0.1.16 - markdown-unlit ==0.4.0 - markup ==3.1.0 + - marvin ==0.2.3 + - marvin-interpolate ==1.1 - math-functions ==0.2.1.0 - mathexpr ==0.3.0.0 + - matplotlib ==0.4.3 - matrices ==0.4.4 - matrix ==0.3.5.0 - matrix-market-attoparsec ==0.1.0.5 @@ -1249,9 +1293,9 @@ default-package-overrides: - mbox ==0.3.3 - mcmc-types ==1.0.3 - median-stream ==0.7.0.0 - - mega-sdist ==0.3.0 + - mega-sdist ==0.3.0.2 - megaparsec ==5.2.0 - - memory ==0.14.1 + - memory ==0.14.3 - MemoTrie ==0.6.7 - mersenne-random ==1.0.0.1 - mersenne-random-pure64 ==0.2.2.0 @@ -1262,21 +1306,22 @@ default-package-overrides: - mfsolve ==0.3.2.0 - microbench ==0.1 - microformats2-parser ==1.0.1.6 - - microlens ==0.4.7.0 + - microlens ==0.4.8.0 - microlens-aeson ==2.2.0 - microlens-contra ==0.1.0.1 - - microlens-ghc ==0.4.7.0 + - microlens-ghc ==0.4.8.0 - microlens-mtl ==0.1.10.0 - - microlens-platform ==0.3.7.1 + - microlens-platform ==0.3.8.0 - microlens-th ==0.4.1.1 - mighty-metropolis ==1.2.0 - - mime-mail ==0.4.13 + - mime-mail ==0.4.13.1 - mime-mail-ses ==0.3.2.3 - mime-types ==0.1.0.7 - - mintty ==0.1 + - mintty ==0.1.1 - misfortune ==0.1.1.2 - missing-foreign ==0.1.1 - MissingH ==1.4.0.1 + - mixed-types-num ==0.1.0.1 - mmap ==0.5.9 - mmorph ==1.0.9 - mockery ==0.3.4 @@ -1286,7 +1331,7 @@ default-package-overrides: - monad-extras ==0.6.0 - monad-http ==0.1.0.0 - monad-journal ==0.7.2 - - monad-logger ==0.3.20.2 + - monad-logger ==0.3.22 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.6 - monad-logger-syslog ==0.1.3.0 @@ -1298,7 +1343,7 @@ default-package-overrides: - monad-peel ==0.2.1.2 - monad-primitive ==0.1 - monad-products ==4.0.1 - - monad-skeleton ==0.1.3 + - monad-skeleton ==0.1.3.2 - monad-time ==0.2 - monad-unlift ==0.2.0 - monad-unlift-ref ==0.2.0 @@ -1330,6 +1375,7 @@ default-package-overrides: - multistate ==0.7.1.1 - murmur-hash ==0.1.0.9 - MusicBrainz ==0.2.4 + - mustache ==2.1.3 - mutable-containers ==0.3.3 - mwc-probability ==1.3.0 - mwc-random ==0.13.5.0 @@ -1380,6 +1426,7 @@ default-package-overrides: - nix-paths ==1.0.0.1 - non-empty-sequence ==0.2.0.2 - nonce ==1.0.2 + - nondeterminism ==1.4 - NoTrace ==0.3.0.1 - nsis ==0.3.1 - numbers ==3000.2.0.1 @@ -1391,7 +1438,7 @@ default-package-overrides: - ObjectName ==1.1.0.1 - octane ==0.18.2 - Octree ==0.5.4.3 - - oeis ==0.3.8 + - oeis ==0.3.9 - ofx ==0.4.2.0 - old-locale ==1.0.0.7 - old-time ==1.1.0.3 @@ -1413,13 +1460,14 @@ default-package-overrides: - opml-conduit ==0.6.0.1 - optional-args ==1.0.1 - options ==1.2.1.1 - - optparse-applicative ==0.13.1.0 + - optparse-applicative ==0.13.2.0 - optparse-generic ==1.1.4 - optparse-helper ==0.2.1.1 - optparse-simple ==0.0.3 - optparse-text ==0.1.1.0 - osdkeys ==0.0 - overloaded-records ==0.4.2.0 + - package-description-remote ==0.2.0.0 - packdeps ==0.4.3 - pager ==0.1.1.0 - pagerduty ==0.0.8 @@ -1439,7 +1487,7 @@ default-package-overrides: - partial-handler ==1.0.2 - partial-isomorphisms ==0.2.2 - patat ==0.5.0.0 - - path ==0.5.12 + - path ==0.5.13 - path-extra ==0.0.3 - path-io ==1.2.2 - path-pieces ==0.2.1 @@ -1457,13 +1505,13 @@ default-package-overrides: - permutation ==0.5.0.5 - persistable-record ==0.4.1.1 - persistable-types-HDBC-pg ==0.0.1.4 - - persistent ==2.6 - - persistent-mysql ==2.6 - - persistent-postgresql ==2.6 + - persistent ==2.6.1 + - persistent-mysql ==2.6.0.1 + - persistent-postgresql ==2.6.1 - persistent-redis ==2.5.2 - persistent-refs ==0.4 - - persistent-sqlite ==2.6.0.1 - - persistent-template ==2.5.1.6 + - persistent-sqlite ==2.6.2 + - persistent-template ==2.5.2 - pgp-wordlist ==0.1.0.2 - phantom-state ==0.2.1.2 - picedit ==0.2.3.0 @@ -1473,7 +1521,7 @@ default-package-overrides: - pinch ==0.3.0.2 - pinchot ==0.24.0.0 - pipes ==4.3.2 - - pipes-attoparsec ==0.5.1.4 + - pipes-attoparsec ==0.5.1.5 - pipes-bytestring ==2.1.4 - pipes-cacophony ==0.4.1 - pipes-category ==0.2.0.1 @@ -1493,7 +1541,7 @@ default-package-overrides: - pkcs10 ==0.2.0.0 - placeholders ==0.1 - plan-b ==0.2.0 - - plot ==0.2.3.6 + - plot ==0.2.3.7 - plot-gtk ==0.2.0.4 - plot-gtk-ui ==0.3.0.2 - plot-gtk3 ==0.1.0.2 @@ -1509,12 +1557,13 @@ default-package-overrides: - post-mess-age ==0.2.1.0 - postgresql-binary ==0.9.3 - postgresql-libpq ==0.9.3.0 + - postgresql-schema ==0.1.10 - postgresql-simple ==0.5.2.1 - postgresql-simple-migration ==0.1.9.0 - postgresql-simple-url ==0.2.0.0 - postgresql-transactional ==1.1.1 - - postgresql-typed ==0.5.0 - - pqueue ==1.3.2 + - postgresql-typed ==0.5.1 + - pqueue ==1.3.2.2 - pred-set ==0.0.1 - prednote ==0.36.0.4 - prefix-units ==0.2.0 @@ -1522,6 +1571,7 @@ default-package-overrides: - prelude-safeenum ==0.1.1.2 - preprocessor-tools ==1.0.1 - presburger ==1.3.1 + - present ==4.1.0 - pretty-class ==1.0.1.1 - pretty-hex ==1.0 - pretty-show ==1.6.12 @@ -1533,7 +1583,7 @@ default-package-overrides: - printcess ==0.1.0.3 - process-extras ==0.7.1 - product-profunctors ==0.7.1.0 - - profiteur ==0.4.2.1 + - profiteur ==0.4.2.2 - profunctor-extras ==4.0 - profunctors ==5.2 - project-template ==0.2.0 @@ -1542,7 +1592,7 @@ default-package-overrides: - prometheus-metrics-ghc ==0.1.0.1 - prompt ==0.1.1.2 - protobuf ==0.2.1.1 - - protobuf-simple ==0.1.0.2 + - protobuf-simple ==0.1.0.3 - protocol-buffers ==2.4.0 - protocol-buffers-descriptor ==2.4.0 - protolude ==0.1.10 @@ -1567,9 +1617,10 @@ default-package-overrides: - quickcheck-instances ==0.3.12 - quickcheck-io ==0.1.4 - quickcheck-simple ==0.1.0.1 - - quickcheck-special ==0.1.0.3 + - quickcheck-special ==0.1.0.4 - quickcheck-text ==0.1.2.1 - quickcheck-unicode ==1.0.0.1 + - raaz ==0.1.1 - rainbow ==0.28.0.4 - rainbox ==0.18.0.10 - ramus ==0.1.2 @@ -1581,13 +1632,13 @@ default-package-overrides: - range ==0.1.2.0 - range-set-list ==0.1.2.0 - rank1dynamic ==0.3.3.0 - - Rasterific ==0.7.1 + - Rasterific ==0.7.2.1 - rasterific-svg ==0.3.2.1 - ratel ==0.3.2 - ratel-wai ==0.2.0 - rattletrap ==2.1.5 - raw-strings-qq ==1.1 - - rawfilepath ==0.1.0.0 + - rawfilepath ==0.1.1 - rawstring-qm ==0.2.3.0 - rdf ==0.1.0.1 - read-editor ==0.1.0.2 @@ -1611,6 +1662,7 @@ default-package-overrides: - reform-happstack ==0.2.5.1 - reform-hsp ==0.2.7.1 - RefSerialize ==0.4.0 + - regex ==0.5.0.0 - regex-applicative ==0.3.3 - regex-applicative-text ==0.1.0.1 - regex-base ==0.93.2 @@ -1624,7 +1676,7 @@ default-package-overrides: - reinterpret-cast ==0.1.0 - relational-query ==0.8.3.5 - relational-query-HDBC ==0.6.0.2 - - relational-record ==0.1.6.1 + - relational-record ==0.1.7.1 - relational-schemas ==0.1.3.1 - renderable ==0.2.0.1 - repa ==3.4.1.2 @@ -1655,7 +1707,7 @@ default-package-overrides: - rfc5051 ==0.1.0.3 - riak ==1.1.1.0 - riak-protobuf ==0.22.0.0 - - RNAlien ==1.3.1 + - RNAlien ==1.3.7 - rng-utils ==0.2.1 - rose-trees ==0.0.4.3 - rot13 ==0.1.0.2 @@ -1666,9 +1718,9 @@ default-package-overrides: - rvar ==0.2.0.3 - s3-signer ==0.3.0.0 - safe ==0.3.14 - - safe-exceptions ==0.1.4.0 + - safe-exceptions ==0.1.5.0 - safe-exceptions-checked ==0.1.0 - - safecopy ==0.9.2 + - safecopy ==0.9.3.1 - SafeSemaphore ==0.10.1 - sampling ==0.3.2 - sandi ==0.4.0 @@ -1678,13 +1730,15 @@ default-package-overrides: - scalpel ==0.5.0 - scalpel-core ==0.5.0 - scanner ==0.2 - - scientific ==0.3.4.10 + - scientific ==0.3.4.11 - scotty ==0.11.0 + - scrape-changes ==0.1.0.5 - scrypt ==0.5.0 - sdl2 ==2.2.0 - sdl2-gfx ==0.2 - sdl2-image ==2.0.0 - sdl2-mixer ==0.1 + - search-algorithms ==0.1.0 - securemem ==0.1.9 - SegmentTree ==0.3 - semigroupoid-extras ==5 @@ -1726,9 +1780,10 @@ default-package-overrides: - sets ==0.0.5.2 - SHA ==1.6.4.2 - shake ==0.15.11 - - shake-language-c ==0.10.0 + - shake-language-c ==0.10.1 - shakespeare ==2.0.12.1 - shell-conduit ==4.5.2 + - shelly ==1.6.8.3 - shortcut-links ==0.4.2.0 - should-not-typecheck ==2.1.0 - show-prettyprint ==0.1.2 @@ -1756,7 +1811,7 @@ default-package-overrides: - smoothie ==0.4.2.6 - smtLib ==1.0.8 - smtp-mail ==0.1.4.6 - - snap-core ==1.0.1.0 + - snap-core ==1.0.2.0 - snap-server ==1.0.1.1 - snowflake ==0.1.1.1 - soap ==0.2.3.3 @@ -1790,7 +1845,8 @@ default-package-overrides: - sqlite-simple ==0.4.13.0 - sqlite-simple-errors ==0.6.0.0 - srcloc ==0.5.1.0 - - stache ==0.2.0 + - stache ==0.2.2 + - stack-run-auto ==0.1.1.4 - stack-type ==0.1.0.0 - state-plus ==0.1.2 - stateref ==0.3 @@ -1806,7 +1862,7 @@ default-package-overrides: - stm-conduit ==3.0.0 - stm-containers ==0.2.15 - stm-delay ==0.1.1.1 - - stm-extras ==0.1.0.1 + - stm-extras ==0.1.0.2 - stm-stats ==0.2.0.0 - stm-supply ==0.2.0.0 - STMonadTrans ==0.4.3 @@ -1814,8 +1870,9 @@ default-package-overrides: - storable-complex ==0.2.2 - storable-endian ==0.2.6 - storable-record ==0.0.3.1 + - store-core ==0.4 - Strafunski-StrategyLib ==5.0.0.10 - - stratosphere ==0.4.1 + - stratosphere ==0.4.2 - streaming ==0.1.4.5 - streaming-bytestring ==0.1.4.6 - streaming-commons ==0.1.17 @@ -1843,7 +1900,7 @@ default-package-overrides: - sundown ==0.6 - superbuffer ==0.2.0.1 - svg-builder ==0.1.0.2 - - svg-tree ==0.6 + - svg-tree ==0.6.1 - SVGFonts ==1.6.0.1 - swagger ==0.3.0 - swagger2 ==2.1.3 @@ -1883,16 +1940,17 @@ default-package-overrides: - tasty-program ==1.0.5 - tasty-quickcheck ==0.8.4 - tasty-rerun ==1.1.6 - - tasty-silver ==3.1.9 + - tasty-silver ==3.1.10 - tasty-smallcheck ==0.8.1 + - tasty-stats ==0.2.0.2 - tasty-tap ==0.0.4 - - tasty-th ==0.1.4 + - tasty-th ==0.1.5 - Taxonomy ==1.0.2 - TCache ==0.12.1 - tce-conf ==1.3 - tcp-streams ==0.6.0.0 - tcp-streams-openssl ==0.6.0.0 - - telegram-api ==0.6.0.2 + - telegram-api ==0.6.1.0 - template ==0.2.0.10 - temporary ==1.2.0.4 - temporary-rc ==1.2.0.3 @@ -1907,7 +1965,7 @@ default-package-overrides: - test-framework-th ==0.2.4 - test-simple ==0.1.9 - testing-feat ==0.4.0.3 - - texmath ==0.9.1 + - texmath ==0.9.4 - text ==1.2.2.1 - text-all ==0.3.0.2 - text-binary ==0.2.1.1 @@ -1935,10 +1993,12 @@ default-package-overrides: - th-reify-compat ==0.0.1.1 - th-reify-many ==0.1.6 - th-to-exp ==0.0.1.0 + - th-utilities ==0.2.0.1 - these ==0.7.3 - thread-local-storage ==0.1.1 - threads ==0.5.1.4 - threepenny-gui ==0.7.0.1 + - threepenny-gui-flexbox ==0.3.0.2 - through-text ==0.1.0.0 - thumbnail-plus ==1.0.5 - thyme ==0.3.5.5 @@ -1957,7 +2017,7 @@ default-package-overrides: - tinylog ==0.14.0 - tinytemplate ==0.1.2.0 - titlecase ==0.1.0.3 - - tls ==1.3.9 + - tls ==1.3.10 - tls-debug ==0.4.4 - token-bucket ==0.1.0.1 - tostring ==0.2.1.1 @@ -1971,12 +2031,13 @@ default-package-overrides: - tree-fun ==0.8.1.0 - trifecta ==1.6.2.1 - true-name ==0.1.0.2 + - tsv2csv ==0.1.0.1 - ttrie ==0.1.2.1 - tttool ==1.7.0.1 - tuple ==0.3.0.2 - tuple-th ==0.2.5 - tuples-homogenous-h98 ==0.1.1.0 - - turtle ==1.3.1 + - turtle ==1.3.2 - turtle-options ==0.1.0.4 - twitter-feed ==0.2.0.11 - type-aligned ==0.9.6 @@ -1998,7 +2059,7 @@ default-package-overrides: - uglymemo ==0.1.0.1 - unbound ==0.5.1 - unbound-generics ==0.3.1 - - unbounded-delays ==0.1.0.9 + - unbounded-delays ==0.1.0.10 - uncertain ==0.3.1.0 - unexceptionalio ==0.3.0 - unicode-show ==0.1.0.2 @@ -2007,6 +2068,7 @@ default-package-overrides: - union ==0.1.1.1 - union-find ==0.2 - uniplate ==1.6.12 + - uniq-deep ==1.1.0.0 - Unique ==0.4.6.1 - units ==2.4 - units-defs ==2.0.1.1 @@ -2022,7 +2084,7 @@ default-package-overrides: - unix-time ==0.3.7 - Unixutils ==1.54.1 - unlit ==0.4.0.0 - - unordered-containers ==0.2.7.2 + - unordered-containers ==0.2.8.0 - uri-bytestring ==0.2.3.1 - uri-encode ==1.5.0.5 - uri-templater ==0.2.1.0 @@ -2034,7 +2096,7 @@ default-package-overrides: - users-test ==0.5.0.1 - utf8-light ==0.4.2 - utf8-string ==1.0.1.1 - - utility-ht ==0.0.12 + - utility-ht ==0.0.13 - uu-interleaved ==0.2.0.0 - uu-parsinglib ==2.9.1.1 - uuid ==1.3.13 @@ -2042,6 +2104,7 @@ default-package-overrides: - uuid-types ==1.0.3 - vado ==0.0.8 - validate-input ==0.4.0.0 + - validation ==0.5.4 - varying ==0.7.0.3 - vault ==0.3.0.6 - vcswrapper ==0.1.5 @@ -2055,14 +2118,15 @@ default-package-overrides: - vector-space ==0.10.4 - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.6 - - vectortiles ==1.2.0.2 + - vectortiles ==1.2.0.4 + - verbosity ==0.2.3.0 - versions ==3.0.0 - vhd ==0.2.2 - ViennaRNAParser ==1.3.2 - viewprof ==0.0.0.1 - vinyl ==0.5.3 - vinyl-utils ==0.3.0.0 - - void ==0.7.1 + - void ==0.7.2 - vty ==5.15 - wai ==3.2.1.1 - wai-app-static ==3.1.6.1 @@ -2072,13 +2136,14 @@ default-package-overrides: - wai-extra ==3.0.19.1 - wai-handler-launch ==3.0.2.2 - wai-logger ==2.3.0 + - wai-middleware-auth ==0.1.1.2 - wai-middleware-caching ==0.1.0.2 - wai-middleware-caching-lru ==0.1.0.0 - wai-middleware-caching-redis ==0.2.0.0 - wai-middleware-consul ==0.1.0.2 - wai-middleware-content-type ==0.5.0.1 - wai-middleware-crowd ==0.1.4.2 - - wai-middleware-metrics ==0.2.3 + - wai-middleware-metrics ==0.2.4 - wai-middleware-prometheus ==0.1.0.1 - wai-middleware-static ==0.8.1 - wai-middleware-throttle ==0.2.1.0 @@ -2095,7 +2160,7 @@ default-package-overrides: - warp ==3.2.11.1 - warp-tls ==3.2.3 - wave ==0.1.4 - - wavefront ==0.7.0.3 + - wavefront ==0.7.1 - wavefront-obj ==0.1.0.1 - web-plugins ==0.2.9 - web-routes ==0.27.11 @@ -2108,7 +2173,7 @@ default-package-overrides: - webdriver-angular ==0.1.11 - webkitgtk3 ==0.14.2.1 - webkitgtk3-javascriptcore ==0.14.2.1 - - webpage ==0.0.4 + - webpage ==0.0.5 - webrtc-vad ==0.1.0.3 - websockets ==0.10.0.0 - websockets-snap ==0.10.2.0 @@ -2124,7 +2189,7 @@ default-package-overrides: - wire-streams ==0.1.1.0 - with-location ==0.1.0 - withdependencies ==0.2.4 - - witherable ==0.1.3.3 + - witherable ==0.1.3.4 - witness ==0.4 - wizards ==1.0.2 - wl-pprint ==1.2 @@ -2139,20 +2204,23 @@ default-package-overrides: - wordpass ==1.0.0.7 - Workflow ==0.8.3 - wrap ==0.0.0 + - wreq ==0.5.0.0 - writer-cps-full ==0.1.0.0 - - writer-cps-lens ==0.1.0.0 - - writer-cps-morph ==0.1.0.1 - - writer-cps-mtl ==0.1.1.2 + - writer-cps-lens ==0.1.0.1 + - writer-cps-morph ==0.1.0.2 + - writer-cps-mtl ==0.1.1.3 - writer-cps-transformers ==0.1.1.2 - wuss ==1.1.3 - X11 ==1.8 + - X11-xft ==0.3.1 - x509 ==1.6.5 - x509-store ==1.6.2 - x509-system ==1.6.4 - x509-validation ==1.6.5 - Xauth ==0.1 - - xdcc ==1.1.3 + - xdcc ==1.1.4 - xdg-basedir ==0.2.2 + - xeno ==0.1 - xenstore ==0.1.1 - xhtml ==3000.2.1 - xlsior ==0.1.0.1 @@ -2164,6 +2232,7 @@ default-package-overrides: - xml-conduit-writer ==0.1.1.1 - xml-hamlet ==0.4.1 - xml-html-qq ==0.1.0.1 + - xml-indexed-cursor ==0.1.1.0 - xml-lens ==0.1.6.3 - xml-picklers ==0.3.6 - xml-to-json-fast ==2.0.0 @@ -2171,6 +2240,7 @@ default-package-overrides: - xmlgen ==0.6.2.1 - xmlhtml ==0.2.3.5 - xmonad ==0.13 + - xmonad-contrib ==0.13 - xss-sanitize ==0.3.5.7 - yackage ==0.8.1 - yahoo-finance-api ==0.2.0.1 @@ -2183,7 +2253,7 @@ default-package-overrides: - yesod-auth-account ==1.4.3 - yesod-auth-basic ==0.1.0.2 - yesod-auth-hashdb ==1.6.0.1 - - yesod-bin ==1.5.2 + - yesod-bin ==1.5.2.2 - yesod-core ==1.4.32 - yesod-eventsource ==1.4.1 - yesod-fay ==0.8.0 @@ -2191,6 +2261,7 @@ default-package-overrides: - yesod-form-richtext ==0.1.0.0 - yesod-gitrepo ==0.2.1.0 - yesod-gitrev ==0.1.0.0 + - yesod-markdown ==0.11.4 - yesod-newsfeed ==1.6 - yesod-persistent ==1.4.2 - yesod-sitemap ==1.4.0.1 @@ -2215,7 +2286,7 @@ default-package-overrides: - yjtools ==0.9.18 - zero ==0.1.4 - zeromq4-haskell ==0.6.5 - - zip ==0.1.9 + - zip ==0.1.10 - zip-archive ==0.3.0.5 - zippers ==0.2.2 - zlib ==0.6.1.2 @@ -2228,7 +2299,8 @@ extra-packages: - aeson < 0.8 # newer versions don't work with GHC 6.12.3 - aeson < 1.1 # required by stack - aeson-pretty < 0.8 # required by elm compiler - - binary > 0.7 && < 0.8 # binary 0.8.x is the latest, but it's largely unsupported so far + - binary > 0.7 && < 0.8 # keep a 7.x major release around for older compilers + - binary > 0.8 && < 0.9 # keep a 8.x major release around for older compilers - Cabal == 1.18.* # required for cabal-install et al on old GHC versions - Cabal == 1.20.* # required for cabal-install et al on old GHC versions - containers < 0.5 # required to build alex with GHC 6.12.3 @@ -2342,12 +2414,14 @@ dont-distribute-packages: shine-varying: [ i686-linux, x86_64-linux, x86_64-darwin ] # these packages depend on software with an unfree license + accelerate-bignum: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-cublas: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-cuda: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-cufft: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-fft: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-fourier-benchmark: [ i686-linux, x86_64-linux, x86_64-darwin ] + accelerate-llvm-ptx: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-yices: [ i686-linux, x86_64-linux, x86_64-darwin ] ccelerate-cuda: [ i686-linux, x86_64-linux, x86_64-darwin ] cublas: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2671,6 +2745,7 @@ dont-distribute-packages: aws-sign4: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sns: [ i686-linux, x86_64-linux, x86_64-darwin ] + axiom: [ i686-linux, x86_64-linux, x86_64-darwin ] azubi: [ i686-linux, x86_64-linux, x86_64-darwin ] azure-service-api: [ i686-linux, x86_64-linux, x86_64-darwin ] azure-servicebus: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2909,6 +2984,7 @@ dont-distribute-packages: bytestring-read: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestringreadp: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] + bytestring-strict-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-typenats: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal2arch: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal2doap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3192,6 +3268,7 @@ dont-distribute-packages: comonad-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] comonad-random: [ i686-linux, x86_64-linux, x86_64-darwin ] ComonadSheet: [ i686-linux, x86_64-linux, x86_64-darwin ] + compactable: [ i686-linux, x86_64-linux, x86_64-darwin ] compact-map: [ i686-linux, x86_64-linux, x86_64-darwin ] compact-socket: [ i686-linux, x86_64-linux, x86_64-darwin ] compact-string: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3590,6 +3667,7 @@ dont-distribute-packages: DiscussionSupportSystem: [ i686-linux, x86_64-linux, x86_64-darwin ] Dish: [ i686-linux, x86_64-linux, x86_64-darwin ] disjoint-set: [ i686-linux, x86_64-linux, x86_64-darwin ] + disjoint-set-stateful: [ i686-linux, x86_64-linux, x86_64-darwin ] distance-of-time: [ i686-linux, x86_64-linux, x86_64-darwin ] Dist: [ i686-linux, x86_64-linux, x86_64-darwin ] DisTract: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3732,6 +3810,7 @@ dont-distribute-packages: elevator: [ i686-linux, x86_64-linux, x86_64-darwin ] elision: [ i686-linux, x86_64-linux, x86_64-darwin ] elocrypt: [ i686-linux, x86_64-linux, x86_64-darwin ] + elsa: [ i686-linux, x86_64-linux, x86_64-darwin ] emacs-keys: [ i686-linux, x86_64-linux, x86_64-darwin ] email: [ i686-linux, x86_64-linux, x86_64-darwin ] emailparse: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3881,6 +3960,7 @@ dont-distribute-packages: feldspar-language: [ i686-linux, x86_64-linux, x86_64-darwin ] fenfire: [ i686-linux, x86_64-linux, x86_64-darwin ] FermatsLastMargin: [ i686-linux, x86_64-linux, x86_64-darwin ] + fernet: [ i686-linux, x86_64-linux, x86_64-darwin ] FerryCore: [ i686-linux, x86_64-linux, x86_64-darwin ] Feval: [ i686-linux, x86_64-linux, x86_64-darwin ] ffeed: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4053,6 +4133,7 @@ dont-distribute-packages: fwgl-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl-javascript: [ i686-linux, x86_64-linux, x86_64-darwin ] + g4ip: [ i686-linux, x86_64-linux, x86_64-darwin ] gact: [ i686-linux, x86_64-linux, x86_64-darwin ] gameclock: [ i686-linux, x86_64-linux, x86_64-darwin ] game-of-life: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4145,6 +4226,7 @@ dont-distribute-packages: ghc-session: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-usage: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-vis: [ i686-linux, x86_64-linux, x86_64-darwin ] ght: [ i686-linux, x86_64-linux, x86_64-darwin ] giak: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4203,6 +4285,9 @@ dont-distribute-packages: glade: [ i686-linux, x86_64-linux, x86_64-darwin ] gladexml-accessor: [ i686-linux, x86_64-linux, x86_64-darwin ] glapp: [ i686-linux, x86_64-linux, x86_64-darwin ] + glazier-react-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + glazier-react: [ i686-linux, x86_64-linux, x86_64-darwin ] + glazier-react-widget: [ i686-linux, x86_64-linux, x86_64-darwin ] GLFW-b-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] GLFW-OGL: [ i686-linux, x86_64-linux, x86_64-darwin ] GLFW-task: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4221,8 +4306,11 @@ dont-distribute-packages: GlomeVec: [ i686-linux, x86_64-linux, x86_64-darwin ] GlomeView: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] + gloss-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-devil: [ i686-linux, x86_64-linux, x86_64-darwin ] + gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + gloss-raster: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-sodium: [ i686-linux, x86_64-linux, x86_64-darwin ] glue-common: [ i686-linux, x86_64-linux, x86_64-darwin ] glue-core: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4513,6 +4601,7 @@ dont-distribute-packages: haroonga: [ i686-linux, x86_64-linux, x86_64-darwin ] harvest-api: [ i686-linux, x86_64-linux, x86_64-darwin ] hasbolt: [ i686-linux, x86_64-linux, x86_64-darwin ] + HasCacBDD: [ i686-linux, x86_64-linux, x86_64-darwin ] hascal: [ i686-linux, x86_64-linux, x86_64-darwin ] hascas: [ i686-linux, x86_64-linux, x86_64-darwin ] hascat: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4695,6 +4784,7 @@ dont-distribute-packages: HCL: [ i686-linux, x86_64-linux, x86_64-darwin ] hcltest: [ i686-linux, x86_64-linux, x86_64-darwin ] hcoap: [ i686-linux, x86_64-linux, x86_64-darwin ] + hcoord: [ i686-linux, x86_64-linux, x86_64-darwin ] hcron: [ i686-linux, x86_64-linux, x86_64-darwin ] hCsound: [ i686-linux, x86_64-linux, x86_64-darwin ] hcube: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5005,6 +5095,7 @@ dont-distribute-packages: hR: [ i686-linux, x86_64-linux, x86_64-darwin ] hricket: [ i686-linux, x86_64-linux, x86_64-darwin ] Hricket: [ i686-linux, x86_64-linux, x86_64-darwin ] + hriemann: [ i686-linux, x86_64-linux, x86_64-darwin ] HROOT-core: [ i686-linux, x86_64-linux, x86_64-darwin ] HROOT-graf: [ i686-linux, x86_64-linux, x86_64-darwin ] HROOT-hist: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5328,6 +5419,7 @@ dont-distribute-packages: implicit-params: [ i686-linux, x86_64-linux, x86_64-darwin ] imports: [ i686-linux, x86_64-linux, x86_64-darwin ] impossible: [ i686-linux, x86_64-linux, x86_64-darwin ] + imprevu-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] improve: [ i686-linux, x86_64-linux, x86_64-darwin ] INblobs: [ i686-linux, x86_64-linux, x86_64-darwin ] inch: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5375,6 +5467,7 @@ dont-distribute-packages: intro: [ i686-linux, x86_64-linux, x86_64-darwin ] intro-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] intset: [ i686-linux, x86_64-linux, x86_64-darwin ] + invertible-hlist: [ i686-linux, x86_64-linux, x86_64-darwin ] invertible: [ i686-linux, x86_64-linux, x86_64-darwin ] invertible-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] io-capture: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5502,6 +5595,7 @@ dont-distribute-packages: json-togo: [ i686-linux, x86_64-linux, x86_64-darwin ] json-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] jsontsv: [ i686-linux, x86_64-linux, x86_64-darwin ] + jsonxlsx: [ i686-linux, x86_64-linux, x86_64-darwin ] jspath: [ i686-linux, x86_64-linux, x86_64-darwin ] juandelacosa: [ i686-linux, x86_64-linux, x86_64-darwin ] judy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5648,6 +5742,8 @@ dont-distribute-packages: language-pig: [ i686-linux, x86_64-linux, x86_64-darwin ] language-puppet: [ i686-linux, x86_64-darwin ] language-python-colour: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-python: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-python-test: [ i686-linux, x86_64-linux, x86_64-darwin ] language-qux: [ i686-linux, x86_64-linux, x86_64-darwin ] language-sh: [ i686-linux, x86_64-linux, x86_64-darwin ] language-spelling: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5739,6 +5835,7 @@ dont-distribute-packages: libxml: [ i686-linux, x86_64-linux, x86_64-darwin ] libxslt: [ i686-linux, x86_64-linux, x86_64-darwin ] libzfs: [ i686-linux, x86_64-linux, x86_64-darwin ] + LibZip: [ i686-linux, x86_64-linux, x86_64-darwin ] lifter: [ i686-linux, x86_64-linux, x86_64-darwin ] ligature: [ i686-linux, x86_64-linux, x86_64-darwin ] lightning-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5807,6 +5904,7 @@ dont-distribute-packages: llvm-general: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-general-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-general-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] + llvm-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] llvm-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5949,6 +6047,7 @@ dont-distribute-packages: mathblog: [ i686-linux, x86_64-linux, x86_64-darwin ] mathlink: [ i686-linux, x86_64-linux, x86_64-darwin ] matlab: [ i686-linux, x86_64-linux, x86_64-darwin ] + matplotlib: [ i686-linux, x86_64-linux, x86_64-darwin ] matsuri: [ i686-linux, x86_64-linux, x86_64-darwin ] maude: [ i686-linux, x86_64-linux, x86_64-darwin ] maxent: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5977,6 +6076,7 @@ dont-distribute-packages: mech: [ i686-linux, x86_64-linux, x86_64-darwin ] mechs: [ i686-linux, x86_64-linux, x86_64-darwin ] Mechs: [ i686-linux, x86_64-linux, x86_64-darwin ] + mediabus-fdk-aac: [ i686-linux, x86_64-linux, x86_64-darwin ] mediabus: [ i686-linux ] mediabus-rtp: [ i686-linux ] mediawiki2latex: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6048,6 +6148,7 @@ dont-distribute-packages: mkbndl: [ i686-linux, x86_64-linux, x86_64-darwin ] mlist: [ i686-linux, x86_64-linux, x86_64-darwin ] ml-w: [ i686-linux, x86_64-linux, x86_64-darwin ] + mmtf: [ i686-linux, x86_64-linux, x86_64-darwin ] mmtl-base: [ i686-linux, x86_64-linux, x86_64-darwin ] mmtl: [ i686-linux, x86_64-linux, x86_64-darwin ] mnist-idx: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6075,6 +6176,7 @@ dont-distribute-packages: MonadCatchIO-transformers-foreign: [ i686-linux, x86_64-linux, x86_64-darwin ] MonadCatchIO-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-classes: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-classes-logging: [ i686-linux, x86_64-linux, x86_64-darwin ] MonadCompose: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-exception: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6141,6 +6243,7 @@ dont-distribute-packages: mps: [ i686-linux, x86_64-linux, x86_64-darwin ] mpvguihs: [ i686-linux, x86_64-linux, x86_64-darwin ] mqtt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + mqtt: [ i686-linux, x86_64-linux, x86_64-darwin ] mrm: [ i686-linux, x86_64-linux, x86_64-darwin ] msgpack-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] msgpack: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6196,6 +6299,7 @@ dont-distribute-packages: mustache-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] mustache: [ i686-linux, x86_64-linux, x86_64-darwin ] mutable-iter: [ i686-linux, x86_64-linux, x86_64-darwin ] + MutationOrder: [ i686-linux, x86_64-linux, x86_64-darwin ] mute-unmute: [ i686-linux, x86_64-linux, x86_64-darwin ] mvc: [ i686-linux, x86_64-linux, x86_64-darwin ] mvclient: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6328,10 +6432,15 @@ dont-distribute-packages: nntp: [ i686-linux, x86_64-linux, x86_64-darwin ] nofib-analyze: [ i686-linux, x86_64-linux, x86_64-darwin ] noise: [ i686-linux, x86_64-linux, x86_64-darwin ] + nomyx-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + nomyx-core: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Core: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx: [ i686-linux, x86_64-linux, x86_64-darwin ] + nomyx-language: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Language: [ i686-linux, x86_64-linux, x86_64-darwin ] + nomyx-library: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Rules: [ i686-linux, x86_64-linux, x86_64-darwin ] + nomyx-server: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Web: [ i686-linux, x86_64-linux, x86_64-darwin ] NonEmptyList: [ i686-linux, x86_64-linux, x86_64-darwin ] nonfree: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6436,6 +6545,7 @@ dont-distribute-packages: optimal-blocks: [ i686-linux, x86_64-linux, x86_64-darwin ] optimization: [ i686-linux, x86_64-linux, x86_64-darwin ] optimusprime: [ i686-linux, x86_64-linux, x86_64-darwin ] + optparse-applicative-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] OrchestrateDB: [ i686-linux, x86_64-linux, x86_64-darwin ] orchestrate: [ i686-linux, x86_64-linux, x86_64-darwin ] orchid-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6631,6 +6741,7 @@ dont-distribute-packages: pitchtrack: [ i686-linux, x86_64-linux, x86_64-darwin ] pit: [ i686-linux, x86_64-linux, x86_64-darwin ] pivotal-tracker: [ i686-linux, x86_64-linux, x86_64-darwin ] + pixelated-avatar-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] pkggraph: [ i686-linux, x86_64-linux, x86_64-darwin ] plailude: [ i686-linux, x86_64-linux, x86_64-darwin ] planar-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6989,6 +7100,7 @@ dont-distribute-packages: regex-deriv: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-dfa: [ i686-linux, x86_64-linux, x86_64-darwin ] regexdot: [ i686-linux, x86_64-linux, x86_64-darwin ] + regex-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-genex: [ i686-linux, x86_64-linux, x86_64-darwin ] regex: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7001,6 +7113,7 @@ dont-distribute-packages: regex-tdfa-utf8: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-tre: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-type: [ i686-linux, x86_64-linux, x86_64-darwin ] + regex-with-pcre: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-xmlschema: [ i686-linux, x86_64-linux, x86_64-darwin ] regional-pointers: [ i686-linux, x86_64-linux, x86_64-darwin ] regions: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7279,6 +7392,7 @@ dont-distribute-packages: servant-auth-token-acid: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token-api: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-auth-token-leveldb: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-auth-token-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-csharp: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-db-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7313,6 +7427,7 @@ dont-distribute-packages: sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] setdown: [ i686-linux, x86_64-linux, x86_64-darwin ] setgame: [ i686-linux, x86_64-linux, x86_64-darwin ] + setoid: [ i686-linux, x86_64-linux, x86_64-darwin ] sets: [ i686-linux, x86_64-linux, x86_64-darwin ] setters: [ i686-linux, x86_64-linux, x86_64-darwin ] set-with: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7667,6 +7782,7 @@ dont-distribute-packages: structured-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] structures: [ i686-linux, x86_64-linux, x86_64-darwin ] stunts: [ i686-linux, x86_64-linux, x86_64-darwin ] + stutter: [ i686-linux, x86_64-linux, x86_64-darwin ] stylized: [ i686-linux, x86_64-linux, x86_64-darwin ] styx: [ i686-linux, x86_64-linux, x86_64-darwin ] subhask: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7930,6 +8046,7 @@ dont-distribute-packages: tkhs: [ i686-linux, x86_64-linux, x86_64-darwin ] tkyprof: [ i686-linux, x86_64-linux, x86_64-darwin ] tld: [ i686-linux, x86_64-linux, x86_64-darwin ] + tldr: [ i686-linux, x86_64-linux, x86_64-darwin ] tls-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] tn: [ i686-linux, x86_64-linux, x86_64-darwin ] toboggan: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7973,6 +8090,7 @@ dont-distribute-packages: transformers-runnable: [ i686-linux, x86_64-linux, x86_64-darwin ] TransformersStepByStep: [ i686-linux, x86_64-linux, x86_64-darwin ] transient-universe: [ i686-linux, x86_64-linux, x86_64-darwin ] + transient-universe-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] translatable-intset: [ i686-linux, x86_64-linux, x86_64-darwin ] translate: [ i686-linux, x86_64-linux, x86_64-darwin ] travis-meta-yaml: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8049,6 +8167,7 @@ dont-distribute-packages: typed-process: [ i686-linux, x86_64-linux, x86_64-darwin ] typedquery: [ i686-linux, x86_64-linux, x86_64-darwin ] typed-spreadsheet: [ i686-linux, x86_64-linux, x86_64-darwin ] + typed-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] typed-wire: [ i686-linux, x86_64-linux, x86_64-darwin ] typed-wire-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] typehash: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8560,12 +8679,19 @@ dont-distribute-packages: zeromq-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] zeroth: [ i686-linux, x86_64-linux, x86_64-darwin ] ZFS: [ i686-linux, x86_64-linux, x86_64-darwin ] + zifter-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] + zifter-git: [ i686-linux, x86_64-linux, x86_64-darwin ] + zifter-hindent: [ i686-linux, x86_64-linux, x86_64-darwin ] + zifter-hlint: [ i686-linux, x86_64-linux, x86_64-darwin ] + zifter: [ i686-linux, x86_64-linux, x86_64-darwin ] + zifter-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] zim-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] zip-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] zipedit: [ i686-linux, x86_64-linux, x86_64-darwin ] zip: [ i686-linux ] zipkin: [ i686-linux, x86_64-linux, x86_64-darwin ] zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] + ziptastic-client: [ i686-linux, x86_64-linux, x86_64-darwin ] zlib-enum: [ i686-linux, x86_64-linux, x86_64-darwin ] ZMachine: [ i686-linux, x86_64-linux, x86_64-darwin ] zmcat: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 981a48055bc..f03fc73387f 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -131,8 +131,6 @@ self: super: builtins.intersectAttrs super { # Need WebkitGTK, not just webkit. webkit = super.webkit.override { webkit = pkgs.webkitgtk2; }; - webkitgtk3 = super.webkitgtk3.override { webkit = pkgs.webkitgtk24x; }; - webkitgtk3-javascriptcore = super.webkitgtk3-javascriptcore.override { webkit = pkgs.webkitgtk24x; }; websnap = super.websnap.override { webkit = pkgs.webkitgtk24x; }; hs-mesos = overrideCabal super.hs-mesos (drv: { @@ -241,6 +239,8 @@ self: super: builtins.intersectAttrs super { } ); + llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm_4; }; + # Needs help finding LLVM. spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm; @@ -433,10 +433,6 @@ self: super: builtins.intersectAttrs super { # This propagates this to everything depending on haskell-gi-base haskell-gi-base = addBuildDepend super.haskell-gi-base pkgs.gobjectIntrospection; - # requires webkitgtk API version 3 (webkitgtk 2.4 is the latest webkit supporting that version) - gi-javascriptcore = super.gi-javascriptcore.override { webkitgtk = pkgs.webkitgtk24x; }; - gi-webkit = super.gi-webkit.override { webkit = pkgs.webkitgtk24x; }; - # Requires gi-javascriptcore API version 4 gi-webkit2 = super.gi-webkit2.override { gi-javascriptcore = self.gi-javascriptcore_4_0_11; }; diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 7205f777bcf..694556123ab 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -15,6 +15,7 @@ let mkDerivationImpl = pkgs.callPackage ./generic-builder.nix { inherit stdenv; inherit (pkgs) fetchurl pkgconfig glibcLocales coreutils gnugrep gnused; + nodejs = pkgs.nodejs-slim; jailbreak-cabal = if (self.ghc.cross or null) != null then self.ghc.bootPkgs.jailbreak-cabal else self.jailbreak-cabal; @@ -79,19 +80,12 @@ let in import ./hackage-packages.nix { inherit pkgs stdenv callPackage; } self // { - inherit mkDerivation callPackage; + inherit mkDerivation callPackage haskellSrc2nix hackage2nix; - callHackage = name: version: self.callPackage (hackage2nix name version); + callHackage = name: version: self.callPackage (self.hackage2nix name version); # Creates a Haskell package from a source package by calling cabal2nix on the source. - callCabal2nix = name: src: args: - let - # Filter out files other than the cabal file. This ensures - # that we don't create new derivations even when the cabal - # file hasn't changed. - justCabal = builtins.filterSource (path: type: pkgs.lib.hasSuffix ".cabal" path) src; - drv = self.callPackage (haskellSrc2nix { inherit name; src = justCabal; }) args; - in overrideCabal drv (drv': { inherit src; }); # Restore the desired src. + callCabal2nix = name: src: self.callPackage (self.haskellSrc2nix { inherit src name; }); ghcWithPackages = selectFrom: withPackages (selectFrom self); diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 42678e342be..d39e1bacd71 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ghc, pkgconfig, glibcLocales, coreutils, gnugrep, gnused -, jailbreak-cabal, hscolour, cpphs +, jailbreak-cabal, hscolour, cpphs, nodejs }: let isCross = (ghc.cross or null) != null; in { pname @@ -125,7 +125,6 @@ let ] ++ optionals (enableDeadCodeElimination && (stdenv.lib.versionOlder "8.0.1" ghc.version)) [ "--ghc-option=-split-sections" ] ++ optionals isGhcjs [ - "--with-hsc2hs=${nativeGhc}/bin/hsc2hs" "--ghcjs" ] ++ optionals isCross ([ "--configure-option=--host=${ghc.cross.config}" @@ -133,6 +132,7 @@ let setupCompileFlags = [ (optionalString (!coreSetup) "-${packageDbFlag}=$packageConfDir") + (optionalString isGhcjs "-build-runner") (optionalString (isGhcjs || isHaLVM || versionOlder "7.8" ghc.version) "-j$NIX_BUILD_CORES") # https://github.com/haskell/cabal/issues/2398 (optionalString (versionOlder "7.10" ghc.version && !isHaLVM) "-threaded") @@ -149,6 +149,8 @@ let buildTools ++ libraryToolDepends ++ executableToolDepends ++ optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++ optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++ + # ghcjs's hsc2hs calls out to the native hsc2hs + optional isGhcjs nativeGhc ++ optionals withBenchmarkDepends (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends); allBuildInputs = propagatedBuildInputs ++ otherBuildInputs; @@ -157,7 +159,7 @@ let ghcEnv = ghc.withPackages (p: haskellBuildInputs); - setupBuilder = if isCross || isGhcjs then "${nativeGhc}/bin/ghc" else ghcCommand; + setupBuilder = if isCross then "${nativeGhc}/bin/ghc" else ghcCommand; setupCommand = "./Setup"; ghcCommand' = if isGhcjs then "ghcjs" else "ghc"; crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else ""; @@ -294,6 +296,14 @@ stdenv.mkDerivation ({ local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile ) mv $packageConfFile $packageConfDir/$pkgId.conf ''} + ${optionalString isGhcjs '' + for exeDir in "$out/bin/"*.jsexe; do + exe="''${exeDir%.jsexe}" + printf '%s\n' '#!${nodejs}/bin/node' > "$exe" + cat "$exeDir/all.js" >> "$exe" + chmod +x "$exe" + done + ''} ${optionalString doCoverage "mkdir -p $out/share && cp -r dist/hpc $out/share"} ${optionalString (enableSharedExecutables && isExecutable && !isGhcjs && stdenv.isDarwin && stdenv.lib.versionOlder ghc.version "7.10") '' for exe in "$out/bin/"* ; do diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c50f9a12731..509f6449e02 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -247,14 +247,14 @@ self: { "ADPfusion" = callPackage ({ mkDerivation, base, bits, containers, DPutils, mmorph, mtl - , OrderedBits, primitive, PrimitiveArray, QuickCheck, strict - , template-haskell, test-framework, test-framework-quickcheck2 - , test-framework-th, th-orphans, transformers, tuple, vector + , OrderedBits, primitive, PrimitiveArray, QuickCheck, strict, tasty + , tasty-quickcheck, tasty-th, template-haskell, th-orphans + , transformers, tuple, vector }: mkDerivation { pname = "ADPfusion"; - version = "0.5.2.0"; - sha256 = "264284d9a7bb0978caec240c98d8cabbe89772248bd8e7514f53b277f902a61d"; + version = "0.5.2.2"; + sha256 = "90720d382870d77918f10c5c5a3cdcfe671e91ce3bfab52399bec307f9ba07e5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -263,8 +263,8 @@ self: { transformers tuple vector ]; testHaskellDepends = [ - base bits OrderedBits PrimitiveArray QuickCheck strict - test-framework test-framework-quickcheck2 test-framework-th vector + base bits OrderedBits PrimitiveArray QuickCheck strict tasty + tasty-quickcheck tasty-th vector ]; homepage = "https://github.com/choener/ADPfusion"; description = "Efficient, high-level dynamic programming"; @@ -272,6 +272,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ADPfusionSet" = callPackage + ({ mkDerivation, ADPfusion, base, bits, containers, DPutils, mmorph + , mtl, OrderedBits, primitive, PrimitiveArray, QuickCheck + , smallcheck, strict, tasty, tasty-quickcheck, tasty-smallcheck + , tasty-th, template-haskell, th-orphans, transformers, tuple + , vector + }: + mkDerivation { + pname = "ADPfusionSet"; + version = "0.0.0.1"; + sha256 = "cb5b430b49e6fb239f30a289def77ecd5197a33a5ec9768e163f21f2f6ef305f"; + libraryHaskellDepends = [ + ADPfusion base bits containers DPutils mmorph mtl OrderedBits + primitive PrimitiveArray QuickCheck strict template-haskell + th-orphans transformers tuple vector + ]; + testHaskellDepends = [ + base QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck + tasty-th + ]; + homepage = "https://github.com/choener/ADPfusionSet"; + description = "Dynamic programming for Set data structures"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "AERN-Basics" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, directory , QuickCheck, random, test-framework, test-framework-quickcheck2 @@ -802,8 +827,8 @@ self: { }: mkDerivation { pname = "AlignmentAlgorithms"; - version = "0.0.2.1"; - sha256 = "8d6118e9cd863cde4ac78f726d36105979ed9f463aa56a25ff4a20cfe881c99a"; + version = "0.1.0.0"; + sha256 = "e84cfd84634113be381bd066c8acfce326c88b8ccb3dcaa05bd2b923a7a4dc4c"; libraryHaskellDepends = [ ADPfusion base containers fmlist FormalGrammars GrammarProducts PrimitiveArray vector @@ -1352,8 +1377,8 @@ self: { }: mkDerivation { pname = "BioHMM"; - version = "1.0.5"; - sha256 = "f32d7c8e0433c38e77c3c06c08fd30bfc6eccaa8a4ccc074638de016ab13793f"; + version = "1.0.7"; + sha256 = "935925dabec9ebabc50947ffcb9c355639a2c1939bf68c712b3c32773a1c5685"; libraryHaskellDepends = [ base colour diagrams-cairo diagrams-lib directory either-unwrap filepath parsec ParsecTools StockholmAlignment SVGFonts text vector @@ -1450,21 +1475,40 @@ self: { }) {}; "BiobaseInfernal" = callPackage - ({ mkDerivation, attoparsec, attoparsec-conduit, base, BiobaseXNA - , biocore, bytestring, bytestring-lexing, conduit, containers - , either-unwrap, lens, primitive, PrimitiveArray, repa - , transformers, tuple, vector + ({ mkDerivation, aeson, attoparsec, base, binary, BiobaseTypes + , BiobaseXNA, bytestring, cereal, cereal-text, cereal-vector + , cmdargs, containers, criterion, data-default, deepseq, DPutils + , filepath, hashable, HUnit, lens, parallel, pipes + , pipes-attoparsec, pipes-bytestring, pipes-parse, pipes-safe + , pipes-zlib, primitive, PrimitiveArray, QuickCheck, strict + , string-conversions, tasty, tasty-hunit, tasty-quickcheck + , tasty-th, text, text-binary, transformers, tuple + , unordered-containers, utf8-string, vector, vector-th-unbox, zlib }: mkDerivation { pname = "BiobaseInfernal"; - version = "0.7.1.0"; - sha256 = "5a3417356d462b64c10516fe898923373bb07bc6e1225b479b725c871546eaa5"; + version = "0.8.1.0"; + sha256 = "0f64adaac1795c537f4b535f904d484e7922eba197d115bf206392f6f225cf78"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - attoparsec attoparsec-conduit base BiobaseXNA biocore bytestring - bytestring-lexing conduit containers either-unwrap lens primitive - PrimitiveArray repa transformers tuple vector + aeson attoparsec base binary BiobaseTypes BiobaseXNA bytestring + cereal cereal-text cereal-vector containers data-default deepseq + DPutils filepath hashable lens parallel pipes pipes-attoparsec + pipes-bytestring pipes-parse pipes-safe pipes-zlib primitive + PrimitiveArray strict string-conversions text text-binary + transformers tuple unordered-containers utf8-string vector + vector-th-unbox zlib ]; - homepage = "http://www.tbi.univie.ac.at/~choener/"; + executableHaskellDepends = [ base cmdargs ]; + testHaskellDepends = [ + base HUnit lens QuickCheck tasty tasty-hunit tasty-quickcheck + tasty-th + ]; + benchmarkHaskellDepends = [ + base criterion lens text transformers + ]; + homepage = "https://github.com/choener/BiobaseInfernal"; description = "Infernal data structures and tools"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -1549,19 +1593,19 @@ self: { "BiobaseTypes" = callPackage ({ mkDerivation, aeson, base, bimaps, binary, cereal, cereal-text - , cereal-vector, data-default, deepseq, hashable, intern - , log-domain, primitive, PrimitiveArray, QuickCheck, stringable - , tasty, tasty-quickcheck, tasty-th, text, text-binary, vector + , cereal-vector, data-default, deepseq, hashable, intern, primitive + , PrimitiveArray, QuickCheck, string-conversions, tasty + , tasty-quickcheck, tasty-th, text, text-binary, vector , vector-binary-instances, vector-th-unbox }: mkDerivation { pname = "BiobaseTypes"; - version = "0.1.2.0"; - sha256 = "b1086f4228edfad9cddfb7abdbeca079bef5517a3629552069f3dfcd8378e84e"; + version = "0.1.2.1"; + sha256 = "92cbf8028151a61bb1e0ad70b5d83ce9a420146f72645d3bd2fbd8f4a1e58c87"; libraryHaskellDepends = [ aeson base bimaps binary cereal cereal-text cereal-vector - data-default deepseq hashable intern log-domain primitive - PrimitiveArray QuickCheck stringable text text-binary vector + data-default deepseq hashable intern primitive PrimitiveArray + QuickCheck string-conversions text text-binary vector vector-binary-instances vector-th-unbox ]; testHaskellDepends = [ @@ -1593,22 +1637,26 @@ self: { "BiobaseXNA" = callPackage ({ mkDerivation, aeson, base, bimaps, binary, bytes, bytestring , cereal, cereal-vector, cmdargs, containers, csv, deepseq - , file-embed, hashable, lens, primitive, PrimitiveArray, split - , text, tuple, vector, vector-binary-instances, vector-th-unbox + , file-embed, hashable, lens, primitive, PrimitiveArray, QuickCheck + , split, tasty, tasty-quickcheck, tasty-th, text, tuple, vector + , vector-binary-instances, vector-th-unbox }: mkDerivation { pname = "BiobaseXNA"; - version = "0.9.3.0"; - sha256 = "c5175ce6473b6f46885834acf600b11ca196d62ae0c5de2c598b8f01c07f3e45"; + version = "0.9.3.1"; + sha256 = "d0cca46d67b08b414f266d29660604615ce62c35704042322fed60aa416b8c4a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bimaps binary bytes bytestring cereal cereal-vector containers csv deepseq file-embed hashable lens primitive - PrimitiveArray split text tuple vector vector-binary-instances - vector-th-unbox + PrimitiveArray QuickCheck split text tuple vector + vector-binary-instances vector-th-unbox ]; executableHaskellDepends = [ base cmdargs ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-quickcheck tasty-th vector + ]; homepage = "https://github.com/choener/BiobaseXNA"; description = "Efficient RNA/DNA representations"; license = stdenv.lib.licenses.gpl3; @@ -1759,6 +1807,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Blogdown" = callPackage + ({ mkDerivation, base, containers, MissingH, parsec }: + mkDerivation { + pname = "Blogdown"; + version = "0.1.0"; + sha256 = "e4485ea5f4b61b5887b930e23f7a3d0a1ed0068070c18aceff511ab980bd5532"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers MissingH parsec ]; + executableHaskellDepends = [ base containers MissingH parsec ]; + testHaskellDepends = [ base containers MissingH parsec ]; + description = "A markdown-like markup language designed for blog posts"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "BluePrintCSS" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -3649,6 +3712,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Data-Angle" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "Data-Angle"; + version = "0.9"; + sha256 = "e1540b8f8d3601ca48bf45a4867e4aad66036d98c53296724a6f620f89e16052"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/deadmanswitch/Data.Angle"; + description = "Geometric angles"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Data-Hash-Consistent" = callPackage ({ mkDerivation, base, bytestring, digest, utf8-string, vector , vector-algorithms @@ -3795,6 +3870,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "DeepDarkFantasy" = callPackage + ({ mkDerivation, base, constraints, mtl, random }: + mkDerivation { + pname = "DeepDarkFantasy"; + version = "0.2017.4.1"; + sha256 = "01342b63961fc2916edebb8b4bc9bd63a1719608ac4c42f5cd700a7ef471dd77"; + libraryHaskellDepends = [ base constraints mtl random ]; + testHaskellDepends = [ base constraints mtl random ]; + description = "A DSL for creating neural network"; + license = stdenv.lib.licenses.asl20; + }) {}; + "DefendTheKing" = callPackage ({ mkDerivation, base, binary, bytestring, containers, GLUT, HTTP , MaybeT, mtl, network, peakachu, random, time, utility-ht, zlib @@ -5410,13 +5497,14 @@ self: { "FormalGrammars" = callPackage ({ mkDerivation, ADPfusion, ansi-wl-pprint, base, bytestring , cmdargs, containers, data-default, HaTeX, lens, mtl, parsers - , PrimitiveArray, semigroups, template-haskell, text, transformers - , trifecta, unordered-containers, vector + , PrimitiveArray, QuickCheck, semigroups, smallcheck, tasty + , tasty-quickcheck, tasty-smallcheck, tasty-th, template-haskell + , text, transformers, trifecta, unordered-containers, vector }: mkDerivation { pname = "FormalGrammars"; - version = "0.3.1.0"; - sha256 = "cc6d92eeda014b8f1b89eed81e11f9b7c4b9c150771f330e43092644754fbac8"; + version = "0.3.1.1"; + sha256 = "5af499a9bbd43121d46e19be1c15eb2edddf20384487b9df76c2bc45fc69164e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -5427,6 +5515,10 @@ self: { executableHaskellDepends = [ ansi-wl-pprint base cmdargs trifecta ]; + testHaskellDepends = [ + base QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck + tasty-th + ]; homepage = "https://github.com/choener/FormalGrammars"; description = "(Context-free) grammars in formal language theory"; license = stdenv.lib.licenses.gpl3; @@ -6417,8 +6509,8 @@ self: { }: mkDerivation { pname = "GrammarProducts"; - version = "0.1.1.2"; - sha256 = "9023283298ad178efaf9ba965e7a0005ff41a8a01d2e0f581ed3c29e414f15a2"; + version = "0.1.1.3"; + sha256 = "20ff8fe82f9a4927bcb318e9c7ac6fb7a05adc99ad1fbc4f4a3a5f0b6abb25d7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -8230,10 +8322,8 @@ self: { }: mkDerivation { pname = "HTTP"; - version = "4000.3.5"; - sha256 = "bca0bf130666e924abaf3daff22be6e27928f83f91d6a34cbc39616497908aed"; - revision = "2"; - editedCabalFile = "6b9a05236856d7cd5523b18339cc577f3d2522609558816b072f33aa94c9bbc9"; + version = "4000.3.6"; + sha256 = "18c4887aac6268712fb4733b00a0681efc0527c1354601be1568ce7845f9ba48"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time ]; @@ -8310,6 +8400,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "HUnit_1_6_0_0" = callPackage + ({ mkDerivation, base, call-stack, deepseq, filepath }: + mkDerivation { + pname = "HUnit"; + version = "1.6.0.0"; + sha256 = "7448e6b966e98e84b7627deba23f71b508e9a61e7bc571d74304a25d30e6d0de"; + libraryHaskellDepends = [ base call-stack deepseq ]; + testHaskellDepends = [ base call-stack deepseq filepath ]; + homepage = "https://github.com/hspec/HUnit#readme"; + description = "A unit testing framework for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HUnit-Diff" = callPackage ({ mkDerivation, ansi-terminal, base, Diff, groom, HUnit }: mkDerivation { @@ -8732,6 +8836,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "HasCacBDD" = callPackage + ({ mkDerivation, base, Cabal, CacBDD, directory, process + , QuickCheck + }: + mkDerivation { + pname = "HasCacBDD"; + version = "0.1.0.0"; + sha256 = "be9d36029cbb47b03093bfc96a0ea48525f1fd8180f8310556308eb61d7de4b6"; + setupHaskellDepends = [ base Cabal directory ]; + libraryHaskellDepends = [ base process QuickCheck ]; + librarySystemDepends = [ CacBDD ]; + testHaskellDepends = [ base QuickCheck ]; + homepage = "https://github.com/m4lvin/HasCacBDD"; + description = "Haskell bindings for CacBDD"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {CacBDD = null;}; + "HasGP" = callPackage ({ mkDerivation, base, haskell98, hmatrix, hmatrix-special, mtl , parsec, random @@ -9482,8 +9604,8 @@ self: { }: mkDerivation { pname = "HsOpenSSL"; - version = "0.11.4.1"; - sha256 = "03445cb1ed881f3a8825e375d87af92a5521549ab86042a5bd4d6052b4e7bfbd"; + version = "0.11.4.4"; + sha256 = "efb284b5a3c55c2c83ba3ede5810bdd1efabf1939b40317023a090046a6849eb"; libraryHaskellDepends = [ base bytestring integer-gmp network time ]; @@ -9777,6 +9899,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "IPv6Addr_1_0_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network + , network-info, random, test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "IPv6Addr"; + version = "1.0.0"; + sha256 = "2ece595b6a29a58074e6459ab03f32aae2a90b475ce3d629ccdf71844f599da4"; + libraryHaskellDepends = [ + aeson attoparsec base iproute network network-info random text + ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit text + ]; + homepage = "https://github.com/MichelBoucey/IPv6Addr"; + description = "Library to deal with IPv6 address text representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "IcoGrid" = callPackage ({ mkDerivation, array, base, GlomeVec }: mkDerivation { @@ -10150,10 +10292,8 @@ self: { }: mkDerivation { pname = "JuicyPixels"; - version = "3.2.8"; - sha256 = "038c6547d543442a93b2028be4b84c225bb7a6fa913e1fc57325c58d043d5644"; - revision = "1"; - editedCabalFile = "5211841fbb8a9a7fe19ce715a749149ab03c28344531bc3163f8580b611a2e3e"; + version = "3.2.8.1"; + sha256 = "b325ed50b887d65af7175bba03a2df5ef04a1e0f73adf2e3aa62d1676fa27104"; libraryHaskellDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -10878,6 +11018,7 @@ self: { homepage = "http://bitbucket.org/astanin/hs-libzip/"; description = "Bindings to libzip, a library for manipulating zip archives"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Limit" = callPackage @@ -10909,22 +11050,26 @@ self: { "LinguisticsTypes" = callPackage ({ mkDerivation, aeson, base, bimaps, binary, bytestring, cereal - , cereal-text, deepseq, hashable, intern, log-domain, QuickCheck - , stringable, test-framework, test-framework-quickcheck2 - , test-framework-th, text, text-binary, vector-th-unbox + , cereal-text, containers, criterion, deepseq, hashable, intern + , log-domain, QuickCheck, string-conversions, tasty + , tasty-quickcheck, tasty-th, text, text-binary, utf8-string + , vector-th-unbox }: mkDerivation { pname = "LinguisticsTypes"; - version = "0.0.0.2"; - sha256 = "9f5a722b1f88207b42801a72b6fc95453f134b7a4252251876a4ef069b7b4bcb"; + version = "0.0.0.3"; + sha256 = "2db4b10d3d9d1be5646627aaac8a12e117813aa5696bc52a9ae8cdabbeec42a7"; libraryHaskellDepends = [ aeson base bimaps binary bytestring cereal cereal-text deepseq - hashable intern log-domain QuickCheck stringable text text-binary - vector-th-unbox + hashable intern log-domain QuickCheck string-conversions text + text-binary utf8-string vector-th-unbox ]; testHaskellDepends = [ - aeson base binary cereal QuickCheck stringable test-framework - test-framework-quickcheck2 test-framework-th + aeson base binary cereal QuickCheck string-conversions tasty + tasty-quickcheck tasty-th + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq text ]; homepage = "https://github.com/choener/LinguisticsTypes"; description = "Collection of types for natural language"; @@ -12097,6 +12242,42 @@ self: { license = "LGPL"; }) {}; + "MutationOrder" = callPackage + ({ mkDerivation, ADPfusion, ADPfusionSet, aeson, base, bimaps + , BiobaseXNA, bytestring, cereal, cereal-vector, cmdargs + , containers, deepseq, directory, DPutils, file-embed, filepath + , FormalGrammars, log-domain, parallel, PrimitiveArray + , PrimitiveArray-Pretty, QuickCheck, serialize-instances + , ShortestPathProblems, tasty, tasty-quickcheck, tasty-th, text + , unordered-containers, vector, vector-strategies + , ViennaRNA-bindings, zlib + }: + mkDerivation { + pname = "MutationOrder"; + version = "0.0.0.2"; + sha256 = "0019590415bbcec4f8e4d8a04af277a3a9360b28255eb44290810b499015f32f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ADPfusion ADPfusionSet aeson base bimaps BiobaseXNA bytestring + cereal cereal-vector containers deepseq directory DPutils filepath + FormalGrammars log-domain parallel PrimitiveArray + PrimitiveArray-Pretty serialize-instances ShortestPathProblems text + unordered-containers vector vector-strategies ViennaRNA-bindings + zlib + ]; + executableHaskellDepends = [ + base bytestring cmdargs file-embed filepath + ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-quickcheck tasty-th vector + ]; + homepage = "https://github.com/choener/MutationOrder"; + description = "Most likely order of mutation events in RNA"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "MyPrimes" = callPackage ({ mkDerivation, base, containers, time }: mkDerivation { @@ -12231,27 +12412,22 @@ self: { }) {}; "NaturalLanguageAlphabets" = callPackage - ({ mkDerivation, aeson, array, attoparsec, base, bimaps, binary - , bytestring, cereal, cereal-text, containers, criterion, deepseq - , file-embed, hashable, hashtables, intern, LinguisticsTypes - , mwc-random, QuickCheck, random, stringable, system-filepath - , test-framework, test-framework-quickcheck2, test-framework-th - , text, text-binary, unordered-containers, vector, vector-th-unbox + ({ mkDerivation, aeson, attoparsec, base, binary, cereal + , containers, criterion, deepseq, file-embed, hashtables + , LinguisticsTypes, mwc-random, QuickCheck, random, tasty + , tasty-quickcheck, tasty-th, text, unordered-containers, vector }: mkDerivation { pname = "NaturalLanguageAlphabets"; - version = "0.1.0.0"; - sha256 = "c233d60b74a4131705e36b5873fae2973f168b8c1c0717055c6d546d40ac6215"; + version = "0.1.1.0"; + sha256 = "ffd069f7cbd6f48db278a15805e6ab2a6cc60c24cacd133ecd0c359eae23db8b"; libraryHaskellDepends = [ - aeson array attoparsec base bimaps binary bytestring cereal - cereal-text deepseq file-embed hashable intern LinguisticsTypes - QuickCheck stringable system-filepath text text-binary - unordered-containers vector vector-th-unbox + aeson attoparsec base file-embed LinguisticsTypes text + unordered-containers ]; testHaskellDepends = [ - aeson base binary cereal LinguisticsTypes QuickCheck stringable - test-framework test-framework-quickcheck2 test-framework-th text - unordered-containers + aeson base binary cereal LinguisticsTypes QuickCheck tasty + tasty-quickcheck tasty-th text unordered-containers ]; benchmarkHaskellDepends = [ base containers criterion deepseq hashtables LinguisticsTypes @@ -13675,8 +13851,8 @@ self: { }: mkDerivation { pname = "Plot-ho-matic"; - version = "0.11.0.0"; - sha256 = "bb9d6d7e5c39e48ebf380653f4f9c65391bb746ea68d44650707d02b3f6521a9"; + version = "0.11.2.0"; + sha256 = "923509dbb3b7ca051770c8f75a0e312640925c68eede5d5ad60f909548dbbdcb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -13782,8 +13958,8 @@ self: { }: mkDerivation { pname = "PrimitiveArray"; - version = "0.8.0.0"; - sha256 = "b4af0d0d8502dc8ba8985cd70b69a0220a70e8d44a2ee4dfa73db1bce5774445"; + version = "0.8.0.1"; + sha256 = "91e77d0f115514fd13f03e185b73bd437a57838cabaebed4d98d04bc52ad38f5"; libraryHaskellDepends = [ aeson base binary bits cereal cereal-vector deepseq DPutils hashable log-domain OrderedBits primitive QuickCheck smallcheck @@ -14440,8 +14616,8 @@ self: { }: mkDerivation { pname = "RNAlien"; - version = "1.3.1"; - sha256 = "2e928bb739cba57427fc3a24780b8b36c8eaf6a709e72dadfc637aab0a862fb3"; + version = "1.3.7"; + sha256 = "de54278982eecd9568ee155a3155f632b503776fff7634b8b3746e29d28248a5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -14638,10 +14814,8 @@ self: { }: mkDerivation { pname = "Rasterific"; - version = "0.7.1"; - sha256 = "a3614c5d87c6aacbbd2aabc16d1258f559b03bf46537f47c375949438e7eb5ef"; - revision = "1"; - editedCabalFile = "6d38b54477eb7392b57e8082cc442a44ec34534a58f61bd09cf4d0b9cee7d089"; + version = "0.7.2.1"; + sha256 = "7f6d86495a5a3aa72dd9c13f2dd8d93526cd5166889f39c5e7dde529cef44d74"; libraryHaskellDepends = [ base bytestring containers dlist FontyFruity free JuicyPixels mtl primitive transformers vector vector-algorithms @@ -14863,6 +15037,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "RtMidi" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "RtMidi"; + version = "0.1.0.0"; + sha256 = "c6534f2f1c279d1cbb2eccd085ca52121d6c94d00f322a4cf2a6c455ab26f720"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/riottracker/RtMidi"; + license = stdenv.lib.licenses.mit; + }) {}; + "RxHaskell" = callPackage ({ mkDerivation, base, containers, stm, transformers }: mkDerivation { @@ -15426,6 +15611,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "SelectSequencesFromMSA" = callPackage + ({ mkDerivation, base, biocore, biofasta, bytestring, ClustalParser + , cmdargs, containers, directory, either-unwrap, filepath, matrix + , parsec, process, text, text-metrics, transformers, vector + , ViennaRNAParser + }: + mkDerivation { + pname = "SelectSequencesFromMSA"; + version = "1.0.2"; + sha256 = "e0bcbec57109cd8528e2fd511b4ca5ea17cbffad4bac4f7a71bad90e0ba2271c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base biocore biofasta bytestring ClustalParser cmdargs containers + directory either-unwrap filepath matrix parsec process text + text-metrics transformers vector ViennaRNAParser + ]; + executableHaskellDepends = [ + base cmdargs directory either-unwrap + ]; + description = "SelectSequences is a tool for selection of a represenative subset of sequences from a multiple sequence alignment in clustal format"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "Semantique" = callPackage ({ mkDerivation, base, bytestring, classify, containers, mongoDB , mtl, network, process, split, tagsoup, text @@ -15491,8 +15700,8 @@ self: { }: mkDerivation { pname = "ShellCheck"; - version = "0.4.5"; - sha256 = "53039ac314b99af691a99aec111572ee51b0579280c7fa5795ac48d0c4e02fa7"; + version = "0.4.6"; + sha256 = "11eb9b2794363fbccc6fbd18601db49680e2c439440a9b103eebfda1aa86b1bc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -15578,6 +15787,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ShortestPathProblems" = callPackage + ({ mkDerivation, ADPfusion, ADPfusionSet, base, FormalGrammars + , log-domain, PrimitiveArray, QuickCheck, tasty, tasty-quickcheck + , tasty-th, text, vector + }: + mkDerivation { + pname = "ShortestPathProblems"; + version = "0.0.0.1"; + sha256 = "0ec13f0863757534aca0e0c739aac1510f48178b14e84d64cc758409595e1ddd"; + libraryHaskellDepends = [ + ADPfusion ADPfusionSet base FormalGrammars log-domain + PrimitiveArray text vector + ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-quickcheck tasty-th vector + ]; + homepage = "https://github.com/choener/ShortestPathProblems"; + description = "grammars for TSP and SHP"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ShowF" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -17509,13 +17739,14 @@ self: { }: mkDerivation { pname = "ViennaRNA-bindings"; - version = "0.233.1.1"; - sha256 = "8435afc87b0265175eef88b586e69934e8404bd5126b6d6f5969c6486ce31b1a"; + version = "0.233.1.2"; + sha256 = "6d3c1e8288727500bd07e2dc4c64bf0a0861e7cf9b8d6862d1ae5efb4b7004c7"; libraryHaskellDepends = [ array base ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ array base QuickCheck tasty tasty-hunit tasty-silver tasty-th ]; + testToolDepends = [ c2hs ]; homepage = "https://github.com/choener/ViennaRNA-bindings"; description = "ViennaRNA v2 bindings"; license = "unknown"; @@ -17861,26 +18092,25 @@ self: { }) {advapi32 = null; gdi32 = null; shell32 = null; shfolder = null; user32 = null; winmm = null;}; - "Win32_2_5_1_0" = callPackage + "Win32_2_5_4_1" = callPackage ({ mkDerivation, advapi32, base, bytestring, filepath, gdi32, imm32 - , msimg32, ntdll, shell32, shfolder, shlwapi, user32, winmm + , msimg32, shell32, shfolder, shlwapi, user32, winmm }: mkDerivation { pname = "Win32"; - version = "2.5.1.0"; - sha256 = "84e1b1ee7e435ad4237d2f625114f205141988b964f42259b5e294066f31ca52"; + version = "2.5.4.1"; + sha256 = "cc183e9e545ad04fe8e509eb9447e9d11b160b2027482230cee8cdc141fd3d64"; libraryHaskellDepends = [ base bytestring filepath ]; librarySystemDepends = [ - advapi32 gdi32 imm32 msimg32 ntdll shell32 shfolder shlwapi user32 - winmm + advapi32 gdi32 imm32 msimg32 shell32 shfolder shlwapi user32 winmm ]; homepage = "https://github.com/haskell/win32"; description = "A binding to part of the Win32 library"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.none; }) {advapi32 = null; gdi32 = null; imm32 = null; msimg32 = null; - ntdll = null; shell32 = null; shfolder = null; shlwapi = null; - user32 = null; winmm = null;}; + shell32 = null; shfolder = null; shlwapi = null; user32 = null; + winmm = null;}; "Win32-console" = callPackage ({ mkDerivation, base, Win32 }: @@ -18039,38 +18269,39 @@ self: { }) {}; "WordAlignment" = callPackage - ({ mkDerivation, ADPfusion, AlignmentAlgorithms, ascii-progress - , attoparsec, base, bytestring, cmdargs, containers - , control-monad-omega, deepseq, file-embed, fmlist, FormalGrammars + ({ mkDerivation, ADPfusion, aeson, AlignmentAlgorithms, attoparsec + , base, bimaps, bytestring, cmdargs, containers, data-default + , deepseq, DPutils, file-embed, filepath, fmlist, FormalGrammars , ghc-prim, GrammarProducts, hashable, intern, lens - , LinguisticsTypes, NaturalLanguageAlphabets, parallel, primitive - , PrimitiveArray, QuickCheck, strict, stringable, template-haskell - , test-framework, test-framework-quickcheck2, test-framework-th - , text, text-format, transformers, tuple-th, unordered-containers - , vector + , LinguisticsTypes, mtl, NaturalLanguageAlphabets, parallel, pipes + , primitive, PrimitiveArray, split, strict, tasty, tasty-quickcheck + , tasty-silver, tasty-th, template-haskell, text, text-format + , transformers, tuple-th, unordered-containers, vector }: mkDerivation { pname = "WordAlignment"; - version = "0.1.0.0"; - sha256 = "0182ffbf3dfddcabd73dce16eef232fce5c680125391ce881ddf2b81c97593d0"; + version = "0.2.0.0"; + sha256 = "9ccd32606db500ecec43b74d8c6fbb84cfe2df7fcb0e50619a155d55d74511cc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ADPfusion AlignmentAlgorithms attoparsec base bytestring containers - control-monad-omega deepseq file-embed fmlist FormalGrammars - ghc-prim GrammarProducts hashable intern lens LinguisticsTypes - NaturalLanguageAlphabets primitive PrimitiveArray strict stringable - template-haskell text text-format transformers tuple-th - unordered-containers vector + ADPfusion aeson AlignmentAlgorithms attoparsec base bimaps + bytestring containers data-default deepseq DPutils file-embed + fmlist FormalGrammars ghc-prim GrammarProducts hashable intern lens + LinguisticsTypes mtl NaturalLanguageAlphabets pipes primitive + PrimitiveArray strict template-haskell text text-format + transformers tuple-th unordered-containers vector ]; executableHaskellDepends = [ - ascii-progress base bytestring cmdargs containers file-embed intern - LinguisticsTypes NaturalLanguageAlphabets parallel strict text - unordered-containers vector + aeson base bytestring cmdargs containers data-default DPutils + file-embed intern lens LinguisticsTypes mtl + NaturalLanguageAlphabets parallel pipes strict text text-format + transformers unordered-containers vector ]; testHaskellDepends = [ - base QuickCheck test-framework test-framework-quickcheck2 - test-framework-th + base bytestring containers DPutils filepath + NaturalLanguageAlphabets split tasty tasty-quickcheck tasty-silver + tasty-th text ]; homepage = "https://github.com/choener/WordAlignment"; description = "Bigram word pair alignments"; @@ -18943,6 +19174,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "accelerate_1_0_0_0" = callPackage + ({ mkDerivation, base, base-orphans, containers, deepseq, directory + , exceptions, fclabels, filepath, ghc-prim, hashable, hashtables + , mtl, pretty, template-haskell, time, transformers, unique, unix + , unordered-containers + }: + mkDerivation { + pname = "accelerate"; + version = "1.0.0.0"; + sha256 = "26bd346b77852ebaeef32e18907272e7b0cc54b033a2fcc7f24ee1afa0e8f112"; + libraryHaskellDepends = [ + base base-orphans containers deepseq directory exceptions fclabels + filepath ghc-prim hashable hashtables mtl pretty template-haskell + time transformers unique unix unordered-containers + ]; + homepage = "https://github.com/AccelerateHS/accelerate/"; + description = "An embedded language for accelerated array processing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-arithmetic" = callPackage ({ mkDerivation, accelerate, accelerate-utility, base, QuickCheck , utility-ht @@ -18963,6 +19215,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "accelerate-bignum" = callPackage + ({ mkDerivation, accelerate, accelerate-io, accelerate-llvm + , accelerate-llvm-native, accelerate-llvm-ptx, base, criterion + , ghc-prim, llvm-hs-pure, mwc-random, tasty, tasty-quickcheck + , template-haskell, vector, vector-th-unbox, wide-word + }: + mkDerivation { + pname = "accelerate-bignum"; + version = "0.1.0.0"; + sha256 = "7c18c467d646ed30131ad197144c4f7fa6ce3e821d41c6db3dba4361f04e30a5"; + libraryHaskellDepends = [ + accelerate accelerate-llvm accelerate-llvm-native + accelerate-llvm-ptx base ghc-prim llvm-hs-pure template-haskell + ]; + testHaskellDepends = [ + accelerate accelerate-llvm-native accelerate-llvm-ptx base tasty + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + accelerate accelerate-io accelerate-llvm-native accelerate-llvm-ptx + base criterion mwc-random vector vector-th-unbox wide-word + ]; + homepage = "https://github.com/tmcdonell/accelerate-bignum"; + description = "Fixed-length large integer arithmetic for Accelerate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-cublas" = callPackage ({ mkDerivation, accelerate, accelerate-arithmetic, accelerate-cuda , accelerate-io, accelerate-utility, base, cublas, cuda, random @@ -18990,18 +19270,20 @@ self: { "accelerate-cuda" = callPackage ({ mkDerivation, accelerate, array, base, binary, bytestring - , cryptohash, cuda, directory, fclabels, filepath, hashable - , hashtables, language-c-quote, mainland-pretty, mtl, old-time - , pretty, process, SafeSemaphore, srcloc, template-haskell, text - , transformers, unix, unordered-containers + , containers, cryptohash, cuda, directory, fclabels, filepath + , hashable, hashtables, language-c-quote, mainland-pretty, mtl + , old-time, pretty, process, SafeSemaphore, srcloc + , template-haskell, text, transformers, unix, unordered-containers }: mkDerivation { pname = "accelerate-cuda"; - version = "0.15.1.1"; - sha256 = "6140c60df329f78d77d258ae3029522cb7a3fb038c531e23792dd8b307ff379d"; + version = "0.17.0.0"; + sha256 = "8bf1a11683db753961ce138aae1726f51aa93ff1bd29e9d30c0e53b60ad5b682"; + revision = "3"; + editedCabalFile = "7593f53c4d1e4851e226fef9f51b60b9addfc1cf7ed5f0f67eb2d3728e7f8013"; libraryHaskellDepends = [ - accelerate array base binary bytestring cryptohash cuda directory - fclabels filepath hashable hashtables language-c-quote + accelerate array base binary bytestring containers cryptohash cuda + directory fclabels filepath hashable hashtables language-c-quote mainland-pretty mtl old-time pretty process SafeSemaphore srcloc template-haskell text transformers unix unordered-containers ]; @@ -19032,37 +19314,37 @@ self: { }) {}; "accelerate-examples" = callPackage - ({ mkDerivation, accelerate, accelerate-cuda, accelerate-fft - , accelerate-io, ansi-wl-pprint, array, attoparsec, base, binary - , bmp, bytestring, bytestring-lexing, cereal, containers, criterion - , directory, ekg, fclabels, filepath, gloss, gloss-accelerate - , gloss-raster-accelerate, gloss-rendering, HUnit, mwc-random - , normaldistribution, primitive, QuickCheck, random, repa, repa-io - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , vector, vector-algorithms + ({ mkDerivation, accelerate, accelerate-fft, accelerate-io + , ansi-wl-pprint, array, base, binary, bmp, bytestring + , bytestring-lexing, cereal, colour-accelerate, containers + , criterion, directory, fclabels, filepath, gloss, gloss-accelerate + , gloss-raster-accelerate, gloss-rendering, HUnit, lens-accelerate + , linear, linear-accelerate, matrix-market-attoparsec, mwc-random + , normaldistribution, pipes, QuickCheck, random, repa, repa-io + , scientific, test-framework, test-framework-hunit + , test-framework-quickcheck2, vector, vector-algorithms }: mkDerivation { pname = "accelerate-examples"; - version = "0.15.1.0"; - sha256 = "2191601709da693aedb29f570e44b899b5132d2bc05fe618bc93608a43fec4a2"; - revision = "1"; - editedCabalFile = "77df83db322287253ea831448eced5c2adff5fe3edc413392cfb0eb8bdb0833b"; + version = "1.0.0.0"; + sha256 = "a659dc486da23d220aeefac958008ae9c0a214570008bfa6eaccb6fc02ac05e9"; configureFlags = [ "-f-opencl" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - accelerate accelerate-cuda ansi-wl-pprint base containers criterion - directory ekg fclabels HUnit mwc-random QuickCheck test-framework + accelerate ansi-wl-pprint base containers criterion directory + fclabels HUnit linear mwc-random QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; executableHaskellDepends = [ - accelerate accelerate-cuda accelerate-fft accelerate-io array - attoparsec base binary bmp bytestring bytestring-lexing cereal - containers criterion directory fclabels filepath gloss - gloss-accelerate gloss-raster-accelerate gloss-rendering HUnit - mwc-random normaldistribution primitive QuickCheck random repa - repa-io test-framework test-framework-hunit - test-framework-quickcheck2 vector vector-algorithms + accelerate accelerate-fft accelerate-io array base binary bmp + bytestring bytestring-lexing cereal colour-accelerate containers + criterion directory fclabels filepath gloss gloss-accelerate + gloss-raster-accelerate gloss-rendering HUnit lens-accelerate + linear-accelerate matrix-market-attoparsec mwc-random + normaldistribution pipes QuickCheck random repa repa-io scientific + test-framework test-framework-hunit test-framework-quickcheck2 + vector vector-algorithms ]; homepage = "https://github.com/AccelerateHS/accelerate-examples"; description = "Examples using the Accelerate library"; @@ -19071,14 +19353,12 @@ self: { }) {}; "accelerate-fft" = callPackage - ({ mkDerivation, accelerate, accelerate-cuda, base, cuda, cufft }: + ({ mkDerivation, accelerate, base, bytestring }: mkDerivation { pname = "accelerate-fft"; - version = "0.15.1.0"; - sha256 = "fd2648931ce4607aba4ad527691a4bba0f043ea4182a160aa8f024152101a702"; - libraryHaskellDepends = [ - accelerate accelerate-cuda base cuda cufft - ]; + version = "1.0.0.0"; + sha256 = "784a486d36ac3af714952744f5f592242f11f477bdf8b336356857d593a584e3"; + libraryHaskellDepends = [ accelerate base bytestring ]; homepage = "https://github.com/AccelerateHS/accelerate-fft"; description = "FFT using the Accelerate library"; license = stdenv.lib.licenses.bsd3; @@ -19155,8 +19435,8 @@ self: { }: mkDerivation { pname = "accelerate-io"; - version = "0.15.1.0"; - sha256 = "d531fc6c950a6fcf0bdd72c65438c27fbffe2f3043444128979490d53fc7677c"; + version = "1.0.0.0"; + sha256 = "d12b3b85b488a860bee0c4d54c98d22a327e3264f5e8d328109035162cc8b640"; libraryHaskellDepends = [ accelerate array base bmp bytestring repa vector ]; @@ -19166,6 +19446,67 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "accelerate-llvm" = callPackage + ({ mkDerivation, abstract-deque, accelerate, base, chaselev-deque + , containers, data-default-class, dlist, exceptions, fclabels + , llvm-hs, llvm-hs-pure, mtl, mwc-random, unordered-containers + , vector + }: + mkDerivation { + pname = "accelerate-llvm"; + version = "1.0.0.0"; + sha256 = "b0ead40df7ff37ffd97374c5320c099cc85399af74e12b375dec46c172988ccf"; + revision = "6"; + editedCabalFile = "f9176273927c5a66cbd32d5039bd4d01ef33783fb5a8e7b24ec6f64da09e1ae6"; + libraryHaskellDepends = [ + abstract-deque accelerate base chaselev-deque containers + data-default-class dlist exceptions fclabels llvm-hs llvm-hs-pure + mtl mwc-random unordered-containers vector + ]; + description = "Accelerate backend generating LLVM"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "accelerate-llvm-native" = callPackage + ({ mkDerivation, accelerate, accelerate-llvm, base, containers + , directory, dlist, fclabels, libffi, llvm-hs, llvm-hs-pure, mtl + , time + }: + mkDerivation { + pname = "accelerate-llvm-native"; + version = "1.0.0.0"; + sha256 = "2dca18b74e9eddb031d85bbf23a20dcdd0ee96a8b47b44ea2028e75fbabb0855"; + revision = "1"; + editedCabalFile = "6cc24adf5c991e7776a8ad0393bc7899caee5e431c8d90bccaf1f8610ae0811d"; + libraryHaskellDepends = [ + accelerate accelerate-llvm base containers directory dlist fclabels + libffi llvm-hs llvm-hs-pure mtl time + ]; + description = "Accelerate backend generating LLVM"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "accelerate-llvm-ptx" = callPackage + ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring + , containers, cuda, directory, dlist, fclabels, filepath, hashable + , llvm-hs, llvm-hs-pure, mtl, pretty, time, unordered-containers + }: + mkDerivation { + pname = "accelerate-llvm-ptx"; + version = "1.0.0.0"; + sha256 = "4fae1fb91339ce1e989f9fc8063869e68eb3cf152d972ec1913d6f5f37d12d0e"; + revision = "1"; + editedCabalFile = "c9e468c5a8c75f231122ba116ae645734f13051ef0163fef2a47bd2ea0278592"; + libraryHaskellDepends = [ + accelerate accelerate-llvm base bytestring containers cuda + directory dlist fclabels filepath hashable llvm-hs llvm-hs-pure mtl + pretty time unordered-containers + ]; + description = "Accelerate backend generating LLVM"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-random" = callPackage ({ mkDerivation, accelerate, base, mwc-random }: mkDerivation { @@ -19472,6 +19813,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "acme-functors" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "acme-functors"; + version = "0.1.0.0"; + sha256 = "381a686e8eecb39c4997205dcb9a43146ca7d1abae03c13301a9f0a26570292d"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/chris-martin/acme-functors"; + description = "The best applicative functors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "acme-grawlix" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -20264,6 +20617,8 @@ self: { pname = "aeson"; version = "1.0.2.1"; sha256 = "e0a66fba0a9996063d0e241b0b868c6271b6aeb457821a78bfcaac5d84c89066"; + revision = "1"; + editedCabalFile = "cf848d5d07a3e6962d7a274d452c772bc1c413a0f9f2d5f112fdde4556a7d7f1"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers deepseq dlist ghc-prim hashable scientific tagged template-haskell text time @@ -20282,19 +20637,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "aeson_1_1_0_0" = callPackage + "aeson_1_1_1_0" = callPackage ({ mkDerivation, attoparsec, base, base-compat, base-orphans , base16-bytestring, bytestring, containers, deepseq, directory , dlist, filepath, generic-deriving, ghc-prim, hashable - , hashable-time, HUnit, QuickCheck, quickcheck-instances - , scientific, tagged, template-haskell, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, time - , time-locale-compat, unordered-containers, uuid-types, vector + , hashable-time, HUnit, integer-logarithms, QuickCheck + , quickcheck-instances, scientific, tagged, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, time, time-locale-compat, unordered-containers, uuid-types + , vector }: mkDerivation { pname = "aeson"; - version = "1.1.0.0"; - sha256 = "5810fc5f664855ba6457d119fffd176ee93e60a27e88f5eedc349d7d75f18880"; + version = "1.1.1.0"; + sha256 = "083791ed61fd5d2ce613ba9d54dd37e598a376fab63c9df0abfaa69e802272d6"; + revision = "1"; + editedCabalFile = "fac1956736821af59480cc0adaa84f6c35f6a7678d4256a818f0a5d84a23aef1"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers deepseq dlist ghc-prim hashable scientific tagged template-haskell text time @@ -20303,7 +20661,7 @@ self: { testHaskellDepends = [ attoparsec base base-compat base-orphans base16-bytestring bytestring containers directory dlist filepath generic-deriving - ghc-prim hashable hashable-time HUnit QuickCheck + ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck quickcheck-instances scientific tagged template-haskell test-framework test-framework-hunit test-framework-quickcheck2 text time time-locale-compat unordered-containers uuid-types vector @@ -20420,15 +20778,15 @@ self: { }) {}; "aeson-diff" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory + ({ mkDerivation, aeson, base, bytestring, directory, doctest , edit-distance-vector, filepath, Glob, hashable, hlint, mtl , optparse-applicative, QuickCheck, quickcheck-instances , scientific, text, unordered-containers, vector }: mkDerivation { pname = "aeson-diff"; - version = "1.1.0.0"; - sha256 = "eeeb97b3f40485e7234427f192c66d044c0a25a1b7a24d91870e85fb226c1086"; + version = "1.1.0.2"; + sha256 = "2d7b0ce01d261690058c4c49d2b6e91f39f32920125a54adda9328fd9dfd7716"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -20439,8 +20797,8 @@ self: { aeson base bytestring optparse-applicative text ]; testHaskellDepends = [ - aeson base bytestring directory filepath Glob hlint QuickCheck - quickcheck-instances text unordered-containers vector + aeson base bytestring directory doctest filepath Glob hlint + QuickCheck quickcheck-instances text unordered-containers vector ]; homepage = "https://github.com/thsutton/aeson-diff"; description = "Extract and apply patches to JSON documents"; @@ -20872,16 +21230,17 @@ self: { }) {}; "aeson-value-parser" = callPackage - ({ mkDerivation, aeson, base-prelude, mtl-prelude, scientific - , success, text, unordered-containers, vector + ({ mkDerivation, aeson, base-prelude, json-pointer + , json-pointer-aeson, mtl-prelude, scientific, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "aeson-value-parser"; - version = "0.11.4"; - sha256 = "f5a31e1aa81eaf7eed3b1a5ad3e793478f51043792435e537ff6649f4cad3c8e"; + version = "0.12.1"; + sha256 = "11096d66a70d036bbe5d685aa516e454623f2f6de98693dbb36e1016dce8ac8d"; libraryHaskellDepends = [ - aeson base-prelude mtl-prelude scientific success text - unordered-containers vector + aeson base-prelude json-pointer json-pointer-aeson mtl-prelude + scientific text transformers unordered-containers vector ]; homepage = "https://github.com/sannsyn/aeson-value-parser"; description = "An API for parsing \"aeson\" JSON tree into Haskell types"; @@ -20903,16 +21262,17 @@ self: { "affection" = callPackage ({ mkDerivation, babl, base, clock, containers, gegl, glib - , monad-loops, mtl, sdl2, text + , monad-loops, monad-parallel, mtl, sdl2, text }: mkDerivation { pname = "affection"; - version = "0.0.0.5"; - sha256 = "4d5f2d6257d6dcb6fe7b1658bead8e0c48451414d434d44e5492709b81ac43e7"; + version = "0.0.0.6"; + sha256 = "bf4993ebf47cabd6126feace83ce954443e06b5361931903a84c21437f388039"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - babl base clock containers gegl glib monad-loops mtl sdl2 text + babl base clock containers gegl glib monad-loops monad-parallel mtl + sdl2 text ]; homepage = "https://github.com/nek0/affection#readme"; description = "A simple Game Engine using SDL"; @@ -21212,8 +21572,8 @@ self: { }: mkDerivation { pname = "airtable-api"; - version = "0.2.0.1"; - sha256 = "e17565f18a0ecee13f9650a350f4731e20a21df03c350a8aa6bfe30b37233230"; + version = "0.3.2.4"; + sha256 = "f44423ee40e66e35ad1ede9481e2c0148600c73001c1316b3f496a6be79ade3a"; libraryHaskellDepends = [ aeson base bytestring hashable lens text time unordered-containers wreq @@ -21503,8 +21863,8 @@ self: { ({ mkDerivation, base, deepseq, template-haskell, text }: mkDerivation { pname = "alex-tools"; - version = "0.1.1.0"; - sha256 = "c0a1c33e24955a7e2536ef5ad7614b227523330ed4c68724fda47ba4ba368d86"; + version = "0.2.0.0"; + sha256 = "6ffbfafcc03ec27a825ec4f488ec4d0c7323e3e7f72463b4920fa2111ac2186e"; libraryHaskellDepends = [ base deepseq template-haskell text ]; description = "A set of functions for a common use case of Alex"; license = stdenv.lib.licenses.isc; @@ -21644,6 +22004,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "algebraic-graphs" = callPackage + ({ mkDerivation, array, base, containers, criterion, extra + , QuickCheck + }: + mkDerivation { + pname = "algebraic-graphs"; + version = "0.0.4"; + sha256 = "f59348961d74eeba4195cc7ee473ab5df2ad9c13a94f8c4e99401e4cb7480eb5"; + libraryHaskellDepends = [ array base containers ]; + testHaskellDepends = [ base containers extra QuickCheck ]; + benchmarkHaskellDepends = [ base containers criterion ]; + homepage = "https://github.com/snowleopard/alga"; + description = "A library for algebraic graph construction and transformation"; + license = stdenv.lib.licenses.mit; + }) {}; + "algebraic-prelude" = callPackage ({ mkDerivation, algebra, base, basic-prelude, lens, semigroups }: mkDerivation { @@ -22054,8 +22430,8 @@ self: { ({ mkDerivation, base, mmorph, transformers }: mkDerivation { pname = "alternators"; - version = "0.1.1.0"; - sha256 = "f95d9a4826c57194e2a22e41a9f0eaef0e96cf95f6372179aa7c47bc3ca8f627"; + version = "0.1.1.1"; + sha256 = "9650d4126bfc2548e20e1ac3855b22568e19f7a40a6c0fa92ece3fcc63d03b0e"; libraryHaskellDepends = [ base mmorph transformers ]; homepage = "https://github.com/louispan/alternators#readme"; description = "Handy functions when using transformers"; @@ -25124,8 +25500,8 @@ self: { }: mkDerivation { pname = "app-settings"; - version = "0.2.0.10"; - sha256 = "88dd9df76930467c14b764108cda92676a6702f68ad38a09c26e740bce29ac28"; + version = "0.2.0.11"; + sha256 = "6a14c69aca4e55cf27933475f5ae0ffead3a83f69f4233896eb13c41dccd50b1"; libraryHaskellDepends = [ base containers directory mtl parsec text ]; @@ -25975,6 +26351,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "arrow-extras" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "arrow-extras"; + version = "0.1.0.1"; + sha256 = "c13c3aba839d1ec78a49991fa4038a68c5eb9ef6da61eceb6e68bc3ce0586a6c"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/louispan/arrow-extras#readme"; + description = "Extra functions for Control.Arrow"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "arrow-improve" = callPackage ({ mkDerivation, arrows, base, pointed, profunctors, semigroupoids }: @@ -26300,24 +26688,6 @@ self: { }) {}; "asn1-encoding" = callPackage - ({ mkDerivation, asn1-types, base, bytestring, hourglass, mtl - , tasty, tasty-quickcheck, text - }: - mkDerivation { - pname = "asn1-encoding"; - version = "0.9.4"; - sha256 = "a78058f7db08fbd72f2b40c72af324a4d31ea95d70b4bfa372107b980394dde8"; - libraryHaskellDepends = [ asn1-types base bytestring hourglass ]; - testHaskellDepends = [ - asn1-types base bytestring hourglass mtl tasty tasty-quickcheck - text - ]; - homepage = "http://github.com/vincenthz/hs-asn1"; - description = "ASN1 data reader and writer in RAW, BER and DER forms"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "asn1-encoding_0_9_5" = callPackage ({ mkDerivation, asn1-types, base, bytestring, hourglass, mtl , tasty, tasty-quickcheck, text }: @@ -26333,7 +26703,6 @@ self: { homepage = "http://github.com/vincenthz/hs-asn1"; description = "ASN1 data reader and writer in RAW, BER and DER forms"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "asn1-parse" = callPackage @@ -26697,12 +27066,12 @@ self: { , configurator, containers, cryptohash, hostname, http-client , http-client-tls, http-media, http-types, jwt, mtl, network , network-api-support, network-uri, snap, snap-core, split, text - , time, time-units, transformers + , time, time-units, transformers, zlib }: mkDerivation { pname = "atlassian-connect-core"; - version = "0.7.0.1"; - sha256 = "febe860cd0151f4b26c9180c71ca7526b99c204e20dc5b03e8a63b827214ee9a"; + version = "0.7.0.2"; + sha256 = "6872f0ca4a70c50942b239828621fda3923a3763921130150be20c568c40ff50"; libraryHaskellDepends = [ aeson atlassian-connect-descriptor base base64-bytestring bytestring case-insensitive cipher-aes configurator containers @@ -26710,11 +27079,12 @@ self: { http-types jwt mtl network network-api-support network-uri snap snap-core split text time time-units transformers ]; + libraryPkgconfigDepends = [ zlib ]; homepage = "https://bitbucket.org/ajknoll/atlassian-connect-core"; description = "Atlassian Connect snaplet for the Snap Framework and helper code"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {inherit (pkgs) zlib;}; "atlassian-connect-descriptor" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, cases, HUnit @@ -26723,8 +27093,8 @@ self: { }: mkDerivation { pname = "atlassian-connect-descriptor"; - version = "0.4.4.1"; - sha256 = "4a6c8efba3282d57abde8852e16aa8ea387858dcfbe1bbb28db2e18b47f80db8"; + version = "0.4.4.2"; + sha256 = "9352e134c720358694b7e839c5056ce62334303d0db9cb94e151c086da123598"; libraryHaskellDepends = [ aeson base cases network network-uri text time-units unordered-containers @@ -27252,13 +27622,13 @@ self: { }: mkDerivation { pname = "attoparsec-time"; - version = "0.1.1"; - sha256 = "9789759199654f3767823b62bb48182b5f83226ebde3ec74e31863309a77a362"; + version = "0.1.1.1"; + sha256 = "8d1ae65e5798e451ca692b0492dd58cde17b33c1a1239bb635215728de7419bb"; libraryHaskellDepends = [ attoparsec base-prelude text time ]; testHaskellDepends = [ base base-prelude directory doctest filepath ]; - homepage = "https://github.com/sannsyn/attoparsec-time"; + homepage = "https://github.com/nikita-volkov/attoparsec-time"; description = "Attoparsec parsers of time"; license = stdenv.lib.licenses.mit; }) {}; @@ -27307,15 +27677,22 @@ self: { }) {}; "audacity" = callPackage - ({ mkDerivation, base, deepseq, utility-ht }: + ({ mkDerivation, base, bytestring, deepseq, directory + , explicit-exception, filepath, non-empty, storable-record + , storablevector, tagchup, transformers, utility-ht, xml-basic + }: mkDerivation { pname = "audacity"; - version = "0.0"; - sha256 = "1f578e6cf8bfc5524a9e49ff306a736ab1c5db2a8a4ab4a3e4f47cb34a2fd7ed"; + version = "0.0.1.1"; + sha256 = "f1d333e19a70af7be5d0bc99640b2d8ebb29bf4c6f707cf5639f5a4fe041abc2"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base deepseq utility-ht ]; - homepage = "http://code.haskell.org/~thielema/audacity"; + libraryHaskellDepends = [ + base bytestring deepseq directory explicit-exception filepath + non-empty storable-record storablevector tagchup transformers + utility-ht xml-basic + ]; + homepage = "http://hub.darcs.net/thielema/audacity"; description = "Interchange with the Audacity sound signal editor"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -27726,8 +28103,8 @@ self: { pname = "avers"; version = "0.0.17.1"; sha256 = "1b45d8aa036b3c2ec7ea180327ff3cdce28dc1e1ef319c062be79f0ffa7626f5"; - revision = "7"; - editedCabalFile = "fb4e416f91c130daa956139b2d2cac7c92735879c699802e7f2acb0115eb671f"; + revision = "8"; + editedCabalFile = "02e4d9421b93aa3fe30c3b676ae1e7c5dca3a7b7d4c710b4f1a0925a071dca6c"; libraryHaskellDepends = [ aeson attoparsec base bytestring clock containers cryptonite filepath inflections memory MonadRandom mtl network network-uri @@ -27744,7 +28121,7 @@ self: { aeson base criterion mtl network-uri resource-pool rethinkdb-client-driver text ]; - description = "empty"; + description = "Server-side implementation of the Avers storage model"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -27757,6 +28134,8 @@ self: { pname = "avers-api"; version = "0.0.18.0"; sha256 = "b1ba2ad32420636bf298efa7d4ff42fda9501672306f04b11c91aee1fe7805c5"; + revision = "1"; + editedCabalFile = "1b4647c9b83c58c85eda00a185f366602084de4e1a75f47ad02fcb1789ecda7e"; libraryHaskellDepends = [ aeson avers base bytestring cookie http-api-data servant text time vector @@ -27775,6 +28154,8 @@ self: { pname = "avers-api-docs"; version = "0.0.18.0"; sha256 = "38a9f290cfd92ee922253337b30297dd5d3fa0db28c5aad5a0e6d01a205efca1"; + revision = "1"; + editedCabalFile = "23afde7dedb160851c8cb51c7d778d52bac33b38b01189d91d71a5d0db0b4512"; libraryHaskellDepends = [ aeson avers avers-api base cookie lens servant servant-swagger swagger2 text unordered-containers @@ -27796,6 +28177,8 @@ self: { pname = "avers-server"; version = "0.0.18.0"; sha256 = "44ea17fd5f2351ae0c63d630f3c4a4879541f47b63b57bd447683d4644901cf7"; + revision = "1"; + editedCabalFile = "e685f7dcb5c8a80b047f6974e51cc2edab7e0a98b260587a7c82627fb858f559"; libraryHaskellDepends = [ aeson avers avers-api base base64-bytestring bytestring bytestring-conversion containers cookie cryptonite either @@ -28398,16 +28781,16 @@ self: { "aws-simple" = callPackage ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, amazonka-sqs - , base, blaze-builder, bytestring, conduit, lens, mtl, resourcet - , text, unordered-containers + , base, bytestring, conduit, lens, mtl, resourcet, text, timespan + , unordered-containers }: mkDerivation { pname = "aws-simple"; - version = "0.3.0.0"; - sha256 = "52fe1741cb4685b56bf9690273e2dc68626165aff4f59a13d82005c15962076d"; + version = "0.4.0.0"; + sha256 = "af86437bb0c29e177e85297fd9f431d8a91b9f75a7db853bf6cd52b26092bc60"; libraryHaskellDepends = [ - amazonka amazonka-core amazonka-s3 amazonka-sqs base blaze-builder - bytestring conduit lens mtl resourcet text unordered-containers + amazonka amazonka-core amazonka-s3 amazonka-sqs base bytestring + conduit lens mtl resourcet text timespan unordered-containers ]; homepage = "https://github.com/agrafix/aws-simple#readme"; description = "Dead simple bindings to commonly used AWS Services"; @@ -28440,6 +28823,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "axiom" = callPackage + ({ mkDerivation, base, bytestring, containers, directory + , ghcjs-perch, mtl, transformers, transient, transient-universe + }: + mkDerivation { + pname = "axiom"; + version = "0.4.4"; + sha256 = "84f8b0b843c67cd34c28f4fa3fac1ef6abbdf0b141615ca29d8cc7f292895002"; + libraryHaskellDepends = [ + base bytestring containers directory ghcjs-perch mtl transformers + transient transient-universe + ]; + homepage = "https://github.com/transient-haskell/axiom"; + description = "Web EDSL for running in browsers and server nodes using transient"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "axiomatic-classes" = callPackage ({ mkDerivation, base, containers, control-invariants, lens , monad-loops, mtl, portable-template-haskell-lens, QuickCheck @@ -28466,8 +28867,8 @@ self: { }: mkDerivation { pname = "azubi"; - version = "0.2.0.1"; - sha256 = "9c772283727f23f433bb3617917ad7318c179a7e34b9bc890ab42ca20e9bd651"; + version = "0.2.0.2"; + sha256 = "5b5901feb57f59e518e53cc8d29863650c5bf34d83224aafc10895e5f8915602"; libraryHaskellDepends = [ base Diff directory filepath options process unix ]; @@ -28671,6 +29072,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "backprop" = callPackage + ({ mkDerivation, ad, base, bifunctors, criterion, deepseq + , directory, generics-sop, hmatrix, microlens, microlens-mtl + , microlens-th, mnist-idx, mtl, mwc-random, profunctors, reflection + , tagged, time, transformers, transformers-base, type-combinators + , vector + }: + mkDerivation { + pname = "backprop"; + version = "0.0.3.0"; + sha256 = "ae199a345a134f2251deec151cd7d32cbe28f327a142fb3c5ed883e992d858e6"; + libraryHaskellDepends = [ + ad base generics-sop microlens microlens-mtl microlens-th mtl + profunctors reflection tagged transformers-base type-combinators + ]; + benchmarkHaskellDepends = [ + base bifunctors criterion deepseq directory generics-sop hmatrix + mnist-idx mwc-random time transformers type-combinators vector + ]; + homepage = "https://github.com/mstksg/backprop"; + description = "Heterogeneous, type-safe automatic backpropagation in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "backtracking-exceptions" = callPackage ({ mkDerivation, base, either, free, kan-extensions, mtl , semigroupoids, semigroups, transformers @@ -29086,8 +29511,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheck, unix }: mkDerivation { pname = "base-compat"; - version = "0.9.1"; - sha256 = "1033b48146b9ffcf4f7c75a321ea0b1525c1b662230f46c41957a1b501b6464a"; + version = "0.9.2"; + sha256 = "b47c4cec234f9ec83c292e7e213ebcfb4e0418db142f151fd8c370ccd5e2b21b"; libraryHaskellDepends = [ base unix ]; testHaskellDepends = [ base hspec QuickCheck ]; description = "A compatibility layer for base"; @@ -29158,6 +29583,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "base-prelude_1_2_0_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "base-prelude"; + version = "1.2.0.1"; + sha256 = "811a494f5996ff1012be15a1236cc4afb6a67fc2a9f54fdb53f4e94a8fde119e"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/nikita-volkov/base-prelude"; + description = "The most complete prelude formed solely from the \"base\" package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base-unicode-symbols" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -29365,38 +29803,17 @@ self: { }) {}; "basic-lens" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "basic-lens"; - version = "0.0.0"; - sha256 = "d2ee8a48909db7f6bbf3deae03d9cfbbdfcce86932f0cae8fb59bf6d0c10ed61"; - revision = "1"; - editedCabalFile = "dcb1e49555431b94fedf161e3a2169213eea59167a34eb20b91be22baac9e170"; - libraryHaskellDepends = [ base ]; + version = "0.0.2"; + sha256 = "dae71ad00f4934019c724d057e63a924753e9c06baa3c3353ad0a5cf57ffd4e2"; + libraryHaskellDepends = [ base template-haskell ]; description = "Basic lens type and functions"; license = stdenv.lib.licenses.bsd3; }) {}; "basic-prelude" = callPackage - ({ mkDerivation, base, bytestring, containers, filepath, hashable - , lifted-base, ReadArgs, safe, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "basic-prelude"; - version = "0.6.1"; - sha256 = "6c2b905777d6e22157da48d7e3d5f3862e0698736afbf4f237fff9d14e803061"; - libraryHaskellDepends = [ - base bytestring containers filepath hashable lifted-base ReadArgs - safe text transformers unordered-containers vector - ]; - homepage = "https://github.com/snoyberg/basic-prelude"; - description = "An enhanced core prelude; a common foundation for alternate preludes"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "basic-prelude_0_6_1_1" = callPackage ({ mkDerivation, base, bytestring, containers, filepath, hashable , lifted-base, ReadArgs, safe, text, transformers , unordered-containers, vector @@ -29773,8 +30190,8 @@ self: { }: mkDerivation { pname = "bench"; - version = "1.0.2"; - sha256 = "9fac082305cc27d9ec7ee351ae1d301fc0a434c77cf1b121f51f2ca46d3a462e"; + version = "1.0.3"; + sha256 = "3107b94eee51a728da8d5e4f1a6b72e474840668029a6c6ddc287b73de4960c6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -30390,7 +30807,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "binary_0_8_4_1" = callPackage + "binary_0_8_5_1" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, Cabal, cereal , containers, criterion, deepseq, directory, filepath, HUnit, mtl , QuickCheck, random, tar, test-framework @@ -30398,10 +30815,8 @@ self: { }: mkDerivation { pname = "binary"; - version = "0.8.4.1"; - sha256 = "8d13c700fe96c84644a2af37003f488668fe9cd1f8e5b316fc929de26ce7e7ba"; - revision = "1"; - editedCabalFile = "56a00340fec65458e3c7cfe1d63651db09dd8d6ac925f843aefd2e98f4adbd50"; + version = "0.8.5.1"; + sha256 = "deb91a69662288f38bb62e04f2cedf8ef60d84437a194c778dacf6c31dfe0596"; libraryHaskellDepends = [ array base bytestring containers ]; testHaskellDepends = [ array base bytestring Cabal containers directory filepath HUnit @@ -31832,21 +32247,21 @@ self: { "biohazard" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, base-prelude , binary, bytestring, bytestring-mmap, containers, directory - , exceptions, filepath, hashable, iteratee, ListLike, primitive - , random, scientific, stm, text, transformers, unix - , unordered-containers, vector, vector-algorithms, vector-th-unbox - , zlib + , exceptions, filepath, hashable, ListLike, monad-control + , primitive, random, scientific, stm, text, transformers + , transformers-base, unix, unordered-containers, vector + , vector-algorithms, vector-th-unbox, zlib }: mkDerivation { pname = "biohazard"; - version = "0.6.10"; - sha256 = "d966220ae495fb0b4ac792ac02aea3a8786f7a792ce7dcf0e88d4ee27378ebda"; + version = "0.6.13"; + sha256 = "a5e8015219273869d4d7b4971b12e707626dc599ca3b8455a2402538149d3a71"; libraryHaskellDepends = [ aeson async attoparsec base base-prelude binary bytestring bytestring-mmap containers directory exceptions filepath hashable - iteratee ListLike primitive random scientific stm text transformers - unix unordered-containers vector vector-algorithms vector-th-unbox - zlib + ListLike monad-control primitive random scientific stm text + transformers transformers-base unix unordered-containers vector + vector-algorithms vector-th-unbox zlib ]; homepage = "http://github.com/udo-stenzel/biohazard"; description = "bioinformatics support library"; @@ -32534,8 +32949,8 @@ self: { }: mkDerivation { pname = "bitx-bitcoin"; - version = "0.11.0.0"; - sha256 = "9f46782f5a9688b7c1681789d7165c9a21247dc5fc67807cf847bf526414ce20"; + version = "0.11.0.1"; + sha256 = "926a57fb85bd42185c2e8abb00e6ff309062abb6b24fce2eef61507896fb219c"; libraryHaskellDepends = [ aeson base bytestring deepseq exceptions http-client http-client-tls http-types microlens microlens-th network @@ -33089,8 +33504,8 @@ self: { ({ mkDerivation, base, blaze-markup, mtl }: mkDerivation { pname = "blaze-svg"; - version = "0.3.6"; - sha256 = "90dff37d78bffe5ee2587bab4281c158d5d1bd3901fe359bfdcc1cb6fb387179"; + version = "0.3.6.1"; + sha256 = "f6a4f1bba1e973b336e94de73369f4562778fde43b6ac7c0b32d6a501527aa60"; libraryHaskellDepends = [ base blaze-markup mtl ]; homepage = "https://github.com/deepakjois/blaze-svg"; description = "SVG combinator library"; @@ -33174,8 +33589,10 @@ self: { }: mkDerivation { pname = "ble"; - version = "0.2.0.0"; - sha256 = "c8961033317b333de25d2fa49375b309b17aa1d825bb4030cc0cc990df6655e1"; + version = "0.3.1.0"; + sha256 = "d3ef2722c649903a26ddbc4d78bf8b7121d5f0bac84fc71ebad4c02e8f9e798c"; + revision = "1"; + editedCabalFile = "7ff3ee0a435f1d611c4ae67323913260a53fc3e22947c1db00bdf721bba7d45b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33184,7 +33601,7 @@ self: { uuid ]; executableHaskellDepends = [ - base bytestring cereal containers d-bus data-default-class + base bytestring cereal containers d-bus data-default-class hslogger microlens microlens-ghc microlens-th mtl random stm text transformers uuid ]; @@ -33586,8 +34003,8 @@ self: { }: mkDerivation { pname = "board-games"; - version = "0.1.0.5"; - sha256 = "b03ba53621f7ebd508d1f910f71492252a7181cc3485ecf7ae874eb634bd5d5e"; + version = "0.1.0.6"; + sha256 = "173e6eba0eddd3807d610c305f37f049fe5d2346e0772e186b3c2aced4043e63"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33653,8 +34070,8 @@ self: { }: mkDerivation { pname = "bolt"; - version = "0.3.0.1"; - sha256 = "dd7f157db6fe2c6cac86a19803ac56ed132d8aa27f602a98e3506d2765b23ff9"; + version = "0.3.1.0"; + sha256 = "b08cbc39c38084e540c30052ac03fc764871650444024008f67d407002f57764"; libraryHaskellDepends = [ base bifunctors bytestring cereal containers hashable network network-uri scientific text transformers unordered-containers @@ -33828,12 +34245,16 @@ self: { }) {}; "bookkeeping-jp" = callPackage - ({ mkDerivation, base, bookkeeping, doctest, Glob }: + ({ mkDerivation, base, bookkeeping, doctest, Glob, mono-traversable + , text, time + }: mkDerivation { pname = "bookkeeping-jp"; - version = "0.1.0.1"; - sha256 = "10cb27933f689d38c0bc6e24ae6b1a06cdd9f69aef83dc6aa779c9872410cde5"; - libraryHaskellDepends = [ base bookkeeping ]; + version = "0.1.1.0"; + sha256 = "b5afda1702307402f950346400d293609e3d066afc728fca260edc400046b0c2"; + libraryHaskellDepends = [ + base bookkeeping mono-traversable text time + ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/arowM/haskell-bookkeeping-jp#readme"; description = "Helper functions for Japanese bookkeeping"; @@ -34393,8 +34814,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.17.1"; - sha256 = "8c7ae11cbe393d3498e8e4a2e2b6eb1ee8b0582b3724fe6e844104e479c48511"; + version = "0.17.2"; + sha256 = "ad154e23b4c38d045c3621de45b876e41eebdde7cae510b733930f0f59ae1c2a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35042,8 +35463,8 @@ self: { }: mkDerivation { pname = "byline"; - version = "0.2.3.0"; - sha256 = "964668e4e3eec9807e64c739a4a215c8e07800661c6d34ad2bd258e08872845c"; + version = "0.2.4.0"; + sha256 = "82433a4629c3ff2f538914100fc6747f6552c3497e4f64223dc9e24791967eef"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35427,6 +35848,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bytestring-strict-builder" = callPackage + ({ mkDerivation, base, base-prelude, bytestring, criterion + , quickcheck-instances, rerebase, semigroups, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "bytestring-strict-builder"; + version = "0.4.3"; + sha256 = "d56f6bc42518565f9310eaa13ce1d35cf29879bdae995d9b893fd309c093d231"; + libraryHaskellDepends = [ + base base-prelude bytestring semigroups + ]; + testHaskellDepends = [ + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + homepage = "https://github.com/nikita-volkov/bytestring-strict-builder"; + description = "An efficient strict bytestring builder"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bytestring-time" = callPackage ({ mkDerivation, attoparsec, base, bytestring, Cabal, hspec , QuickCheck, text, time @@ -35595,6 +36039,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "c-mosquitto" = callPackage + ({ mkDerivation, base, bytestring, containers, inline-c, mosquitto + , options, primitive + }: + mkDerivation { + pname = "c-mosquitto"; + version = "0.1.0.0"; + sha256 = "f5ebcc828368ab3e76f45e64fc0266d8483f28f42cbcda911a22d6021204cd3f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers inline-c primitive + ]; + librarySystemDepends = [ mosquitto ]; + executableHaskellDepends = [ base options ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/tolysz/c-mosquitto#readme"; + description = "Simpe mosquito MQTT binding able to work with the Amazons IoT"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) mosquitto;}; + "c-storable-deriving" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -35690,6 +36155,31 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "c2hs_0_28_2" = callPackage + ({ mkDerivation, array, base, bytestring, containers, directory + , dlist, filepath, HUnit, language-c, pretty, process, shelly + , test-framework, test-framework-hunit, text, transformers + }: + mkDerivation { + pname = "c2hs"; + version = "0.28.2"; + sha256 = "f4171478cafe9f4906735763c2e0bc1ca0a9f56b50e9d59aac07520434920f9e"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array base bytestring containers directory dlist filepath + language-c pretty process + ]; + testHaskellDepends = [ + base filepath HUnit shelly test-framework test-framework-hunit text + transformers + ]; + homepage = "https://github.com/haskell/c2hs"; + description = "C->Haskell FFI tool that gives some cross-language type safety"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "c2hs-extra" = callPackage ({ mkDerivation, base, c2hs }: mkDerivation { @@ -35787,8 +36277,8 @@ self: { }: mkDerivation { pname = "cabal-bounds"; - version = "1.0.5"; - sha256 = "10a81b97a6d993c37778b5840be9a7a67ab47feb59cec3550e345ab5239c8e62"; + version = "1.1.0"; + sha256 = "74114ed6e439566fcb0dd466efe011c6f16defb1dba6c2345bd4184c1698e58a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36281,6 +36771,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cabal-plan" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring + , bytestring, containers, directory, filepath, mtl, text + }: + mkDerivation { + pname = "cabal-plan"; + version = "0.1.1.0"; + sha256 = "aa33d57eb818ca5da4c1ebf96f12e6751c216b279ee6bffdaee09bfd9cf6ea69"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring containers directory + filepath text + ]; + executableHaskellDepends = [ + ansi-terminal base bytestring containers mtl text + ]; + homepage = "https://github.com/hvr/cabal-plan"; + description = "Library and utiltity for processing cabal's plan.json file"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "cabal-progdeps" = callPackage ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { @@ -36319,8 +36831,8 @@ self: { }: mkDerivation { pname = "cabal-rpm"; - version = "0.11"; - sha256 = "c705a4fc4bcdf64989d26b94b52381ab465db542e0a99e8614ced9fe872ed9d5"; + version = "0.11.1"; + sha256 = "db4e85d9490fe054af792d454004e8537de52c9bd506efe077a6b328440c12df"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -36582,8 +37094,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.1"; - sha256 = "6874df33b6a208d7715f673ceded9e09a7e8188a0a94651b14e208b928256f6e"; + version = "2.1.1"; + sha256 = "1f628410eb6a1a8cba4a80c6ba0d9aa75f495594360fed83cd2223be548854bd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36817,8 +37329,8 @@ self: { }: mkDerivation { pname = "cacophony"; - version = "0.9.1"; - sha256 = "cb60834c8b0571f2b2b54b6f9847960c71ffe5350c60791c439de6ba54c67c02"; + version = "0.9.2"; + sha256 = "fb66334322e6b6c1d0896f1a780724fa4624c90f8e8d5a3c7ca21ace7a040316"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37276,8 +37788,8 @@ self: { }: mkDerivation { pname = "canteven-http"; - version = "0.1.3.0"; - sha256 = "d427d5bc77861c2a648a604443f2a5ca882b911487ac313dbb5db6b0271870d4"; + version = "0.1.4.0"; + sha256 = "46e1b58deb3c18ea9b85377466f4fbe0ad7998e0130fab1208eb8fed2343ba7f"; libraryHaskellDepends = [ base bytestring canteven-log directory exceptions filepath http-types mime-types monad-logger template-haskell text time @@ -37488,6 +38000,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "carbonara" = callPackage + ({ mkDerivation, base, mysql-simple, postgresql-simple, split, time + }: + mkDerivation { + pname = "carbonara"; + version = "0.0.1"; + sha256 = "76974d0c8d12e744db649a8c55e6b310ea96550d60677b79f9249c71d033bf27"; + libraryHaskellDepends = [ + base mysql-simple postgresql-simple split time + ]; + homepage = "https://github.com/szehk/Haskell-Carbonara-Library"; + description = "some spaghetti code"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "carboncopy" = callPackage ({ mkDerivation, base, bytestring, filepath, haskell98, IfElse , MissingH @@ -37534,8 +38061,8 @@ self: { }: mkDerivation { pname = "carray"; - version = "0.1.6.5"; - sha256 = "6b253bd77cbe3cf1ed05ed60fa45f72f2ed5f6a0db5395ba26d58317b146786b"; + version = "0.1.6.6"; + sha256 = "9f50136c01e6a58e7195c5c72fa3e13a76c81933467ae74177dfcc8b91b142c0"; libraryHaskellDepends = [ array base binary bytestring ix-shapable QuickCheck syb ]; @@ -37846,8 +38373,8 @@ self: { ({ mkDerivation, base, split }: mkDerivation { pname = "casing"; - version = "0.1.1.0"; - sha256 = "db3ba2aa997885da68348ff8c71e98434edc5a80e8e665154ccbf6f9ee3b63fb"; + version = "0.1.2.1"; + sha256 = "a8bff2e6ed42915a472fa6f62873d78f21c2d31390845a8d3b5ea2638101a638"; libraryHaskellDepends = [ base split ]; description = "Convert between various source code casing conventions"; license = stdenv.lib.licenses.mit; @@ -39117,8 +39644,8 @@ self: { ({ mkDerivation, base, bytestring }: mkDerivation { pname = "charsetdetect"; - version = "1.0"; - sha256 = "f7d8e6a38572ed4e0789279ff9726a7a2b192e3f8c099cc54484c47acd1660f0"; + version = "1.1.0.2"; + sha256 = "5e8339ec02f13265016489141b69af373564edc7581ef46f8ae405b8a919d5e6"; libraryHaskellDepends = [ base bytestring ]; homepage = "http://www.github.com/batterseapower/charsetdetect"; description = "Character set detection using Mozilla's Universal Character Set Detector"; @@ -39209,8 +39736,8 @@ self: { }: mkDerivation { pname = "chatter"; - version = "0.9.0.0"; - sha256 = "edf8212aeb172c7ba63be8d72eded4f7ca3eb0c29fbf78b134d7a9e64f989f5a"; + version = "0.9.1.0"; + sha256 = "c0bf8a15a71e935a83ae3b723a63ab81b13d59a1de1f9cd44c0a77e6a15852e0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39358,20 +39885,6 @@ self: { }) {}; "check-email" = callPackage - ({ mkDerivation, base, bytestring, email-validate, resolv }: - mkDerivation { - pname = "check-email"; - version = "1.0"; - sha256 = "dfbba577c18ca1180d8d4b38cd0a54a6f0ca5a886e502cb83c8ab07675463cb7"; - revision = "1"; - editedCabalFile = "39f8616eeee765838400cd6754f864e9e65e8a89123327161227b6a424c20d75"; - libraryHaskellDepends = [ base bytestring email-validate ]; - librarySystemDepends = [ resolv ]; - description = "Confirm whether an email is valid and probably existant"; - license = stdenv.lib.licenses.bsd3; - }) {resolv = null;}; - - "check-email_1_0_2" = callPackage ({ mkDerivation, base, bytestring, email-validate, resolv }: mkDerivation { pname = "check-email"; @@ -39382,7 +39895,6 @@ self: { homepage = "https://github.com/qoelet/check-email#readme"; description = "Confirm whether an email is valid and probably existant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {resolv = null;}; "check-pvp" = callPackage @@ -40233,8 +40745,8 @@ self: { }: mkDerivation { pname = "clafer"; - version = "0.4.4"; - sha256 = "285e0dc889526f37f7bcc6418699b5465c269a9e6cb17a9219405089c644f21f"; + version = "0.4.5"; + sha256 = "0b19b7dd173851200a2a55ccb491e58c6239f838d2da476fb2ba22486d3d99d2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40267,8 +40779,8 @@ self: { }: mkDerivation { pname = "claferIG"; - version = "0.4.4"; - sha256 = "7eecfddae7d82ba90fba1e68ab19513f5eb056ed3741f6b577b5b41d8728eeb4"; + version = "0.4.5"; + sha256 = "52369e39c556ecc20b6f426ac53ec9f346986008c612f3c08450adef125d61cb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40298,8 +40810,8 @@ self: { }: mkDerivation { pname = "claferwiki"; - version = "0.4.4"; - sha256 = "993d093d554939dd4570ce7d54df818b5c249f7434c90d68d89f5e537dbff028"; + version = "0.4.5"; + sha256 = "e012350a1575d7a5f2eab664ccbe79d3ca7f166004d3295142c3a9df7bbb5766"; libraryHaskellDepends = [ base clafer containers directory gitit MissingH mtl network network-uri process SHA split time transformers transformers-compat @@ -40591,38 +41103,6 @@ self: { }) {}; "classy-prelude" = callPackage - ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring - , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim - , hashable, hspec, lifted-async, lifted-base, monad-unlift - , mono-traversable, mono-traversable-instances, mtl - , mutable-containers, primitive, QuickCheck, safe-exceptions, say - , semigroups, stm, stm-chans, text, time, time-locale-compat - , transformers, transformers-base, unordered-containers, vector - , vector-instances - }: - mkDerivation { - pname = "classy-prelude"; - version = "1.2.0"; - sha256 = "74ca864563ae2b6e048f86ec3be256192e81d12fbef0723d2aa2ee3d1d71fd70"; - libraryHaskellDepends = [ - async base basic-prelude bifunctors bytestring chunked-data - containers deepseq dlist exceptions ghc-prim hashable lifted-async - lifted-base monad-unlift mono-traversable - mono-traversable-instances mtl mutable-containers primitive - safe-exceptions say semigroups stm stm-chans text time - time-locale-compat transformers transformers-base - unordered-containers vector vector-instances - ]; - testHaskellDepends = [ - base containers hspec QuickCheck transformers unordered-containers - ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "A typeclass-based Prelude"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "classy-prelude_1_2_0_1" = callPackage ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim , hashable, hspec, lifted-async, lifted-base, monad-unlift @@ -40965,8 +41445,8 @@ self: { }: mkDerivation { pname = "clean-home"; - version = "0.0.4"; - sha256 = "42307b2fdcf750a64cae131845e39964a47adb1e1b16ba19497f4ab907250969"; + version = "0.0.5"; + sha256 = "c1c54d4579c557936b455768bc4f0e52181d845b93aec01e14898d3533b0cfb0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -41216,6 +41696,8 @@ self: { pname = "clist"; version = "0.1.0.0"; sha256 = "eddf07964751b51550c5197f39cc772418b0fa7d2ad6cf762af589ce9bd973cb"; + revision = "1"; + editedCabalFile = "5508b5f87701885103461d4e1b28594051e698fd6f09254cddd4b37676809d02"; libraryHaskellDepends = [ base base-unicode-symbols peano ]; homepage = "https://github.com/strake/clist.hs"; description = "Counted list"; @@ -41224,21 +41706,21 @@ self: { }) {}; "clit" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base + ({ mkDerivation, ansi-wl-pprint, authenticate-oauth, base , bytestring, data-default, directory, http-client, http-client-tls , http-types, lens, megaparsec, MissingH, optparse-applicative , split, text }: mkDerivation { pname = "clit"; - version = "0.3.1.0"; - sha256 = "1e8f6dfb1c868b979722ec855b8b75165a61bf41a210a2c29a408573c9bc8085"; + version = "0.4.0.6"; + sha256 = "09463f9525829b9fa7d8cef461ae3d9ce163bdab04e9cfa0afc88318b0163493"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-wl-pprint authenticate-oauth base bytestring - data-default directory http-client http-client-tls http-types lens - megaparsec MissingH optparse-applicative split text + ansi-wl-pprint authenticate-oauth base bytestring data-default + directory http-client http-client-tls http-types lens megaparsec + MissingH optparse-applicative split text ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/vmchale/command-line-tweeter#readme"; @@ -41402,6 +41884,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cloudi" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , network, time, unix, zlib + }: + mkDerivation { + pname = "cloudi"; + version = "1.7.0"; + sha256 = "66d372c0fe9a19f465f6b40d43864e9a43195c5de99ab560f0b5bbb6f3978648"; + libraryHaskellDepends = [ + array base binary bytestring containers network time unix zlib + ]; + homepage = "https://github.com/CloudI/cloudi_api_haskell"; + description = "Haskell CloudI API"; + license = stdenv.lib.licenses.bsdOriginal; + }) {}; + "cloudyfs" = callPackage ({ mkDerivation, base, bytestring, containers, convertible , datetime, filepath, HFuse, HTTP, regex-base, regex-tdfa, tagsoup @@ -41565,8 +42063,8 @@ self: { }: mkDerivation { pname = "cmark"; - version = "0.5.5"; - sha256 = "03bd6fc962bb92127f64a9c597a904492a16fb3f34587775a741d22311fe53e2"; + version = "0.5.5.1"; + sha256 = "62b461f2ab0a611f0a88325c98f11c053a356d94e877b5efed564abb4f5b5a0d"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base HUnit text ]; benchmarkHaskellDepends = [ @@ -41680,8 +42178,8 @@ self: { }: mkDerivation { pname = "cmdargs"; - version = "0.10.14"; - sha256 = "38b60053c11394a1876d2744950eece66ca9e4364298c1383f247894044bce58"; + version = "0.10.16"; + sha256 = "fb194adb76f6f464ff38df8a6644c6ed7375cc7054278492145a705a87526fbd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41692,6 +42190,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cmdargs_0_10_17" = callPackage + ({ mkDerivation, base, filepath, process, template-haskell + , transformers + }: + mkDerivation { + pname = "cmdargs"; + version = "0.10.17"; + sha256 = "3437a4caf4ced650b61620e1c66f406db76ff70244928e5a4e7a20e5e88374da"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base filepath process template-haskell transformers + ]; + homepage = "https://github.com/ndmitchell/cmdargs#readme"; + description = "Command line argument processing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cmdargs-browser" = callPackage ({ mkDerivation, base, bytestring, cmdargs, directory, filepath , http-types, process, text, transformers, wai, wai-handler-launch @@ -41856,8 +42373,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "code-page"; - version = "0.1.2"; - sha256 = "aef2b0b043767ef28496aa6b8c744db8185492c0d1e94e567a62eb4fdcaa3b09"; + version = "0.1.3"; + sha256 = "e65c86600e06d85f2e2c2a9df4b3d68e2dbd3adb2df9e922a4cd744966762191"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "https://github.com/RyanGlScott/code-page"; @@ -42424,6 +42941,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "colour-accelerate" = callPackage + ({ mkDerivation, accelerate, base }: + mkDerivation { + pname = "colour-accelerate"; + version = "0.1.0.0"; + sha256 = "3292dae683026ae6890908a70363d80500f56c0f539c8571672e667623b08cb2"; + libraryHaskellDepends = [ accelerate base ]; + homepage = "https://github.com/tmcdonell/colour-accelerate"; + description = "Working with colours in Accelerate"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "colour-space" = callPackage ({ mkDerivation, base, colour, constrained-categories, JuicyPixels , linear, linearmap-category, manifolds, semigroups, vector-space @@ -42586,8 +43115,8 @@ self: { }: mkDerivation { pname = "comfort-graph"; - version = "0.0.1"; - sha256 = "81487e3610993d2939bf1777823357095645f710d1bee94dd4dd0fa052b428a0"; + version = "0.0.2"; + sha256 = "ec69c1718ac3f790953912262d261a10bd3515a3c809b0671e108c3958e8fb3e"; libraryHaskellDepends = [ base containers QuickCheck transformers utility-ht ]; @@ -42600,6 +43129,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "comic" = callPackage + ({ mkDerivation, aeson, base, text }: + mkDerivation { + pname = "comic"; + version = "0"; + sha256 = "e3c1b2ad7814d6ad252f7239e77c0b26457805086e72a0df8b9adc6bda1dc203"; + libraryHaskellDepends = [ aeson base text ]; + homepage = "https://oss.xkcd.com/"; + description = "A format for describing comics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "comma" = callPackage ({ mkDerivation, attoparsec, base, QuickCheck, text }: mkDerivation { @@ -42883,6 +43424,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "compactable" = callPackage + ({ mkDerivation, base, containers, transformers, vector }: + mkDerivation { + pname = "compactable"; + version = "0.1.0.1"; + sha256 = "67c806a237be7fba93da9d91b5d20c8586f647f97cb4408be8bd44173b8609c0"; + libraryHaskellDepends = [ base containers transformers vector ]; + description = "A generalization for containers that can be stripped of Nothings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "compactmap" = callPackage ({ mkDerivation, base, containers, hspec, QuickCheck, vector }: mkDerivation { @@ -42917,6 +43470,8 @@ self: { pname = "compdata"; version = "0.10.1"; sha256 = "61572f134ec555695905c28db76c8f1f50df531337e56d5c74a16a52c58840cb"; + revision = "1"; + editedCabalFile = "beac5f52bb9a37fdfe168d354a51b915d01b8837c51394358347d35483f530eb"; libraryHaskellDepends = [ base containers deepseq derive mtl QuickCheck template-haskell th-expand-syns transformers tree-view @@ -43067,10 +43622,10 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "complex-generic"; - version = "0.1.1"; - sha256 = "9422670fd08f3daaae823466398a9d4b9b2d8b4b9d568380833c5c391e679896"; + version = "0.1.1.1"; + sha256 = "1f535c9ab52930cfae7665b659713214af81ab6ffdfddb42c540bad8522a8b0f"; libraryHaskellDepends = [ base template-haskell ]; - homepage = "https://gitorious.org/complex-generic"; + homepage = "https://code.mathr.co.uk/complex-generic"; description = "complex numbers with non-mandatory RealFloat"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -43130,6 +43685,90 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "composite-aeson" = callPackage + ({ mkDerivation, aeson, aeson-better-errors, aeson-qq, base + , basic-prelude, composite-base, containers, contravariant, Frames + , generic-deriving, hspec, lens, profunctors, QuickCheck + , scientific, tagged, template-haskell, text, time + , unordered-containers, vector, vinyl + }: + mkDerivation { + pname = "composite-aeson"; + version = "0.2.0.0"; + sha256 = "57319e561a9b8d52dcaff3ef5fda46de8128e39ed2a7bbae212b32f8652f21a6"; + libraryHaskellDepends = [ + aeson aeson-better-errors base basic-prelude composite-base + containers contravariant Frames generic-deriving lens profunctors + scientific tagged template-haskell text time unordered-containers + vector vinyl + ]; + testHaskellDepends = [ + aeson aeson-better-errors aeson-qq base basic-prelude + composite-base containers contravariant Frames generic-deriving + hspec lens profunctors QuickCheck scientific tagged + template-haskell text time unordered-containers vector vinyl + ]; + homepage = "https://github.com/ConferHealth/composite#readme"; + description = "JSON for Vinyl/Frames records"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "composite-base" = callPackage + ({ mkDerivation, base, basic-prelude, Frames, hspec, lens + , QuickCheck, template-haskell, text, vinyl + }: + mkDerivation { + pname = "composite-base"; + version = "0.2.0.0"; + sha256 = "b18c0b286d4d8dfd8771df540dba9f8e9d0fc58484650d7434ed24e95d6428b1"; + libraryHaskellDepends = [ + base basic-prelude Frames lens template-haskell text vinyl + ]; + testHaskellDepends = [ + base basic-prelude Frames hspec lens QuickCheck template-haskell + text vinyl + ]; + homepage = "https://github.com/ConferHealth/composite#readme"; + description = "Shared utilities for composite-* packages"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "composite-ekg" = callPackage + ({ mkDerivation, base, basic-prelude, composite-base, ekg, ekg-core + , Frames, lens, text, vinyl + }: + mkDerivation { + pname = "composite-ekg"; + version = "0.2.0.0"; + sha256 = "bb836d7e938e18848ae3bae573c4e7ec47b4dfdd56e5ebfdb556033e1a62c095"; + libraryHaskellDepends = [ + base basic-prelude composite-base ekg ekg-core Frames lens text + vinyl + ]; + homepage = "https://github.com/ConferHealth/composite#readme"; + description = "EKG Metrics for Vinyl/Frames records"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "composite-opaleye" = callPackage + ({ mkDerivation, base, basic-prelude, bytestring, composite-base + , Frames, lens, opaleye, postgresql-simple, product-profunctors + , profunctors, template-haskell, text, vinyl + }: + mkDerivation { + pname = "composite-opaleye"; + version = "0.2.0.0"; + sha256 = "e1f018cd598679e2a79d9ce4b99463cdf0a2720ff3df57be2e1025731417ef37"; + libraryHaskellDepends = [ + base basic-prelude bytestring composite-base Frames lens opaleye + postgresql-simple product-profunctors profunctors template-haskell + text vinyl + ]; + homepage = "https://github.com/ConferHealth/composite#readme"; + description = "Opaleye SQL for Frames records"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "composition" = callPackage ({ mkDerivation }: mkDerivation { @@ -43332,6 +43971,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "concise" = callPackage + ({ mkDerivation, base, bytestring, lens, QuickCheck + , quickcheck-instances, tasty, tasty-quickcheck, text + }: + mkDerivation { + pname = "concise"; + version = "0.1.0.0"; + sha256 = "b5760c71b0968fb7e6aa683d81c1563776b7239f5fc5e2d819b6b0da6503413d"; + libraryHaskellDepends = [ base bytestring lens text ]; + testHaskellDepends = [ + base bytestring lens QuickCheck quickcheck-instances tasty + tasty-quickcheck text + ]; + homepage = "https://github.com/frasertweedal/hs-concise"; + description = "Utilities for Control.Lens.Cons"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "concorde" = callPackage ({ mkDerivation, base, containers, process, safe, temporary }: mkDerivation { @@ -43565,8 +44222,8 @@ self: { }: mkDerivation { pname = "concurrent-machines"; - version = "0.2.3.3"; - sha256 = "e5204231e35181e56b9313f6dbe83d531b3f6c3f6dfbe3a1c465e5b6b2a24924"; + version = "0.3.0"; + sha256 = "c5ef38498f89f794cf9065841bf0e865b871a14874cde2f51aad3194e61a0ad2"; libraryHaskellDepends = [ async base containers lifted-async machines monad-control semigroups time transformers transformers-base @@ -43896,8 +44553,8 @@ self: { }: mkDerivation { pname = "conduit-combinators"; - version = "1.1.0"; - sha256 = "ff1f16f24e2c186ce5d61f079b318e2f58c4bc3a4a2c8d9011d001512786335a"; + version = "1.1.1"; + sha256 = "a022e80d54d6cae017ae69e04b44fd6f57f8bac6b889e574dc09d30170ac0918"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring chunked-data conduit conduit-extra filepath monad-control mono-traversable @@ -43946,6 +44603,8 @@ self: { pname = "conduit-extra"; version = "1.1.15"; sha256 = "7bef29eb0db59c236519b0c5cac82183ed7741a535a57e0772aac1158e90bb8d"; + revision = "1"; + editedCabalFile = "94498d0883d567317ebd300ed3efcd1712ae0b444e35f50a941b3b62f57b164f"; libraryHaskellDepends = [ async attoparsec base blaze-builder bytestring conduit directory exceptions filepath monad-control network primitive process @@ -44472,8 +45131,8 @@ self: { }: mkDerivation { pname = "connection"; - version = "0.2.7"; - sha256 = "46d452dc92ebc6e851a9f9ac01dd2d29df846795dfce039cf07ba7102a323235"; + version = "0.2.8"; + sha256 = "70b1f44e8786320c18b26fc5d4ec115fc8ac016ba1f852fa8137f55d785a93eb"; libraryHaskellDepends = [ base byteable bytestring containers data-default-class network socks tls x509 x509-store x509-system x509-validation @@ -44589,17 +45248,24 @@ self: { }) {}; "constrained-monads" = callPackage - ({ mkDerivation, base, containers, doctest, QuickCheck - , transformers + ({ mkDerivation, base, containers, criterion, deepseq, doctest + , free, nat-sized-numbers, QuickCheck, smallcheck, transformers + , vector }: mkDerivation { pname = "constrained-monads"; - version = "0.1.0.0"; - sha256 = "1822fb5f5bec60b9c7efc11b776718bcdc66399a8c34687fe6173975ec010184"; - libraryHaskellDepends = [ base containers transformers ]; + version = "0.5.0.0"; + sha256 = "8e618d145ec4d38c41446b56fdc4264d789bf3f9bc03e1db64827086ecdb07c0"; + libraryHaskellDepends = [ + base containers deepseq free transformers + ]; testHaskellDepends = [ base containers doctest QuickCheck transformers ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq nat-sized-numbers QuickCheck + smallcheck transformers vector + ]; homepage = "https://github.com/oisdk/constrained-monads#readme"; description = "Typeclasses and instances for monads with constraints"; license = stdenv.lib.licenses.mit; @@ -44630,14 +45296,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "constraint-manip" = callPackage + ({ mkDerivation, base, indextype }: + mkDerivation { + pname = "constraint-manip"; + version = "0.1.0.0"; + sha256 = "48baa31f15760a8688a00f5eacca8acbccd8c6b16895e17d08d2b26851a556c9"; + libraryHaskellDepends = [ base indextype ]; + description = "Some conviencience type functions for manipulating constraints"; + license = stdenv.lib.licenses.mit; + }) {}; + "constraints" = callPackage ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl , transformers, transformers-compat }: mkDerivation { pname = "constraints"; - version = "0.9"; - sha256 = "b7b4135ceacdd18d291bbd83277cc21bbb066d0e16ce35f879619f17c1c8d29d"; + version = "0.9.1"; + sha256 = "276e012838861145fca65d065dd9839f7cbd71236032b557194389180a30a785"; libraryHaskellDepends = [ base binary deepseq ghc-prim hashable mtl transformers transformers-compat @@ -44779,15 +45456,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "containers_0_5_10_1" = callPackage + "containers_0_5_10_2" = callPackage ({ mkDerivation, array, base, ChasingBottoms, criterion, deepseq , ghc-prim, HUnit, QuickCheck, random, test-framework , test-framework-hunit, test-framework-quickcheck2, transformers }: mkDerivation { pname = "containers"; - version = "0.5.10.1"; - sha256 = "fa74241147e58084fe2520a376349df114b8280ddcd9062ae351fed20946d347"; + version = "0.5.10.2"; + sha256 = "a04efef290be272cdeca1c36f9cff17271ccd8d2b484ebf152bb496fb5328c23"; libraryHaskellDepends = [ array base deepseq ghc-prim ]; testHaskellDepends = [ array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck @@ -46010,26 +46687,6 @@ self: { }) {}; "cpphs" = callPackage - ({ mkDerivation, base, directory, old-locale, old-time, polyparse - }: - mkDerivation { - pname = "cpphs"; - version = "1.20.3"; - sha256 = "c63f0edb351f0977c2af6ad17c7164c44dc7c7499c0effe91d839fc7973dad91"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base directory old-locale old-time polyparse - ]; - executableHaskellDepends = [ - base directory old-locale old-time polyparse - ]; - homepage = "http://projects.haskell.org/cpphs/"; - description = "A liberalised re-implementation of cpp, the C pre-processor"; - license = "LGPL"; - }) {}; - - "cpphs_1_20_4" = callPackage ({ mkDerivation, base, directory, filepath, old-locale, old-time , polyparse }: @@ -46037,6 +46694,8 @@ self: { pname = "cpphs"; version = "1.20.4"; sha256 = "d159437cea89854c3f413f7157f40ea2d82272fce83efe6ce17e2065883da47e"; + revision = "1"; + editedCabalFile = "9304f73fec5750ee55b381f925d34c73cc1f660f5adaa6490d9d8dabf4ae1880"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46048,7 +46707,6 @@ self: { homepage = "http://projects.haskell.org/cpphs/"; description = "A liberalised re-implementation of cpp, the C pre-processor"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cprng-aes" = callPackage @@ -47689,8 +48347,8 @@ self: { }: mkDerivation { pname = "csound-catalog"; - version = "0.6.1"; - sha256 = "aa97c5076d7d1d217ea62027b7529b8acfb6539001aafa50da3064fb4afbf1c1"; + version = "0.7.0"; + sha256 = "1e00985b6e618c873dc5ddf46c14397302fdf0fbeb13236597dfeb891877b5bb"; libraryHaskellDepends = [ base csound-expression csound-sampler sharc-timbre transformers ]; @@ -47708,8 +48366,8 @@ self: { }: mkDerivation { pname = "csound-expression"; - version = "5.1.0"; - sha256 = "3d42e34bb20823342974362c08f6bc386656922119020b34dbf92c39e72c8885"; + version = "5.2.0"; + sha256 = "54431ddf02de0ce6205853eea81cd6177db50295ab6d840326c56f481897d6d2"; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic csound-expression-opcodes csound-expression-typed data-default @@ -47726,8 +48384,8 @@ self: { }: mkDerivation { pname = "csound-expression-dynamic"; - version = "0.2.0"; - sha256 = "901b7811a296ab59b2baecf161e69c478da2f4b9a1f8d24d5e0c7063704df475"; + version = "0.3.0"; + sha256 = "5836c4fe387f84e0d042b6a57bfa5969135c64c1840b6a989cabd6eefe8026f4"; libraryHaskellDepends = [ array base Boolean containers data-default data-fix data-fix-cse hashable transformers wl-pprint @@ -47743,8 +48401,8 @@ self: { }: mkDerivation { pname = "csound-expression-opcodes"; - version = "0.0.3.1"; - sha256 = "c725eab85daca0de9dd689b40013f5af95089ef09539c009c58ebd020b161136"; + version = "0.0.3.2"; + sha256 = "44139db6b4ddbe2f5e632eebabd106b42eb11340dbf665f5162d9a29a2da7e27"; libraryHaskellDepends = [ base csound-expression-dynamic csound-expression-typed transformers ]; @@ -47759,8 +48417,8 @@ self: { }: mkDerivation { pname = "csound-expression-typed"; - version = "0.1.0.0"; - sha256 = "ecff32336825df2197502e7b464c00b3fd1dc40eaab52f40cd9a585c4180e866"; + version = "0.2.0.0"; + sha256 = "282e20fe3a1272f56b3376fa3d8789a657d21fee8a266843ca16d5256ba21cc6"; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic data-default deepseq ghc-prim hashable temporal-media transformers @@ -47775,8 +48433,8 @@ self: { ({ mkDerivation, base, csound-expression, transformers }: mkDerivation { pname = "csound-sampler"; - version = "0.0.7.0"; - sha256 = "deb478e275edcf7dada65f57ace1989d3e9e8f1c2fe2ef81aa1c257f82236870"; + version = "0.0.8.0"; + sha256 = "394811198d15d102542d4d34d3d9536e0854c5c5b0352778c1866564795c2fa2"; libraryHaskellDepends = [ base csound-expression transformers ]; homepage = "https://github.com/anton-k/csound-sampler"; description = "A musical sampler based on Csound"; @@ -48117,6 +48775,8 @@ self: { pname = "cublas"; version = "0.2.1.0"; sha256 = "3c6031d2f7332a6a2357a1ec9adc4ba1404c5c05cb5a42193847ceac7652a80b"; + revision = "1"; + editedCabalFile = "2784c7237bd25f49735d8779ea8d3a57514b2418bfdeb2697bdd06e688acd9d7"; libraryHaskellDepends = [ base cuda filepath language-c storable-complex template-haskell ]; @@ -48148,10 +48808,8 @@ self: { }: mkDerivation { pname = "cuda"; - version = "0.7.5.2"; - sha256 = "749b2411255f699289d2989c8720b751940678bfbb621ccd8bb98eaf0a7b94d6"; - revision = "1"; - editedCabalFile = "dd05fcdff465dcbe7252532e3b9ba481d76548611e02bc28fce734378c093dee"; + version = "0.7.5.3"; + sha256 = "c6cf3a3047d13042f81b822c54683fedb989fe844b3f8e528ecda29da0f7a7f5"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -48421,6 +49079,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cutter" = callPackage + ({ mkDerivation, base, bytestring, explicit-exception, spreadsheet + , utility-ht + }: + mkDerivation { + pname = "cutter"; + version = "0.0"; + sha256 = "117319c36a20efea6d9edd0a8d902e37ec0386512f2eb8a6e5563411c00c6ac2"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring explicit-exception spreadsheet utility-ht + ]; + description = "Cut files according to a position list"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cv-combinators" = callPackage ({ mkDerivation, allocated-processor, base, HOpenCV, vector-space }: @@ -48482,8 +49157,8 @@ self: { }: mkDerivation { pname = "d-bus"; - version = "0.1.5"; - sha256 = "79a28c075e0eac6f3bb50fedd88d8454ed5f8b6737cd484e2f26fd13361b7d06"; + version = "0.1.6"; + sha256 = "16223d22697eda3d52a0e6643c2ad6d98b3d957680990403bed64878a8bc3b63"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -49763,8 +50438,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "data-fix"; - version = "0.0.3"; - sha256 = "f6c69e973a110c36c738d9f37bf3092eff5d25ec11782c301e255844b5010e57"; + version = "0.0.4"; + sha256 = "85e2d23ab0030c3c2aff4b2cc15deb7896b03189de0d53598fdaf582df7e8690"; + revision = "1"; + editedCabalFile = "e784f9bb1f2b758fbd41f5ff535ba911081182f89a81c19e36735f0e5e8d59f8"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/anton-k/data-fix"; description = "Fixpoint data types"; @@ -50109,6 +50786,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "data-msgpack-types" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, hashable + , QuickCheck, text, unordered-containers, vector, void + }: + mkDerivation { + pname = "data-msgpack-types"; + version = "0.0.1"; + sha256 = "529f139f089643a240c6e139b76c4ca1f18bce24dd352615584ebf041e94a898"; + libraryHaskellDepends = [ + base bytestring containers deepseq hashable QuickCheck text + unordered-containers vector void + ]; + homepage = "http://msgpack.org/"; + description = "A Haskell implementation of MessagePack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "data-named" = callPackage ({ mkDerivation, attoparsec, base, binary, containers, text }: mkDerivation { @@ -51084,6 +51778,8 @@ self: { pname = "dbus"; version = "0.10.12"; sha256 = "f6d7b5640eb03e9598e38b1a2b2e7af1e9d357f3f845fc9528f9750965b92d54"; + revision = "1"; + editedCabalFile = "056e9977d3cf251022d8f4013531c0dd6b62afa68719b5567756386e1503271e"; libraryHaskellDepends = [ base bytestring cereal containers libxml-sax network parsec random text transformers unix vector xml-types @@ -52509,8 +53205,8 @@ self: { }: mkDerivation { pname = "derive"; - version = "2.6.1"; - sha256 = "8544ac13c09059acd2914da86506206879e3feb375361fc5e312548c4d9b6d72"; + version = "2.6.2"; + sha256 = "2f98205548dec0b9cafb9ff39a80628798e72f693acdb9b522d23442ed791132"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53053,6 +53749,8 @@ self: { pname = "diagrams-cairo"; version = "1.4"; sha256 = "a94ec8bfdba325cf317368355eaa282bef3c75ed78e153ef400b8627575cea81"; + revision = "1"; + editedCabalFile = "c7830d8248ab40cb8724f3d3b0fce53b9b5be7a06c4dba0510ac900977e71277"; libraryHaskellDepends = [ array base bytestring cairo colour containers data-default-class diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl @@ -53096,8 +53794,8 @@ self: { pname = "diagrams-contrib"; version = "1.4.0.1"; sha256 = "1194be9ab13c8660ef1c56c35b3a6578953db51e173de96eb8d49603e855750c"; - revision = "1"; - editedCabalFile = "58ebbd4d2285416111e8582c133d68ced6ecb5a2a94d5dc07cca899a971b02f8"; + revision = "2"; + editedCabalFile = "f48239089189d320f3f48f25d2381f5d1e931ed7cdbdd70eb2ce246a9d04fda5"; libraryHaskellDepends = [ base circle-packing colour containers cubicbezier data-default data-default-class diagrams-core diagrams-lib diagrams-solve @@ -53589,15 +54287,16 @@ self: { "dictionaries" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, containers - , data-default, directory, exceptions, filepath, text, time, zlib + , data-default, directory, exceptions, filepath, text, time + , transformers, zlib }: mkDerivation { pname = "dictionaries"; - version = "0.1.0.0"; - sha256 = "28b3ba1e9ad52ccf4f333861e22830da77ad915622fa1ffca87cff6e9716c0ab"; + version = "0.1.0.1"; + sha256 = "89712a700212f922671f3784f785ccf1e53865570fab48471b02ef409e73be35"; libraryHaskellDepends = [ attoparsec base binary bytestring containers data-default directory - exceptions filepath text time zlib + exceptions filepath text time transformers zlib ]; description = "Tools to handle StarDict dictionaries"; license = stdenv.lib.licenses.bsd3; @@ -54333,12 +55032,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "directory_1_3_1_0" = callPackage + "directory_1_3_1_1" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.1.0"; - sha256 = "94b0d06aba8311e3b9dc8e460d4ad5b25fdfcc361eecb8e7ad68a18f171aa7f2"; + version = "1.3.1.1"; + sha256 = "5354dd7644237d312f2a223446e0adc11a7ec36c72e1925cae11159869de8b42"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -54578,6 +55277,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "disjoint-set-stateful" = callPackage + ({ mkDerivation, base, hspec, primitive, ref-tf, vector }: + mkDerivation { + pname = "disjoint-set-stateful"; + version = "0.1.0.0"; + sha256 = "addb5ab47b17356cd79fd4232db23c2ef09292cfd4c1ef04f2595416df0132f1"; + libraryHaskellDepends = [ base primitive ref-tf vector ]; + testHaskellDepends = [ base hspec primitive ref-tf vector ]; + homepage = "https://github.com/clintonmead/disjoint-set-stateful"; + description = "Monadic disjoint set"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "disjoint-sets-st" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -54617,12 +55330,12 @@ self: { }) {}; "disposable" = callPackage - ({ mkDerivation, base, dlist }: + ({ mkDerivation, base, dlist, ghcjs-base-stub }: mkDerivation { pname = "disposable"; - version = "0.1.1.0"; - sha256 = "719e8e28cfe3345c441478f9d88949767122d2708241a0e232e9fe672c662b12"; - libraryHaskellDepends = [ base dlist ]; + version = "0.2.0.3"; + sha256 = "6d1b6d12d1f742f204effb46c204a596cd3aeeae42bebacb86c37e60db202351"; + libraryHaskellDepends = [ base dlist ghcjs-base-stub ]; homepage = "https://github.com/louispan/disposable#readme"; description = "Allows storing different resource-releasing actions together"; license = stdenv.lib.licenses.bsd3; @@ -54676,8 +55389,8 @@ self: { }: mkDerivation { pname = "distributed-closure"; - version = "0.3.3.0"; - sha256 = "bc675fd3b93c7e51a923969220821ea1676c639ff9fd4e742bd864e90f2e368f"; + version = "0.3.4.0"; + sha256 = "efb5bb1afca02c9ae4df081cb9f5665e4f9ba4273270250425c229f59970f2b0"; libraryHaskellDepends = [ base binary bytestring constraints syb template-haskell ]; @@ -54767,31 +55480,29 @@ self: { }) {}; "distributed-process-client-server" = callPackage - ({ mkDerivation, ansi-terminal, base, binary, containers - , data-accessor, deepseq, distributed-process - , distributed-process-async, distributed-process-extras - , distributed-process-tests, fingertree, ghc-prim, hashable, HUnit - , mtl, network, network-transport, network-transport-tcp, rematch - , stm, test-framework, test-framework-hunit, time, transformers + ({ mkDerivation, ansi-terminal, base, binary, containers, deepseq + , distributed-process, distributed-process-async + , distributed-process-extras, distributed-process-systest + , exceptions, fingertree, ghc-prim, hashable, HUnit, mtl, network + , network-transport, network-transport-tcp, rematch, stm + , test-framework, test-framework-hunit, time, transformers , unordered-containers }: mkDerivation { pname = "distributed-process-client-server"; - version = "0.1.3.2"; - sha256 = "2c905624d5486b7bc8bd1a4763b139e7eb364b20467c9abddd553f9afbd3601f"; - revision = "2"; - editedCabalFile = "aedbbade08de4e7483cc9bc84e41ca9e6227a279480e025a27c78f31f1775413"; + version = "0.2.3"; + sha256 = "04ddbb27cca0d6599424c11695701d25921cbe83e05b0f4b58e78856bf9dc29f"; libraryHaskellDepends = [ - base binary containers data-accessor deepseq distributed-process - distributed-process-async distributed-process-extras fingertree - hashable mtl stm time transformers unordered-containers + base binary containers deepseq distributed-process + distributed-process-async distributed-process-extras exceptions + fingertree hashable mtl stm time transformers unordered-containers ]; testHaskellDepends = [ ansi-terminal base binary containers deepseq distributed-process distributed-process-async distributed-process-extras - distributed-process-tests fingertree ghc-prim HUnit mtl network - network-transport network-transport-tcp rematch stm test-framework - test-framework-hunit transformers + distributed-process-systest exceptions fingertree ghc-prim HUnit + mtl network network-transport network-transport-tcp rematch stm + test-framework test-framework-hunit transformers ]; homepage = "http://github.com/haskell-distributed/distributed-process-client-server"; description = "The Cloud Haskell Application Platform"; @@ -54863,8 +55574,10 @@ self: { }: mkDerivation { pname = "distributed-process-extras"; - version = "0.3.1"; - sha256 = "feeb3891a60c8f1833aec4e3a7eeae34a54f0baf83f6ebfb5610bb14b4f66bdc"; + version = "0.3.2"; + sha256 = "3333113881efd9c6ca78df62168bb81097e503e52dfe71b760ec42cac309dcb3"; + revision = "2"; + editedCabalFile = "0ce943845b07c684bdaa074bbd1afc7e5fc680b2c37d4415c28d60df49d9a311"; libraryHaskellDepends = [ base binary containers deepseq distributed-process exceptions fingertree hashable mtl stm time transformers unordered-containers @@ -54883,6 +55596,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "distributed-process-fsm" = callPackage + ({ mkDerivation, ansi-terminal, base, binary, bytestring + , containers, data-accessor, deepseq, distributed-process + , distributed-process-client-server, distributed-process-extras + , distributed-process-systest, distributed-static, exceptions + , fingertree, ghc-prim, hashable, HUnit, mtl, network + , network-transport, network-transport-tcp, QuickCheck, rematch + , stm, test-framework, test-framework-hunit + , test-framework-quickcheck2, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "distributed-process-fsm"; + version = "0.0.1"; + sha256 = "c639ad24d035b47df926deec89b92243058503d7852ee905df2bb6fb00eb60bb"; + libraryHaskellDepends = [ + base binary containers deepseq distributed-process + distributed-process-client-server distributed-process-extras + exceptions mtl stm time transformers unordered-containers + ]; + testHaskellDepends = [ + ansi-terminal base binary bytestring containers data-accessor + deepseq distributed-process distributed-process-extras + distributed-process-systest distributed-static fingertree ghc-prim + hashable HUnit mtl network network-transport network-transport-tcp + QuickCheck rematch stm test-framework test-framework-hunit + test-framework-quickcheck2 time transformers unordered-containers + ]; + homepage = "http://github.com/haskell-distributed/distributed-process-fsm"; + description = "The Cloud Haskell implementation of Erlang/OTP gen_statem"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "distributed-process-lifted" = callPackage ({ mkDerivation, base, binary, deepseq, distributed-process , distributed-process-monad-control, HUnit, lifted-base @@ -55669,20 +56415,26 @@ self: { }) {}; "docker" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, connection - , containers, data-default-class, http-client, http-client-tls - , http-types, lens, lens-aeson, mtl, network, process, QuickCheck - , scientific, tasty, tasty-hunit, tasty-quickcheck, text, time, tls - , transformers, unordered-containers, x509, x509-store, x509-system + ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit + , conduit-combinators, conduit-extra, connection, containers + , data-default-class, directory, exceptions, filemanip, filepath + , http-client, http-client-tls, http-conduit, http-types, lens + , lens-aeson, monad-control, mtl, network, process, QuickCheck + , resourcet, scientific, tar, tasty, tasty-hunit, tasty-quickcheck + , temporary, text, time, tls, transformers, transformers-base + , unordered-containers, uuid, x509, x509-store, x509-system, zlib }: mkDerivation { pname = "docker"; - version = "0.3.0.1"; - sha256 = "410054ae9a047caff47af15a72d26a699b500f59cca3d6a66f54a5fc505a4ec7"; + version = "0.4.0.0"; + sha256 = "61f68e9e1335e7d625b2c7476619f3f4dba7e67faf9738d26e9b73b89cf18f39"; libraryHaskellDepends = [ - aeson base blaze-builder bytestring containers data-default-class - http-client http-types mtl network scientific text time tls - unordered-containers x509 x509-store x509-system + aeson base blaze-builder bytestring conduit conduit-combinators + conduit-extra containers data-default-class directory exceptions + filemanip filepath http-client http-conduit http-types + monad-control mtl network resourcet scientific tar temporary text + time tls transformers transformers-base unordered-containers uuid + x509 x509-store x509-system zlib ]; testHaskellDepends = [ aeson base bytestring connection containers http-client @@ -56219,6 +56971,18 @@ self: { license = "GPL"; }) {}; + "doublify-toolkit" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "doublify-toolkit"; + version = "0.0.1"; + sha256 = "dba394c7bf1d64898679a3b8108245abcf053fee439b8e4066ce2135f8592b52"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/doublifyapis/toolkit-haskell"; + description = "Doublify API toolkit for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "dove" = callPackage ({ mkDerivation, acl2, base }: mkDerivation { @@ -56630,12 +57394,12 @@ self: { }) {}; "drmaa" = callPackage - ({ mkDerivation, base, drmaa, inline-c, shelly, text }: + ({ mkDerivation, base, directory, drmaa, inline-c }: mkDerivation { pname = "drmaa"; - version = "0.1.1"; - sha256 = "66b095d3b94ed531e2a704fba319002e8d3b7b6f9b3f68102a4b4d0f7a048567"; - libraryHaskellDepends = [ base inline-c shelly text ]; + version = "0.2.0"; + sha256 = "e65d76b31c8041e553081f5fe500b5f3fffe7919731126a1956cc88639fdbe42"; + libraryHaskellDepends = [ base directory inline-c ]; librarySystemDepends = [ drmaa ]; description = "A minimal Haskell bindings to DRMAA C library"; license = stdenv.lib.licenses.bsd3; @@ -56699,6 +57463,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dsc" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, hspec + , QuickCheck, SimpleAES, string-conversions + }: + mkDerivation { + pname = "dsc"; + version = "0.2.0"; + sha256 = "ef44a52479a8945abe392192cde1cb09211b25e0afe1aa949dc0589ec922d513"; + libraryHaskellDepends = [ + base base64-bytestring bytestring SimpleAES string-conversions + ]; + testHaskellDepends = [ + base base64-bytestring bytestring hspec QuickCheck SimpleAES + string-conversions + ]; + homepage = "https://github.com/qoelet/dsc#readme"; + description = "Helper functions for setting up Double Submit Cookie defense for forms"; + license = stdenv.lib.licenses.mit; + }) {}; + "dsh-sql" = callPackage ({ mkDerivation, aeson, algebra-dag, algebra-sql, base, bytestring , bytestring-lexing, containers, Decimal, DSH, either, HDBC @@ -57259,8 +58043,8 @@ self: { ({ mkDerivation, base, primitive, vector }: mkDerivation { pname = "dynamic-mvector"; - version = "0.1.0.4"; - sha256 = "a36fc29ba4b91d52beb1f2df6ba8a837c6f112ef31358b20f5d0056f20d788a6"; + version = "0.1.0.5"; + sha256 = "22b69e25f7bdeb51dc9071e352eeed58c292ebe3c9f88e2749ce0b6a5f4d5e43"; libraryHaskellDepends = [ base primitive vector ]; homepage = "https://github.com/AndrasKovacs/dynamic-mvector"; description = "A wrapper around MVector that enables pushing, popping and extending"; @@ -57718,6 +58502,8 @@ self: { pname = "echo"; version = "0.1.3"; sha256 = "704f07310f8272d170f8ab7fb2a2c13f15d8501ef8310801e36964c8eff485ef"; + revision = "1"; + editedCabalFile = "5490be9cfbea95e14a7a68b7d055ae8d295822e0b146d2ac8285b3e5a3e3282f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base process ]; @@ -58162,21 +58948,21 @@ self: { "egison" = callPackage ({ mkDerivation, array, base, containers, criterion, deepseq - , directory, filepath, ghc, ghc-paths, Glob, haskeline, HUnit - , monad-parallel, mtl, parsec, process, random, regex-tdfa - , test-framework, test-framework-hunit, text, transformers - , unordered-containers, vector + , directory, filepath, ghc, ghc-paths, Glob, haskeline, HUnit, mtl + , parallel, parsec, process, random, regex-tdfa, test-framework + , test-framework-hunit, text, transformers, unordered-containers + , vector }: mkDerivation { pname = "egison"; - version = "3.6.4"; - sha256 = "8900413b3f0e42c0907bec37dfd2ed0d2f6c618836ea6054615a786ff4fcf5f3"; + version = "3.6.5"; + sha256 = "56ffcb0beb846026eb73cbf541c1b6e287daa13e13f8698be4ad251fcabcb4b9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base containers directory ghc ghc-paths haskeline - monad-parallel mtl parsec process random regex-tdfa text - transformers unordered-containers vector + array base containers directory ghc ghc-paths haskeline mtl + parallel parsec process random regex-tdfa text transformers + unordered-containers vector ]; executableHaskellDepends = [ array base containers directory filepath ghc ghc-paths haskeline @@ -59045,6 +59831,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "elsa" = callPackage + ({ mkDerivation, array, base, dequeue, directory, filepath + , hashable, json, megaparsec, mtl, tasty, tasty-hunit + , unordered-containers + }: + mkDerivation { + pname = "elsa"; + version = "0.2.0.0"; + sha256 = "79d83d3ab692b21920189ea780ab4418e06330959165b29f4d9940e1e03e64af"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base dequeue directory filepath hashable json megaparsec mtl + unordered-containers + ]; + executableHaskellDepends = [ base mtl ]; + testHaskellDepends = [ base directory filepath tasty tasty-hunit ]; + homepage = "http://github.com/ucsd-progsys/elsa"; + description = "A tiny language for understanding the lambda-calculus"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "emacs-keys" = callPackage ({ mkDerivation, base, doctest, split, tasty, tasty-hspec , tasty-quickcheck, template-haskell, th-lift, xkbcommon @@ -59348,6 +60157,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "encode-string" = callPackage + ({ mkDerivation, base, bytestring, QuickCheck, quickcheck-instances + , text + }: + mkDerivation { + pname = "encode-string"; + version = "0.1.0.0"; + sha256 = "fb13bf53058bff828555f76421d0c0e195ea8ac0d92c6e73ce43055d680cb990"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ + base bytestring QuickCheck quickcheck-instances text + ]; + homepage = "https://github.com/minad/encode-string#readme"; + description = "Safe string conversion and encoding"; + license = stdenv.lib.licenses.mit; + }) {}; + "encoding" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , extensible-exceptions, ghc-prim, HaXml, mtl, regex-compat @@ -59948,8 +60774,8 @@ self: { }: mkDerivation { pname = "equal-files"; - version = "0.0.5.2"; - sha256 = "1c391e4f2e813d5aaaa77c849ce96f070fd0846d192fd0784fdf021075ebc91e"; + version = "0.0.5.3"; + sha256 = "e5b785c286c557c57dba7107d913b220781aa2549ba4b7685da494b20a0172aa"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -60240,6 +61066,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "errors_2_2_0" = callPackage + ({ mkDerivation, base, exceptions, safe, text, transformers + , transformers-compat, unexceptionalio + }: + mkDerivation { + pname = "errors"; + version = "2.2.0"; + sha256 = "fda1c9e91950d7dc4d8483e2dc65085f12de5c2819b815799b6e75846fc9617c"; + libraryHaskellDepends = [ + base exceptions safe text transformers transformers-compat + unexceptionalio + ]; + description = "Simplified error-handling"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ersaconcat" = callPackage ({ mkDerivation, base, directory, doctest, filepath, HTTP , network-uri, process, QuickCheck, tagsoup, template-haskell @@ -60386,6 +61229,8 @@ self: { pname = "esqueleto"; version = "2.5.1"; sha256 = "76a75c84c4b4e0d41b28d8f8e73cc746282f5e7e50cfb11fcc252286950c87d9"; + revision = "1"; + editedCabalFile = "d612bc43e57e7d69561a7d88ad5cb564999c202ddaffe8460bff1979402710b8"; libraryHaskellDepends = [ base blaze-html bytestring conduit monad-logger persistent resourcet tagged text transformers unordered-containers @@ -60507,6 +61352,8 @@ self: { pname = "ether"; version = "0.4.0.2"; sha256 = "8b9dce4d444613dc46df988fa3a437297503e63ff29fd28113b35b98a8dcd953"; + revision = "1"; + editedCabalFile = "a876e46771d9778373b6a63d43ecb4bb88e303c420341547bfd3f9b9054d1373"; libraryHaskellDepends = [ base exceptions mmorph monad-control mtl template-haskell transformers transformers-base transformers-lift @@ -60519,6 +61366,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ether_0_4_1_0" = callPackage + ({ mkDerivation, base, exceptions, mmorph, monad-control, mtl + , QuickCheck, tasty, tasty-quickcheck, template-haskell + , transformers, transformers-base, transformers-lift + }: + mkDerivation { + pname = "ether"; + version = "0.4.1.0"; + sha256 = "4790c6a8d2f81fcda1dd037bd89e4183d215417f0f3228b6f3dee5a2be139d30"; + libraryHaskellDepends = [ + base exceptions mmorph monad-control mtl template-haskell + transformers transformers-base transformers-lift + ]; + testHaskellDepends = [ + base mtl QuickCheck tasty tasty-quickcheck transformers + ]; + homepage = "https://int-index.github.io/ether/"; + description = "Monad transformers and classes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ethereum-client-haskell" = callPackage ({ mkDerivation, ansi-wl-pprint, array, base, base16-bytestring , binary, bytestring, cmdargs, containers, cryptohash, data-default @@ -60691,15 +61560,14 @@ self: { "eve" = callPackage ({ mkDerivation, base, containers, data-default, free, hspec - , hspec-core, lens, mtl, pipes, pipes-concurrency, pipes-parse + , hspec-core, lens, mtl }: mkDerivation { pname = "eve"; - version = "0.1.0"; - sha256 = "18cc10498a3c663fed847eaa5caf910f613cca4c817e05a3e884b077b2122ed9"; + version = "0.1.7"; + sha256 = "b1d4ad466224f3cad47bce852e5c1605e3353b57adb1a4dc57591ee89e99b237"; libraryHaskellDepends = [ - base containers data-default free lens mtl pipes pipes-concurrency - pipes-parse + base containers data-default free lens mtl ]; testHaskellDepends = [ base data-default hspec hspec-core lens mtl @@ -60805,8 +61673,8 @@ self: { }: mkDerivation { pname = "eventloop"; - version = "0.8.2.1"; - sha256 = "aed31b9515e726ae439323590336295cbdcd9c530aebb95f976a1068fc4c6848"; + version = "0.8.2.2"; + sha256 = "20681dea13cfc53e4b8e0b27c4e8ec62462a0c0886a797eb773370db1ca0e00e"; libraryHaskellDepends = [ aeson base bytestring concurrent-utilities deepseq network stm suspend text timers websockets @@ -61203,8 +62071,8 @@ self: { ({ mkDerivation, base, directory, filepath, unix }: mkDerivation { pname = "executable-path"; - version = "0.0.3"; - sha256 = "8c7215ed4c3cd558f89dc862d21cf9dab3c6b762f4f90c0c1be9e3141c46e5c9"; + version = "0.0.3.1"; + sha256 = "9cc742b6d40a487b3af38dca6852ca3b50a0db94d42fe819576c84beb5adbc6f"; libraryHaskellDepends = [ base directory filepath unix ]; homepage = "http://code.haskell.org/~bkomuves/"; description = "Finding out the full path of the executable"; @@ -61297,25 +62165,25 @@ self: { }) {inherit (pkgs) exif;}; "exinst" = callPackage - ({ mkDerivation, aeson, base, bytes, constraints, deepseq - , generic-random, hashable, profunctors, QuickCheck, singletons - , tasty, tasty-hunit, tasty-quickcheck + ({ mkDerivation, aeson, base, binary, bytes, bytestring, cereal + , constraints, deepseq, hashable, profunctors, QuickCheck + , singletons, tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "exinst"; - version = "0.3"; - sha256 = "3edfe07ca71b4c296349661f8f2d496100d3b44ae72af8ce1ab7f76f1adddb11"; + version = "0.4"; + sha256 = "49f2465086a7e0411d9bdfe5957e54e7bd85d873dc7e75d3447c7b2edf98ee58"; libraryHaskellDepends = [ - aeson base bytes constraints deepseq hashable profunctors - QuickCheck singletons + aeson base binary bytes cereal constraints deepseq hashable + profunctors QuickCheck singletons ]; testHaskellDepends = [ - aeson base bytes constraints deepseq generic-random hashable - profunctors QuickCheck singletons tasty tasty-hunit + aeson base binary bytes bytestring cereal constraints deepseq + hashable profunctors QuickCheck singletons tasty tasty-hunit tasty-quickcheck ]; homepage = "https://github.com/k0001/exinst"; - description = "Derive instances for your existential types"; + description = "Recover type indexes and instances for your existentialized types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -61758,7 +62626,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "extensible_0_4" = callPackage + "extensible_0_4_1" = callPackage ({ mkDerivation, base, comonad, constraints, criterion, deepseq , effin, extensible-effects, freer, ghc-prim, lens, monad-skeleton , mtl, primitive, profunctors, semigroups, tagged, template-haskell @@ -61766,8 +62634,8 @@ self: { }: mkDerivation { pname = "extensible"; - version = "0.4"; - sha256 = "f9fbd703c2ac7b2790446cb04281d3577848797d53413374e5c1987afcec3a1c"; + version = "0.4.1"; + sha256 = "4982d227fa1dc75ec7ade1ecb81d2611f35cace2bc79a9b68cbdf4305453648a"; libraryHaskellDepends = [ base comonad constraints deepseq ghc-prim monad-skeleton mtl primitive profunctors semigroups tagged template-haskell @@ -62312,8 +63180,8 @@ self: { }: mkDerivation { pname = "fast-tagsoup"; - version = "1.0.12"; - sha256 = "6447078da5a85c62528edab1a266ae8709811ba1d113f6dee1ec249e75e3904a"; + version = "1.0.13"; + sha256 = "250658a41dae37448ce938ef05f9eaa1d9083b4b6030de03df074d3e546a0986"; libraryHaskellDepends = [ base bytestring containers tagsoup text text-icu ]; @@ -62776,6 +63644,8 @@ self: { pname = "fclabels"; version = "2.0.3.2"; sha256 = "4d5d83ffc3c8bc610e9c42e19c2e07a1ca68666310261de15703c605047182b0"; + revision = "1"; + editedCabalFile = "9e2c00e02216a9ba54f4798c9c68e88b0b94440e9ebd583d126404e8f7fe8c90"; libraryHaskellDepends = [ base mtl template-haskell transformers ]; testHaskellDepends = [ base HUnit mtl template-haskell transformers @@ -62888,6 +63758,8 @@ self: { pname = "feed"; version = "0.3.12.0"; sha256 = "cc2d6a3b91027d75b91a0a4c0f83f2df68bee3ce0d7338ea5ae0bcab6dd47942"; + revision = "1"; + editedCabalFile = "f4f8a8372bb2337c23c91e9fb5e29b379def01dba7234db0e44b9e753c25cc8c"; libraryHaskellDepends = [ base old-locale old-time time time-locale-compat utf8-string xml ]; @@ -63183,6 +64055,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {raptor = null;}; + "fernet" = callPackage + ({ mkDerivation, aeson, base, binary, byteable, bytestring + , cryptonite, HUnit, memory, optparse-applicative, QuickCheck + , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, time, unix + }: + mkDerivation { + pname = "fernet"; + version = "0.1.0.0"; + sha256 = "3ed511803b0754f56948dd172888ad51314cfb41ea029f92306d89b03dac1119"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary byteable bytestring cryptonite memory time + ]; + executableHaskellDepends = [ + base bytestring memory optparse-applicative time unix + ]; + testHaskellDepends = [ + aeson base bytestring HUnit memory QuickCheck tasty tasty-golden + tasty-hunit tasty-quickcheck time + ]; + homepage = "https://github.com/rvl/fernet-hs"; + description = "Generate and verify HMAC-based authentication tokens"; + license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fez-conf" = callPackage ({ mkDerivation, base, containers, regex-compat }: mkDerivation { @@ -63243,18 +64142,19 @@ self: { }) {}; "ffmpeg-light" = callPackage - ({ mkDerivation, base, either, exceptions, ffmpeg, JuicyPixels - , libavcodec, libavdevice, libavformat, libswscale, mtl - , transformers, vector + ({ mkDerivation, base, bytestring, either, exceptions, ffmpeg + , JuicyPixels, libavcodec, libavdevice, libavformat, libswscale + , mtl, transformers, vector }: mkDerivation { pname = "ffmpeg-light"; - version = "0.11.3"; - sha256 = "57206bff8bcf82f08f0881b80d5992d2be41b32443b8eca10d198789af24adfb"; + version = "0.12.0"; + sha256 = "9ff53c44c03562218ad04f3ac76c0e7fe8a7a91ed446743d20fb021705966833"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base either exceptions JuicyPixels mtl transformers vector + base bytestring either exceptions JuicyPixels mtl transformers + vector ]; libraryPkgconfigDepends = [ ffmpeg libavcodec libavdevice libavformat libswscale @@ -63289,8 +64189,8 @@ self: { }: mkDerivation { pname = "fft"; - version = "0.1.8.4"; - sha256 = "2ea96d3150c1fca6ae2d8f0cead263ea1deddc0be18727a0cf4030f2ef07e1b4"; + version = "0.1.8.5"; + sha256 = "fa290a4d7e2f356237e8d450a5a945cf2bde1b281b08a703d101ccc2e959aa1f"; libraryHaskellDepends = [ array base carray ix-shapable storable-complex syb transformers ]; @@ -63314,22 +64214,6 @@ self: { }) {inherit (pkgs) fftw;}; "fgl" = callPackage - ({ mkDerivation, array, base, containers, deepseq, hspec - , QuickCheck, transformers - }: - mkDerivation { - pname = "fgl"; - version = "5.5.3.0"; - sha256 = "d70cd8e2694311fae0b44fe0d1b342c95706ceffd3be66767e9027dfa5597e39"; - libraryHaskellDepends = [ - array base containers deepseq transformers - ]; - testHaskellDepends = [ base containers hspec QuickCheck ]; - description = "Martin Erwig's Functional Graph Library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fgl_5_5_3_1" = callPackage ({ mkDerivation, array, base, containers, deepseq, hspec , microbench, QuickCheck, transformers }: @@ -63344,22 +64228,9 @@ self: { benchmarkHaskellDepends = [ base deepseq microbench ]; description = "Martin Erwig's Functional Graph Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fgl-arbitrary" = callPackage - ({ mkDerivation, base, containers, fgl, hspec, QuickCheck }: - mkDerivation { - pname = "fgl-arbitrary"; - version = "0.2.0.2"; - sha256 = "501d77f1f5efd952aaf06d35fc95bfd3a9bc93906f78a363766ec74d14d50b8b"; - libraryHaskellDepends = [ base fgl QuickCheck ]; - testHaskellDepends = [ base containers fgl hspec QuickCheck ]; - description = "QuickCheck support for fgl"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fgl-arbitrary_0_2_0_3" = callPackage ({ mkDerivation, base, containers, fgl, hspec, QuickCheck }: mkDerivation { pname = "fgl-arbitrary"; @@ -63369,7 +64240,6 @@ self: { testHaskellDepends = [ base containers fgl hspec QuickCheck ]; description = "QuickCheck support for fgl"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fgl-extras-decompositions" = callPackage @@ -64078,20 +64948,18 @@ self: { }) {inherit (pkgs) cfitsio;}; "fitspec" = callPackage - ({ mkDerivation, base, cmdargs, haskell-src, haskell-src-exts - , leancheck, pretty, template-haskell + ({ mkDerivation, base, cmdargs, leancheck, pretty, template-haskell }: mkDerivation { pname = "fitspec"; - version = "0.4.0"; - sha256 = "73dae591138ff5390be2b7f373a4f3bed89d4d39d26ac665f5f8cf5326aad5da"; + version = "0.4.1"; + sha256 = "e4b0d7b33ab7b1e3acfdb5c3d170c5c3977e50fd05c124aec3e492374341bb6a"; libraryHaskellDepends = [ base cmdargs leancheck template-haskell ]; testHaskellDepends = [ base cmdargs leancheck template-haskell ]; benchmarkHaskellDepends = [ - base cmdargs haskell-src haskell-src-exts leancheck pretty - template-haskell + base cmdargs leancheck pretty template-haskell ]; homepage = "https://github.com/rudymatela/fitspec#readme"; description = "refining property sets for testing Haskell programs"; @@ -65008,8 +65876,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.5.1.3"; - sha256 = "391f97abb8acac97b82d3b8a3ee3d62e2f76b566c01be2dff8835932fd85ae29"; + version = "0.5.1.5"; + sha256 = "74cdfdc677fe52b1c551fed125a7fb38b3858e0256be2c512929a9cd0c3d45f0"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -65287,8 +66155,8 @@ self: { }: mkDerivation { pname = "foldl"; - version = "1.2.3"; - sha256 = "fb081168f7736a04dc68db348d2e0bc58d535da5ed74c4394a022dbaa46d3f25"; + version = "1.2.4"; + sha256 = "1c9777b172422aa0a184a44fdd20ee74f2d5e9d735b127fcc7ee1e61647ce3b5"; libraryHaskellDepends = [ base bytestring comonad containers contravariant mwc-random primitive profunctors text transformers vector @@ -66006,10 +66874,8 @@ self: { }: mkDerivation { pname = "foundation"; - version = "0.0.3"; - sha256 = "72d7f2af963d42cb7e1164b854978ad3f351175449ba2d27c6b639ffca0b75fa"; - revision = "1"; - editedCabalFile = "d3e2dc092452ec38bd2b555ecb5c5aceecb21880810c115973bf5cf2b4e0da5b"; + version = "0.0.5"; + sha256 = "d2822ebd4159ef2786909dee674397d675dcb710ee2b48a693d69a1ece30cf55"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base mtl QuickCheck tasty tasty-hunit tasty-quickcheck @@ -66792,8 +67658,8 @@ self: { }: mkDerivation { pname = "friday-juicypixels"; - version = "0.1.2"; - sha256 = "2f8fca7cf49c86af592691bdaaada94ae768a9e054956759a860c9b59ae16ed1"; + version = "0.1.2.1"; + sha256 = "ca861884ede7a37567fc291e8e98515f3ec5cc8dfc0200944e5fd5fa49251af4"; libraryHaskellDepends = [ base friday JuicyPixels vector ]; testHaskellDepends = [ base bytestring file-embed friday hspec JuicyPixels @@ -67463,6 +68329,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "functor-classes-compat" = callPackage + ({ mkDerivation, base, containers, hashable, unordered-containers + , vector + }: + mkDerivation { + pname = "functor-classes-compat"; + version = "1"; + sha256 = "ef11f94f44a74d6657ee61dcd2cfbc6d0889d233a2fb4caae6a29d9c59a1366f"; + libraryHaskellDepends = [ + base containers hashable unordered-containers vector + ]; + homepage = "https://github.com/phadej/functor-classes-compat#readme"; + description = "Data.Functor.Classes instances for core packages"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "functor-combo" = callPackage ({ mkDerivation, base, base-orphans, containers, data-inttrie, lub , type-unary, TypeCompose @@ -67801,6 +68683,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "g4ip" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "g4ip"; + version = "0.1.0.0"; + sha256 = "fc280273fd9e6324d1b304bf553ae43f69202ae8619a74fa2b4bd7fa069ec086"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/cacay/G4ip"; + description = "A theorem prover for propositional logic that uses G4ip"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gact" = callPackage ({ mkDerivation, base, biopsl, bytestring, cmdargs, hashable , unordered-containers @@ -68314,8 +69210,8 @@ self: { }: mkDerivation { pname = "general-games"; - version = "1.0.2"; - sha256 = "1415c6cb8a2d37322e7568ae53ffca5d658aed6e47bbbefa5c59ed88c09b384e"; + version = "1.0.5"; + sha256 = "427d0319c4aa99d8071d25bc4df7e7f1eff341b05d8f5ed85a735b1b6c032a53"; libraryHaskellDepends = [ base monad-loops MonadRandom random random-shuffle ]; @@ -68402,6 +69298,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generic-arbitrary" = callPackage + ({ mkDerivation, base, QuickCheck }: + mkDerivation { + pname = "generic-arbitrary"; + version = "0.1.0"; + sha256 = "69f30a54e7a3d0a45288778e22e6d0d03cfc3b525dfe0a663cd4f559a619bcc6"; + libraryHaskellDepends = [ base QuickCheck ]; + description = "Generic implementation for QuickCheck's Arbitrary"; + license = stdenv.lib.licenses.mit; + }) {}; + "generic-binary" = callPackage ({ mkDerivation, base, binary, bytestring, ghc-prim }: mkDerivation { @@ -68475,6 +69382,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generic-enum" = callPackage + ({ mkDerivation, array, base, bytestring, hspec }: + mkDerivation { + pname = "generic-enum"; + version = "0.1.1.0"; + sha256 = "bea3687bf956cbcc4dbe24ad52a9f916f76a564f8cc046341568b176708a94d4"; + libraryHaskellDepends = [ array base bytestring ]; + testHaskellDepends = [ array base bytestring hspec ]; + description = "An Enum class that fixes some deficiences with Prelude's Enum"; + license = stdenv.lib.licenses.mit; + }) {}; + "generic-lucid-scaffold" = callPackage ({ mkDerivation, base, lucid, text }: mkDerivation { @@ -68530,24 +69449,6 @@ self: { }) {}; "generic-random" = callPackage - ({ mkDerivation, ad, base, containers, hashable, hmatrix, ieee754 - , MonadRandom, mtl, QuickCheck, transformers, unordered-containers - , vector - }: - mkDerivation { - pname = "generic-random"; - version = "0.4.0.0"; - sha256 = "68c5036f55584c5164c79a6adf6d9dc4435844fc98d206be80a1683cc4929f22"; - libraryHaskellDepends = [ - ad base containers hashable hmatrix ieee754 MonadRandom mtl - QuickCheck transformers unordered-containers vector - ]; - homepage = "http://github.com/lysxia/generic-random"; - description = "Generic random generators"; - license = stdenv.lib.licenses.mit; - }) {}; - - "generic-random_0_4_1_0" = callPackage ({ mkDerivation, base, boltzmann-samplers, QuickCheck }: mkDerivation { pname = "generic-random"; @@ -68557,7 +69458,6 @@ self: { homepage = "http://github.com/lysxia/generic-random"; description = "Generic random generators"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generic-records" = callPackage @@ -68878,8 +69778,10 @@ self: { ({ mkDerivation, base, hspec, QuickCheck, validity }: mkDerivation { pname = "genvalidity"; - version = "0.3.1.0"; - sha256 = "fd79841970e8d29a204e8cdf540478760f2a488bde21583668a3e7d8526f588a"; + version = "0.3.2.0"; + sha256 = "1a92621a1d9f09e134891fe408cd6c17af866a80648ec53f014eed9604b9905b"; + revision = "1"; + editedCabalFile = "08fd437bc922f93c1122c58d0dca3e93befe76c800e117b729da975836ba8f26"; libraryHaskellDepends = [ base QuickCheck validity ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/NorfairKing/validity#readme"; @@ -68887,14 +69789,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-bytestring" = callPackage + ({ mkDerivation, base, bytestring, genvalidity, genvalidity-hspec + , hspec, QuickCheck, validity, validity-bytestring + }: + mkDerivation { + pname = "genvalidity-bytestring"; + version = "0.0.0.1"; + sha256 = "314e531c902db8e36df9f23c8e8a9b355cabf8377ddb1b24410e25f96f806d67"; + libraryHaskellDepends = [ + base bytestring genvalidity QuickCheck validity validity-bytestring + ]; + testHaskellDepends = [ + base bytestring genvalidity genvalidity-hspec hspec QuickCheck + ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for ByteString"; + license = stdenv.lib.licenses.mit; + }) {}; + "genvalidity-containers" = callPackage ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec , hspec, QuickCheck, validity, validity-containers }: mkDerivation { pname = "genvalidity-containers"; - version = "0.2.0.0"; - sha256 = "79cccb5ac44193287e65aaf751617e213e71b012cc96e31e42428cdfd9c63ce1"; + version = "0.2.0.1"; + sha256 = "97fa168074201195a57ad36f4ae678435f2595e071f9ec259bca72eacf0eaf29"; libraryHaskellDepends = [ base containers genvalidity QuickCheck validity validity-containers ]; @@ -68908,15 +69829,15 @@ self: { }) {}; "genvalidity-hspec" = callPackage - ({ mkDerivation, base, doctest, genvalidity, hspec, hspec-core - , QuickCheck, validity + ({ mkDerivation, base, doctest, genvalidity, genvalidity-property + , hspec, hspec-core, QuickCheck, validity }: mkDerivation { pname = "genvalidity-hspec"; - version = "0.3.1.0"; - sha256 = "abead88444f51c39f59cf2b959ad0d9532f4b58b87cb9f53b6e6c0bc6f62ef5d"; + version = "0.4.0.0"; + sha256 = "4e3f5370e5945cb63a4063b9fc810384df7ce9bf9b0aa6f6f1549739897067ad"; libraryHaskellDepends = [ - base genvalidity hspec QuickCheck validity + base genvalidity genvalidity-property hspec QuickCheck validity ]; testHaskellDepends = [ base doctest genvalidity hspec hspec-core QuickCheck @@ -68934,8 +69855,8 @@ self: { }: mkDerivation { pname = "genvalidity-hspec-aeson"; - version = "0.0.1.0"; - sha256 = "58da64350fb137c8fae3a62450fe541adf66ddc4f2d42791350cb6085ac1b2b0"; + version = "0.0.1.1"; + sha256 = "78c874a190dd0a92005a1c2d8ca2b05ae6682d3486dc1d5a9feeb0daab393d37"; libraryHaskellDepends = [ aeson base bytestring deepseq genvalidity genvalidity-hspec hspec QuickCheck @@ -68949,14 +69870,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-hspec-binary" = callPackage + ({ mkDerivation, base, binary, deepseq, doctest, genvalidity + , genvalidity-hspec, hspec, QuickCheck + }: + mkDerivation { + pname = "genvalidity-hspec-binary"; + version = "0.0.0.0"; + sha256 = "fdb91ed09a3e486508d8180dc4fcc3f229d376838576c5a0a271b4dbbd2937b6"; + libraryHaskellDepends = [ + base binary deepseq genvalidity genvalidity-hspec hspec QuickCheck + ]; + testHaskellDepends = [ base doctest genvalidity hspec ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Standard spec's for binary-related Instances"; + license = stdenv.lib.licenses.mit; + }) {}; + "genvalidity-hspec-cereal" = callPackage ({ mkDerivation, base, cereal, deepseq, doctest, genvalidity , genvalidity-hspec, hspec, QuickCheck }: mkDerivation { pname = "genvalidity-hspec-cereal"; - version = "0.0.0.0"; - sha256 = "1cbb1d37aed02b8aa75092b0ff7065bdd0238a02fd735a2b1e548be9e11e48de"; + version = "0.0.0.1"; + sha256 = "72da16d069acb00176f0e17844b1991c86769feb4157ba0afa204f4dfb21fd78"; libraryHaskellDepends = [ base cereal deepseq genvalidity genvalidity-hspec hspec QuickCheck ]; @@ -68973,8 +69911,8 @@ self: { }: mkDerivation { pname = "genvalidity-path"; - version = "0.1.0.0"; - sha256 = "0b955a1e244c9fa2915212447b75ec862c3677a43e8b2654e368568ef6244b38"; + version = "0.1.0.2"; + sha256 = "3dbdb8e37bfedce8f0a09a5bd3ef9d2968ee79cc1dbadb92deec231887aeebbe"; libraryHaskellDepends = [ base genvalidity path validity-path ]; testHaskellDepends = [ base genvalidity-hspec hspec path ]; homepage = "https://github.com/NorfairKing/validity#readme"; @@ -68983,14 +69921,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-property" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, genvalidity + , hspec, QuickCheck, validity + }: + mkDerivation { + pname = "genvalidity-property"; + version = "0.0.0.0"; + sha256 = "5d202e8245c3658630273469730f2601414b466165da92392e6dc0c85c728f10"; + libraryHaskellDepends = [ + base genvalidity hspec QuickCheck validity + ]; + testHaskellDepends = [ base directory doctest filepath ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Standard properties for functions on `Validity` types"; + license = stdenv.lib.licenses.mit; + }) {}; + "genvalidity-text" = callPackage ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, text, validity, validity-text }: mkDerivation { pname = "genvalidity-text"; - version = "0.3.1.0"; - sha256 = "84ca3ffc6717a1cf9c535a53e4f8451ae4878370870555bced73ea33fd724a02"; + version = "0.3.1.1"; + sha256 = "07a1a3faede82fb451a111ae7f6b2c44b67c8665369b440fa3ece9b630b4ae7a"; libraryHaskellDepends = [ array base genvalidity QuickCheck text validity validity-text ]; @@ -69009,8 +69964,8 @@ self: { }: mkDerivation { pname = "genvalidity-time"; - version = "0.0.0.0"; - sha256 = "6f0a0872e4163afbe03ebdca19cc3411ba60cfc8ff44db03cd06c66c4b974e3e"; + version = "0.0.0.1"; + sha256 = "b2afbab45a899b0827e30ea6c147f62cb2ad1b6199dd1b517016679d65b5a082"; libraryHaskellDepends = [ base genvalidity time validity-time ]; testHaskellDepends = [ base genvalidity-hspec hspec time ]; homepage = "https://github.com/NorfairKing/validity#readme"; @@ -69604,6 +70559,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-heap-view_0_5_9" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, deepseq, ghc + , template-haskell, transformers + }: + mkDerivation { + pname = "ghc-heap-view"; + version = "0.5.9"; + sha256 = "c631a30ed4dc3d6b53ffe1dbed7d2dc5799a362e6e490a7760ff2fd2b0df32af"; + libraryHaskellDepends = [ + base binary bytestring containers ghc template-haskell transformers + ]; + testHaskellDepends = [ base deepseq ]; + description = "Extract the heap representation of Haskell values and thunks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-imported-from" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , exceptions, filepath, ghc, ghc-mod, ghc-paths, ghc-syb-utils @@ -69872,14 +70844,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-prof_1_4_0" = callPackage + "ghc-prof_1_4_0_1" = callPackage ({ mkDerivation, attoparsec, base, containers, directory, filepath , process, scientific, tasty, tasty-hunit, temporary, text, time }: mkDerivation { pname = "ghc-prof"; - version = "1.4.0"; - sha256 = "2ab282b118684c30cf10f6b69aa362dacaf274a73b7e23b668c36d6830ce4253"; + version = "1.4.0.1"; + sha256 = "af2e4919097e4bed023aefd9b10fb70ded3ea369e7457324e7ad7d2b96d809e0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70108,6 +71080,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-usage" = callPackage + ({ mkDerivation, base, containers, ghc, ghc-paths, unix }: + mkDerivation { + pname = "ghc-usage"; + version = "0.1.0.1"; + sha256 = "dddd7072f2955da4ce29fbb7d8904523fa4d3b563837432889e7e2920f09acf4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers ghc ]; + executableHaskellDepends = [ base ghc-paths unix ]; + description = "Print minimal export lists"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-vis" = callPackage ({ mkDerivation, base, cairo, containers, deepseq, fgl , ghc-heap-view, graphviz, gtk3, mtl, svgcairo, text, transformers @@ -70277,6 +71264,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ghcjs-base-stub" = callPackage + ({ mkDerivation, aeson, attoparsec, base, deepseq, ghc-prim + , primitive, scientific, text, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "ghcjs-base-stub"; + version = "0.1.0.2"; + sha256 = "629089740c7fd2349b39a3899bad3692667dfd2ff6443b3e815d2bf3cad60ff5"; + libraryHaskellDepends = [ + aeson attoparsec base deepseq ghc-prim primitive scientific text + transformers unordered-containers vector + ]; + homepage = "https://github.com/louispan/javascript-stub#readme"; + description = "Allow GHCJS projects to compile under GHC and develop using intero"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ghcjs-codemirror" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -70405,6 +71410,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ghcjs-perch_0_3_3_2" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "ghcjs-perch"; + version = "0.3.3.2"; + sha256 = "a7cee1699b51af9e0aa62dec2ab4a04f68250106da02c77bed19dd69fae5e6d9"; + libraryHaskellDepends = [ base transformers ]; + description = "GHCJS version of Perch library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghcjs-promise" = callPackage ({ mkDerivation, base, ghcjs-base, protolude }: mkDerivation { @@ -70556,8 +71573,7 @@ self: { "gi-cairo" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers - , gobjectIntrospection, haskell-gi, haskell-gi-base, text - , transformers + , haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-cairo"; @@ -70568,9 +71584,8 @@ self: { base bytestring containers haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ cairo gobjectIntrospection ]; + libraryPkgconfigDepends = [ cairo ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; preCompileBuildDriver = '' PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" @@ -70578,7 +71593,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Cairo bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection;}; + }) {inherit (pkgs) cairo;}; "gi-gdk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo @@ -70596,7 +71611,6 @@ self: { ]; libraryPkgconfigDepends = [ gtk3 ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gtk3.dev}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gdk bindings"; license = stdenv.lib.licenses.lgpl21; @@ -70605,8 +71619,8 @@ self: { "gi-gdkpixbuf" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf - , gi-gio, gi-glib, gi-gobject, gobjectIntrospection, haskell-gi - , haskell-gi-base, text, transformers + , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base, text + , transformers }: mkDerivation { pname = "gi-gdkpixbuf"; @@ -70617,22 +71631,16 @@ self: { base bytestring containers gi-gio gi-glib gi-gobject haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ gdk_pixbuf gobjectIntrospection ]; + libraryPkgconfigDepends = [ gdk_pixbuf ]; doHaddock = false; - preConfigure = '' - export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0:${gdk_pixbuf.dev}/share/gir-1.0 - export GI_TYPELIB_PATH=${gdk_pixbuf.out}/lib/girepository-1.0 - ''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GdkPixbuf bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) gdk_pixbuf; - inherit (pkgs) gobjectIntrospection;}; + }) {inherit (pkgs) gdk_pixbuf;}; "gi-gio" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, glib, gobjectIntrospection, haskell-gi - , haskell-gi-base, text, transformers + , gi-gobject, glib, haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gio"; @@ -70643,13 +71651,12 @@ self: { base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ glib gobjectIntrospection ]; + libraryPkgconfigDepends = [ glib ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gio bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; + }) {inherit (pkgs) glib;}; "gi-girepository" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject @@ -70675,8 +71682,7 @@ self: { "gi-glib" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, glib - , gobjectIntrospection, haskell-gi, haskell-gi-base, text - , transformers + , haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-glib"; @@ -70687,18 +71693,16 @@ self: { base bytestring containers haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ glib gobjectIntrospection ]; + libraryPkgconfigDepends = [ glib ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GLib bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; + }) {inherit (pkgs) glib;}; "gi-gobject" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib - , gobjectIntrospection, haskell-gi, haskell-gi-base, text - , transformers + , haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gobject"; @@ -70709,13 +71713,12 @@ self: { base bytestring containers gi-glib haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ glib gobjectIntrospection ]; + libraryPkgconfigDepends = [ glib ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GObject bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; + }) {inherit (pkgs) glib;}; "gi-gst" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib @@ -70741,8 +71744,8 @@ self: { "gi-gstaudio" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gi-gst, gi-gstbase, gobjectIntrospection - , gst_plugins_base, haskell-gi, haskell-gi-base, text, transformers + , gi-gobject, gi-gst, gi-gstbase, gst-plugins-base, haskell-gi + , haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gstaudio"; @@ -70753,19 +71756,18 @@ self: { base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase haskell-gi haskell-gi-base text transformers ]; - librarySystemDepends = [ gobjectIntrospection ]; - libraryPkgconfigDepends = [ gst_plugins_base ]; + libraryPkgconfigDepends = [ gst-plugins-base ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerAudio bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gobjectIntrospection; gst_plugins_base = null;}; + }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gstbase" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gi-gst, gobjectIntrospection, gst_plugins_base - , haskell-gi, haskell-gi-base, text, transformers + , gi-gobject, gi-gst, gst-plugins-base, haskell-gi, haskell-gi-base + , text, transformers }: mkDerivation { pname = "gi-gstbase"; @@ -70776,19 +71778,18 @@ self: { base bytestring containers gi-glib gi-gobject gi-gst haskell-gi haskell-gi-base text transformers ]; - librarySystemDepends = [ gobjectIntrospection ]; - libraryPkgconfigDepends = [ gst_plugins_base ]; + libraryPkgconfigDepends = [ gst-plugins-base ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerBase bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gobjectIntrospection; gst_plugins_base = null;}; + }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gstvideo" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gi-gst, gi-gstbase, gobjectIntrospection - , gst_plugins_base, haskell-gi, haskell-gi-base, text, transformers + , gi-gobject, gi-gst, gi-gstbase, gst-plugins-base, haskell-gi + , haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gstvideo"; @@ -70799,14 +71800,13 @@ self: { base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase haskell-gi haskell-gi-base text transformers ]; - librarySystemDepends = [ gobjectIntrospection ]; - libraryPkgconfigDepends = [ gst_plugins_base ]; + libraryPkgconfigDepends = [ gst-plugins-base ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamerVideo bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gobjectIntrospection; gst_plugins_base = null;}; + }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gtk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk @@ -70825,7 +71825,6 @@ self: { ]; libraryPkgconfigDepends = [ gtk3 ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gtk3.dev}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gtk bindings"; license = stdenv.lib.licenses.lgpl21; @@ -70899,7 +71898,7 @@ self: { "gi-javascriptcore" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi - , haskell-gi-base, javascriptcoregtk, text, transformers, webkitgtk + , haskell-gi-base, text, transformers, webkitgtk24x }: mkDerivation { pname = "gi-javascriptcore"; @@ -70910,18 +71909,17 @@ self: { base bytestring containers haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ javascriptcoregtk webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk24x ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${webkitgtk}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "JavaScriptCore bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {javascriptcoregtk = null; inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) webkitgtk24x;}; "gi-javascriptcore_4_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi - , haskell-gi-base, javascriptcoregtk, text, transformers, webkitgtk + , haskell-gi-base, text, transformers, webkitgtk }: mkDerivation { pname = "gi-javascriptcore"; @@ -70932,14 +71930,13 @@ self: { base bytestring containers haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ javascriptcoregtk webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${webkitgtk}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "JavaScriptCore bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {javascriptcoregtk = null; inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs.gnome3) webkitgtk;}; "gi-notify" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf @@ -70963,10 +71960,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libnotify;}; + "gi-ostree" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, ostree, text + , transformers + }: + mkDerivation { + pname = "gi-ostree"; + version = "1.0.1"; + sha256 = "de10141aad3fe918b337743231d86f2dd70e876e6e49de8f4d36ef700d241299"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi + haskell-gi-base text transformers + ]; + libraryPkgconfigDepends = [ ostree ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "OSTree bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {inherit (pkgs) ostree;}; + "gi-pango" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers - , gi-glib, gi-gobject, gobjectIntrospection, haskell-gi - , haskell-gi-base, pango, text, transformers + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, pango, text + , transformers }: mkDerivation { pname = "gi-pango"; @@ -70977,9 +71995,8 @@ self: { base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ cairo gobjectIntrospection pango ]; + libraryPkgconfigDepends = [ cairo pango ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; preCompileBuildDriver = '' PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" @@ -70988,14 +72005,12 @@ self: { description = "Pango bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection; - inherit (pkgs.gnome2) pango;}; + }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;}; "gi-pangocairo" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo - , gi-glib, gi-gobject, gi-pango, gobjectIntrospection, haskell-gi - , haskell-gi-base, pango, system-cairo, system-pango, text - , transformers + ({ mkDerivation, base, bytestring, Cabal, cairo, containers + , gi-cairo, gi-glib, gi-gobject, gi-pango, haskell-gi + , haskell-gi-base, pango, text, transformers }: mkDerivation { pname = "gi-pangocairo"; @@ -71006,22 +72021,17 @@ self: { base bytestring containers gi-cairo gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ - gobjectIntrospection pango system-cairo system-pango - ]; + libraryPkgconfigDepends = [ cairo pango ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${system-pango.dev}/share/gir-1.0''; preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${system-pango.dev}/lib/pkgconfig:${system-cairo.dev}/lib/pkgconfig" - setupCompileFlags+=" $(pkg-config --libs pangocairo cairo-gobject)" + PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" ''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "PangoCairo bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gobjectIntrospection; - inherit (pkgs.gnome2) pango; system-cairo = pkgs.cairo; - system-pango = pkgs.pango;}; + }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;}; "gi-poppler" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo @@ -71045,6 +72055,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) poppler;}; + "gi-secret" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio + , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libsecret, text + , transformers + }: + mkDerivation { + pname = "gi-secret"; + version = "0.0.1"; + sha256 = "877f0d508b6bcdd46b2e2ab285de6cd96e687f3085c9b2bb7b23600834b29f9a"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-gio gi-glib gi-gobject haskell-gi + haskell-gi-base text transformers + ]; + libraryPkgconfigDepends = [ libsecret ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Libsecret bindings"; + license = stdenv.lib.licenses.lgpl21; + }) {inherit (pkgs) libsecret;}; + "gi-soup" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libsoup, text @@ -71092,7 +72123,7 @@ self: { ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base - , text, transformers, webkit + , text, transformers, webkitgtk24x }: mkDerivation { pname = "gi-webkit"; @@ -71104,19 +72135,19 @@ self: { gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ webkit ]; + libraryPkgconfigDepends = [ webkitgtk24x ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "WebKit bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit = null;}; + }) {inherit (pkgs) webkitgtk24x;}; "gi-webkit2" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base, text - , transformers, webkit2gtk, webkitgtk + , transformers, webkitgtk }: mkDerivation { pname = "gi-webkit2"; @@ -71128,19 +72159,18 @@ self: { gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ webkit2gtk webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${webkitgtk}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "WebKit2 bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit2gtk = null; inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs.gnome3) webkitgtk;}; "gi-webkit2webextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base - , text, transformers, webkit2gtk-web-extension, webkitgtk + , text, transformers, webkitgtk-web-extension }: mkDerivation { pname = "gi-webkit2webextension"; @@ -71151,14 +72181,13 @@ self: { base bytestring containers gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ webkit2gtk-web-extension webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk-web-extension ]; doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${webkitgtk}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "WebKit2-WebExtension bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit2gtk-web-extension = null; inherit (pkgs) webkitgtk;}; + }) {webkitgtk-web-extension = null;}; "giak" = callPackage ({ mkDerivation, async, base, bytestring, Cabal, containers @@ -71433,8 +72462,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20170301.1"; - sha256 = "f416c02fabefb28e346b3bb6723141b0ff9785575e78e4d1e9ab5982cf6389de"; + version = "6.20170321"; + sha256 = "f86351a99bbfff0285914c4639d2bc68ffcc172a6dacdef164254261cf1f0795"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -71770,8 +72799,8 @@ self: { }: mkDerivation { pname = "gitHUD"; - version = "1.3.6"; - sha256 = "a522924926b65d19601726fb5fde020c0523f0b30c95d6bb1e0ba0d751da8a49"; + version = "1.3.7"; + sha256 = "dc38431b13d2dc4625987131c1389ed4ab67154990035c0c66f30d90d1a344af"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec process text unix ]; @@ -72256,6 +73285,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gitrev_1_3_1" = callPackage + ({ mkDerivation, base, base-compat, directory, filepath, process + , template-haskell + }: + mkDerivation { + pname = "gitrev"; + version = "1.3.1"; + sha256 = "a89964db24f56727b0e7b10c98fe7c116d721d8c46f52d6e77088669aaa38332"; + libraryHaskellDepends = [ + base base-compat directory filepath process template-haskell + ]; + homepage = "https://github.com/acfoltzer/gitrev"; + description = "Compile git revision info into Haskell projects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gitson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , conduit-combinators, conduit-extra, criterion, directory, doctest @@ -72342,16 +73388,18 @@ self: { }) {}; "gl" = callPackage - ({ mkDerivation, base, containers, directory, filepath, fixed, half - , hxt, mesa, split, transformers + ({ mkDerivation, base, Cabal, containers, directory, filepath + , fixed, half, hxt, mesa, transformers }: mkDerivation { pname = "gl"; - version = "0.7.8.1"; - sha256 = "ed792ee75d32489857295ef9ae6a4a49900e2ed4a01cd2bac9fdd17959a6219a"; + version = "0.8.0"; + sha256 = "aa4d2838157c86da920bda651458a4266fccc7c291ea93a69558ab02540e1439"; + setupHaskellDepends = [ + base Cabal containers directory filepath hxt transformers + ]; libraryHaskellDepends = [ - base containers directory filepath fixed half hxt split - transformers + base containers fixed half transformers ]; librarySystemDepends = [ mesa ]; description = "Complete OpenGL raw bindings"; @@ -72487,6 +73535,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "glaze_0_3_0_1" = callPackage + ({ mkDerivation, base, lens }: + mkDerivation { + pname = "glaze"; + version = "0.3.0.1"; + sha256 = "bbb184408bcf24e8c4f89a960cf7a69ab0c51e98bf84c5fa9901aae1702e22a1"; + libraryHaskellDepends = [ base lens ]; + homepage = "https://github.com/louispan/glaze#readme"; + description = "Framework for rendering things with metadata/headers and values"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "glazier" = callPackage ({ mkDerivation, base, lens, mmorph, mtl, profunctors , semigroupoids, transformers @@ -72503,19 +73564,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "glazier_0_11_0_0" = callPackage + "glazier_0_11_0_1" = callPackage ({ mkDerivation, base, lens, mmorph, mtl, semigroupoids , transformers }: mkDerivation { pname = "glazier"; - version = "0.11.0.0"; - sha256 = "8ef0c04025f7d6942eeee13f9f376ed8019e38b6cd48e1eaffff5f5cd789c0ff"; + version = "0.11.0.1"; + sha256 = "1151031c7943140b19fc3b319f6e1c648cc75fa0fd619f17d64dfe7857b60b46"; libraryHaskellDepends = [ base lens mmorph mtl semigroupoids transformers ]; homepage = "https://github.com/louispan/glazier#readme"; - description = "Composable widgets framework"; + description = "Composable widgets framework with enhanced with transformers and lens"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -72537,6 +73598,89 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "glazier-pipes_0_1_5_1" = callPackage + ({ mkDerivation, base, glazier, mmorph, pipes, stm, stm-extras + , transformers + }: + mkDerivation { + pname = "glazier-pipes"; + version = "0.1.5.1"; + sha256 = "9d1d044a4d8641a0da09d6447298530a8a785bb3e29c0177a0b682f9bbf4d1ac"; + libraryHaskellDepends = [ + base glazier mmorph pipes stm stm-extras transformers + ]; + homepage = "https://github.com/louispan/glazier-pipes#readme"; + description = "A threaded rendering framework using glaizer and pipes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "glazier-react" = callPackage + ({ mkDerivation, base, containers, deepseq, disposable, dlist, free + , ghcjs-base-stub, glazier, javascript-extras, lens, mmorph, mtl + , pipes-concurrency, profunctors, semigroupoids, stm, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "glazier-react"; + version = "0.4.0.0"; + sha256 = "2486f02a5c8375cc2b7f75d53279ef96257067e24bc1b946c9ab304cf3b7b883"; + libraryHaskellDepends = [ + base containers deepseq disposable dlist free ghcjs-base-stub + glazier javascript-extras lens mmorph mtl pipes-concurrency + profunctors semigroupoids stm text transformers + unordered-containers + ]; + homepage = "https://github.com/louispan/glazier-react#readme"; + description = "ReactJS binding using Glazier and Pipes.Fluid"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "glazier-react-examples" = callPackage + ({ mkDerivation, base, containers, disposable, dlist, free + , ghcjs-base-stub, glazier, glazier-react, glazier-react-widget + , javascript-extras, lens, mmorph, mtl, pipes, pipes-concurrency + , pipes-misc, stm, text, transformers, unordered-containers + }: + mkDerivation { + pname = "glazier-react-examples"; + version = "0.4.0.0"; + sha256 = "2bff5dbf10e7f78bf61f93a8abe210d0cafcf634f3973e78aa2b1e7fd8188152"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers disposable dlist free ghcjs-base-stub glazier + glazier-react glazier-react-widget javascript-extras lens mmorph + mtl pipes pipes-concurrency pipes-misc stm text transformers + unordered-containers + ]; + homepage = "https://github.com/louispan/glazier-react#readme"; + description = "Examples of using glazier-react"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "glazier-react-widget" = callPackage + ({ mkDerivation, base, containers, disposable, dlist, free + , ghcjs-base-stub, glazier, glazier-react, javascript-extras, lens + , mmorph, mtl, pipes-concurrency, stm, transformers + }: + mkDerivation { + pname = "glazier-react-widget"; + version = "0.4.0.0"; + sha256 = "f60ebf2ff016382dda3d5808eef28eb900fc62f86b5f7c6be98c92186bce2d68"; + libraryHaskellDepends = [ + base containers disposable dlist free ghcjs-base-stub glazier + glazier-react javascript-extras lens mmorph mtl pipes-concurrency + stm transformers + ]; + homepage = "https://github.com/louispan/glazier-react-widget#readme"; + description = "Generic widget library using glazier-react"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gli" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , friendly-time, http-client, http-client-tls, http-conduit @@ -72812,14 +73956,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "gloss_1_11_1_1" = callPackage + ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim + , gloss-rendering, GLUT, OpenGL + }: + mkDerivation { + pname = "gloss"; + version = "1.11.1.1"; + sha256 = "14e09540ba120c4d0d9153655c35602de4657aa40ad2add693ca12f825d1d653"; + libraryHaskellDepends = [ + base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL + ]; + homepage = "http://gloss.ouroborus.net"; + description = "Painless 2D vector graphics, animations and simulations"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gloss-accelerate" = callPackage ({ mkDerivation, accelerate, base, gloss, gloss-rendering }: mkDerivation { pname = "gloss-accelerate"; - version = "1.9.0.0"; - sha256 = "3bf746a687ed23fbb19d6ac358cad52dfeb06301315ac4e69d221c6a5139798f"; - revision = "1"; - editedCabalFile = "cddab61d37317ec1a15ad7da65d909b8668b284dcf182a7a348d234bff7d30ff"; + version = "0.2.0.0"; + sha256 = "5039b74bac0851ceaa7b971a5a50f1533c5e7d99594bc8030ee01c473f5875ae"; libraryHaskellDepends = [ accelerate base gloss gloss-rendering ]; description = "Extras to interface Gloss and Accelerate"; license = stdenv.lib.licenses.bsd3; @@ -72830,12 +73989,13 @@ self: { ({ mkDerivation, base, containers, ghc-prim, gloss }: mkDerivation { pname = "gloss-algorithms"; - version = "1.10.2.3"; - sha256 = "8874065cdd7184ebf0fea50543ad31de6bca8f9d264e018f9d8a458e8bdbc675"; + version = "1.11.1.1"; + sha256 = "e1a7561c87a2d105054017d1c4fd393f597ddfcf0409aad097ba7e8e7aae23f2"; libraryHaskellDepends = [ base containers ghc-prim gloss ]; homepage = "http://gloss.ouroborus.net"; description = "Data structures and algorithms for working with 2D graphics"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-banana" = callPackage @@ -72872,8 +74032,8 @@ self: { }: mkDerivation { pname = "gloss-examples"; - version = "1.10.2.4"; - sha256 = "ef1adf43066757d82adc16b4bde4f19a73653b837112ca41713ad16e230cac62"; + version = "1.11.1.1"; + sha256 = "41be02978633f00d377c7d2378b2d510da343a91b634770b14cb4d834bf6bd54"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -72883,6 +74043,7 @@ self: { homepage = "http://gloss.ouroborus.net"; description = "Examples using the gloss library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-game" = callPackage @@ -72923,26 +74084,27 @@ self: { }: mkDerivation { pname = "gloss-raster"; - version = "1.10.2.4"; - sha256 = "f9875344822a1bbb4b937605e1b1483b25559c186db94033c97117f6148cdef5"; + version = "1.11.1.1"; + sha256 = "277897eb2646fb66e23391796ed9e92360467ddf3acac196f658203cd9787c46"; libraryHaskellDepends = [ base containers ghc-prim gloss gloss-rendering repa ]; homepage = "http://gloss.ouroborus.net"; description = "Parallel rendering of raster images"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-raster-accelerate" = callPackage - ({ mkDerivation, accelerate, accelerate-cuda, base, gloss + ({ mkDerivation, accelerate, base, colour-accelerate, gloss , gloss-accelerate }: mkDerivation { pname = "gloss-raster-accelerate"; - version = "1.9.0.0"; - sha256 = "288e1937da8a28e947bafd55624bffb469c84ef031b23b895589deac205ef24d"; + version = "0.2.0.0"; + sha256 = "d88c6dd639b86a451e77b5eae86fec785b476dd337bb189b82981bf33fe580fa"; libraryHaskellDepends = [ - accelerate accelerate-cuda base gloss gloss-accelerate + accelerate base colour-accelerate gloss gloss-accelerate ]; description = "Parallel rendering of raster images using Accelerate"; license = stdenv.lib.licenses.bsd3; @@ -72962,6 +74124,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "gloss-rendering_1_11_1_1" = callPackage + ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }: + mkDerivation { + pname = "gloss-rendering"; + version = "1.11.1.1"; + sha256 = "1f0a9a6d2124d4cbfb30821f1654d2cd9d7c1766310cf7f9009ccc9808474af4"; + libraryHaskellDepends = [ + base bmp bytestring containers GLUT OpenGL + ]; + description = "Gloss picture data types and rendering functions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gloss-sodium" = callPackage ({ mkDerivation, base, gloss, sodium }: mkDerivation { @@ -73220,8 +74396,8 @@ self: { }: mkDerivation { pname = "gnss-converters"; - version = "0.2.4"; - sha256 = "0781dbaaece9a06a2ded982b193e6a5fed7a4a36f4e3ac031f89d710e97dfafd"; + version = "0.2.5"; + sha256 = "fdb2f813be0fe972855910100b544f7dbf3a2cd69d79e99bcffc9f60e761ec02"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73453,6 +74629,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gochan" = callPackage + ({ mkDerivation, array, base, criterion, ghc-prim, hspec + , hspec-core, primitive, random, vector, vector-algorithms, weigh + }: + mkDerivation { + pname = "gochan"; + version = "0.0.2"; + sha256 = "f3c7e4f9c355f59725a46f3723360bc778d8306192b205b218a0074dd1be1ae5"; + revision = "1"; + editedCabalFile = "05736bf5e4d1080b23156bd7acd6f24925641a7c0a911bf15992a7232f0554a7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base ghc-prim primitive random vector vector-algorithms + ]; + executableHaskellDepends = [ base criterion random weigh ]; + testHaskellDepends = [ base hspec hspec-core ]; + homepage = "http://github.com/cstrahan/gochan"; + description = "Go-style channels"; + license = stdenv.lib.licenses.mit; + }) {}; + "gofer-prelude" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -76171,15 +77369,16 @@ self: { }) {}; "google-maps-geocoding" = callPackage - ({ mkDerivation, aeson, base, http-client, servant, servant-client - , text + ({ mkDerivation, aeson, base, google-static-maps, http-client + , servant, servant-client, text }: mkDerivation { pname = "google-maps-geocoding"; - version = "0.1.0.1"; - sha256 = "58cd8efd50ebeaf4a5630f4548065c1e05ce6a39367d9ccaa0e1ccc67be3f531"; + version = "0.3.0.0"; + sha256 = "11b543397fd2a414371b0ba795ae4f49ab29db318d1f154df1d4f6c9cebe39b2"; libraryHaskellDepends = [ - aeson base http-client servant servant-client text + aeson base google-static-maps http-client servant servant-client + text ]; homepage = "https://github.com/mpilgrem/google-maps-geocoding#readme"; description = "Google Maps Geocoding API bindings"; @@ -76207,15 +77406,15 @@ self: { "google-oauth2-for-cli" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath - , hspec, http-types, req, time, wai, warp + , hspec, http-types, req, time, unix, wai, warp }: mkDerivation { pname = "google-oauth2-for-cli"; - version = "0.1.0.0"; - sha256 = "ccbb42b8d946442399d057cf211df23f46a8d95bd82a6965bc078e5385d2232d"; + version = "0.1.0.1"; + sha256 = "811b7daf819be3afdad8e7fda31ec8ff1ec8a79476de687d14229e5e43aa37d8"; libraryHaskellDepends = [ - aeson base bytestring directory filepath http-types req time wai - warp + aeson base bytestring directory filepath http-types req time unix + wai warp ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/ishiy1993/google-oauth2-for-cli#readme"; @@ -76253,6 +77452,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "google-static-maps" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytedump + , bytestring, cryptonite, double-conversion, http-client + , JuicyPixels, memory, MissingH, network-uri, servant + , servant-client, servant-JuicyPixels, text, utf8-string + }: + mkDerivation { + pname = "google-static-maps"; + version = "0.4.0.0"; + sha256 = "015e9f538cac89c82eda25732905eefc7c31bda40d068da5e13b8d3402b03464"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytedump bytestring cryptonite + double-conversion http-client JuicyPixels memory MissingH + network-uri servant servant-client servant-JuicyPixels text + utf8-string + ]; + homepage = "https://github.com/mpilgrem/google-static-maps#readme"; + description = "Bindings to the Google Static Maps API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "google-translate" = callPackage ({ mkDerivation, aeson, base, bytestring, http-api-data , http-client, servant, servant-client, text, transformers @@ -77561,8 +78781,8 @@ self: { }: mkDerivation { pname = "grid"; - version = "7.8.7"; - sha256 = "5369d0ab7b98b926951e81a65a349f11ab6badd71f65555d713428664c1e017c"; + version = "7.8.8"; + sha256 = "20a93f4fc42dd2082e991eac5dce282c00511abff66e9bd02c6753a748379d9c"; libraryHaskellDepends = [ base cereal containers ]; testHaskellDepends = [ base containers QuickCheck test-framework @@ -77824,6 +79044,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "group-by-date" = callPackage + ({ mkDerivation, base, explicit-exception, filemanip, hsshellscript + , pathtype, time, transformers, unix-compat, utility-ht + }: + mkDerivation { + pname = "group-by-date"; + version = "0.1"; + sha256 = "6660c6bd7be563375b5bacf6c3d0a0499678896808b1843e62e94c7bebb7f3ee"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base explicit-exception filemanip hsshellscript pathtype time + transformers unix-compat utility-ht + ]; + homepage = "http://hub.darcs.net/thielema/group-by-date/"; + description = "Shell command for grouping files by dates into folders"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "group-with" = callPackage ({ mkDerivation, base, Cabal, containers, hspec, hspec-expectations , QuickCheck @@ -77985,8 +79224,8 @@ self: { ({ mkDerivation, base, vector }: mkDerivation { pname = "gsl-random"; - version = "0.5.0"; - sha256 = "d2adccfe625d3cb5046ae5bb3c7a23d23697d1fc2c6a717df75f75aba2881c2e"; + version = "0.5.1"; + sha256 = "4b4e8d498b2c664c9219f6381b790f50192d77432a393d405052205d3e8d46e8"; libraryHaskellDepends = [ base vector ]; homepage = "http://github.com/patperry/hs-gsl-random"; description = "Bindings the the GSL random number generation facilities"; @@ -78048,8 +79287,8 @@ self: { }: mkDerivation { pname = "gssapi-wai"; - version = "0.1.0.0"; - sha256 = "1a2b844a611f4615d948baa7253099f5acab01529005d522b46db839833f371f"; + version = "0.1.0.1"; + sha256 = "12ec5a79ae4da85c7117edefc2a6b37790c7d4cf65ae04e89541de7709ee7a8e"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive gssapi http-types vault wai wai-extra @@ -78062,7 +79301,7 @@ self: { "gstreamer" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, directory, glib - , gst_plugins_base, gstreamer, gtk2hs-buildtools, mtl + , gst-plugins-base, gstreamer, gtk2hs-buildtools, mtl }: mkDerivation { pname = "gstreamer"; @@ -78072,12 +79311,12 @@ self: { libraryHaskellDepends = [ array base bytestring directory glib mtl ]; - libraryPkgconfigDepends = [ gst_plugins_base gstreamer ]; + libraryPkgconfigDepends = [ gst-plugins-base gstreamer ]; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GStreamer open source multimedia framework"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {gst_plugins_base = null; inherit (pkgs) gstreamer;}; + }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;}; "gt-tools" = callPackage ({ mkDerivation, base, containers, extensible-exceptions, haskeline @@ -80161,10 +81400,8 @@ self: { }: mkDerivation { pname = "haddock-api"; - version = "2.17.3"; - sha256 = "8d35a256c2ee07083c1e1a8b08e536069ffdad27598bed69d88847fb51234dc7"; - revision = "1"; - editedCabalFile = "5d33603e8e6befb2c2ed2dd8c5029b78e1377a387b165671105cadb9cb7df4f8"; + version = "2.17.3.1"; + sha256 = "ed8c5282260d3300dc06e45e2f9a5d53606315a15a2336db749d3faa64d564ba"; libraryHaskellDepends = [ array base bytestring Cabal containers deepseq directory filepath ghc ghc-boot ghc-paths haddock-library transformers xhtml @@ -81054,23 +82291,16 @@ self: { }) {}; "halma" = callPackage - ({ mkDerivation, async, base, containers, data-default - , diagrams-cairo, diagrams-gtk, diagrams-lib, grid, gtk, HUnit, mtl - , mvc, pipes, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, timeit + ({ mkDerivation, aeson, base, containers, data-default + , diagrams-lib, grid, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "halma"; - version = "0.2.0.1"; - sha256 = "4c1b2990d2cbe3b46f5895cf9db75aaabbdf3a9e31df09d3c9fc5528a36c6011"; - isLibrary = true; - isExecutable = true; + version = "0.3.0.0"; + sha256 = "ce4af6881502d16e55be04ff055c79898885aed2e657c981633b3a14584cd542"; libraryHaskellDepends = [ - base containers data-default diagrams-lib grid - ]; - executableHaskellDepends = [ - async base data-default diagrams-cairo diagrams-gtk diagrams-lib - gtk mtl mvc pipes timeit + aeson base containers data-default diagrams-lib grid ]; testHaskellDepends = [ base containers grid HUnit QuickCheck test-framework @@ -81082,6 +82312,50 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "halma-gui" = callPackage + ({ mkDerivation, async, base, data-default, diagrams-cairo + , diagrams-gtk, diagrams-lib, gtk, halma, mtl, mvc, pipes, timeit + }: + mkDerivation { + pname = "halma-gui"; + version = "0.1.1.0"; + sha256 = "28c092d95859946c408bfec96a4794923802c8644b987d3fb7477504cb898861"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async base data-default diagrams-cairo diagrams-gtk diagrams-lib + gtk halma mtl mvc pipes timeit + ]; + homepage = "https://github.com/timjb/halma"; + description = "GTK application for playing Halma"; + license = stdenv.lib.licenses.mit; + }) {}; + + "halma-telegram-bot" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , data-default, diagrams-cairo, diagrams-lib, directory, exceptions + , filepath, halma, http-client, http-client-tls, megaparsec, mtl + , optparse-applicative, semigroups, servant-client, telegram-api + , temporary, text, transformers, vector + }: + mkDerivation { + pname = "halma-telegram-bot"; + version = "0.1.0.0"; + sha256 = "0b7e311a1d86c7ccb8df208f985914e07c2f5df7f80ebcdbedd658cfb7afdcfa"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring containers data-default + diagrams-cairo diagrams-lib directory exceptions filepath halma + http-client http-client-tls megaparsec mtl optparse-applicative + semigroups servant-client telegram-api temporary text transformers + vector + ]; + homepage = "https://github.com/timjb/halma"; + description = "Telegram bot for playing Halma"; + license = stdenv.lib.licenses.mit; + }) {}; + "haltavista" = callPackage ({ mkDerivation, base, hint, process }: mkDerivation { @@ -81217,6 +82491,8 @@ self: { pname = "hamtmap"; version = "0.3"; sha256 = "d4d107ece7ffa69528a720763a0741dcab4773646df974596220d745250fd911"; + revision = "1"; + editedCabalFile = "bbdcebe83e12f704a0b6611b1a9e7aa22db20023c6e3d44505617410f53733b6"; libraryHaskellDepends = [ array base deepseq hashable ]; homepage = "https://github.com/exclipy/pdata"; description = "A purely functional and persistent hash map"; @@ -81941,8 +83217,8 @@ self: { }: mkDerivation { pname = "happstack-hsp"; - version = "7.3.7.1"; - sha256 = "bbc884e4a5ca78faf08e17799c1d037622e377915ece889674004e0e54109617"; + version = "7.3.7.2"; + sha256 = "3c5de37dc150695fda04b3143396d9030772c8a72a204f49c243b160ffa295e4"; libraryHaskellDepends = [ base bytestring happstack-server harp hsp hsx2hs mtl syb text utf8-string @@ -82065,8 +83341,8 @@ self: { }: mkDerivation { pname = "happstack-server"; - version = "7.4.6.3"; - sha256 = "6dd5f859b114bdbdde00b585800bc4b7ed821dd7bad67bb253e3602d88f5ceef"; + version = "7.4.6.4"; + sha256 = "b4c6c9503deeff37751af9ab9700158347658f28f1712933f9f1c8763b4ea1b9"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -82548,8 +83824,8 @@ self: { }: mkDerivation { pname = "hasbolt"; - version = "0.1.1.1"; - sha256 = "c715475ce67d5b311f6dc252d2d2e58cac9a12e417c007e28635c30c8ca619b1"; + version = "0.1.1.2"; + sha256 = "a89161c4a2939f92906d67c85133c82d2295f8f53577ad210260463411fb2a8f"; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 data-default hex network network-simple text transformers @@ -82727,18 +84003,20 @@ self: { }) {}; "hashable" = callPackage - ({ mkDerivation, base, bytestring, criterion, ghc-prim, HUnit - , integer-gmp, QuickCheck, random, siphash, test-framework + ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim + , HUnit, integer-gmp, QuickCheck, random, siphash, test-framework , test-framework-hunit, test-framework-quickcheck2, text, unix }: mkDerivation { pname = "hashable"; - version = "1.2.5.0"; - sha256 = "153eb1614a739f3ccf8c5fcd4230a17b8b24862ab727c46dd4acd22bc15fb2bc"; + version = "1.2.6.0"; + sha256 = "429b663c827af52f64b0f376ee6e7a990e57ec54a59107857311054ade6e0a52"; + revision = "1"; + editedCabalFile = "8f8a4f7b788fb1ea04636634c7e1c9cd0a4a6cfe66cdb808dc24f56c187451df"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring ghc-prim integer-gmp text + base bytestring deepseq ghc-prim integer-gmp text ]; testHaskellDepends = [ base bytestring ghc-prim HUnit QuickCheck random test-framework @@ -82958,6 +84236,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hashtables_1_2_1_1" = callPackage + ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }: + mkDerivation { + pname = "hashtables"; + version = "1.2.1.1"; + sha256 = "227f554a93310645c654254659969b347de3d1bf3d98901dbb5c113ece72e951"; + libraryHaskellDepends = [ + base ghc-prim hashable primitive vector + ]; + homepage = "http://github.com/gregorycollins/hashtables"; + description = "Mutable hash tables in the ST monad"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hashtables-plus" = callPackage ({ mkDerivation, base, criterion-plus, deepseq, hashable , hashtables, lens, loch-th, mtl, mwc-random, placeholders @@ -83566,6 +84859,34 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; + "haskell-gi_0_20_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers + , directory, doctest, filepath, glib, gobjectIntrospection + , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe + , text, transformers, xdg-basedir, xml-conduit + }: + mkDerivation { + pname = "haskell-gi"; + version = "0.20.1"; + sha256 = "7ff1d57f01386c6b32c788a599928b6a209922fa254d49e0607523c44984cd12"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring Cabal containers directory filepath + haskell-gi-base mtl pretty-show process regex-tdfa safe text + transformers xdg-basedir xml-conduit + ]; + libraryPkgconfigDepends = [ glib gobjectIntrospection ]; + executableHaskellDepends = [ + base containers directory filepath haskell-gi-base pretty-show text + ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "Generate Haskell bindings for GObject Introspection capable libraries"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; + "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { @@ -83579,6 +84900,20 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "haskell-gi-base_0_20_1" = callPackage + ({ mkDerivation, base, bytestring, containers, glib, text }: + mkDerivation { + pname = "haskell-gi-base"; + version = "0.20.1"; + sha256 = "e9d8d3d75e0ea91108339daa172bc938512432509caeafdf5bd96551a380f046"; + libraryHaskellDepends = [ base bytestring containers text ]; + libraryPkgconfigDepends = [ glib ]; + homepage = "https://github.com/haskell-gi/haskell-gi-base"; + description = "Foundation for libraries generated by haskell-gi"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "haskell-google-trends" = callPackage ({ mkDerivation, base, bytestring, haskell-fake-user-agent, lens , regex-base, regex-posix, tagsoup, text, wreq @@ -83600,14 +84935,14 @@ self: { "haskell-igraph" = callPackage ({ mkDerivation, base, binary, bytestring, bytestring-lexing, c2hs - , colour, data-default-class, hashable, hxt, igraph, primitive - , random, split, tasty, tasty-golden, tasty-hunit - , unordered-containers + , colour, data-default-class, data-ordlist, hashable, hxt, igraph + , matrices, primitive, random, split, tasty, tasty-golden + , tasty-hunit, unordered-containers }: mkDerivation { pname = "haskell-igraph"; - version = "0.2.2"; - sha256 = "33673e6369f2b83c9103367af9b4050c3a6ed71ebbb3033a601a1e4c65f57a7d"; + version = "0.3.0"; + sha256 = "fb02f544b8ff98893bae89c72323dbb5ff49357e7c7b65f45eb11d26168517b4"; libraryHaskellDepends = [ base binary bytestring bytestring-lexing colour data-default-class hashable hxt primitive split unordered-containers @@ -83615,7 +84950,7 @@ self: { librarySystemDepends = [ igraph ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ - base random tasty tasty-golden tasty-hunit + base data-ordlist matrices random tasty tasty-golden tasty-hunit ]; description = "Imcomplete igraph bindings"; license = stdenv.lib.licenses.mit; @@ -84158,8 +85493,8 @@ self: { ({ mkDerivation, base, doctest, lens, semigroups, text, time }: mkDerivation { pname = "haskell-time-range"; - version = "0.2.0.0"; - sha256 = "73c6258304465cd4e243287e7012a9630a6835025104414105c29c9e9f5503c7"; + version = "0.2.0.1"; + sha256 = "249315cc1167c23e9e50bdc61b5b2ddb062603616df0b2e575a6235516320ef6"; libraryHaskellDepends = [ base lens semigroups text time ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/mankyKitty/haskell-time-range#readme"; @@ -84209,6 +85544,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-ast_0_6_0_0" = callPackage + ({ mkDerivation, base, ghc, mtl, references, template-haskell + , uniplate + }: + mkDerivation { + pname = "haskell-tools-ast"; + version = "0.6.0.0"; + sha256 = "bb3669b5fb70875551a29efd781e58408c26107eb26f1a4b41d8123a9f7dd6a6"; + libraryHaskellDepends = [ + base ghc mtl references template-haskell uniplate + ]; + homepage = "https://github.com/nboldi/haskell-tools"; + description = "Haskell AST for efficient tooling"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-ast-fromghc" = callPackage ({ mkDerivation, base, bytestring, containers, ghc , haskell-tools-ast, mtl, references, safe, split, template-haskell @@ -84282,6 +85634,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-backend-ghc_0_6_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, ghc + , haskell-tools-ast, mtl, references, safe, split, template-haskell + , transformers, uniplate + }: + mkDerivation { + pname = "haskell-tools-backend-ghc"; + version = "0.6.0.0"; + sha256 = "1bc88d278a314207ebe47cc8a85cebf6b6cd6d835f858e45be2d0cc663a40d96"; + libraryHaskellDepends = [ + base bytestring containers ghc haskell-tools-ast mtl references + safe split template-haskell transformers uniplate + ]; + homepage = "https://github.com/nboldi/haskell-tools"; + description = "Creating the Haskell-Tools AST from GHC's representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-cli" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , directory, filepath, ghc, ghc-paths, haskell-tools-ast @@ -84312,6 +85683,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-cli_0_6_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , directory, filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-prettyprint, haskell-tools-refactor, knob, mtl + , process, references, split, strict, tasty, tasty-hunit, time + }: + mkDerivation { + pname = "haskell-tools-cli"; + version = "0.6.0.0"; + sha256 = "fe6da0d9a8cfd42ff74579bbfe7d727a64f4e3b8b99770920877a0ddcee6d786"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filepath ghc ghc-paths haskell-tools-ast + haskell-tools-prettyprint haskell-tools-refactor mtl references + split strict + ]; + executableHaskellDepends = [ base directory process split ]; + testHaskellDepends = [ + base bytestring directory filepath knob tasty tasty-hunit + ]; + benchmarkHaskellDepends = [ + aeson base bytestring criterion directory filepath knob split time + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Command-line frontend for Haskell-tools Refact"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-daemon" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, ghc, ghc-paths, haskell-tools-ast @@ -84340,6 +85741,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-daemon_0_6_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, Diff + , directory, filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-prettyprint, haskell-tools-refactor, HUnit, mtl + , network, process, references, split, strict, tasty, tasty-hunit + }: + mkDerivation { + pname = "haskell-tools-daemon"; + version = "0.6.0.0"; + sha256 = "25500cc2877eb692cb70905b8f52fc4934ead7030d1acad4165a663dc59e7545"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers Diff directory filepath ghc + ghc-paths haskell-tools-ast haskell-tools-prettyprint + haskell-tools-refactor mtl network process references split strict + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base bytestring directory filepath ghc HUnit network process + tasty tasty-hunit + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Background process for Haskell-tools refactor that editors can connect to"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-debug" = callPackage ({ mkDerivation, base, ghc, ghc-paths, haskell-tools-ast , haskell-tools-backend-ghc, haskell-tools-prettyprint @@ -84362,6 +85791,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-debug_0_6_0_0" = callPackage + ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-backend-ghc, haskell-tools-prettyprint + , haskell-tools-refactor, references, template-haskell + }: + mkDerivation { + pname = "haskell-tools-debug"; + version = "0.6.0.0"; + sha256 = "e7c1d57bf0399e5421cff93a7873eb762fc428d0165a18512ef6a755b40f3a80"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base filepath ghc ghc-paths haskell-tools-ast + haskell-tools-backend-ghc haskell-tools-prettyprint + haskell-tools-refactor references template-haskell + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Debugging Tools for Haskell-tools"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-demo" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, ghc, ghc-paths, haskell-tools-ast @@ -84393,6 +85845,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-demo_0_6_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-backend-ghc, haskell-tools-prettyprint + , haskell-tools-refactor, http-types, HUnit, mtl, network + , references, tasty, tasty-hunit, transformers, wai, wai-websockets + , warp, websockets + }: + mkDerivation { + pname = "haskell-tools-demo"; + version = "0.6.0.0"; + sha256 = "d914bcd4e1e5eb9bee7dcb309847a075ee218c995bc1614bdf0f1ef7a10a1547"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-refactor http-types mtl + references transformers wai wai-websockets warp websockets + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base bytestring directory filepath HUnit network tasty + tasty-hunit websockets + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "A web-based demo for Haskell-tools Refactor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-prettyprint" = callPackage ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl , references, split, uniplate @@ -84410,6 +85893,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-prettyprint_0_6_0_0" = callPackage + ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl + , references, split, text, uniplate + }: + mkDerivation { + pname = "haskell-tools-prettyprint"; + version = "0.6.0.0"; + sha256 = "3940d50675b96c29a45a8682effb22a65bf49711dc44deaafcf46272d1c821f8"; + libraryHaskellDepends = [ + base containers ghc haskell-tools-ast mtl references split text + uniplate + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Pretty printing of Haskell-Tools AST"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-refactor" = callPackage ({ mkDerivation, base, Cabal, containers, directory, either , filepath, ghc, ghc-paths, haskell-tools-ast @@ -84441,6 +85942,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-refactor_0_6_0_0" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, either + , filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-backend-ghc, haskell-tools-prettyprint + , haskell-tools-rewrite, mtl, old-time, polyparse, references + , split, tasty, tasty-hunit, template-haskell, time, transformers + , uniplate + }: + mkDerivation { + pname = "haskell-tools-refactor"; + version = "0.6.0.0"; + sha256 = "1a339d0571d78a94099cd442bf0865cb30df3b7054e7c75d7a5a20effbf94087"; + libraryHaskellDepends = [ + base Cabal containers directory filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-rewrite mtl references + split template-haskell transformers uniplate + ]; + testHaskellDepends = [ + base Cabal containers directory either filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-rewrite mtl old-time + polyparse references split tasty tasty-hunit template-haskell time + transformers uniplate + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Refactoring Tool for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-rewrite" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , haskell-tools-ast, haskell-tools-prettyprint, mtl, references @@ -84464,6 +85996,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-rewrite_0_6_0_0" = callPackage + ({ mkDerivation, base, containers, directory, filepath, ghc + , haskell-tools-ast, haskell-tools-prettyprint, mtl, references + , tasty, tasty-hunit + }: + mkDerivation { + pname = "haskell-tools-rewrite"; + version = "0.6.0.0"; + sha256 = "3a328de2b8df98fdb7e10308daf31b3ca8be401ad8df3b26887f2035642705f7"; + libraryHaskellDepends = [ + base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl + references + ]; + testHaskellDepends = [ + base directory filepath haskell-tools-ast haskell-tools-prettyprint + tasty tasty-hunit + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Facilities for generating new parts of the Haskell-Tools AST"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tor" = callPackage ({ mkDerivation, array, asn1-encoding, asn1-types, async , attoparsec, base, base64-bytestring, binary, bytestring, cereal @@ -85625,8 +87180,8 @@ self: { }: mkDerivation { pname = "hasmin"; - version = "0.3.1.3"; - sha256 = "b5297b795fba11f2644c9211b60cf535ca8d67aea6059714e7948d8261ddc9d8"; + version = "0.3.2"; + sha256 = "2e9473b11870b5a5a585fa453d4b5873f2e3885e0927653dcd50151eb513859b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85641,7 +87196,7 @@ self: { attoparsec base doctest doctest-discover hspec hspec-attoparsec mtl QuickCheck text ]; - homepage = "https://github.com/contivero/hasmin/"; + homepage = "https://github.com/contivero/hasmin#readme"; description = "\"A CSS Minifier\""; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -85708,6 +87263,41 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql_0_19_18" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, bytestring + , bytestring-strict-builder, contravariant, contravariant-extras + , criterion, data-default-class, deepseq, dlist, either, hashable + , hashtables, loch-th, mtl, placeholders, postgresql-binary + , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances + , rebase, rerebase, scientific, semigroups, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text, time, transformers + , uuid, vector + }: + mkDerivation { + pname = "hasql"; + version = "0.19.18"; + sha256 = "a67e8bc48197e36e1d9906d4bba3779913e44105e58703169db914207315224d"; + libraryHaskellDepends = [ + attoparsec base base-prelude bytestring bytestring-strict-builder + contravariant contravariant-extras data-default-class dlist either + hashable hashtables loch-th mtl placeholders postgresql-binary + postgresql-libpq profunctors semigroups text transformers vector + ]; + testHaskellDepends = [ + data-default-class QuickCheck quickcheck-instances rebase rerebase + tasty tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + benchmarkHaskellDepends = [ + base base-prelude bytestring contravariant contravariant-extras + criterion data-default-class deepseq dlist either hashable + profunctors scientific text time transformers uuid vector + ]; + homepage = "https://github.com/nikita-volkov/hasql"; + description = "An efficient PostgreSQL driver and a flexible mapping API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-backend" = callPackage ({ mkDerivation, base, base-prelude, bytestring, either, free , list-t, text, transformers, vector @@ -85759,8 +87349,8 @@ self: { }: mkDerivation { pname = "hasql-cursor-query"; - version = "0.4.1"; - sha256 = "9f0b1bf2ea1634f2f2da0727bfab331722c71573a3574f65423cada54da7c902"; + version = "0.4.2"; + sha256 = "9cf2c8ea63f69fbe5c989c6c8c9dac6043da781bb08e65950399a8e7abb07556"; libraryHaskellDepends = [ base base-prelude bytestring contravariant foldl hasql hasql-cursor-transaction hasql-transaction profunctors @@ -85777,16 +87367,16 @@ self: { "hasql-cursor-transaction" = callPackage ({ mkDerivation, base, base-prelude, bytestring - , bytestring-tree-builder, contravariant, hasql, hasql-transaction - , transformers + , bytestring-tree-builder, contravariant, contravariant-extras + , hasql, hasql-transaction, transformers }: mkDerivation { pname = "hasql-cursor-transaction"; - version = "0.6"; - sha256 = "07b991914a5664378ab358536ba36ea9c54f7771c41c7eed6688053fa289c2f6"; + version = "0.6.1"; + sha256 = "4f68d7f004212712cbde02e037a4f539410ff77070112be2d268402c9e6b85bf"; libraryHaskellDepends = [ base base-prelude bytestring bytestring-tree-builder contravariant - hasql hasql-transaction transformers + contravariant-extras hasql hasql-transaction transformers ]; homepage = "https://github.com/nikita-volkov/hasql-cursor-transaction"; description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors"; @@ -86866,6 +88456,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hcoord" = callPackage + ({ mkDerivation, base, data-default, HUnit, ieee754, mtl + , regex-pcre + }: + mkDerivation { + pname = "hcoord"; + version = "1.0.0.0"; + sha256 = "f5c26d445dbcc5df8a164a40ab209a9879e9c5f61fb34f839bf38e6df3be8037"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl regex-pcre ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base data-default HUnit ieee754 mtl ]; + homepage = "https://github.com/danfran/hcoord#readme"; + description = "Easily convert between latitude/longitude, UTM and OSGB"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hcron" = callPackage ({ mkDerivation, base, bytestring, containers, directory, mtl , old-locale, pretty, process, random, stm, time @@ -87259,8 +88868,8 @@ self: { }: mkDerivation { pname = "hdocs"; - version = "0.5.1.0"; - sha256 = "bb4a43b479b1731105b7c6195bff59a3763042daf1102765c4f78d075a5ba2df"; + version = "0.5.2.0"; + sha256 = "aca302d1b972c6623b03091e965af6f259b5b81ff383d66c6511027d53ba8a90"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87434,24 +89043,20 @@ self: { }) {}; "heckle" = callPackage - ({ mkDerivation, base, blaze-html, directory, filepath - , optparse-applicative, optparse-generic, pandoc, pandoc-types + ({ mkDerivation, base, blaze-html, directory, pandoc, pandoc-types , process, split, tagsoup, time }: mkDerivation { pname = "heckle"; - version = "2.0.1.9"; - sha256 = "b8a14e8e80dfc0190088e8f05baf9b47c46ac72e6b8ec5f36be244087b0469ba"; + version = "2.0.2.1"; + sha256 = "964d64df847910a5db1bd126b89a658e0ef7dd01f9db7a84244ac3f2451938be"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base blaze-html directory filepath pandoc pandoc-types process - split tagsoup time - ]; - executableHaskellDepends = [ - base directory filepath optparse-applicative optparse-generic - process split + base blaze-html directory pandoc pandoc-types process split tagsoup + time ]; + executableHaskellDepends = [ base directory process split ]; homepage = "https://github.com/2016rshah/heckle"; description = "Jekyll in Haskell (feat. LaTeX)"; license = stdenv.lib.licenses.mit; @@ -88333,24 +89938,26 @@ self: { }) {}; "hesh" = callPackage - ({ mkDerivation, aeson, base, bytestring, Cabal, cartel, cmdtheline - , containers, cryptohash, directory, filemanip, filepath - , hackage-db, haskell-src-exts, parsec, process, template-haskell - , text, time, transformers, uniplate + ({ mkDerivation, aeson, base, bytestring, Cabal, cartel, cmdargs + , containers, cryptohash, data-default, directory, exceptions + , filemanip, filepath, hackage-db, haskell-src-exts, parsec + , process, template-haskell, text, time, transformers, uniplate + , unix }: mkDerivation { pname = "hesh"; - version = "1.5.0"; - sha256 = "1e79b396d448fd7e98c293c14efed69e65ece14a5fd77bb408b8e4d0a5a024f6"; + version = "1.11.0"; + sha256 = "4bec3fe05382272c9c089615200271f416a944035ec74cd4417269314327e0b0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base filemanip parsec process template-haskell text transformers + base exceptions filemanip parsec process template-haskell text + transformers ]; executableHaskellDepends = [ - aeson base bytestring Cabal cartel cmdtheline containers cryptohash - directory filepath hackage-db haskell-src-exts parsec process text - time uniplate + aeson base bytestring Cabal cartel cmdargs containers cryptohash + data-default directory filepath hackage-db haskell-src-exts parsec + process text time uniplate unix ]; homepage = "https://github.com/jekor/hesh"; description = "the Haskell Extensible Shell: Haskell for Bash-style scripts"; @@ -88424,6 +90031,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "heterolist" = callPackage + ({ mkDerivation, base, constraint-manip, hspec, indextype, polydata + }: + mkDerivation { + pname = "heterolist"; + version = "0.2.0.0"; + sha256 = "f2a14a202ab78321de4e5433523dbdabe7f8c4bcaed0a31e6c281e9f092dc15d"; + libraryHaskellDepends = [ + base constraint-manip indextype polydata + ]; + testHaskellDepends = [ + base constraint-manip hspec indextype polydata + ]; + description = "A heterogeneous list type"; + license = stdenv.lib.licenses.mit; + }) {}; + "hetris" = callPackage ({ mkDerivation, array, base, hscurses, ncurses, old-time, random }: @@ -89128,15 +90752,15 @@ self: { }) {}; "hgis" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, cairo - , Chart, Chart-cairo, Chart-diagrams, colour, composition + ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, Chart + , Chart-cairo, Chart-diagrams, colour, composition , data-binary-ieee754, data-default, directory, filepath, hspec , lens, monad-loops, optparse-applicative, transformers }: mkDerivation { pname = "hgis"; - version = "0.1.1.2"; - sha256 = "fe9ba90e951533980aff909f6c53a33d2e1960ddb5eb547a4650564a0ee4bb5f"; + version = "0.1.3.2"; + sha256 = "6fa441ccf23a2a867d24a3a229add55ce15d9ef95811e04f96e6882713824f0a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89145,14 +90769,13 @@ self: { directory filepath lens monad-loops optparse-applicative transformers ]; - libraryPkgconfigDepends = [ cairo ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/vmchale/hgis#readme"; description = "Package and command-line for GIS with Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) cairo;}; + }) {}; "hgithub" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring @@ -89406,6 +91029,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {systemd = null;}; + "hidden-char" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "hidden-char"; + version = "0.1.0.0"; + sha256 = "805d8e7f4919f2b32374cf0074c3987831464a359be3b72f6b38509b58d7c9b7"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/rcook/hidden-char#readme"; + description = "Provides getHiddenChar function"; + license = stdenv.lib.licenses.mit; + }) {}; + "hieraclus" = callPackage ({ mkDerivation, base, containers, HUnit, mtl, multiset }: mkDerivation { @@ -90592,6 +92228,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hjsonschema_1_6_1" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , directory, file-embed, filepath, hashable, hjsonpointer, hspec + , http-client, http-types, pcre-heavy, profunctors, protolude + , QuickCheck, scientific, semigroups, text, unordered-containers + , vector, wai-app-static, warp + }: + mkDerivation { + pname = "hjsonschema"; + version = "1.6.1"; + sha256 = "c3816837b0ff64d32db0e575bf25cf3c23866b4bd1825e51172e1f964c81bc9e"; + libraryHaskellDepends = [ + aeson base bytestring containers file-embed filepath hashable + hjsonpointer http-client http-types pcre-heavy profunctors + protolude QuickCheck scientific semigroups text + unordered-containers vector + ]; + testHaskellDepends = [ + aeson async base bytestring directory filepath hjsonpointer hspec + profunctors protolude QuickCheck semigroups text + unordered-containers vector wai-app-static warp + ]; + homepage = "https://github.com/seagreen/hjsonschema"; + description = "JSON Schema library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hkdf" = callPackage ({ mkDerivation, base, byteable, bytestring, cryptohash, hspec }: mkDerivation { @@ -90694,49 +92358,47 @@ self: { "hledger" = callPackage ({ mkDerivation, base, base-compat, bytestring, cmdargs, containers , criterion, csv, data-default, directory, file-embed, filepath - , hashable, haskeline, hledger-lib, html, HUnit, megaparsec, mtl - , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa - , safe, shakespeare, split, tabular, temporary, terminfo - , test-framework, test-framework-hunit, text, time, timeit - , transformers, unordered-containers, utf8-string, wizards + , hashable, haskeline, here, hledger-lib, html, HUnit, megaparsec + , mtl, mtl-compat, old-time, parsec, pretty-show, process + , regex-tdfa, safe, shakespeare, split, tabular, temporary + , terminfo, test-framework, test-framework-hunit, text, time + , timeit, transformers, unordered-containers, utf8-string, wizards }: mkDerivation { pname = "hledger"; - version = "1.1"; - sha256 = "b254b2a3918e047ca031f6dfafc42dd5fcb4b859157fae2d019dcd95262408e5"; - revision = "1"; - editedCabalFile = "d33edead74698ee1e7f3e5f167bfd8e32664d520df69092f5ac48f0816939aaf"; + version = "1.2"; + sha256 = "06f4bae5a49916e0291b1b6d6c2017794c98f14bb22ffa20c49e9650278247a2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base-compat bytestring cmdargs containers csv data-default - directory file-embed filepath hashable haskeline hledger-lib HUnit - megaparsec mtl mtl-compat old-time pretty-show process regex-tdfa - safe shakespeare split tabular temporary terminfo text time - transformers unordered-containers utf8-string wizards + directory file-embed filepath hashable haskeline here hledger-lib + HUnit megaparsec mtl mtl-compat old-time pretty-show process + regex-tdfa safe shakespeare split tabular temporary terminfo text + time transformers unordered-containers utf8-string wizards ]; executableHaskellDepends = [ base base-compat bytestring cmdargs containers csv data-default - directory file-embed filepath haskeline hledger-lib HUnit mtl + directory file-embed filepath haskeline here hledger-lib HUnit mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe shakespeare split tabular temporary terminfo text time unordered-containers utf8-string wizards ]; testHaskellDepends = [ base base-compat bytestring cmdargs containers csv data-default - directory file-embed filepath haskeline hledger-lib HUnit mtl + directory file-embed filepath haskeline here hledger-lib HUnit mtl mtl-compat old-time parsec pretty-show process regex-tdfa safe shakespeare split tabular temporary terminfo test-framework test-framework-hunit text time unordered-containers utf8-string wizards ]; benchmarkHaskellDepends = [ - base base-compat criterion directory file-embed filepath + base base-compat criterion directory file-embed filepath here hledger-lib html pretty-show process tabular temporary time timeit ]; homepage = "http://hledger.org"; description = "Command-line interface for the hledger accounting tool"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -90748,8 +92410,8 @@ self: { }: mkDerivation { pname = "hledger-api"; - version = "1.1"; - sha256 = "182b8bdaf2b4b7d621a8570f0fa81a34de4f34f1a41f8dca6d60c05dd5701b1c"; + version = "1.2"; + sha256 = "98d3590c8ba7ea11f1d374b6dc0e26642b0d20ce091b83918d42118fd381425d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -90759,7 +92421,7 @@ self: { ]; homepage = "http://hledger.org"; description = "Web API server for the hledger accounting tool"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -90806,8 +92468,8 @@ self: { }: mkDerivation { pname = "hledger-iadd"; - version = "1.2"; - sha256 = "7ec0817c2c9c20c05c6496eca6264124139e7575e452ada5b1fd225c97533083"; + version = "1.2.1"; + sha256 = "bc2636fbdce63f62b29ef9cba4e876469b4a040b0b10d2d4575927ef186a591e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90869,35 +92531,31 @@ self: { ({ mkDerivation, array, base, base-compat, blaze-markup, bytestring , cmdargs, containers, csv, data-default, Decimal, deepseq , directory, doctest, filepath, Glob, hashtables, HUnit, megaparsec - , mtl, mtl-compat, old-time, parsec, parsers, pretty-show - , regex-tdfa, safe, semigroups, split, system-filepath - , test-framework, test-framework-hunit, text, time, transformers - , trifecta, uglymemo, utf8-string + , mtl, mtl-compat, old-time, parsec, pretty-show, regex-tdfa, safe + , semigroups, split, test-framework, test-framework-hunit, text + , time, transformers, uglymemo, utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.1"; - sha256 = "4142142fb92e6c1affc1420e3478449cf0d9d696ab05cc801338a562a5560556"; - revision = "1"; - editedCabalFile = "cf72c68e9c71bc059e7ea98e764837e649ec9ecda073ac936e5fb71e06115724"; + version = "1.2"; + sha256 = "2c7fd837b2a9596b4d6bd3e5f5b60918c697ebb411942f973b6bd4587042d797"; libraryHaskellDepends = [ array base base-compat blaze-markup bytestring cmdargs containers csv data-default Decimal deepseq directory filepath hashtables - HUnit megaparsec mtl mtl-compat old-time parsec parsers pretty-show - regex-tdfa safe semigroups split system-filepath text time - transformers trifecta uglymemo utf8-string + HUnit megaparsec mtl mtl-compat old-time parsec pretty-show + regex-tdfa safe semigroups split text time transformers uglymemo + utf8-string ]; testHaskellDepends = [ array base base-compat blaze-markup bytestring cmdargs containers csv data-default Decimal deepseq directory doctest filepath Glob - hashtables HUnit megaparsec mtl mtl-compat old-time parsec parsers - pretty-show regex-tdfa safe split system-filepath test-framework - test-framework-hunit text time transformers trifecta uglymemo - utf8-string + hashtables HUnit megaparsec mtl mtl-compat old-time parsec + pretty-show regex-tdfa safe split test-framework + test-framework-hunit text time transformers uglymemo utf8-string ]; homepage = "http://hledger.org"; description = "Core data types, parsers and functionality for the hledger accounting tools"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; }) {}; "hledger-ui" = callPackage @@ -90909,10 +92567,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.1.2"; - sha256 = "5cc85502297f3ccf31990ebbe60178ee9f90ea434e86756f39e2848f0ae788d1"; - revision = "2"; - editedCabalFile = "b8f09f1a5411bec106f6f507a5d71eea67685f6271c716e390b4f6513c7acddd"; + version = "1.2"; + sha256 = "61e2aa3496a7f2898de3e487d9ee90d045e1c8851e74b3995ce37f332784b00a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -90923,7 +92579,7 @@ self: { ]; homepage = "http://hledger.org"; description = "Curses-style user interface for the hledger accounting tool"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -90957,10 +92613,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.1"; - sha256 = "da0c0c1096497737540efdc85cbb95cd01cbd48410491d8b2c26529b4151a2ca"; - revision = "1"; - editedCabalFile = "fbc15617f161701111b55e6d19f2fa0b4bac297c0db23194ca5c5d9d87a8301d"; + version = "1.2"; + sha256 = "a3a14ae8d0548aeb239768639afbfc0631aed4ff620720c28448d88d20eac5e6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90989,7 +92643,7 @@ self: { ]; homepage = "http://hledger.org"; description = "Web interface for the hledger accounting tool"; - license = "GPL"; + license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -91051,12 +92705,13 @@ self: { }) {inherit (pkgs) git; inherit (pkgs) openssl;}; "hlibsass" = callPackage - ({ mkDerivation, base, hspec, libsass }: + ({ mkDerivation, base, Cabal, directory, hspec, libsass }: mkDerivation { pname = "hlibsass"; - version = "0.1.5.0"; - sha256 = "ce3e9a15d01c1b61d41b03e9b05ecd9b4b9aaf6da7d591086181b74e18d25bb8"; + version = "0.1.6.0"; + sha256 = "3d8826ce12d8e1179ff226f38f860355e40601cf9fd7955f93d97613734a9cde"; configureFlags = [ "-fexternallibsass" ]; + setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base ]; librarySystemDepends = [ libsass ]; testHaskellDepends = [ base hspec ]; @@ -91315,6 +92970,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hmatrix-nlopt" = callPackage + ({ mkDerivation, base, doctest, hmatrix, nlopt-haskell, vector }: + mkDerivation { + pname = "hmatrix-nlopt"; + version = "0.1.0.0"; + sha256 = "c2e9a63256018d6e867c957e05d953975f4b32430ea418774c6c8d2eead6028a"; + libraryHaskellDepends = [ base hmatrix nlopt-haskell vector ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/peddie/hmatrix-nlopt"; + description = "Interface HMatrix with the NLOPT minimizer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hmatrix-quadprogpp" = callPackage ({ mkDerivation, base, hmatrix, QuadProgpp, vector }: mkDerivation { @@ -91377,8 +93045,8 @@ self: { }: mkDerivation { pname = "hmatrix-svdlibc"; - version = "0.4.0"; - sha256 = "774504e862542f90441701122638c4ce11aa94792d270045eb0f0997e6f874a2"; + version = "0.4.1"; + sha256 = "4a36946603633e0185cd2729292e6a24051f81c0b840ea63a65a75031acfd2ef"; libraryHaskellDepends = [ base hmatrix vector ]; testHaskellDepends = [ base hmatrix hspec QuickCheck vector ]; benchmarkHaskellDepends = [ base criterion hmatrix vector ]; @@ -93925,6 +95593,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hriemann" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, criterion + , hostname, kazura-queue, network, protocol-buffers + , protocol-buffers-descriptor, text, time, unagi-chan + }: + mkDerivation { + pname = "hriemann"; + version = "0.2.1.0"; + sha256 = "73503679ae0ef115b4e6d7fcbeb757bcbba5182572365d039a720791e7cb261b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers criterion hostname kazura-queue + network protocol-buffers protocol-buffers-descriptor text time + unagi-chan + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/shmish111/hriemann"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hruby" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, QuickCheck , ruby, scientific, stm, text, unordered-containers, vector @@ -94361,8 +96053,8 @@ self: { pname = "hs-pkg-config"; version = "0.2.1.0"; sha256 = "104e39324e9ece701a21bf3f428b5d0382fd8f426b65b4ef1f54ab41cc9d6227"; - revision = "1"; - editedCabalFile = "9337acf593d6f7e1d54f81886cb3736001a127e3b75ba01bd97a99d77565f784"; + revision = "2"; + editedCabalFile = "014d1b8e4375de3e7d154b6996b9e54917fde4d3d7fec917feaf262576a645ce"; libraryHaskellDepends = [ base data-default-class text ]; homepage = "https://github.com/trskop/hs-pkg-config"; description = "Create pkg-config configuration files"; @@ -94441,6 +96133,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hs-server-starter" = callPackage + ({ mkDerivation, base, directory, HUnit, network, temporary, unix + }: + mkDerivation { + pname = "hs-server-starter"; + version = "0.1.0.1"; + sha256 = "6e120890191f091a76629aab51a00c309c1bf039f22e87ee0c70a30c088e380f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory network ]; + testHaskellDepends = [ base HUnit network temporary unix ]; + homepage = "https://github.com/hiratara/hs-server-starter"; + description = "Write a server supporting Server::Starter's protocol in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hs-twitter" = callPackage ({ mkDerivation, base, HTTP, json, mime, network, old-locale , old-time, random, utf8-string @@ -94620,8 +96328,8 @@ self: { }: mkDerivation { pname = "hsass"; - version = "0.4.0"; - sha256 = "512faf0e01e720395699066139379fb2e5e5f456f465c72d58282b75b6ec0f9d"; + version = "0.4.1"; + sha256 = "67db51178ebd99cd69c232b04a2d2a319b6a8b73c2713d172caf81344915fbcc"; libraryHaskellDepends = [ base bytestring data-default-class filepath hlibsass monad-loops transformers @@ -95321,8 +97029,8 @@ self: { }: mkDerivation { pname = "hsdev"; - version = "0.2.2.0"; - sha256 = "844973b82ed0a0a7321d8106755e71db229889af4b0516e5da861bf6474bb932"; + version = "0.2.2.2"; + sha256 = "39fa69fb48273f81c6a6683544720cf9b61d41374901e8e1730609c1a189d1d2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95521,8 +97229,8 @@ self: { }: mkDerivation { pname = "hsexif"; - version = "0.6.1.0"; - sha256 = "868a46bcd841a2db36eebba803962f966c24c4a98b7581c9f329fd596bafab4f"; + version = "0.6.1.1"; + sha256 = "37702ce6939a7c1d1780185285ae9353abcbc3c59552d06a2e1bcaa820a33f09"; libraryHaskellDepends = [ base binary bytestring containers iconv text time ]; @@ -95907,6 +97615,26 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) lua5_1;}; + "hslua_0_5_0" = callPackage + ({ mkDerivation, base, bytestring, hspec, hspec-contrib, HUnit + , lua5_1, QuickCheck, quickcheck-instances, text + }: + mkDerivation { + pname = "hslua"; + version = "0.5.0"; + sha256 = "6b270a14cce6046a443e6700d0b73725bef2dc068dd40aa6a1feb1c84f41171b"; + configureFlags = [ "-fsystem-lua" ]; + libraryHaskellDepends = [ base bytestring ]; + librarySystemDepends = [ lua5_1 ]; + testHaskellDepends = [ + base bytestring hspec hspec-contrib HUnit QuickCheck + quickcheck-instances text + ]; + description = "A Lua language interpreter embedding in Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) lua5_1;}; + "hslua-aeson" = callPackage ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit , ieee754, QuickCheck, quickcheck-instances, scientific, text @@ -95914,8 +97642,8 @@ self: { }: mkDerivation { pname = "hslua-aeson"; - version = "0.1.0.0"; - sha256 = "62564714c0952da7f631f60ad502863376aad1963aa80d2365d5765f93872ff7"; + version = "0.1.0.3"; + sha256 = "f10c7fc9fdcc1c41964eb5ab170ce233be99343eb73ddaff5c175bea5bfcf1ea"; libraryHaskellDepends = [ aeson base hashable hslua scientific text unordered-containers vector @@ -96137,29 +97865,27 @@ self: { }) {}; "hsoz" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , base64-bytestring, byteable, bytestring, case-insensitive - , containers, cryptonite, data-default, either, errors, exceptions - , hashable, http-client, http-conduit, http-types, HUnit, lens - , lucid, memory, mtl, network, optparse-applicative, QuickCheck - , scientific, scotty, securemem, tasty, tasty-golden, tasty-hunit - , tasty-quickcheck, text, time, transformers, unordered-containers - , uri-bytestring, vault, wai, warp + ({ mkDerivation, aeson, attoparsec, base, bytestring + , case-insensitive, containers, cryptonite, data-default, either + , errors, exceptions, hashable, http-client, http-conduit + , http-types, HUnit, lens, lucid, memory, mtl, network + , optparse-applicative, QuickCheck, scientific, scotty, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, text, time + , transformers, unordered-containers, uri-bytestring, vault, wai + , warp }: mkDerivation { pname = "hsoz"; - version = "0.0.0.4"; - sha256 = "a007f1ed9937208c613cbd854d103b09c54bdc35f972186d43adf0e3795dd058"; - revision = "1"; - editedCabalFile = "00802583e500dd540bb78ae2e03802dcb5965e3bc9338616d72149cbeea12073"; + version = "0.0.1.0"; + sha256 = "c524eef8566f37cc8bee4717088cbb32a440df3b2304da465090819ebbea2d64"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring base64-bytestring byteable - bytestring case-insensitive containers cryptonite data-default - either errors exceptions hashable http-client http-types lens - memory mtl network scientific scotty securemem text time - transformers unordered-containers uri-bytestring vault wai warp + aeson attoparsec base bytestring case-insensitive containers + cryptonite data-default either errors exceptions hashable + http-client http-types lens memory mtl network scientific scotty + text time transformers unordered-containers uri-bytestring vault + wai warp ]; executableHaskellDepends = [ aeson base bytestring case-insensitive containers cryptonite @@ -96223,8 +97949,8 @@ self: { }: mkDerivation { pname = "hsparql"; - version = "0.3.0"; - sha256 = "a9b1e3ce4e7ad04634a4eec62249f877d8a2203bdd38192dee9a57714c779fe1"; + version = "0.3.1"; + sha256 = "80cdbdec7f99957514f76faa858a0fd7b3c7e7c8539afd141983d6af6a32e728"; libraryHaskellDepends = [ base bytestring HTTP MissingH mtl network network-uri rdf4h text xml @@ -96263,8 +97989,8 @@ self: { }: mkDerivation { pname = "hspec"; - version = "2.4.2"; - sha256 = "48b7e342c0990ae38373acbb7cac5a2ef9b1bb2cca8bdf41a896f1593e677484"; + version = "2.4.3"; + sha256 = "3a7388e3471461e09f49dd37a64d29769b406448b8365ce1538f6da1fdaf6e37"; libraryHaskellDepends = [ base call-stack hspec-core hspec-discover hspec-expectations HUnit QuickCheck transformers @@ -96302,8 +98028,8 @@ self: { ({ mkDerivation, base, checkers, hspec }: mkDerivation { pname = "hspec-checkers"; - version = "0.1.0.1"; - sha256 = "9703ad134d1711b17301d760cebc36814c48a0e4e5712590514c93e6ec278dab"; + version = "0.1.0.2"; + sha256 = "e7db79dc527cf5b806723bbe3d511a074297976a0c7042968b9abc57f8337e99"; libraryHaskellDepends = [ base checkers hspec ]; testHaskellDepends = [ base checkers hspec ]; description = "Allows to use checkers properties from hspec"; @@ -96331,8 +98057,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.4.2"; - sha256 = "393ba143901824579b736fb4313c7e07e57eda45580e657bf24d1b1c32c0a318"; + version = "2.4.3"; + sha256 = "7c9d6f34799b3f0221d016f73509be147bb9deb1161321ccdc19f2af0809e155"; libraryHaskellDepends = [ ansi-terminal array async base call-stack deepseq directory filepath hspec-expectations HUnit QuickCheck quickcheck-io random @@ -96353,8 +98079,8 @@ self: { ({ mkDerivation, base, directory, filepath, hspec-meta }: mkDerivation { pname = "hspec-discover"; - version = "2.4.2"; - sha256 = "8c9ad7bc21eabcc28526e8fd8e12927c0d659c9b3179e665c30b175fa5011d2c"; + version = "2.4.3"; + sha256 = "aa3d75c891dd134020dcb6afe547f15d055e6c304c2cd1a5c723f7602868b44e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -96399,8 +98125,8 @@ self: { ({ mkDerivation, base, hspec-expectations, transformers }: mkDerivation { pname = "hspec-expectations-lifted"; - version = "0.8.2"; - sha256 = "2b629013b07f69b2dbbe1462f067f097a9f28beae2eb222b1255ff45327cecef"; + version = "0.10.0"; + sha256 = "22cdf1509b396fea2f53a0bb88dec3552f540d58cc60962a82970264c1e73828"; libraryHaskellDepends = [ base hspec-expectations transformers ]; description = "A version of hspec-expectations generalized to MonadIO"; license = stdenv.lib.licenses.mit; @@ -96674,8 +98400,8 @@ self: { }: mkDerivation { pname = "hspec-snap"; - version = "1.0.0.0"; - sha256 = "e3afa22d1c68a9db41463b115f432ac01d80fee706ae58bf2cf00d6d4f7b0e65"; + version = "1.0.0.1"; + sha256 = "4c97bd2c2d81feffd21d848b7682aecbf77d36418c126bb6d50ab181cd1f4cce"; libraryHaskellDepends = [ aeson base bytestring containers digestive-functors HandsomeSoup hspec hspec-core hxt lens mtl snap snap-core text transformers @@ -97202,6 +98928,8 @@ self: { pname = "hsshellscript"; version = "3.3.4"; sha256 = "3bd909d227215e0de6d6a42af736ccc21c360b677b9bff5b9c366859f582b54e"; + revision = "2"; + editedCabalFile = "29ba42acbe811deb1bf36828db57e8063c8e733e39e7d848fc29c0aca184602b"; libraryHaskellDepends = [ base directory parsec random unix ]; libraryToolDepends = [ c2hs ]; homepage = "http://www.volker-wysk.de/hsshellscript/"; @@ -97819,8 +99547,8 @@ self: { }: mkDerivation { pname = "html-entities"; - version = "1.1.3"; - sha256 = "6bb2ae9f6b65b5652854e78ece26d7c78e4c5eef6c7f5a75ee88e6730469bc1d"; + version = "1.1.4"; + sha256 = "0d5c21b4d6b82f85fa4ad867db99b25fb948becd37a6841391cc7dec829792c0"; libraryHaskellDepends = [ attoparsec base-prelude text unordered-containers ]; @@ -98850,8 +100578,8 @@ self: { }: mkDerivation { pname = "http-reverse-proxy"; - version = "0.4.3.2"; - sha256 = "c2b3300bf43a9810e8642dd7fa44ecfb5e0ce1055dc01e0b604ae9a99fbfd77a"; + version = "0.4.3.3"; + sha256 = "eccfbd44f9f9f8a2a8d70dd4f9a347e4dbe39b38327271fcceeff25f0dd18b81"; libraryHaskellDepends = [ async base blaze-builder bytestring case-insensitive conduit conduit-extra containers data-default-class http-client http-types @@ -99358,12 +101086,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hunit-dejafu_0_4_0_0" = callPackage + "hunit-dejafu_0_4_0_1" = callPackage ({ mkDerivation, base, dejafu, exceptions, HUnit, random }: mkDerivation { pname = "hunit-dejafu"; - version = "0.4.0.0"; - sha256 = "70c53e26261d0075807635c135ead2a8b96a5fec004e9f50ee9043ead136e216"; + version = "0.4.0.1"; + sha256 = "b0e97ecb22eb7b0b1552daad8cd7ddab4e91c255e7fc8183e0ee2536fa7d8caf"; libraryHaskellDepends = [ base dejafu exceptions HUnit random ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the HUnit test framework"; @@ -101271,6 +102999,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hzenhan" = callPackage + ({ mkDerivation, base, containers, QuickCheck, text }: + mkDerivation { + pname = "hzenhan"; + version = "0.0.1"; + sha256 = "13350850717d2691ad30dbbfe76a8506d726fae278b6079bb1258dfcecccf6d8"; + libraryHaskellDepends = [ base containers text ]; + testHaskellDepends = [ base containers QuickCheck text ]; + homepage = "https://github.com/karky7/hzenhan#readme"; + description = "Zenhan library for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hzk" = callPackage ({ mkDerivation, base, bytestring, resource-pool, tasty , tasty-hunit, time, zookeeper_mt @@ -101413,6 +103154,8 @@ self: { pname = "iban"; version = "0.1.1.1"; sha256 = "e9e2ef69259edb58988ab147fbd71d75f7c1a1015220e40cca4e1c68d5fc9c91"; + revision = "1"; + editedCabalFile = "6feb3674edd88f6a5d6de76bd3ee726d39564309c148249762ee02a657434cbf"; libraryHaskellDepends = [ base containers iso3166-country-codes text unordered-containers ]; @@ -101667,6 +103410,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "identicon_0_2_1" = callPackage + ({ mkDerivation, base, bytestring, criterion, hspec, JuicyPixels + , QuickCheck, random, tf-random + }: + mkDerivation { + pname = "identicon"; + version = "0.2.1"; + sha256 = "b86796d03b0480a59f9889244aa3df6459c2def0666a2656219a306d1e25c13f"; + libraryHaskellDepends = [ base bytestring JuicyPixels ]; + testHaskellDepends = [ + base bytestring hspec JuicyPixels QuickCheck + ]; + benchmarkHaskellDepends = [ + base bytestring criterion JuicyPixels random tf-random + ]; + homepage = "https://github.com/mrkkrp/identicon"; + description = "Flexible generation of identicons"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "identifiers" = callPackage ({ mkDerivation, base, binary, bytestring, cereal, containers , criterion, deepseq, hashable, ListLike, QuickCheck @@ -101675,8 +103439,8 @@ self: { }: mkDerivation { pname = "identifiers"; - version = "0.4.0.0"; - sha256 = "0e9504c56888e35664840027b8fa38f9cd16ef6b19adf0a1aee7a86208436552"; + version = "0.4.1.0"; + sha256 = "8ba63f3a52712f2296d8dc1737593560c38055a54f2745d3a9c465269d25b38c"; libraryHaskellDepends = [ base binary cereal containers deepseq hashable ListLike text unordered-containers @@ -101764,31 +103528,31 @@ self: { "idris" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal , ansi-wl-pprint, array, async, base, base64-bytestring, binary - , blaze-html, blaze-markup, bytestring, cheapskate, containers - , deepseq, directory, filepath, fingertree, fsnotify, gmp - , haskeline, ieee754, libffi, mtl, network, optparse-applicative - , parsers, pretty, process, regex-tdfa, safe, split, tagged, tasty - , tasty-golden, tasty-rerun, terminal-size, text, time - , transformers, transformers-compat, trifecta, uniplate, unix - , unordered-containers, utf8-string, vector + , blaze-html, blaze-markup, bytestring, cheapskate, code-page + , containers, deepseq, directory, filepath, fingertree, fsnotify + , gmp, haskeline, ieee754, libffi, mtl, network + , optparse-applicative, parsers, pretty, process, regex-tdfa, safe + , split, tagged, tasty, tasty-golden, tasty-rerun, terminal-size + , text, time, transformers, transformers-compat, trifecta, uniplate + , unix, unordered-containers, utf8-string, vector , vector-binary-instances, zip-archive }: mkDerivation { pname = "idris"; - version = "0.99"; - sha256 = "f124c22a56d3547f878fdcfcddb36884bf69279411a724bb18b7829e8bdfa4e9"; + version = "1.0"; + sha256 = "b06852c83e307c9398fa33e031ca1fbe3c4f927496e7f5b00f13b4ed19f82beb"; configureFlags = [ "-fcurses" "-fffi" "-fgmp" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal ansi-wl-pprint array async base base64-bytestring binary blaze-html blaze-markup bytestring - cheapskate containers deepseq directory filepath fingertree - fsnotify haskeline ieee754 libffi mtl network optparse-applicative - parsers pretty process regex-tdfa safe split terminal-size text - time transformers transformers-compat trifecta uniplate unix - unordered-containers utf8-string vector vector-binary-instances - zip-archive + cheapskate code-page containers deepseq directory filepath + fingertree fsnotify haskeline ieee754 libffi mtl network + optparse-applicative parsers pretty process regex-tdfa safe split + terminal-size text time transformers transformers-compat trifecta + uniplate unix unordered-containers utf8-string vector + vector-binary-instances zip-archive ]; librarySystemDepends = [ gmp ]; executableHaskellDepends = [ @@ -101893,8 +103657,8 @@ self: { ({ mkDerivation, base, binary, bytestring }: mkDerivation { pname = "iff"; - version = "0.0.5"; - sha256 = "26ec287bfa3039429d21af00f98b9a7723922dab71d721c54fc7cd9f464bc1e3"; + version = "0.0.6"; + sha256 = "6b8845808481307e2d374fd8d17e82a5de1284e612cf8ade27db8785e9e12837"; libraryHaskellDepends = [ base binary bytestring ]; homepage = "http://code.haskell.org/~thielema/iff/"; description = "Constructing and dissecting IFF files"; @@ -102549,6 +104313,41 @@ self: { license = "unknown"; }) {}; + "imm_1_2_0_0" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, atom-conduit, base + , blaze-html, blaze-markup, bytestring, case-insensitive + , chunked-data, comonad, conduit, conduit-combinators, connection + , containers, directory, dyre, fast-logger, filepath, free + , hashable, HaskellNet, HaskellNet-SSL, http-client + , http-client-tls, http-types, mime-mail, mono-traversable + , monoid-subclasses, network, opml-conduit, optparse-applicative + , rainbow, rainbox, rss-conduit, safe-exceptions, tagged, text + , time, timerep, tls, transformers, uri-bytestring, xml + , xml-conduit, xml-types + }: + mkDerivation { + pname = "imm"; + version = "1.2.0.0"; + sha256 = "29256d69fb797031bbcb2307d230e3a988491de604a9f76f5098b8fda1d2ecae"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint atom-conduit base blaze-html blaze-markup + bytestring case-insensitive chunked-data comonad conduit + conduit-combinators connection containers directory dyre + fast-logger filepath free hashable HaskellNet HaskellNet-SSL + http-client http-client-tls http-types mime-mail mono-traversable + monoid-subclasses network opml-conduit optparse-applicative rainbow + rainbox rss-conduit safe-exceptions tagged text time timerep tls + transformers uri-bytestring xml xml-conduit xml-types + ]; + executableHaskellDepends = [ base free ]; + homepage = "https://github.com/k0ral/imm"; + description = "Execute arbitrary actions for each unread element of RSS/Atom feeds"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "immortal" = callPackage ({ mkDerivation, base, lifted-base, monad-control, stm, tasty , tasty-hunit, transformers, transformers-base @@ -102727,6 +104526,50 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "imprevu" = callPackage + ({ mkDerivation, aeson, base, Boolean, Cabal, containers + , DebugTraceHelpers, ghc, Imprevu, lens, monad-loops, mtl, NoTrace + , old-locale, random, safe, semigroups, shortcut, stm, time + , time-recurrence, validation + }: + mkDerivation { + pname = "imprevu"; + version = "0.1.0"; + sha256 = "38d48f6634effa51d039a880cf6fbd595f6868e637e261413caef95c65d30aa9"; + libraryHaskellDepends = [ + aeson base Boolean containers DebugTraceHelpers ghc lens + monad-loops mtl NoTrace old-locale random safe semigroups shortcut + stm time time-recurrence validation + ]; + testHaskellDepends = [ base Cabal Imprevu ]; + homepage = "http://www.nomyx.net"; + description = "Reactive programming language based on a DSL"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {Imprevu = null;}; + + "imprevu-happstack" = callPackage + ({ mkDerivation, base, blaze-html, Cabal, containers + , DebugTraceHelpers, ghc, happstack-server, HTTP, imprevu, lens + , monad-extras, mtl, NoTrace, old-locale, reform, reform-blaze + , reform-happstack, safe, stm, text + }: + mkDerivation { + pname = "imprevu-happstack"; + version = "0.1.0"; + sha256 = "5925745029fe381ad5b13c755ac2b6b3d0f201531cfee86293406863fb64f01b"; + libraryHaskellDepends = [ + base blaze-html containers DebugTraceHelpers ghc happstack-server + HTTP imprevu lens monad-extras mtl NoTrace old-locale reform + reform-blaze reform-happstack safe stm text + ]; + testHaskellDepends = [ base Cabal ]; + homepage = "http://www.nomyx.net"; + description = "Imprevu support for Happstack"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "improve" = callPackage ({ mkDerivation, base, mtl, yices }: mkDerivation { @@ -103078,10 +104921,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "indextype"; - version = "0.1.0.0"; - sha256 = "7be4ceac4ac1dea5f8c47cf0ae638029d7ab62b0df6ec6d215aac4a1e9ae0498"; - revision = "2"; - editedCabalFile = "daa67f59c54d4c61f73317a1edc7ee86e59327df0eade3a8db6e348a80b8d2d5"; + version = "0.2.0.0"; + sha256 = "9b680b0a7fb25429238b00b3c0e87faad0a5f90c9bef73ab80a4726aebf397bb"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "A series of type families and constraints for \"indexable\" types"; @@ -103280,8 +105121,10 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.0.0"; - sha256 = "6b86e068856689490a006dcaeac1f47fc8deb3d678bd0ddd9dad7c78cff396ad"; + version = "1.1.1"; + sha256 = "7dead9ab13e8feca491f5444d6d42383f948b347c7ceb44942a21c21f8b3a522"; + revision = "1"; + editedCabalFile = "5f2759927fa334b8991455100079701ef0064764715e42c82f5b469325e2174d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103489,7 +105332,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "inline-java_0_6_2" = callPackage + "inline-java_0_6_3" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, containers , directory, distributed-closure, filepath, ghc-heap-view, hspec , inline-c, jni, jvm, language-java, process, singletons, syb @@ -103497,8 +105340,8 @@ self: { }: mkDerivation { pname = "inline-java"; - version = "0.6.2"; - sha256 = "9c162f26c77d1030f0f5054394265aab7fded1c83df67b3ea8fe7e4bb68aa8c5"; + version = "0.6.3"; + sha256 = "a9d5742b78b22ea4190269d73e2cc6f74a5f45e150ee9582bdbb31ba966c657c"; libraryHaskellDepends = [ base binary bytestring Cabal containers directory distributed-closure filepath ghc-heap-view inline-c jni jvm @@ -103967,8 +105810,8 @@ self: { }: mkDerivation { pname = "interlude-l"; - version = "0.1.0.8"; - sha256 = "5eb16c248a0528543702ae17452c8cdb31d525f1bc95b4e9ea146682fab93100"; + version = "0.2.0.0"; + sha256 = "39707b2d0ad546aa6ff34ad072ab0a231e23dc3c009708c63b0331c3c7f14270"; libraryHaskellDepends = [ aeson base exceptions lens monad-control MonadRandom mtl protolude string-conv text transformers witherable @@ -104128,15 +105971,15 @@ self: { ({ mkDerivation, array, base, containers, QuickCheck, utility-ht }: mkDerivation { pname = "interpolation"; - version = "0.1"; - sha256 = "cad3e655c9893007058dfd8b128195a15434f0759e447c78722fb50aa50337fa"; + version = "0.1.0.1"; + sha256 = "ac693e487d2097c6997d3bf82113deaac5562ec97bda692e69fc684f24982948"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base utility-ht ]; testHaskellDepends = [ array base containers QuickCheck utility-ht ]; - homepage = "http://code.haskell.org/~thielema/interpolation/"; + homepage = "http://hub.darcs.net/thielema/interpolation/"; description = "piecewise linear and cubic Hermite interpolation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -104202,20 +106045,21 @@ self: { "intricacy" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers - , cryptohash, directory, filepath, hscurses, mtl, network-fancy - , random, safe, SDL, SDL-gfx, SDL-mixer, SDL-ttf, stm, time - , transformers, vector + , crypto-api, crypto-pubkey-types, cryptohash, directory, filepath + , hscurses, mtl, network-fancy, random, RSA, safe, SDL, SDL-gfx + , SDL-mixer, SDL-ttf, stm, time, transformers, vector }: mkDerivation { pname = "intricacy"; - version = "0.6.2"; - sha256 = "dce6907980d4b3e9eace2e4e5f5192459992a365d12d2c22860ff1afe2ffb5c7"; + version = "0.7.0.1"; + sha256 = "27920afacec2929700d4a1a152ea12d416b2e498bcb52604cc57fa47be18df16"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array base binary bytestring containers cryptohash directory - filepath hscurses mtl network-fancy random safe SDL SDL-gfx - SDL-mixer SDL-ttf stm time transformers vector + array base binary bytestring containers crypto-api + crypto-pubkey-types cryptohash directory filepath hscurses mtl + network-fancy random RSA safe SDL SDL-gfx SDL-mixer SDL-ttf stm + time transformers vector ]; homepage = "http://mbays.freeshell.org/intricacy"; description = "A game of competitive puzzle-design"; @@ -104223,32 +106067,6 @@ self: { }) {}; "intro" = callPackage - ({ mkDerivation, base, bifunctors, binary, bytestring, containers - , deepseq, dlist, extra, hashable, lens, mtl, safe - , string-conversions, tagged, text, transformers - , unordered-containers, writer-cps-mtl - }: - mkDerivation { - pname = "intro"; - version = "0.1.0.8"; - sha256 = "09c570361dddf8c67572acffc7fd6c93bdfa1c8143d2f7eb9aec0ad5db4f21bf"; - libraryHaskellDepends = [ - base bifunctors binary bytestring containers deepseq dlist extra - hashable mtl safe string-conversions tagged text transformers - unordered-containers writer-cps-mtl - ]; - testHaskellDepends = [ - base bifunctors binary bytestring containers deepseq dlist extra - hashable lens mtl safe string-conversions tagged text transformers - unordered-containers writer-cps-mtl - ]; - homepage = "https://github.com/minad/intro#readme"; - description = "\"Fixed Prelude\" - Mostly total and safe, provides Text and Monad transformers"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "intro_0_1_0_10" = callPackage ({ mkDerivation, base, bifunctors, binary, bytestring, containers , deepseq, dlist, extra, hashable, lens, mtl, safe , string-conversions, tagged, text, transformers @@ -104274,6 +106092,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "intro_0_2_0_2" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bifunctors, binary + , bytestring, cassava, containers, contravariant, deepseq, dlist + , extra, filepath, hashable, lens, megaparsec, mtl, profunctors + , QuickCheck, quickcheck-instances, safe, tagged, text + , transformers, unordered-containers, writer-cps-mtl + }: + mkDerivation { + pname = "intro"; + version = "0.2.0.2"; + sha256 = "24a45432efcf9920391465723fde8c20384dcd2d2c4c0e7ca921f4aeb14c88d7"; + libraryHaskellDepends = [ + base bifunctors binary bytestring containers deepseq dlist extra + hashable mtl safe tagged text transformers unordered-containers + writer-cps-mtl + ]; + testHaskellDepends = [ + aeson async attoparsec base bifunctors binary bytestring cassava + containers contravariant deepseq dlist extra filepath hashable lens + megaparsec mtl profunctors QuickCheck quickcheck-instances safe + tagged text transformers unordered-containers writer-cps-mtl + ]; + homepage = "https://github.com/minad/intro#readme"; + description = "\"Fixed Prelude\" - Mostly total and safe, provides Text and Monad transformers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "intro-prelude" = callPackage ({ mkDerivation, intro }: mkDerivation { @@ -104386,6 +106232,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "invertible-hlist" = callPackage + ({ mkDerivation, base, HList, invertible }: + mkDerivation { + pname = "invertible-hlist"; + version = "0.2.0.2"; + sha256 = "c50f1f10c75476893d117c0cc4b29129e427ceaa0386e9b709b6168f269144a0"; + libraryHaskellDepends = [ base HList invertible ]; + description = "invertible functions and instances for HList"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "invertible-hxt" = callPackage + ({ mkDerivation, base, hxt, hxt-charproperties, invertible, mtl }: + mkDerivation { + pname = "invertible-hxt"; + version = "0.1"; + sha256 = "add3ba846667b933d8fd4bbe20a1f68be02716e6e047eb711b96a14975a88e94"; + libraryHaskellDepends = [ + base hxt hxt-charproperties invertible mtl + ]; + description = "invertible transformer instances for HXT Picklers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "invertible-syntax" = callPackage ({ mkDerivation, base, partial-isomorphisms }: mkDerivation { @@ -104526,10 +106397,8 @@ self: { }: mkDerivation { pname = "io-streams"; - version = "1.3.6.0"; - sha256 = "5e2ae8363cc30d69687db98bfa6711ec53b3b104fcc1829c1e62d8de3d249e3d"; - revision = "1"; - editedCabalFile = "2e5ea27945eb6c0f4260a482cc77c6ebebdf160cd00fa86130f4d31342fa994f"; + version = "1.3.6.1"; + sha256 = "28dcd4abc4b132aa4689c2f9c455ca6777b792f1ffef682576e0978793c83628"; configureFlags = [ "-fnointeractivetests" ]; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder network primitive @@ -104748,6 +106617,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ip6addr_0_5_3" = callPackage + ({ mkDerivation, base, cmdargs, IPv6Addr, text }: + mkDerivation { + pname = "ip6addr"; + version = "0.5.3"; + sha256 = "1ff90994e691785a6eb4bc080d71556761f0ef6f91f0a3a1452c58a8b06e03c6"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base cmdargs IPv6Addr text ]; + homepage = "https://github.com/MichelBoucey/ip6addr"; + description = "Commandline tool to generate IPv6 address text representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ipatch" = callPackage ({ mkDerivation, base, bytestring, darcs, directory, filepath , hashed-storage, process, unix @@ -104817,7 +106701,7 @@ self: { description = "haskell binding to ipopt and nlopt including automatic differentiation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) ipopt; nlopt = null;}; + }) {inherit (pkgs) ipopt; inherit (pkgs) nlopt;}; "ipprint" = callPackage ({ mkDerivation, base, haskell-src, sr-extra }: @@ -104977,25 +106861,6 @@ self: { }) {}; "irc-conduit" = callPackage - ({ mkDerivation, async, base, bytestring, conduit, conduit-extra - , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text - , time, tls, transformers, x509-validation - }: - mkDerivation { - pname = "irc-conduit"; - version = "0.2.2.0"; - sha256 = "b66e058a66e9cd782f065be6b100bb80157c55d733db6691112a70e9aab13065"; - libraryHaskellDepends = [ - async base bytestring conduit conduit-extra connection irc irc-ctcp - network-conduit-tls profunctors text time tls transformers - x509-validation - ]; - homepage = "https://github.com/barrucadu/irc-conduit"; - description = "Streaming IRC message library using conduits"; - license = stdenv.lib.licenses.mit; - }) {}; - - "irc-conduit_0_2_2_1" = callPackage ({ mkDerivation, async, base, bytestring, conduit, conduit-extra , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text , time, tls, transformers, x509-validation @@ -105012,7 +106877,6 @@ self: { homepage = "https://github.com/barrucadu/irc-conduit"; description = "Streaming IRC message library using conduits"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc-core" = callPackage @@ -105049,18 +106913,18 @@ self: { }) {}; "irc-dcc" = callPackage - ({ mkDerivation, attoparsec, base, binary, bytestring, errors + ({ mkDerivation, attoparsec, base, binary, bytestring , hspec-attoparsec, io-streams, iproute, irc-ctcp, mtl, network , path, safe-exceptions, tasty, tasty-hspec, tasty-quickcheck , transformers, utf8-string }: mkDerivation { pname = "irc-dcc"; - version = "2.0.0"; - sha256 = "af21bb0929ead7439e0d45ce4db1c35799949d91c8dd8f25f048826498483115"; + version = "2.0.1"; + sha256 = "6408a28733743d3463664677c5e3ad72e46c168799dad458988067039f25d2df"; libraryHaskellDepends = [ - attoparsec base binary bytestring errors io-streams iproute - irc-ctcp mtl network path safe-exceptions transformers utf8-string + attoparsec base binary bytestring io-streams iproute irc-ctcp mtl + network path safe-exceptions transformers utf8-string ]; testHaskellDepends = [ base bytestring hspec-attoparsec iproute network path tasty @@ -105265,11 +107129,11 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "is"; - version = "0.2"; - sha256 = "502c962d45859050455057be9886e8944e300ef690a56605c91aca76fdcd19c6"; + version = "0.4"; + sha256 = "7f628b7fe4d1acc8f7b043cebb3da597faa83802166b3efbf08ad6ef778ee72d"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; - description = "Pattern predicates using TH"; + description = "Generic pattern predicates"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -105354,6 +107218,8 @@ self: { pname = "iso3166-country-codes"; version = "0.20140203.8"; sha256 = "b4d6e01cd61bcaef9a8e455c331a8e7a2298531cb587ef6f23675eae7a6b0a36"; + revision = "1"; + editedCabalFile = "ee03b7547119da3be9afb040b2e93d06ad65d63c3bc401044d1c443c77bd0158"; libraryHaskellDepends = [ base ]; description = "A datatype for ISO 3166 country codes"; license = "LGPL"; @@ -105451,8 +107317,8 @@ self: { }: mkDerivation { pname = "isotope"; - version = "0.3.3.0"; - sha256 = "e08fac7483c11f37786f5f98f6f7d1e58a456d1470c3f0f35bc9326e88c1fa2e"; + version = "0.4.0.0"; + sha256 = "040dc0ab7b47f478351bdd491acb6ed7e6f5aad2845f3cf29dfdd89041129ea7"; libraryHaskellDepends = [ base containers megaparsec template-haskell th-lift ]; @@ -105766,8 +107632,8 @@ self: { pname = "ivory-backend-c"; version = "0.1.0.5"; sha256 = "e07d69634f6b50145f51886b87b7556bd6eb01e21bcd6476f849071a1120e535"; - revision = "1"; - editedCabalFile = "d628f3ab8d4d61816af6f9ff9fb34bf8cbcf28d2ff75246aa86303a59c457d1a"; + revision = "3"; + editedCabalFile = "896caeaf7836e16c1e75400cb0d4be531cfdf5bac4c87740c54319b9964c2027"; libraryHaskellDepends = [ base base-compat bytestring containers directory filepath ivory ivory-artifact ivory-opts language-c-quote mainland-pretty monadLib @@ -105863,6 +107729,8 @@ self: { pname = "ivory-opts"; version = "0.1.0.5"; sha256 = "36bbf696b1f711885a2493233d09a304686572ff32d0e7e8f30c0a8ebc139340"; + revision = "1"; + editedCabalFile = "f64e49dfa4b60729864f1a33acfb53df1465c19b200a92786537d4cf6f96c1d6"; libraryHaskellDepends = [ base base-compat containers data-reify dlist fgl filepath ivory monadLib pretty @@ -106377,12 +108245,14 @@ self: { }) {}; "javascript-extras" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, deepseq, ghcjs-base-stub, parallel, text }: mkDerivation { pname = "javascript-extras"; - version = "0.1.0.0"; - sha256 = "cf74b6c2be87ee5bc96b5ff47335a8eb2d879d7ec83bf6c83be609293f40f4be"; - libraryHaskellDepends = [ base ]; + version = "0.2.0.2"; + sha256 = "45075e3abfe658311f209110701c02fa57dddd36b1df9405cb7ae5abdb3d6c83"; + libraryHaskellDepends = [ + base deepseq ghcjs-base-stub parallel text + ]; homepage = "https://github.com/louispan/javascript-extras#readme"; description = "Extra javascript functions when using GHCJS"; license = stdenv.lib.licenses.bsd3; @@ -106823,6 +108693,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "js-jquery_3_2_1" = callPackage + ({ mkDerivation, base, HTTP }: + mkDerivation { + pname = "js-jquery"; + version = "3.2.1"; + sha256 = "60503d82d0a601291cf0aa495edecbdb749dcf8982502bf18b9a886979ac1e0f"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base HTTP ]; + doCheck = false; + homepage = "https://github.com/ndmitchell/js-jquery#readme"; + description = "Obtain minified jQuery code"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jsaddle" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, containers, deepseq, filepath, ghc-prim, http-types @@ -107476,8 +109361,8 @@ self: { pname = "json-schema"; version = "0.7.4.1"; sha256 = "560d6a17d6eab734f43d329e51967e3ed62f8df2a6fea4a92d06359fe77d7c96"; - revision = "6"; - editedCabalFile = "b6211ab8989ce7d576cac285b7d17f2e50ee79139545e2e84b2dd319904360b2"; + revision = "7"; + editedCabalFile = "c3b107899b4297971b6b2cb913b3ace26f6d847844c6a7a6b6fe9f8dc2a9a6f7"; libraryHaskellDepends = [ aeson base containers generic-aeson generic-deriving mtl scientific text time unordered-containers vector @@ -107652,6 +109537,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "jsonextfilter" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , monads-tf, optparse-applicative, process, scientific, string-qq + , text, unordered-containers, vector + }: + mkDerivation { + pname = "jsonextfilter"; + version = "0.1.0.0"; + sha256 = "6c2dc674133e3a6304a0803c3e823d1210b50cd4d1c711b1182f767addc0a156"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson attoparsec base bytestring containers monads-tf + optparse-applicative process scientific string-qq text + unordered-containers vector + ]; + homepage = "https://github.com/mackeyrms/jsonextfilter#readme"; + description = "Filter select values in JSON objects to unix programs"; + license = stdenv.lib.licenses.mit; + }) {}; + "jsonresume" = callPackage ({ mkDerivation, aeson, base, bytestring, old-locale, text, time , unordered-containers @@ -107755,6 +109661,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "jsonxlsx" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , HUnit, old-time, optparse-applicative, scientific, string-qq + , text, time, unordered-containers, vector, xlsx + }: + mkDerivation { + pname = "jsonxlsx"; + version = "0.1.0.1"; + sha256 = "4778267befeec6c792da44faa7e81b4c7649f8f2983501fea523d7c4e1f9c460"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson attoparsec base bytestring containers HUnit old-time + optparse-applicative scientific string-qq text time + unordered-containers vector xlsx + ]; + homepage = "https://github.com/mackeyrms/jsonxlsx#readme"; + description = "json to xlsx converter"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jspath" = callPackage ({ mkDerivation, base, bytestring, bytestring-trie, JSONb , utf8-string @@ -107818,8 +109746,8 @@ self: { }: mkDerivation { pname = "juicy-gcode"; - version = "0.1.0.1"; - sha256 = "4393aae302e034c95e2c3cff57f432c322db7ecf21580295310648c73bc09bbf"; + version = "0.1.0.3"; + sha256 = "fbef1579a9561b62b308e5f172cee2dc4d11e7b5fb6e51fae7c1721bd60eeb33"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -107839,8 +109767,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.2.16"; - sha256 = "5eac14b5102b5be904142843977560cddf4829182637e059cd09e7a384b7052f"; + version = "0.2.17"; + sha256 = "3952d52d54fbacfff9a001d00a7627955c9429304ca08b1f4edcde201e5ba764"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109448,8 +111376,8 @@ self: { }: mkDerivation { pname = "knead"; - version = "0.2.0.1"; - sha256 = "767515c8db0abff908d927354a027cb4f2cac929cb768302ba3900c050ad945c"; + version = "0.2.1"; + sha256 = "0aa766ebd9b72370dd18b1f7e3bef2d67c6575b36d9f47467ab54997bfe88f0d"; libraryHaskellDepends = [ base llvm-extra llvm-tf storable-record storable-tuple transformers utility-ht @@ -109697,6 +111625,18 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "ksystools" = callPackage + ({ mkDerivation, base, directory }: + mkDerivation { + pname = "ksystools"; + version = "0.1.0.0"; + sha256 = "61bf58d8d7464cdcd565fc80cf91b62190daff6ea3c99dad66a5da71fe586d53"; + libraryHaskellDepends = [ base directory ]; + homepage = "https://github.com/kisom/ksystools#readme"; + description = "System management tooling"; + license = stdenv.lib.licenses.mit; + }) {}; + "ktx" = callPackage ({ mkDerivation, base, bytestring, egl, glew, OpenGL }: mkDerivation { @@ -109767,8 +111707,8 @@ self: { ({ mkDerivation, base, text, time }: mkDerivation { pname = "l10n"; - version = "0.1.0.0"; - sha256 = "56f935a18248473cada2bca5cef2c5e98fbab77a02f5bb075ecdc90750de6531"; + version = "0.1.0.1"; + sha256 = "0a7032476d257981eb7c274600bef809b4a515ab162a1772a7887f0113455ca0"; libraryHaskellDepends = [ base text time ]; homepage = "https://github.com/louispan/l10n#readme"; description = "Enables providing localization as typeclass instances in separate files"; @@ -110604,15 +112544,17 @@ self: { }) {}; "lambdatex" = callPackage - ({ mkDerivation, async, base, containers, directory, HaTeX, hspec - , mtl, QuickCheck, quickcheck-text, text, transformers + ({ mkDerivation, async, base, containers, directory, filepath + , HaTeX, hspec, mtl, QuickCheck, quickcheck-text, text + , transformers }: mkDerivation { pname = "lambdatex"; - version = "0.1.1.0"; - sha256 = "ab86128908697c0f595076b36769e26365d927ade325879d9b350deb489c0164"; + version = "0.2.0.0"; + sha256 = "64d89ff1a397e7cc1390f5c0c49fd83e358b9fa12ca78325ff63a2cc44ddcea9"; libraryHaskellDepends = [ - async base containers directory HaTeX mtl text transformers + async base containers directory filepath HaTeX mtl text + transformers ]; testHaskellDepends = [ base hspec QuickCheck quickcheck-text text @@ -110746,8 +112688,8 @@ self: { }: mkDerivation { pname = "language-bash"; - version = "0.6.2"; - sha256 = "63b3201611262cf8aad5b836b2bbe673a6b718bd1a05d16289e3adc790b08ce8"; + version = "0.7.0"; + sha256 = "9debcc259bba8c09490965d6886db1b5495193aae633e624542e8e7f9f2df970"; libraryHaskellDepends = [ base parsec pretty transformers ]; testHaskellDepends = [ base parsec process QuickCheck tasty tasty-expected-failure @@ -110801,14 +112743,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "language-c_0_6" = callPackage + "language-c_0_6_1" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , directory, filepath, happy, pretty, process, syb }: mkDerivation { pname = "language-c"; - version = "0.6"; - sha256 = "5699cd7d386ae5a583d703bbc1c83b46faa618f3e53ff7fe9a97f6c7acb36be6"; + version = "0.6.1"; + sha256 = "23cadc9d04e46490ec57f56b79ecdc2a709ebf57571345905e6e30db29fa37e8"; libraryHaskellDepends = [ array base bytestring containers directory filepath pretty process syb @@ -110861,8 +112803,10 @@ self: { }: mkDerivation { pname = "language-c-quote"; - version = "0.11.7.1"; - sha256 = "5583e92748e6b4cac01536bff86eb119e424e136e03bb3ea0d2db3217328f88c"; + version = "0.11.7.3"; + sha256 = "8e1bdc55d7c146e3d58feba03388f679933a8e033aaf15087e73d4d45e344152"; + revision = "1"; + editedCabalFile = "33b48f16c0cb1e3476c76828c61c9faed896f1bba16336903bd2bafbae94145c"; libraryHaskellDepends = [ array base bytestring containers exception-mtl exception-transformers filepath haskell-src-meta mainland-pretty @@ -110878,32 +112822,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "language-c-quote_0_11_7_2" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers - , exception-mtl, exception-transformers, filepath, happy - , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb - , symbol, template-haskell, test-framework, test-framework-hunit - }: - mkDerivation { - pname = "language-c-quote"; - version = "0.11.7.2"; - sha256 = "5654187eaa82afe2b7ad959436b35c561fa5bc5b68af5624ab204e9db3591508"; - libraryHaskellDepends = [ - array base bytestring containers exception-mtl - exception-transformers filepath haskell-src-meta mainland-pretty - mtl srcloc syb symbol template-haskell - ]; - libraryToolDepends = [ alex happy ]; - testHaskellDepends = [ - base bytestring HUnit mainland-pretty srcloc symbol test-framework - test-framework-hunit - ]; - homepage = "http://www.drexel.edu/~mainland/"; - description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "language-cil" = callPackage ({ mkDerivation, base, bool-extras }: mkDerivation { @@ -111434,8 +113352,8 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.3.5.1"; - sha256 = "4c33feba8e2b3654d25d7cb3d7a881b1f1228196db2d0335a0a83c995b5f19d4"; + version = "1.3.7"; + sha256 = "9b549422aed7b8a4b0d1fb1ed62e8648d2b16646c29d3736aeef1008035955ee"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111464,50 +113382,6 @@ self: { hydraPlatforms = [ "x86_64-linux" ]; }) {}; - "language-puppet_1_3_6" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base - , base16-bytestring, bytestring, case-insensitive, containers - , cryptonite, directory, either, exceptions, filecache, formatting - , Glob, hashable, hruby, hslogger, hspec, hspec-megaparsec - , http-api-data, http-client, HUnit, lens, lens-aeson, megaparsec - , memory, mtl, operational, optparse-applicative, parallel-io - , parsec, pcre-utils, process, random, regex-pcre-builtin - , scientific, semigroups, servant, servant-client, split, stm - , strict-base-types, temporary, text, time, transformers, unix - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "language-puppet"; - version = "1.3.6"; - sha256 = "25acf7b9449999beb8b65c8f594c51171f94b074fb5a5228ce267f96f50d2be2"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring - case-insensitive containers cryptonite directory either exceptions - filecache formatting hashable hruby hslogger hspec http-api-data - http-client lens lens-aeson megaparsec memory mtl operational - parsec pcre-utils process random regex-pcre-builtin scientific - semigroups servant servant-client split stm strict-base-types text - time transformers unix unordered-containers vector yaml - ]; - executableHaskellDepends = [ - aeson base bytestring containers Glob hslogger http-client lens - megaparsec mtl optparse-applicative parallel-io regex-pcre-builtin - servant-client strict-base-types text transformers - unordered-containers vector yaml - ]; - testHaskellDepends = [ - ansi-wl-pprint base Glob hslogger hspec hspec-megaparsec HUnit lens - megaparsec mtl scientific strict-base-types temporary text - transformers unix unordered-containers vector - ]; - homepage = "http://lpuppet.banquise.net/"; - description = "Tools to parse and evaluate the Puppet DSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "language-python" = callPackage ({ mkDerivation, alex, array, base, containers, happy, monads-tf , pretty, transformers, utf8-string @@ -111523,6 +113397,7 @@ self: { homepage = "http://github.com/bjpop/language-python"; description = "Parsing and pretty printing of Python code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-python-colour" = callPackage @@ -111554,6 +113429,7 @@ self: { homepage = "http://github.com/bjpop/language-python-test"; description = "testing code for the language-python library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-qux" = callPackage @@ -111715,8 +113591,8 @@ self: { }: mkDerivation { pname = "large-hashable"; - version = "0.1.0.3"; - sha256 = "ece9da94f91dfb97f3507035f280fe89a9bed50cf1071aae1afbd5d288682d89"; + version = "0.1.0.4"; + sha256 = "e9c3345d9fa0161f1b809f2c57e00b4c687ebd48ea42623fe480cc85339a628e"; libraryHaskellDepends = [ aeson base base16-bytestring bytes bytestring containers scientific strict template-haskell text time transformers unordered-containers @@ -112012,6 +113888,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "layout-rules" = callPackage + ({ mkDerivation, alex-tools, base, text }: + mkDerivation { + pname = "layout-rules"; + version = "0.1.0.1"; + sha256 = "b00a77aec2f4d8dcd71b29b5c399a7668158ae7bc05d1c7fb09e414ec3354934"; + libraryHaskellDepends = [ alex-tools base text ]; + homepage = "https://github.com/elliottt/layout-rules"; + description = "A collection of different layout implementations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lazy-csv" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -112300,8 +114188,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "leancheck"; - version = "0.6.0"; - sha256 = "15651a9e1bb9b20e805a012be57082c5e2c1f59dde51c25f9fb88299150853ed"; + version = "0.6.2"; + sha256 = "f422d9b18382d338814f6435330ed68340ac5294a4b9a6af6f6cc12763721377"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/rudymatela/leancheck#readme"; @@ -112448,19 +114336,19 @@ self: { "legion" = callPackage ({ mkDerivation, aeson, base, binary, binary-conduit, bytestring , canteven-http, conduit, conduit-extra, containers - , data-default-class, data-dword, directory, exceptions, http-types + , data-default-class, data-dword, exceptions, http-types , monad-logger, network, Ranged-sets, scotty, scotty-resource, text , time, transformers, unix, uuid, wai, wai-extra, warp }: mkDerivation { pname = "legion"; - version = "0.9.0.0"; - sha256 = "a40c85edad14c4dca15d3d4ef6b3c240c5afb30a3798ab63acc43f6f1d5a08ce"; + version = "0.9.0.2"; + sha256 = "784005d0ca6875192b9837ea169b4b768e0fd34881f913809c2e7310044191eb"; libraryHaskellDepends = [ aeson base binary binary-conduit bytestring canteven-http conduit - conduit-extra containers data-default-class data-dword directory - exceptions http-types monad-logger network Ranged-sets scotty - scotty-resource text time transformers unix uuid wai wai-extra warp + conduit-extra containers data-default-class data-dword exceptions + http-types monad-logger network Ranged-sets scotty scotty-resource + text time transformers unix uuid wai wai-extra warp ]; homepage = "https://github.com/owensmurray/legion#readme"; description = "Distributed, stateful, homogeneous microservice framework"; @@ -112471,22 +114359,21 @@ self: { "legion-discovery" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring, Cabal , canteven-http, canteven-log, conduit, containers - , data-default-class, ekg, graphviz, http-types, legion - , legion-extra, monad-logger, scotty, scotty-format - , scotty-resource, SHA, text, time, transformers, wai, wai-extra - , warp + , data-default-class, ekg, graphviz, http-api-data, http-grammar + , legion, legion-extra, monad-logger, mtl, servant-server, SHA + , text, time, wai, wai-extra, warp }: mkDerivation { pname = "legion-discovery"; - version = "0.3.0.0"; - sha256 = "a5bcbbcaec065c4f833b51c05e0379bce3e1f22ca70585b63878ef57dbabfc61"; + version = "1.0.0.0"; + sha256 = "7be93501fda9e9f37fbd90db3692ea1bf36069b1bb80f34f6663e339f3104854"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base binary bytestring Cabal canteven-http canteven-log conduit containers data-default-class ekg graphviz - http-types legion legion-extra monad-logger scotty scotty-format - scotty-resource SHA text time transformers wai wai-extra warp + http-api-data http-grammar legion legion-extra monad-logger mtl + servant-server SHA text time wai wai-extra warp ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; @@ -112498,17 +114385,16 @@ self: { "legion-discovery-client" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers - , data-default-class, http-client, http-types, load-balancing - , network, resourcet, text, transformers + , http-client, http-types, load-balancing, resourcet, text + , transformers }: mkDerivation { pname = "legion-discovery-client"; - version = "0.1.0.3"; - sha256 = "4fd1c98dcade6f1251418f14537df3cffb4af814eca8074f7a06e0efdd67189b"; + version = "0.1.1.1"; + sha256 = "257150e35dddb8e67fa48dc61b740ec73e216cd59ce21bbe898c0fc3f290df24"; libraryHaskellDepends = [ - aeson base bytestring Cabal containers data-default-class - http-client http-types load-balancing network resourcet text - transformers + aeson base bytestring Cabal containers http-client http-types + load-balancing resourcet text transformers ]; testHaskellDepends = [ base ]; homepage = "https://github.com/owensmurray/legion-discovery-client#readme"; @@ -112524,8 +114410,8 @@ self: { }: mkDerivation { pname = "legion-extra"; - version = "0.1.2.0"; - sha256 = "20619c18f0b4155fdef8a358338a987e41bc0ae3081990cdfcf3354cc4c67bec"; + version = "0.1.2.1"; + sha256 = "696c33bc6dd19dbc6320a637359675bfc3090b9ad05d92fd356b4242f8832519"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring canteven-log conduit containers data-default-class data-dword directory legion network @@ -112679,6 +114565,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-accelerate" = callPackage + ({ mkDerivation, accelerate, base, lens }: + mkDerivation { + pname = "lens-accelerate"; + version = "0.1.0.0"; + sha256 = "e4a736962342c116960425a32a17f4eaccc03bf583c09d2a619779deee5c9548"; + libraryHaskellDepends = [ accelerate base lens ]; + homepage = "https://github.com/tmcdonell/lens-accelerate"; + description = "Instances to mix lens with accelerate"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lens-action" = callPackage ({ mkDerivation, base, comonad, contravariant, directory, doctest , filepath, lens, mtl, profunctors, semigroupoids, semigroups @@ -112774,6 +114672,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-labels" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "lens-labels"; + version = "0.1.0.0"; + sha256 = "cde729cf0f9024417d17234a933a54e0a4f3e2073e84f00e8ad60da5fc39e67c"; + libraryHaskellDepends = [ base ghc-prim ]; + homepage = "https://github.com/google/proto-lens"; + description = "Integration of lenses with OverloadedLabels"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lens-prelude" = callPackage ({ mkDerivation, array, base, bytestring, containers, contravariant , either, hashable, lens, mtl, text, time, transformers @@ -112977,14 +114887,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lentil_1_0_9_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip + , filepath, hspec, natural-sort, optparse-applicative, parsec + , pipes, regex-tdfa, semigroups, terminal-progress-bar, text + , transformers + }: + mkDerivation { + pname = "lentil"; + version = "1.0.9.0"; + sha256 = "4403da26f4c6bef7848a20587422103e1e84cd446fc428dfe6370b875c78cf93"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-wl-pprint base csv directory filemanip filepath natural-sort + optparse-applicative parsec pipes regex-tdfa semigroups + terminal-progress-bar text transformers + ]; + testHaskellDepends = [ + ansi-wl-pprint base csv directory filemanip filepath hspec + natural-sort optparse-applicative parsec pipes regex-tdfa + semigroups terminal-progress-bar text transformers + ]; + homepage = "http://www.ariis.it/static/articles/lentil/page.html"; + description = "frugal issue tracker"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lenz" = callPackage ({ mkDerivation, base, base-unicode-symbols, transformers }: mkDerivation { pname = "lenz"; - version = "0.1"; - sha256 = "98b3aef14ca16218ecd6643812e9df5dde5c60af6e2f56f98ec523ecc0917397"; - revision = "1"; - editedCabalFile = "48a9254ce289eedf5db423844732c4b5a42798d94b3c2e82b4b9770f87c97f07"; + version = "0.1.2.1"; + sha256 = "086dc7dd29cdc7f8166f2248bd9cebbfe0f926ec5f6a6d99e6ac81cfe62b1215"; libraryHaskellDepends = [ base base-unicode-symbols transformers ]; description = "Van Laarhoven lenses"; license = "unknown"; @@ -113513,25 +115449,27 @@ self: { "liblawless" = callPackage ({ mkDerivation, aeson, base, base-unicode-symbols, binary - , boomerang, bytestring, containers, containers-unicode-symbols - , contravariant, data-default, data-textual, dns, exceptions - , filepath, hjsonschema, lens, machines, managed, mtl, network - , network-ip, parsers, pathtype, protolude, QuickCheck, random - , semigroups, stm, stm-containers, temporary, test-framework + , boomerang, bytestring, concurrent-machines, containers + , containers-unicode-symbols, contravariant, data-default + , data-textual, dns, exceptions, filepath, hjsonschema, lens + , machines, managed, monad-control, mtl, network, network-ip + , parsers, pathtype, protolude, QuickCheck, random, semigroups, stm + , stm-containers, temporary, test-framework , test-framework-quickcheck2, test-framework-th, text, text-icu , text-icu-normalized, text-printer, time, transformers, zippers }: mkDerivation { pname = "liblawless"; - version = "0.17.1"; - sha256 = "dbba3ab5865c0f957daf3ead4e3f7c16a44ba2e3c4fbbe4ced429f1c88e6f397"; + version = "0.19.1"; + sha256 = "e2d5e56b411098adcd139d6aae5f9226f8951b0a932af8cbfa178ffa626f326c"; libraryHaskellDepends = [ aeson base base-unicode-symbols binary boomerang bytestring - containers containers-unicode-symbols contravariant data-default - data-textual dns exceptions hjsonschema lens machines managed mtl - network network-ip parsers pathtype protolude QuickCheck random - semigroups stm stm-containers temporary text text-icu - text-icu-normalized text-printer time transformers zippers + concurrent-machines containers containers-unicode-symbols + contravariant data-default data-textual dns exceptions hjsonschema + lens machines managed monad-control mtl network network-ip parsers + pathtype protolude QuickCheck random semigroups stm stm-containers + temporary text text-icu text-icu-normalized text-printer time + transformers zippers ]; testHaskellDepends = [ aeson base binary bytestring exceptions filepath network QuickCheck @@ -114348,6 +116286,20 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "line-size" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "line-size"; + version = "0.1.0.0"; + sha256 = "ba7b29516152e13756eed1593c0f33332ee7fae9f7da268429c9684ec85a79db"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base ]; + homepage = "xy30.com"; + description = "Display the number of bytes of each line"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "line2pdf" = callPackage ({ mkDerivation, base, bytestring, containers }: mkDerivation { @@ -114404,6 +116356,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "linear-accelerate_0_3" = callPackage + ({ mkDerivation, accelerate, base, Cabal, distributive, filepath + , lens, linear + }: + mkDerivation { + pname = "linear-accelerate"; + version = "0.3"; + sha256 = "3aef0c04059e3b650573929aabbf782cc712b2926d76a2a3ed7e37079bdb42a9"; + setupHaskellDepends = [ base Cabal filepath ]; + libraryHaskellDepends = [ + accelerate base distributive lens linear + ]; + homepage = "http://github.com/ekmett/linear-accelerate/"; + description = "Lifting linear vector spaces into Accelerate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "linear-algebra-cblas" = callPackage ({ mkDerivation, base, ieee754, QuickCheck, storable-complex , test-framework, test-framework-quickcheck2, vector @@ -114708,8 +116678,8 @@ self: { }: mkDerivation { pname = "linode"; - version = "0.2.0.0"; - sha256 = "3a5c1d507121a40848217ad8e092c3347c1c26a1ada09ccfa1450b30d22d59fa"; + version = "0.3.0.0"; + sha256 = "7c5c35938d19cd8577bd40c8c574a27011b3c0b30da45920129187d4d204139e"; libraryHaskellDepends = [ aeson async base binary bytestring containers errors lens process retry safe text transformers wreq @@ -115666,8 +117636,8 @@ self: { }: mkDerivation { pname = "llvm-extra"; - version = "0.7.0.1"; - sha256 = "4928e405deff09451edce864558ce7b3276549ca7f1d71dac118dcbcafe15573"; + version = "0.7.1"; + sha256 = "02b54ca12c6dbcb24589bbc93819a4857f169b811e15a6d00d05b7e42f1f6505"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115789,6 +117759,54 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "llvm-hs" = callPackage + ({ mkDerivation, array, base, bytestring, Cabal, containers + , llvm-config, llvm-hs-pure, mtl, parsec, pretty-show, QuickCheck + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, temporary + , transformers, transformers-compat, utf8-string + }: + mkDerivation { + pname = "llvm-hs"; + version = "4.0.1.0"; + sha256 = "48f5a375514269fae1fa8723c80500de845e0798a55fc36074e22bc2e7daa82d"; + setupHaskellDepends = [ base Cabal containers ]; + libraryHaskellDepends = [ + array base bytestring containers llvm-hs-pure mtl parsec + template-haskell transformers transformers-compat utf8-string + ]; + libraryToolDepends = [ llvm-config ]; + testHaskellDepends = [ + base bytestring containers llvm-hs-pure mtl pretty-show QuickCheck + tasty tasty-hunit tasty-quickcheck temporary transformers + transformers-compat + ]; + homepage = "http://github.com/llvm-hs/llvm-hs/"; + description = "General purpose LLVM bindings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {llvm-config = null;}; + + "llvm-hs-pure" = callPackage + ({ mkDerivation, base, containers, mtl, parsec, tasty, tasty-hunit + , template-haskell, transformers, transformers-compat + }: + mkDerivation { + pname = "llvm-hs-pure"; + version = "4.0.0.0"; + sha256 = "7452314aac955bd9afb4e93df2fc235788d069b18b16872878681cf91d0639fd"; + libraryHaskellDepends = [ + base containers mtl parsec template-haskell transformers + transformers-compat + ]; + testHaskellDepends = [ + base containers mtl tasty tasty-hunit transformers + transformers-compat + ]; + homepage = "http://github.com/llvm-hs/llvm-hs/"; + description = "Pure Haskell LLVM functionality (no FFI)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "llvm-ht" = callPackage ({ mkDerivation, base, bytestring, directory, mtl, process , type-level @@ -115824,12 +117842,12 @@ self: { }) {}; "llvm-pretty" = callPackage - ({ mkDerivation, base, containers, monadLib, pretty }: + ({ mkDerivation, base, containers, monadLib, parsec, pretty }: mkDerivation { pname = "llvm-pretty"; - version = "0.6.0.0"; - sha256 = "f9b50885551a48624a0577c6dabaef1fc77245367d6d9afdb84d548ada328e66"; - libraryHaskellDepends = [ base containers monadLib pretty ]; + version = "0.7.1.0"; + sha256 = "5805bbb6a0408dad250eaee5ebd15bc8fbeccbca8b54fa50aa1de94ea95d2c60"; + libraryHaskellDepends = [ base containers monadLib parsec pretty ]; description = "A pretty printing library inspired by the llvm binding"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -115841,8 +117859,8 @@ self: { }: mkDerivation { pname = "llvm-pretty-bc-parser"; - version = "0.3.0.1"; - sha256 = "def47c50959ae7b270987bcf53af87e07a290275bfd34f01e3d3c50b8edf1178"; + version = "0.3.2.0"; + sha256 = "198a7985b2c263427a9a216d2b4074e3ac44b5100a3b8580be926ea5c4ed1440"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115866,8 +117884,8 @@ self: { }: mkDerivation { pname = "llvm-tf"; - version = "3.1.0.1"; - sha256 = "5aa4e2e733b442de88096ba0eaa7fe92e52a1e61601c423d4fbb4dc44355e2e5"; + version = "3.1.0.2"; + sha256 = "566a16989cdb64a87a78287341aa71379db88c6072683219c2853dff2afabf98"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116142,8 +118160,8 @@ self: { pname = "lock-file"; version = "0.5.0.2"; sha256 = "274ecb94d0af66fed7b624fca402381d7f262f510ac7c4271037153efda49ad0"; - revision = "3"; - editedCabalFile = "565e73c14184f1760473a10e35d2a04f354dbec33abcf185d217754ad63709b6"; + revision = "4"; + editedCabalFile = "2c6bc79db0f2cdeb55396860867b462995047699a66e4b0cb31724f961ae443b"; libraryHaskellDepends = [ base data-default-class directory exceptions tagged-exception-core transformers @@ -116212,6 +118230,33 @@ self: { pname = "log"; version = "0.7"; sha256 = "67daea67ce76d9838f2cb853f198e891d853d705405ff3806ce46fdf2376e51b"; + revision = "1"; + editedCabalFile = "e5202dc6af8bc3ecfffe0ef5d49c71dc2049a05f0f584d514c609af7702f111c"; + libraryHaskellDepends = [ + base log-base log-elasticsearch log-postgres + ]; + testHaskellDepends = [ + aeson base bloodhound bytestring exceptions http-client http-types + process random tasty tasty-hunit text time transformers + ]; + homepage = "https://github.com/scrive/log"; + description = "Structured logging solution with multiple backends"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "log_0_8" = callPackage + ({ mkDerivation, aeson, base, bloodhound, bytestring, exceptions + , http-client, http-types, log-base, log-elasticsearch + , log-postgres, process, random, tasty, tasty-hunit, text, time + , transformers + }: + mkDerivation { + pname = "log"; + version = "0.8"; + sha256 = "3c48e377d8e25cb6874c1496d8635342dc3c57843d45f1347b4fdfb110d42a52"; + revision = "1"; + editedCabalFile = "110b0297ddce3744cffe2749373311677df01d27531bbec528a27744d7aed1ea"; libraryHaskellDepends = [ base log-base log-elasticsearch log-postgres ]; @@ -116232,8 +118277,8 @@ self: { }: mkDerivation { pname = "log-base"; - version = "0.7"; - sha256 = "ba961838e19cccb5d84a052ba75acbd7320119dda482a4fa230346743c8a8c07"; + version = "0.7.1"; + sha256 = "63eb485d51edb8f76d1cf3feeab379afe19546f8e52e284db51e5ae4c690a2bf"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring deepseq exceptions monad-control monad-time mtl semigroups stm text time transformers-base @@ -116307,6 +118352,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "log-elasticsearch_0_8_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring + , bloodhound, bytestring, deepseq, http-client, http-client-tls + , log-base, semigroups, text, text-show, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "log-elasticsearch"; + version = "0.8.1"; + sha256 = "b0a67b2335f2d1a075bf611b723572db81075c69a3f4a4a06ab35906341f8281"; + libraryHaskellDepends = [ + aeson aeson-pretty base base64-bytestring bloodhound bytestring + deepseq http-client http-client-tls log-base semigroups text + text-show time transformers unordered-containers vector + ]; + homepage = "https://github.com/scrive/log"; + description = "Structured logging solution (Elasticsearch back end)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "log-postgres" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , bytestring, deepseq, hpqtypes, http-client, lifted-base, log-base @@ -116355,24 +118421,25 @@ self: { "log-warper" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring , containers, data-default, directory, dlist, errors, exceptions - , extra, filepath, formatting, hashable, hslogger, hspec, HUnit - , lens, monad-control, monad-loops, mtl, QuickCheck, safecopy, text - , text-format, time, transformers, transformers-base, universum - , unordered-containers, yaml + , extra, filepath, formatting, hashable, hspec, HUnit, lens, mmorph + , monad-control, monad-loops, mtl, network, QuickCheck, safecopy + , text, text-format, time, transformers, transformers-base + , universum, unix, unordered-containers, yaml }: mkDerivation { pname = "log-warper"; - version = "0.5.1"; - sha256 = "8645928457c46ca217c2a9ebc75819176643552876c832ad3691a66e762798ea"; + version = "1.0.4"; + sha256 = "c2024e6a5c01d2862d05ea47273e659c3ee31afeeb2f69e67b52fec0749f0990"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal base bytestring containers directory dlist - errors exceptions extra filepath formatting hashable hslogger lens - monad-control monad-loops mtl safecopy text text-format time - transformers transformers-base universum unordered-containers yaml + errors exceptions extra filepath formatting hashable lens mmorph + monad-control monad-loops mtl network safecopy text text-format + time transformers transformers-base universum unix + unordered-containers yaml ]; - executableHaskellDepends = [ base exceptions hslogger text ]; + executableHaskellDepends = [ base exceptions text ]; testHaskellDepends = [ async base data-default directory filepath hspec HUnit lens QuickCheck universum unordered-containers @@ -117475,30 +119542,6 @@ self: { }) {}; "lucid" = callPackage - ({ mkDerivation, base, bifunctors, blaze-builder, bytestring - , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph - , mtl, parsec, text, transformers, unordered-containers - }: - mkDerivation { - pname = "lucid"; - version = "2.9.7"; - sha256 = "a087af27ad196e3a41ccb6b954a12d384589a14b2ac55614e6a27817f65e0608"; - libraryHaskellDepends = [ - base blaze-builder bytestring containers hashable mmorph mtl text - transformers unordered-containers - ]; - testHaskellDepends = [ - base bifunctors hspec HUnit mtl parsec text - ]; - benchmarkHaskellDepends = [ - base blaze-builder bytestring criterion deepseq text - ]; - homepage = "https://github.com/chrisdone/lucid"; - description = "Clear to write, read and edit DSL for HTML"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lucid_2_9_8_1" = callPackage ({ mkDerivation, base, bifunctors, blaze-builder, bytestring , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph , mtl, parsec, text, transformers, unordered-containers @@ -117520,7 +119563,6 @@ self: { homepage = "https://github.com/chrisdone/lucid"; description = "Clear to write, read and edit DSL for HTML"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lucid-foundation" = callPackage @@ -118021,18 +120063,18 @@ self: { }) {}; "machinecell" = callPackage - ({ mkDerivation, arrows, base, free, hspec, mtl, profunctors - , QuickCheck, semigroups, transformers + ({ mkDerivation, base, free, hspec, mtl, profunctors, QuickCheck + , semigroups, transformers }: mkDerivation { pname = "machinecell"; - version = "3.3.1"; - sha256 = "5911832fa471797e5cbc5b4c98c1078f0bad799ba8cb33dbf0e19c6fae35619c"; + version = "3.3.2"; + sha256 = "6625464ab50569d1c8bf285f7ae360ff46bd9b282fa512e77d94f19822b15f3e"; libraryHaskellDepends = [ - arrows base free mtl profunctors semigroups transformers + base free mtl profunctors semigroups transformers ]; testHaskellDepends = [ - arrows base hspec mtl profunctors QuickCheck semigroups + base hspec mtl profunctors QuickCheck semigroups ]; homepage = "http://github.com/as-capabl/machinecell"; description = "Arrow based stream transducers"; @@ -118104,8 +120146,8 @@ self: { }: mkDerivation { pname = "machines-directory"; - version = "0.2.0.10"; - sha256 = "2ee750f86d1658635095c35e94799d06a921e641bf4daa55676fd06e8e9a98a4"; + version = "0.2.1.0"; + sha256 = "849c07db6ff6cfd88348d228a7a3f8ccb16e99568230ee0d20faa5670474deb4"; libraryHaskellDepends = [ base directory filepath machines machines-io transformers ]; @@ -118181,8 +120223,8 @@ self: { }: mkDerivation { pname = "mackerel-client"; - version = "0.0.3"; - sha256 = "aaa47cb30b2e727602de95d600446aba6094854bd772ac5be945b86cedbbc269"; + version = "0.0.4"; + sha256 = "2f63c376f93d771a8ac9fbd531cf4ad208459423bd3cc2a9cddb44ae0e9724d0"; libraryHaskellDepends = [ aeson base bytestring data-default directory filepath htoml http-client http-client-tls http-types parsec split text @@ -118243,24 +120285,25 @@ self: { }) {}; "madlang" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, gitrev, hspec - , hspec-megaparsec, lens, megaparsec, mtl, mwc-random - , optparse-generic, text + ({ mkDerivation, ansi-wl-pprint, base, composition, containers + , criterion, directory, hspec, hspec-megaparsec, lens, megaparsec + , mtl, mwc-random, optparse-applicative, text, tibetan-utils }: mkDerivation { pname = "madlang"; - version = "1.0.0.1"; - sha256 = "edeea8b9d3cabfaf5392fbe7ad307754e20fe8ef90294b5a846c9a7f8edb5af8"; + version = "2.1.0.1"; + sha256 = "5fe47345bdeb09d6c5947df21afb3c58cda051e136e0b30696a8c02da48b18a9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base gitrev lens megaparsec mtl mwc-random - optparse-generic text + ansi-wl-pprint base composition containers directory lens + megaparsec mtl mwc-random optparse-applicative text tibetan-utils ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec hspec-megaparsec megaparsec mtl text ]; + benchmarkHaskellDepends = [ base criterion megaparsec text ]; homepage = "https://github.com/vmchale/madlang#readme"; description = "Randomized templating language DSL"; license = stdenv.lib.licenses.bsd3; @@ -118295,6 +120338,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) file;}; + "magicbane" = callPackage + ({ mkDerivation, aeson, aeson-qq, attoparsec, base, classy-prelude + , conduit, conduit-combinators, data-default, data-has, either + , ekg-core, ekg-wai, envy, errors, fast-logger, http-api-data + , http-client, http-client-tls, http-conduit, http-date + , http-link-header, http-media, http-types, lifted-async + , mime-types, monad-control, monad-logger, monad-metrics, mtl + , network, network-uri, raw-strings-qq, refined, servant + , servant-server, split, string-conversions, text, transformers + , unordered-containers, wai, wai-cli, wai-middleware-metrics + }: + mkDerivation { + pname = "magicbane"; + version = "0.1.1"; + sha256 = "a4022e70c5d97717127fe947e1d03a8648616ed84cb99fd6ab4775d83a014dc6"; + revision = "3"; + editedCabalFile = "707d4c38ae27930b18c675893fef20afab379474dc22783bc4e70842cc7f4d62"; + libraryHaskellDepends = [ + aeson aeson-qq attoparsec base classy-prelude conduit + conduit-combinators data-default data-has either ekg-core ekg-wai + envy errors fast-logger http-api-data http-client http-client-tls + http-conduit http-date http-link-header http-media http-types + lifted-async mime-types monad-control monad-logger monad-metrics + mtl network network-uri raw-strings-qq refined servant + servant-server split string-conversions text transformers + unordered-containers wai wai-cli wai-middleware-metrics + ]; + homepage = "https://github.com/myfreeweb/magicbane"; + description = "A web framework that integrates Servant, ClassyPrelude, EKG, fast-logger, wai-cli…"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "magico" = callPackage ({ mkDerivation, base, hmatrix, transformers, utility-ht }: mkDerivation { @@ -118531,6 +120606,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "make-monofoldable-foldable" = callPackage + ({ mkDerivation, base, mono-traversable }: + mkDerivation { + pname = "make-monofoldable-foldable"; + version = "0.1.0.0"; + sha256 = "2a776a84e4bb9bee57194f844eef373767b136619436f140c26a73dadc4b9aae"; + libraryHaskellDepends = [ base mono-traversable ]; + description = "Make a MonoFoldable type into an ordinary Foldable type"; + license = stdenv.lib.licenses.mit; + }) {}; + "make-package" = callPackage ({ mkDerivation, async, base, bytestring, configurator, containers , directory, filepath, github, haskeline, lens, lens-datetime, mtl @@ -119117,6 +121203,8 @@ self: { pname = "map-syntax"; version = "0.2.0.2"; sha256 = "b18f95a6369a600fda189c6f475606cbf5f5f1827f96ca3384f33ae76bda4d8a"; + revision = "1"; + editedCabalFile = "f8205f1f917f16053960ba89576a8420d744f03bfbe8539d153153c257e2474c"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers deepseq hspec HUnit mtl QuickCheck transformers @@ -119722,20 +121810,25 @@ self: { }) {eng = null; mat = null; mx = null;}; "matplotlib" = callPackage - ({ mkDerivation, aeson, base, bytestring, process, tasty - , tasty-hunit, temporary + ({ mkDerivation, ad, aeson, base, bytestring, containers, process + , random, raw-strings-qq, split, tasty, tasty-expected-failure + , tasty-golden, tasty-hunit, temporary }: mkDerivation { pname = "matplotlib"; - version = "0.1.0.0"; - sha256 = "8001811170e201741eca52a0926c78810f451b104cc1ef055779b1b7351dee0d"; + version = "0.4.3"; + sha256 = "9491d76f4dc4237c6af73bb33c31cdc6608e1fcb8fe6fb00a94f3fceb3939873"; libraryHaskellDepends = [ - aeson base bytestring process temporary + aeson base bytestring containers process temporary + ]; + testHaskellDepends = [ + ad base bytestring process random raw-strings-qq split tasty + tasty-expected-failure tasty-golden tasty-hunit temporary ]; - testHaskellDepends = [ base tasty tasty-hunit temporary ]; homepage = "https://github.com/abarbu/matplotlib-haskell"; description = "Bindings to Matplotlib; a Python plotting library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "matrices" = callPackage @@ -119991,6 +122084,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mbox-utility" = callPackage + ({ mkDerivation, base, bytestring, hsemail, non-empty, old-time + , parsec, spreadsheet, utility-ht + }: + mkDerivation { + pname = "mbox-utility"; + version = "0.0"; + sha256 = "b17881a3674b55bf361c3ae7e6164a2106087900e665f44c8d55371078c2cb39"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring hsemail non-empty old-time parsec spreadsheet + utility-ht + ]; + description = "List contents of an mbox file containing e-mails"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mcm" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers , directory, filepath, hostname, MissingH, polyparse, process, text @@ -120248,20 +122359,21 @@ self: { ({ mkDerivation, array, async, base, binary, bytestring, cereal , conduit, conduit-combinators, conduit-extra, containers , data-default, deepseq, hspec, lens, lifted-async, monad-control - , mtl, network, parallel, primitive, process, QuickCheck, random - , resourcet, singletons, spool, stm, streaming-commons, tagged - , template-haskell, text, time, transformers, type-spec, vector + , monad-logger, mtl, network, parallel, primitive, process + , QuickCheck, random, resourcet, singletons, spool, stm + , streaming-commons, tagged, template-haskell, text, time + , transformers, type-spec, vector }: mkDerivation { pname = "mediabus"; - version = "0.2.0.2"; - sha256 = "3dd4d11c4253eebe2ff21368222661341b64e8176171fb4be77b9ee45402f7d1"; + version = "0.3.2.1"; + sha256 = "ac1fc31e78c001a3cf58b7acec59c08b83e063414650f5995e1a590cc728045d"; libraryHaskellDepends = [ array async base bytestring cereal conduit conduit-combinators conduit-extra containers data-default deepseq lens lifted-async - monad-control mtl network parallel primitive process QuickCheck - random resourcet spool stm streaming-commons tagged text time - transformers vector + monad-control monad-logger mtl network parallel primitive process + QuickCheck random resourcet spool stm streaming-commons tagged text + time transformers vector ]; testHaskellDepends = [ array async base binary bytestring conduit conduit-combinators @@ -120275,38 +122387,67 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; + "mediabus-fdk-aac" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-combinators + , containers, criterion, deepseq, fdk-aac, ghc-prim, inline-c, lens + , mediabus, monad-logger, random, resourcet, spool, tagged, text + , time, transformers, vector + }: + mkDerivation { + pname = "mediabus-fdk-aac"; + version = "0.3.2.1"; + sha256 = "197213a3645fda298d0a7ff9b123445df3464e70b9f2396f093b44119cfeba15"; + libraryHaskellDepends = [ + base bytestring conduit conduit-combinators containers deepseq + inline-c lens mediabus monad-logger random resourcet spool tagged + text time transformers vector + ]; + libraryPkgconfigDepends = [ fdk-aac ]; + testHaskellDepends = [ + base conduit deepseq ghc-prim lens mediabus monad-logger vector + ]; + benchmarkHaskellDepends = [ + base conduit criterion deepseq ghc-prim lens mediabus monad-logger + vector + ]; + homepage = "https://github.com/lindenbaum/mediabus-fdk-aac"; + description = "Mediabus plugin for the Frauenhofer ISO-14496-3 AAC FDK"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {fdk-aac = null;}; + "mediabus-rtp" = callPackage ({ mkDerivation, array, async, base, binary, bytestring, cereal , conduit, conduit-combinators, conduit-extra, containers , data-default, deepseq, hspec, lens, lifted-async, mediabus - , monad-control, mtl, network, parallel, primitive, process - , QuickCheck, random, resourcet, singletons, spool, stm + , monad-control, monad-logger, mtl, network, parallel, primitive + , process, QuickCheck, random, resourcet, singletons, spool, stm , streaming-commons, tagged, template-haskell, text, time , transformers, type-spec, vector }: mkDerivation { pname = "mediabus-rtp"; - version = "0.2.0.0"; - sha256 = "f802521f6f504e1ea56a2c694a216a8b92087f21aa4d493d3c6bf11d27063d27"; + version = "0.3.2.1"; + sha256 = "05752dd0721a4620ff5810c5dcbc420cc3b3a4a0a9d10402967d937e3823624d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array async base bytestring cereal conduit conduit-combinators conduit-extra containers data-default deepseq lens lifted-async - mediabus monad-control mtl network parallel primitive process - QuickCheck random resourcet spool stm streaming-commons tagged text - time transformers vector + mediabus monad-control monad-logger mtl network parallel primitive + process QuickCheck random resourcet spool stm streaming-commons + tagged text time transformers vector ]; executableHaskellDepends = [ async base conduit conduit-combinators conduit-extra data-default - lens lifted-async mediabus monad-control mtl parallel QuickCheck - random stm streaming-commons tagged time vector + lens lifted-async mediabus monad-control monad-logger mtl parallel + QuickCheck random stm streaming-commons tagged time vector ]; testHaskellDepends = [ array async base binary bytestring conduit conduit-combinators conduit-extra containers data-default deepseq hspec lens mediabus - monad-control mtl QuickCheck singletons spool stm tagged - template-haskell text time transformers type-spec vector + monad-control monad-logger mtl QuickCheck singletons spool stm + tagged template-haskell text time transformers type-spec vector ]; homepage = "https://github.com/lindenbaum/mediabus-rtp"; description = "Receive and Send RTP Packets"; @@ -120410,19 +122551,20 @@ self: { }) {}; "mega-sdist" = callPackage - ({ mkDerivation, base, classy-prelude-conduit, conduit-extra - , directory, filepath, http-conduit, tar-conduit, typed-process - , yaml + ({ mkDerivation, base, bytestring, classy-prelude-conduit + , conduit-extra, directory, filepath, http-conduit, optparse-simple + , tar-conduit, temporary, typed-process, yaml }: mkDerivation { pname = "mega-sdist"; - version = "0.3.0"; - sha256 = "afbfc37f2ebbf8bbe880297f784e81a63886dc14aacb2ed921d6c63c66abbf81"; + version = "0.3.0.2"; + sha256 = "f06c0decd916515b947062beb4a981fd867a15caeaa248637cdee0a83ea5b17f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base classy-prelude-conduit conduit-extra directory filepath - http-conduit tar-conduit typed-process yaml + base bytestring classy-prelude-conduit conduit-extra directory + filepath http-conduit optparse-simple tar-conduit temporary + typed-process yaml ]; homepage = "https://github.com/snoyberg/mega-sdist"; description = "Handles uploading to Hackage from mega repos"; @@ -120667,6 +122809,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "meminfo" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers }: + mkDerivation { + pname = "meminfo"; + version = "0.2.0.0"; + sha256 = "7da81f784616e45ea4a3b3b0f77a8425301b4c4ba0514cbe36333492f129b3d7"; + libraryHaskellDepends = [ attoparsec base bytestring containers ]; + description = "Library for reading `/proc/meminfo`"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "memis" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, directory, filemanip, filepath, http-types @@ -120749,14 +122902,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "memorable-bits" = callPackage + ({ mkDerivation, base, binary, bits, bytes, bytestring, criterion + , cryptonite, data-dword, doctest, hashable, HUnit, memory, mtl + , network-ip, optparse-applicative, random, split, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "memorable-bits"; + version = "0.1.0.0"; + sha256 = "7ac3591f17c1a32c9d74f10cb610979729a1201e6f617604300152d2410cbd4b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bits bytes bytestring cryptonite data-dword hashable + memory mtl network-ip random split + ]; + executableHaskellDepends = [ + base bytestring cryptonite optparse-applicative + ]; + testHaskellDepends = [ + base doctest HUnit tasty tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + benchmarkHaskellDepends = [ base bytestring criterion random ]; + description = "Generate human memorable strings from binary data"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "memory" = callPackage ({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty , tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "memory"; - version = "0.14.1"; - sha256 = "1cd87a34ca28ab5fbb9fbeb82f66cdbabf4e276e10caf7a64b798bf42edc0825"; + version = "0.14.2"; + sha256 = "e4428c76a6da8f232d96fe12a15c130fcc808d7542c2ce21744266f3cb905012"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; homepage = "https://github.com/vincenthz/hs-memory"; @@ -120764,6 +122945,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "memory_0_14_3" = callPackage + ({ mkDerivation, base, bytestring, deepseq, foundation, ghc-prim + , tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "memory"; + version = "0.14.3"; + sha256 = "e729f2693c100e92000dece9643ab8daf28648e7bb587b3120ba3ef0df4eb879"; + libraryHaskellDepends = [ + base bytestring deepseq foundation ghc-prim + ]; + testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; + homepage = "https://github.com/vincenthz/hs-memory"; + description = "memory and related abstraction stuff"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "memorypool" = callPackage ({ mkDerivation, base, containers, transformers, unsafe, vector }: mkDerivation { @@ -121046,6 +123245,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mezzo" = callPackage + ({ mkDerivation, base, boxes, ghc-typelits-natnormalise, HCodecs + , hspec, QuickCheck, should-not-typecheck, template-haskell + }: + mkDerivation { + pname = "mezzo"; + version = "0.2.0.2"; + sha256 = "9c0c9c1933d3f8875bcf6f85fbce269c8a224947fa9e775929b298b71763a0ac"; + libraryHaskellDepends = [ + base boxes ghc-typelits-natnormalise HCodecs template-haskell + ]; + testHaskellDepends = [ + base hspec QuickCheck should-not-typecheck + ]; + homepage = "https://github.com/DimaSamoz/mezzo"; + description = "Typesafe music composition"; + license = stdenv.lib.licenses.mit; + }) {}; + "mezzolens" = callPackage ({ mkDerivation, base, containers, mtl, transformers }: mkDerivation { @@ -121177,8 +123395,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "microlens"; - version = "0.4.7.0"; - sha256 = "c149874a5cf038c1dde51b79b22733116817619e5ed11c7787aadb9d8ea31e26"; + version = "0.4.8.0"; + sha256 = "aa0b12717671593f7e2cd686762fb842b22bf3e5b4559e4db8863f1d30be7af5"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/aelve/microlens"; description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this."; @@ -121239,8 +123457,8 @@ self: { }: mkDerivation { pname = "microlens-ghc"; - version = "0.4.7.0"; - sha256 = "ef1f68645d0f62e9f108852dd0637109625703175eb571c7f183aa3244bf0cdf"; + version = "0.4.8.0"; + sha256 = "dea1ea2fa61dea6ebb431e95b36ae4e2011ddb94ad3e0693173fd41f1858697a"; libraryHaskellDepends = [ array base bytestring containers microlens transformers ]; @@ -121271,8 +123489,8 @@ self: { }: mkDerivation { pname = "microlens-platform"; - version = "0.3.7.1"; - sha256 = "e242c6f454305e5a310f7f3b4e8b3ee00158fe7160321e27a56b47ffaa2c4493"; + version = "0.3.8.0"; + sha256 = "e31b5a10962dde72e4e7c5d6136028973116abee8d0901aa934e19193f086f84"; libraryHaskellDepends = [ base hashable microlens microlens-ghc microlens-mtl microlens-th text unordered-containers vector @@ -121425,8 +123643,8 @@ self: { }: mkDerivation { pname = "midi-music-box"; - version = "0.0.0.1"; - sha256 = "1e830c1f871cbf8f5b478c5923d52f76457b15eda2d64a4bf9e6c2016ed47de9"; + version = "0.0.0.3"; + sha256 = "e698cefeee56bc3561376a6dfab990e0a48388938d80fb3410ed017f6b4ae141"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -121712,8 +123930,8 @@ self: { }: mkDerivation { pname = "mime-mail"; - version = "0.4.13"; - sha256 = "a089fd837b77b75eb36dc1749da422820d2658d0145a378e6de32f3b30b7a440"; + version = "0.4.13.1"; + sha256 = "9481671092739dab1d963c9db0dce56a0187390fb24c9badeeded6afb5895917"; libraryHaskellDepends = [ base base64-bytestring blaze-builder bytestring filepath process random text @@ -121927,18 +124145,18 @@ self: { , http-client, http-conduit, http-types, lifted-async, lifted-base , memory, monad-control, protolude, QuickCheck, resourcet, tasty , tasty-hunit, tasty-quickcheck, tasty-smallcheck, temporary, text - , time, transformers, transformers-base, xml-conduit + , text-format, time, transformers, transformers-base, xml-conduit }: mkDerivation { pname = "minio-hs"; - version = "0.1.0"; - sha256 = "7138f31251268521dd35b143dd943f87f32c3f3b7606487b8f176e4561ddf908"; + version = "0.2.1"; + sha256 = "484b7b61d479b5377ad0894c3c45f71f8d69eaa0a11664d0ae3ac7f9685035c1"; libraryHaskellDepends = [ async base bytestring case-insensitive conduit conduit-combinators conduit-extra containers cryptonite cryptonite-conduit data-default exceptions filepath http-client http-conduit http-types lifted-async lifted-base memory monad-control protolude resourcet - text time transformers transformers-base xml-conduit + text text-format time transformers transformers-base xml-conduit ]; testHaskellDepends = [ async base bytestring case-insensitive conduit conduit-combinators @@ -121946,9 +124164,10 @@ self: { directory exceptions filepath http-client http-conduit http-types lifted-async lifted-base memory monad-control protolude QuickCheck resourcet tasty tasty-hunit tasty-quickcheck tasty-smallcheck - temporary text time transformers transformers-base xml-conduit + temporary text text-format time transformers transformers-base + xml-conduit ]; - homepage = "https://github.com/donatello/minio-hs#readme"; + homepage = "https://github.com/minio/minio-hs#readme"; description = "A Minio client library, compatible with S3 like services"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -122124,8 +124343,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "mintty"; - version = "0.1"; - sha256 = "956b346c89b12e683b957bf45eb0d09cae121fd247916de0386687f713ca0865"; + version = "0.1.1"; + sha256 = "c87f349f1999e8dee25f636428fc1742f50bcd2b51c9288578c60c58102e9f83"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/RyanGlScott/mintty"; description = "A reliable way to detect the presence of a MinTTY console on Windows"; @@ -122245,6 +124464,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mixed-types-num" = callPackage + ({ mkDerivation, base, convertible, hspec, hspec-smallcheck + , QuickCheck, smallcheck + }: + mkDerivation { + pname = "mixed-types-num"; + version = "0.1.0.1"; + sha256 = "9c42ecb9382ab2848eb9b9d889ed4bee1c3b25fbfba7848b639ab146112bf78e"; + libraryHaskellDepends = [ + base convertible hspec hspec-smallcheck QuickCheck smallcheck + ]; + testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ]; + homepage = "https://github.com/michalkonecny/mixed-types-num"; + description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mkbndl" = callPackage ({ mkDerivation, base, directory, filepath, haskell98 }: mkDerivation { @@ -122325,6 +124561,8 @@ self: { pname = "mmorph"; version = "1.0.9"; sha256 = "e1f27d3881b254e2a87ffb21f33e332404abb180361f9d29092a85e321554563"; + revision = "1"; + editedCabalFile = "4dd6d1966746918b7503dafa8b78b75df2245406baa083858e1a2310313aaef7"; libraryHaskellDepends = [ base mtl transformers transformers-compat ]; @@ -122332,6 +124570,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mmtf" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, data-msgpack + , hspec, QuickCheck, text + }: + mkDerivation { + pname = "mmtf"; + version = "0.1.0.1"; + sha256 = "29404fe3eff386a044f1c750eadc80b98b51d377020a27b8c253a285cdf61080"; + libraryHaskellDepends = [ + base binary bytestring containers data-msgpack text + ]; + testHaskellDepends = [ base bytestring hspec QuickCheck ]; + homepage = "https://github.com/zmactep/mmtf#readme"; + description = "Macromolecular Transmission Format implementation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mmtl" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -122361,10 +124617,8 @@ self: { }: mkDerivation { pname = "mnist-idx"; - version = "0.1.2.6"; - sha256 = "0ea524a09dbf48c372859b491439b8131f4f0875e8a6d980342d0d438d61a9ae"; - revision = "1"; - editedCabalFile = "4e91ab8e67b03b8d567f0b2d900b1364840d2a83c3bd5a8f312e4b0467a9bac6"; + version = "0.1.2.8"; + sha256 = "42ff167e84414821ed47d783042cad20a0bd198f935648aa6cdf97bdc291b2fe"; libraryHaskellDepends = [ base binary bytestring vector ]; testHaskellDepends = [ base binary directory hspec vector ]; homepage = "https://github.com/kryoxide/mnist-idx/"; @@ -122432,8 +124686,10 @@ self: { }: mkDerivation { pname = "model"; - version = "0.2.1"; - sha256 = "0da6c98beffd1767fa5bbee92de5ff444402899a4855b193f83511309afeb96d"; + version = "0.2.4"; + sha256 = "9ff1ea0de33416c070d47cc3aaf565818f01006cc61e5b822a966862b7a12d0b"; + revision = "1"; + editedCabalFile = "ab32dfd91043557c42073acf6e9687c849fab77564358e09cf2e5bf654f5d3d4"; libraryHaskellDepends = [ base containers deepseq ListLike pretty transformers ]; @@ -122812,6 +125068,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "monad-classes-logging" = callPackage + ({ mkDerivation, base, ghc-prim, logging-effect, monad-classes + , tasty, tasty-hunit, transformers + }: + mkDerivation { + pname = "monad-classes-logging"; + version = "0.1.0.0"; + sha256 = "beabe968a16ccc3c0d2477b2cbe8ba9e2c23b5d7ecc99f25229958580b9fe3b1"; + libraryHaskellDepends = [ + base ghc-prim logging-effect monad-classes transformers + ]; + testHaskellDepends = [ + base logging-effect monad-classes tasty tasty-hunit transformers + ]; + homepage = "https://github.com/edwardgeorge/monad-classes-logging#readme"; + description = "monad-classes based typeclass for Ollie's logging-effect LoggingT"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-codec" = callPackage ({ mkDerivation, base, binary, containers, data-lens, mtl }: mkDerivation { @@ -123075,8 +125351,8 @@ self: { }: mkDerivation { pname = "monad-logger"; - version = "0.3.20.2"; - sha256 = "1f004999b282b3895cc0904053befb48b863efc2899a89e93195b4544cc9c737"; + version = "0.3.21"; + sha256 = "878d41b5a15e08817e0ad8675ea2f1e012747027f773df7a319e05f47828e53c"; libraryHaskellDepends = [ base blaze-builder bytestring conduit conduit-extra exceptions fast-logger lifted-base monad-control monad-loops mtl resourcet stm @@ -123088,6 +125364,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-logger_0_3_22" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, conduit + , conduit-extra, exceptions, fast-logger, lifted-base + , monad-control, monad-loops, mtl, resourcet, stm, stm-chans + , template-haskell, text, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "monad-logger"; + version = "0.3.22"; + sha256 = "997152368c9200cff7547cc2037ed4f2b34e6e56de97d1aaac6b5a888a9b01e6"; + libraryHaskellDepends = [ + base blaze-builder bytestring conduit conduit-extra exceptions + fast-logger lifted-base monad-control monad-loops mtl resourcet stm + stm-chans template-haskell text transformers transformers-base + transformers-compat + ]; + homepage = "https://github.com/kazu-yamamoto/logger"; + description = "A class of monads which can log messages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-logger-json" = callPackage ({ mkDerivation, aeson, base, monad-logger, template-haskell, text }: @@ -123350,26 +125649,6 @@ self: { }) {}; "monad-peel" = callPackage - ({ mkDerivation, base, extensible-exceptions, HUnit, test-framework - , test-framework-hunit, transformers - }: - mkDerivation { - pname = "monad-peel"; - version = "0.2.1.1"; - sha256 = "f591f54910a117bba2fc963d5502de668ece69181b605cf9db353fbcfa9fe394"; - libraryHaskellDepends = [ - base extensible-exceptions transformers - ]; - testHaskellDepends = [ - base extensible-exceptions HUnit test-framework - test-framework-hunit transformers - ]; - homepage = "http://andersk.mit.edu/haskell/monad-peel/"; - description = "Lift control operations like exception catching through monad transformers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "monad-peel_0_2_1_2" = callPackage ({ mkDerivation, base, extensible-exceptions, HUnit, test-framework , test-framework-hunit, transformers }: @@ -123387,7 +125666,6 @@ self: { homepage = "http://andersk.mit.edu/haskell/monad-peel/"; description = "Lift control operations like exception catching through monad transformers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-primitive" = callPackage @@ -123440,28 +125718,15 @@ self: { }) {}; "monad-skeleton" = callPackage - ({ mkDerivation, base, containers, ghc-prim }: - mkDerivation { - pname = "monad-skeleton"; - version = "0.1.2.2"; - sha256 = "b1cc4f0b9e308374c76902942b8381e0af869b0915735d380f792bb11e362de3"; - libraryHaskellDepends = [ base containers ghc-prim ]; - homepage = "https://github.com/fumieval/monad-skeleton"; - description = "An undead monad"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "monad-skeleton_0_1_3" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "monad-skeleton"; - version = "0.1.3"; - sha256 = "4de3aee29408f98fe0f3dc6161d98e13a5292a67b23cb80e7f1875eead7d8a40"; + version = "0.1.3.2"; + sha256 = "2564f0a1124f0def0684cf25ad0e29de0e6b485b544590817374967045cb81b1"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/fumieval/monad-skeleton"; description = "Monads of program skeleta"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-st" = callPackage @@ -124134,30 +126399,6 @@ self: { }) {}; "mono-traversable" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion, foldl - , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split - , text, transformers, unordered-containers, vector - , vector-algorithms - }: - mkDerivation { - pname = "mono-traversable"; - version = "1.0.1.3"; - sha256 = "2861eca0d69c759b02cb7e9669b7a3f8a6b0ede2d96984cba295b69bc9c70a72"; - libraryHaskellDepends = [ - base bytestring containers hashable split text transformers - unordered-containers vector vector-algorithms - ]; - testHaskellDepends = [ - base bytestring containers foldl hspec HUnit QuickCheck semigroups - text transformers unordered-containers vector - ]; - benchmarkHaskellDepends = [ base criterion mwc-random vector ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "Type classes for mapping, folding, and traversing monomorphic containers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mono-traversable_1_0_2" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, foldl , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split , text, transformers, unordered-containers, vector @@ -124179,7 +126420,6 @@ self: { homepage = "https://github.com/snoyberg/mono-traversable"; description = "Type classes for mapping, folding, and traversing monomorphic containers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mono-traversable-instances" = callPackage @@ -124812,6 +127052,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mqtt" = callPackage + ({ mkDerivation, async, attoparsec, base, binary, bytestring + , case-insensitive, clock, containers, criterion, deepseq + , exceptions, hslogger, network-uri, random, socket, tasty + , tasty-hunit, tasty-quickcheck, text, tls, uuid, websockets, x509 + , x509-validation + }: + mkDerivation { + pname = "mqtt"; + version = "0.1.1.0"; + sha256 = "7b6dbb9ebd768f208c78b270086abbbfb9543a3735e8c2e9671900ff6ba8e432"; + libraryHaskellDepends = [ + async attoparsec base binary bytestring case-insensitive clock + containers hslogger socket text tls uuid websockets x509 + x509-validation + ]; + testHaskellDepends = [ + async attoparsec base binary bytestring containers deepseq + exceptions network-uri random tasty tasty-hunit tasty-quickcheck + text tls uuid + ]; + benchmarkHaskellDepends = [ + base binary bytestring criterion text + ]; + homepage = "https://github.com/lpeterse/haskell-mqtt"; + description = "An MQTT protocol implementation"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mqtt-hs" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, monad-loops , mtl, network, singletons, stm, text, transformers @@ -125864,6 +128134,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mushu" = callPackage + ({ mkDerivation, base, brick, bytestring, classy-prelude + , connection, containers, data-default, directory, filepath, fuzzy + , hscurses, htoml, libmpd, list-t, microlens, microlens-platform + , microlens-th, mtl, network, pretty, process, safe-exceptions + , template-haskell, text, text-zipper, time, transformers + , unordered-containers, vector, vty + }: + mkDerivation { + pname = "mushu"; + version = "0.1.1"; + sha256 = "9b0a749a3f81d3101df1295ff0a2509604f5142d51e1daa97fab692c4b8b35f2"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base brick bytestring classy-prelude connection containers + data-default directory filepath fuzzy hscurses htoml libmpd list-t + microlens microlens-platform microlens-th mtl network pretty + process safe-exceptions template-haskell text text-zipper time + transformers unordered-containers vector vty + ]; + testHaskellDepends = [ base classy-prelude ]; + homepage = "https://github.com/elaye/mushu#README.md"; + description = "Minimalist MPD client"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "music-articulation" = callPackage ({ mkDerivation, average, base, semigroups }: mkDerivation { @@ -126185,6 +128482,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mustache_2_1_3" = callPackage + ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring + , cmdargs, containers, directory, either, filepath, hspec, lens + , mtl, parsec, process, scientific, tar, template-haskell + , temporary, text, th-lift, unordered-containers, vector, wreq + , yaml, zlib + }: + mkDerivation { + pname = "mustache"; + version = "2.1.3"; + sha256 = "6bf426f9633aeff26bc78a5219b4ff93a785614adfc35f59933368ece71781b4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory either filepath mtl + parsec scientific template-haskell text th-lift + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring cmdargs filepath text yaml + ]; + testHaskellDepends = [ + aeson base base-unicode-symbols bytestring directory filepath hspec + lens process tar temporary text unordered-containers wreq yaml zlib + ]; + homepage = "https://github.com/JustusAdam/mustache"; + description = "A mustache template parser library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mustache-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, directory , optparse-applicative, parsec, pretty-show, scientific, text @@ -126361,6 +128689,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mwc-random-accelerate" = callPackage + ({ mkDerivation, accelerate, base, mwc-random }: + mkDerivation { + pname = "mwc-random-accelerate"; + version = "0.1.0.0"; + sha256 = "30fad33d12b130457a6dcb8bedc885700e6ac0eea9b0f25fe6e5fe34968932e3"; + libraryHaskellDepends = [ accelerate base mwc-random ]; + description = "Generate Accelerate arrays filled with high quality pseudorandom numbers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mwc-random-monad" = callPackage ({ mkDerivation, base, monad-primitive, mwc-random, primitive , transformers, vector @@ -127113,8 +129452,8 @@ self: { ({ mkDerivation, base, doctest, QuickCheck, smallcheck }: mkDerivation { pname = "nat-sized-numbers"; - version = "0.1.0.0"; - sha256 = "64b862c8e64ccd3d71dc62723dc84817f9b1aeea45818d535cca60575de34144"; + version = "0.2.0.0"; + sha256 = "b3c907665ff1107da9c0acb9404766f6ded98e3cfd51c2348ff7434eaa32e23c"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck smallcheck ]; homepage = "https://github.com/oisdk/nat-sized-numbers#readme"; @@ -127591,22 +129930,23 @@ self: { }) {}; "nested-routes" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, composition-extra - , errors, exceptions, hashable, hashtables, HSet, hspec, hspec-wai - , http-types, mtl, poly-arity, pred-set, pred-trie, regex-compat - , semigroups, tasty, tasty-hspec, text, transformers, tries - , unordered-containers, wai-middleware-content-type - , wai-middleware-verbs, wai-transformers + ({ mkDerivation, attoparsec, base, bifunctors, bytestring + , composition-extra, errors, exceptions, hashable, hashtables, HSet + , hspec, hspec-wai, http-types, mtl, poly-arity, pred-set + , pred-trie, regex-compat, semigroups, tasty, tasty-hspec, text + , transformers, tries, unordered-containers + , wai-middleware-content-type, wai-middleware-verbs + , wai-transformers }: mkDerivation { pname = "nested-routes"; - version = "7.2.2"; - sha256 = "f93d56283b2855aee02daac7ecd693a2b9f7e99a5da33211694a5a5746c35cd9"; + version = "8.0.0"; + sha256 = "ad7c65559f6324f533f9c58607b46651253759f390815802c1cff2e02c01805f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base bytestring composition-extra errors exceptions - hashable hashtables mtl poly-arity pred-set pred-trie regex-compat + attoparsec base bifunctors bytestring errors exceptions hashable + hashtables mtl poly-arity pred-set pred-trie regex-compat semigroups text transformers tries unordered-containers wai-middleware-content-type wai-middleware-verbs wai-transformers ]; @@ -129544,6 +131884,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "nlopt-haskell" = callPackage + ({ mkDerivation, base, nlopt, vector }: + mkDerivation { + pname = "nlopt-haskell"; + version = "0.1.0.0"; + sha256 = "d23e9c4e6faffb613dcc1695a03c6277ad748a962b92c8dbe0da0a5df502706a"; + libraryHaskellDepends = [ base vector ]; + librarySystemDepends = [ nlopt ]; + testHaskellDepends = [ base vector ]; + homepage = "https://github.com/peddie/nlopt-haskell"; + description = "Low-level bindings to the NLOPT optimization library"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) nlopt;}; + "nlp-scores" = callPackage ({ mkDerivation, base, containers, strict }: mkDerivation { @@ -129700,6 +132054,144 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "nomyx-api" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, either + , hslogger, lens, mtl, network-uri, nomyx-core, nomyx-language + , QuickCheck, resourcet, safe, servant, servant-client + , servant-server, servant-swagger, split, stm, swagger2, text + , transformers, wai, wai-cors, wai-extra, warp, yaml + }: + mkDerivation { + pname = "nomyx-api"; + version = "0.1.0"; + sha256 = "2ed761b1bf0ecc4b9892e98d41aa458a88102217a6fcaea3b217a6bc0462a3b8"; + libraryHaskellDepends = [ + aeson base bytestring containers either hslogger lens mtl + network-uri nomyx-core nomyx-language QuickCheck resourcet safe + servant servant-client servant-server servant-swagger split stm + swagger2 text transformers wai wai-cors wai-extra warp yaml + ]; + homepage = "http://www.nomyx.net"; + description = "REST API for Nomyx"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "nomyx-core" = callPackage + ({ mkDerivation, acid-state, aeson, base, blaze-html, blaze-markup + , bytestring, Cabal, DebugTraceHelpers, deepseq, directory + , either-unwrap, exceptions, filepath, HaskellNet, HaskellNet-SSL + , hint, hint-server, hscolour, hslogger, imprevu, ixset, lens + , mime-mail, MissingH, mtl, network, nomyx-language, nomyx-library + , NoTrace, old-locale, random, safe, safecopy, shortcut, stm, tar + , template-haskell, temporary, text, time, unix, yaml + }: + mkDerivation { + pname = "nomyx-core"; + version = "1.0.0"; + sha256 = "a28504ddf5858cb710c54828cf1b9531ca7471bc4f918aab5c48a590c424b931"; + libraryHaskellDepends = [ + acid-state aeson base blaze-html blaze-markup bytestring + DebugTraceHelpers deepseq directory either-unwrap exceptions + filepath HaskellNet HaskellNet-SSL hint hint-server hscolour + hslogger imprevu ixset lens mime-mail MissingH mtl network + nomyx-language nomyx-library NoTrace old-locale random safe + safecopy shortcut stm tar template-haskell temporary text time unix + yaml + ]; + testHaskellDepends = [ base Cabal ]; + homepage = "http://www.nomyx.net"; + description = "A Nomic game in haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "nomyx-language" = callPackage + ({ mkDerivation, base, Boolean, containers, DebugTraceHelpers, ghc + , imprevu, lens, monad-loops, mtl, old-locale, random, safe + , shortcut, text, time, time-recurrence + }: + mkDerivation { + pname = "nomyx-language"; + version = "1.0.0"; + sha256 = "131200f5c2b0b1893d29a697ae2e80108e0f99b3b5d20d4324cc3b2b207839bd"; + libraryHaskellDepends = [ + base Boolean containers DebugTraceHelpers ghc imprevu lens + monad-loops mtl old-locale random safe shortcut text time + time-recurrence + ]; + homepage = "http://www.nomyx.net"; + description = "Language to express rules for Nomic"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "nomyx-library" = callPackage + ({ mkDerivation, base, containers, ghc, lens, mtl, nomyx-language + , old-locale, safe, shortcut, time, time-recurrence + }: + mkDerivation { + pname = "nomyx-library"; + version = "1.0.0"; + sha256 = "14d7ce8365492bb5aa3d7581d4fe629f7f56d9bcbd26f82608e5e1dcb53a64e9"; + libraryHaskellDepends = [ + base containers ghc lens mtl nomyx-language old-locale safe + shortcut time time-recurrence + ]; + homepage = "http://www.nomyx.net"; + description = "Library of rules for Nomyx"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "nomyx-server" = callPackage + ({ mkDerivation, base, Cabal, directory, exceptions, filepath + , hslogger, imprevu, lens, mtl, network, nomyx-api, nomyx-core + , nomyx-language, nomyx-library, nomyx-web, safe, stm, time + }: + mkDerivation { + pname = "nomyx-server"; + version = "1.0.0"; + sha256 = "601a55a28842a8e4fdad53e7cdf20fd79a817a4c27978db802098b7256a95218"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory exceptions filepath hslogger imprevu lens mtl + network nomyx-api nomyx-core nomyx-language nomyx-library nomyx-web + safe stm time + ]; + testHaskellDepends = [ base Cabal ]; + homepage = "http://www.nomyx.net"; + description = "A Nomic game in haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "nomyx-web" = callPackage + ({ mkDerivation, acid-state, base, blaze-html, blaze-markup + , bytestring, filepath, happstack-authenticate, happstack-server + , hscolour, HTTP, http-types, imprevu, imprevu-happstack, jmacro + , lens, mtl, nomyx-auth, nomyx-core, nomyx-language, old-locale + , reform, reform-blaze, reform-happstack, safe, split, stm, text + , time, web-routes, web-routes-happstack, web-routes-th + }: + mkDerivation { + pname = "nomyx-web"; + version = "1.0.0"; + sha256 = "387d235cd62d3ff11a2576a2ad2f20aff0853a2d880c7a2809f28f5dc79eacda"; + libraryHaskellDepends = [ + acid-state base blaze-html blaze-markup bytestring filepath + happstack-authenticate happstack-server hscolour HTTP http-types + imprevu imprevu-happstack jmacro lens mtl nomyx-auth nomyx-core + nomyx-language old-locale reform reform-blaze reform-happstack safe + split stm text time web-routes web-routes-happstack web-routes-th + ]; + homepage = "http://www.nomyx.net"; + description = "Web gui for Nomyx"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {nomyx-auth = null;}; + "non-empty" = callPackage ({ mkDerivation, base, containers, deepseq, QuickCheck, utility-ht }: @@ -129731,8 +132223,8 @@ self: { ({ mkDerivation, base, checkers, QuickCheck }: mkDerivation { pname = "non-empty-zipper"; - version = "0.1.0.5"; - sha256 = "196e30fd12ce74458a62b8b61ea7c1f6cec4d5999f465d2ccb11b394c3ed77b4"; + version = "0.1.0.7"; + sha256 = "6b840c98fbe045bf3a2d4b5606ef8deb6668f6dbdaf872473273f129fda081fe"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base checkers QuickCheck ]; description = "The Zipper for NonEmpty"; @@ -129887,6 +132379,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "normalize-imports" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "normalize-imports"; + version = "0.1.0"; + sha256 = "34cdd6f575cbc98419a1c31e7d8390494ea9708915811aa9d0d1d556f9945264"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/qoelet/normalize-imports#readme"; + description = "Sort and align Haskell import statements"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "not-gloss" = callPackage ({ mkDerivation, base, binary, bmp, bytestring, GLUT, OpenGL , OpenGLRaw, spatial-math, time, vector, vector-binary-instances @@ -130459,6 +132966,49 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "numhask" = callPackage + ({ mkDerivation, adjunctions, base, distributive, doctest, HUnit + , protolude, QuickCheck, singletons, tasty, tasty-hunit + , tasty-quickcheck, vector + }: + mkDerivation { + pname = "numhask"; + version = "0.0.2"; + sha256 = "567762fe357d2114176425b115fa89b304ab9a41ca564b4b599bbc00384246b2"; + libraryHaskellDepends = [ + adjunctions base distributive protolude QuickCheck singletons + vector + ]; + testHaskellDepends = [ + base doctest HUnit QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + homepage = "https://github.com/tonyday567/numhask"; + description = "A numeric prelude"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "numhask-range" = callPackage + ({ mkDerivation, base, containers, foldl, formatting, HUnit, lens + , linear, numhask, protolude, QuickCheck, smallcheck, tasty + , tasty-hspec, tasty-hunit, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "numhask-range"; + version = "0.0.1"; + sha256 = "52a73be1f8d653bb4ef0e54da3ec6a923494944e88ccbd86f2f9b7ea39c44f05"; + libraryHaskellDepends = [ + base containers foldl formatting lens linear numhask protolude + QuickCheck + ]; + testHaskellDepends = [ + base HUnit numhask protolude QuickCheck smallcheck tasty + tasty-hspec tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + homepage = "https://github.com/tonyday567/numhask-range"; + description = "see readme.md"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "nums" = callPackage ({ mkDerivation }: mkDerivation { @@ -131004,8 +133554,10 @@ self: { }: mkDerivation { pname = "oeis"; - version = "0.3.8"; - sha256 = "4be72f80596045a51e56f8d810b5a044689f117b38a614bd9645e97dd3e39c93"; + version = "0.3.9"; + sha256 = "8a692c0b898f5d89e607f9593697a24827981a1cfee53045c192084015061b8e"; + revision = "1"; + editedCabalFile = "524984744830f3a5d6709b9fe20faab0f27de42be3daaf7854c82bbaf0a06665"; libraryHaskellDepends = [ base HTTP network network-uri ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit @@ -131222,15 +133774,16 @@ self: { }) {}; "ombra" = callPackage - ({ mkDerivation, base, gl, hashable, hashtables, transformers - , unordered-containers, vect + ({ mkDerivation, base, Boolean, gl, hashable, hashtables + , transformers, unordered-containers, vector-space }: mkDerivation { pname = "ombra"; - version = "0.2.2.0"; - sha256 = "006dde6ad3c4273078f7129a67380b1002b2fb6f2f92f253695e846a23181d60"; + version = "0.3.0.0"; + sha256 = "99516f07fdc85967a562668f136a2899fda28ea6fe3be27e09bc06a2aca654ad"; libraryHaskellDepends = [ - base gl hashable hashtables transformers unordered-containers vect + base Boolean gl hashable hashtables transformers + unordered-containers vector-space ]; homepage = "https://github.com/ziocroc/Ombra"; description = "Render engine"; @@ -131378,8 +133931,8 @@ self: { }: mkDerivation { pname = "one-liner"; - version = "0.8"; - sha256 = "83831911ce829082bff57e5596bbb23947a153cd5ad6dd90f02b3152faf22ea6"; + version = "0.8.1"; + sha256 = "b9136bd0502b2fb1ec171b1cc2b8b2dff4fe3f42e8ae9e7e49306e2bb4624455"; libraryHaskellDepends = [ base bifunctors contravariant ghc-prim profunctors tagged transformers @@ -131700,8 +134253,8 @@ self: { ({ mkDerivation, atomspace-cwrapper, base, transformers }: mkDerivation { pname = "opencog-atomspace"; - version = "0.1.0.7"; - sha256 = "24bcde8b587dc6864b0eb450aea3a246a51d3e540bc186e3ba6ac83158a37a1b"; + version = "0.1.0.8"; + sha256 = "0ba5d6d681d4dc2960a596b13d2027dc9b48ac087ebd02bce58403ee1241b3c0"; libraryHaskellDepends = [ base transformers ]; librarySystemDepends = [ atomspace-cwrapper ]; homepage = "github.com/opencog/atomspace/tree/master/opencog/haskell"; @@ -132558,7 +135111,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "optparse-applicative" = callPackage + "optparse-applicative_0_13_1_0" = callPackage ({ mkDerivation, ansi-wl-pprint, base, process, QuickCheck , transformers, transformers-compat }: @@ -132573,6 +135126,42 @@ self: { homepage = "https://github.com/pcapriotti/optparse-applicative"; description = "Utilities and combinators for parsing command line options"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "optparse-applicative" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, process, QuickCheck + , transformers, transformers-compat + }: + mkDerivation { + pname = "optparse-applicative"; + version = "0.13.2.0"; + sha256 = "5c83cfce7e53f4d3b1f5d53f082e7e61959bf14e6be704c698c3ab7f1b956ca2"; + libraryHaskellDepends = [ + ansi-wl-pprint base process transformers transformers-compat + ]; + testHaskellDepends = [ base QuickCheck ]; + homepage = "https://github.com/pcapriotti/optparse-applicative"; + description = "Utilities and combinators for parsing command line options"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "optparse-applicative-simple" = callPackage + ({ mkDerivation, attoparsec, attoparsec-data, base-prelude + , optparse-applicative, rerebase, text + }: + mkDerivation { + pname = "optparse-applicative-simple"; + version = "1"; + sha256 = "8708357dbaef4aff4024342011bfc36219ad325148d707c2dad51f88aefc8f65"; + libraryHaskellDepends = [ + attoparsec base-prelude optparse-applicative text + ]; + testHaskellDepends = [ attoparsec-data rerebase ]; + homepage = "https://github.com/nikita-volkov/optparse-applicative-simple"; + description = "Simple command line interface arguments parser"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optparse-declarative" = callPackage @@ -132918,8 +135507,8 @@ self: { }: mkDerivation { pname = "orgstat"; - version = "0.0.2"; - sha256 = "7187c2118b82f48f25306315160b3483e05a7638df53e5167fc519b8f8e4ff8d"; + version = "0.0.3"; + sha256 = "28f2e870e547e0e2a452cadbd509aef6e054dee9e57f96c859383b7776b3b8b3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133591,8 +136180,8 @@ self: { pname = "pandoc"; version = "1.19.2.1"; sha256 = "08692f3d77bf95bb9ba3407f7af26de7c23134e7efcdafad0bdaf9050e2c7801"; - revision = "1"; - editedCabalFile = "0ba3a65619868f044f48fcad137a2d3564ef1f07daf022f3e147248c1eed3bfa"; + revision = "2"; + editedCabalFile = "5dc6d0e5637a60e185b91d0540ba0c729ff9413bb852abd94fe9ac19fa3f1227"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -133861,8 +136450,8 @@ self: { pname = "pandoc-types"; version = "1.17.0.5"; sha256 = "c8825588b587ff5ed0c105156a11a43f3b752279997231cfc13102809bbc51b3"; - revision = "1"; - editedCabalFile = "f6238d666c941d4eb5c80c195a9df9cb4d6579281b648dbecd2aad84aaf0e949"; + revision = "2"; + editedCabalFile = "7a12dacfadc507c1e7992acdceeba8a1a12ca682724dd1cc4faefaf985b8c2ea"; libraryHaskellDepends = [ aeson base bytestring containers deepseq ghc-prim QuickCheck syb ]; @@ -135323,19 +137912,21 @@ self: { "patch-image" = callPackage ({ mkDerivation, accelerate, accelerate-arithmetic, accelerate-cuda , accelerate-cufft, accelerate-fourier, accelerate-io - , accelerate-utility, base, Cabal, filepath, gnuplot, hmatrix - , JuicyPixels, utility-ht, vector + , accelerate-utility, array, base, Cabal, carray, containers + , enumset, fft, filepath, gnuplot, hmatrix, JuicyPixels, knead + , llvm-extra, llvm-tf, pqueue, tfp, utility-ht, vector }: mkDerivation { pname = "patch-image"; - version = "0.1.0.2"; - sha256 = "5dfe265b69765a8a9e2ef550da10a6a65c56fde23ad2124046bafe2c2ec95e35"; + version = "0.2"; + sha256 = "23517289417a46873182c45091da803df80942758b38dca89303c0d066546450"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ accelerate accelerate-arithmetic accelerate-cuda accelerate-cufft - accelerate-fourier accelerate-io accelerate-utility base Cabal - filepath gnuplot hmatrix JuicyPixels utility-ht vector + accelerate-fourier accelerate-io accelerate-utility array base + Cabal carray containers enumset fft filepath gnuplot hmatrix + JuicyPixels knead llvm-extra llvm-tf pqueue tfp utility-ht vector ]; homepage = "http://hub.darcs.net/thielema/patch-image/"; description = "Compose a big image from overlapping parts"; @@ -135365,21 +137956,16 @@ self: { "path" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions - , filepath, hashable, hspec, HUnit, mtl, QuickCheck - , template-haskell + , filepath, hashable, hspec, mtl, template-haskell }: mkDerivation { pname = "path"; - version = "0.5.12"; - sha256 = "52f0dae7e3d72d26fa62ff55de65b6697744dd0c5b96f48625cb00df1cf1055d"; - revision = "1"; - editedCabalFile = "540d42d3ea3169520a788d6771a3f907f01e5410bd87deea8bb57cb76b536ca0"; + version = "0.5.13"; + sha256 = "1968303e1632499890c3c760ade68e91e848cb45de552090d86e6c75b93e7d51"; libraryHaskellDepends = [ aeson base deepseq exceptions filepath hashable template-haskell ]; - testHaskellDepends = [ - aeson base bytestring filepath hspec HUnit mtl QuickCheck - ]; + testHaskellDepends = [ aeson base bytestring filepath hspec mtl ]; description = "Support for well-typed paths"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -135632,6 +138218,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pb-next" = callPackage + ({ mkDerivation, base, data-default, either, optparse-applicative + , parsec, tasty, tasty-hunit, text, transformers + }: + mkDerivation { + pname = "pb-next"; + version = "0.1.0.0"; + sha256 = "0c62eb075cdef80c0393162925369476fe6469d8a252cd0c298c5f05fb6ba3aa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base either parsec text transformers ]; + executableHaskellDepends = [ + base data-default either optparse-applicative text + ]; + testHaskellDepends = [ base parsec tasty tasty-hunit ]; + homepage = "https://github.com/githubuser/pb-next#readme"; + description = "Utility CLI for working with protobuf files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pbc4hs" = callPackage ({ mkDerivation, base, hslua, string-qq }: mkDerivation { @@ -136467,42 +139073,6 @@ self: { }) {}; "persistent" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , blaze-html, blaze-markup, bytestring, conduit, containers - , exceptions, fast-logger, hspec, http-api-data, lifted-base - , monad-control, monad-logger, mtl, old-locale, path-pieces - , resource-pool, resourcet, scientific, silently, tagged - , template-haskell, text, time, transformers, transformers-base - , unordered-containers, vector - }: - mkDerivation { - pname = "persistent"; - version = "2.6"; - sha256 = "42423362de94599581d18be644ba77181e87417087b3953daec2e8512d408e3e"; - revision = "2"; - editedCabalFile = "34e03865c3d882d04c3a03e289007cd6a8669b941b5fdac27c2628a2d976b2b6"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html blaze-markup - bytestring conduit containers exceptions fast-logger http-api-data - lifted-base monad-control monad-logger mtl old-locale path-pieces - resource-pool resourcet scientific silently tagged template-haskell - text time transformers transformers-base unordered-containers - vector - ]; - testHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html bytestring - conduit containers fast-logger hspec http-api-data lifted-base - monad-control monad-logger mtl old-locale path-pieces resource-pool - resourcet scientific tagged template-haskell text time transformers - unordered-containers vector - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Type-safe, multi-backend data serialization"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "persistent_2_6_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, conduit, containers , exceptions, fast-logger, hspec, http-api-data, lifted-base @@ -136533,7 +139103,6 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, multi-backend data serialization"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -136697,28 +139266,6 @@ self: { }) {}; "persistent-mysql" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit - , containers, monad-control, monad-logger, mysql, mysql-simple - , persistent, resource-pool, resourcet, text, transformers - }: - mkDerivation { - pname = "persistent-mysql"; - version = "2.6"; - sha256 = "a34c9f34feab49af156870a4c09df98d9cda54a3dd08944e3e0d326e86993be7"; - revision = "2"; - editedCabalFile = "58089479bffd093a76438ed244837a885f9b0a78fa814c92d3a6aad86ed3d206"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring conduit containers - monad-control monad-logger mysql mysql-simple persistent - resource-pool resourcet text transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Backend for the persistent library using MySQL database server"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "persistent-mysql_2_6_0_1" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, monad-control, monad-logger, mysql, mysql-simple , persistent, resource-pool, resourcet, text, transformers @@ -136738,6 +139285,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "persistent-mysql-haskell" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , io-streams, monad-control, monad-logger, mysql-haskell, network + , persistent, persistent-template, resource-pool, resourcet, text + , time, transformers + }: + mkDerivation { + pname = "persistent-mysql-haskell"; + version = "0.2.1.0"; + sha256 = "bb7281fda0ff259d7d8738d541619fad2aadbc74245db72853d8fc6d669278cb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers io-streams monad-control + monad-logger mysql-haskell network persistent resource-pool + resourcet text time transformers + ]; + executableHaskellDepends = [ + base monad-logger persistent persistent-template transformers + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "A pure haskell backend for the persistent library using MySQL database server"; + license = stdenv.lib.licenses.mit; + }) {}; + "persistent-odbc" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , convertible, HDBC, HDBC-odbc, monad-control, monad-logger @@ -136774,27 +139346,6 @@ self: { }) {}; "persistent-postgresql" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit - , containers, monad-control, monad-logger, persistent - , postgresql-libpq, postgresql-simple, resource-pool, resourcet - , text, time, transformers - }: - mkDerivation { - pname = "persistent-postgresql"; - version = "2.6"; - sha256 = "d640eecc5c8528c5ab42f08a01b74d409ca2b8e67259f477f3cd3686bc3aaae2"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring conduit containers - monad-control monad-logger persistent postgresql-libpq - postgresql-simple resource-pool resourcet text time transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Backend for the persistent library using postgresql"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "persistent-postgresql_2_6_1" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, monad-control, monad-logger, persistent , postgresql-libpq, postgresql-simple, resource-pool, resourcet @@ -136812,7 +139363,6 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -136910,33 +139460,6 @@ self: { }) {}; "persistent-sqlite" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, containers - , hspec, monad-control, monad-logger, old-locale, persistent - , persistent-template, resource-pool, resourcet, temporary, text - , time, transformers - }: - mkDerivation { - pname = "persistent-sqlite"; - version = "2.6.0.1"; - sha256 = "84df1475478f8c4aa7790152c89ffca43a08a32cd933e4062cb219a023e4768c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring conduit containers monad-control monad-logger - old-locale persistent resource-pool resourcet text time - transformers - ]; - testHaskellDepends = [ - base hspec persistent persistent-template temporary text time - transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Backend for the persistent library using sqlite3"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "persistent-sqlite_2_6_2" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , hspec, microlens-th, monad-control, monad-logger, old-locale , persistent, persistent-template, resource-pool, resourcet @@ -136960,37 +139483,10 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using sqlite3"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; "persistent-template" = callPackage - ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers - , ghc-prim, hspec, http-api-data, monad-control, monad-logger - , path-pieces, persistent, QuickCheck, tagged, template-haskell - , text, transformers, unordered-containers - }: - mkDerivation { - pname = "persistent-template"; - version = "2.5.1.6"; - sha256 = "f88a8735173ba197f8d698a9c1fd5c649234fd60efe493f401432926a55e7b44"; - revision = "2"; - editedCabalFile = "18eae1801d9742facf54aada319dfde737a1cc758b39bb2f237a4d15c98b65c6"; - libraryHaskellDepends = [ - aeson aeson-compat base bytestring containers ghc-prim - http-api-data monad-control monad-logger path-pieces persistent - tagged template-haskell text transformers unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring hspec persistent QuickCheck text transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Type-safe, non-relational, multi-backend persistence"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "persistent-template_2_5_2" = callPackage ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers , ghc-prim, hspec, http-api-data, monad-control, monad-logger , path-pieces, persistent, QuickCheck, tagged, template-haskell @@ -137011,7 +139507,6 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, non-relational, multi-backend persistence"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -137399,8 +139894,8 @@ self: { }: mkDerivation { pname = "phash"; - version = "0.0.5"; - sha256 = "7b199d520b4b08562532ab968853c701ecb868df35862ba6db5c8be299fdcdae"; + version = "0.0.6"; + sha256 = "f575e0aadb3fbf185defc6ded00efc150ed162dd8ef4e311575e012e6ab221bb"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ pHash ]; testHaskellDepends = [ @@ -137459,8 +139954,8 @@ self: { }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.12.0"; - sha256 = "db6c64e67759c9133f12a70fa82df22c8f7d4ba4450b5317aa57f35a177976fb"; + version = "0.0.13.0"; + sha256 = "72d782287fccefaab02a524a8fc64affbee3692b56889dd07ed64427a1c453f7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -137815,6 +140310,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pictikz" = callPackage + ({ mkDerivation, base, matrix, transformers, xml }: + mkDerivation { + pname = "pictikz"; + version = "1.0.0.1"; + sha256 = "69e1e3e93db18c36ee716ebb57e3dbb35c3894724ad36793abf80e7d5cd8f3b8"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base matrix transformers xml ]; + description = "Converts a svg image to tikz code"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "pid1" = callPackage ({ mkDerivation, base, process, unix }: mkDerivation { @@ -138021,10 +140529,8 @@ self: { }: mkDerivation { pname = "pipes-aeson"; - version = "0.4.1.7"; - sha256 = "c7cfb199fe3160e3b87f70017050dec94451a4cbc56d3956c91ca007ce5cb8cd"; - revision = "1"; - editedCabalFile = "7ce776e074de974988cd06b5b26062b4f5f1647c07fc2ecdd2992c482c0d286d"; + version = "0.4.1.8"; + sha256 = "350411f492fefa8d5a2554e7521d22b7ee88bacbea9d27c0d22468f6355ebe75"; libraryHaskellDepends = [ aeson attoparsec base bytestring pipes pipes-attoparsec pipes-bytestring pipes-parse transformers @@ -138062,10 +140568,8 @@ self: { }: mkDerivation { pname = "pipes-attoparsec"; - version = "0.5.1.4"; - sha256 = "fab0a84f9f81e6ae06eae85fd895f0cb8c698723cab7f33addaf5d14cd553507"; - revision = "1"; - editedCabalFile = "c90218d8e50e98ed17267f3f96a6e0382fd20c6143892470a6eeb6eda4f34edd"; + version = "0.5.1.5"; + sha256 = "fe9eb446289dbc4c4acdde39620877b885417990d9774f622fa9d1daa591cafd"; libraryHaskellDepends = [ attoparsec base bytestring pipes pipes-parse text transformers ]; @@ -138138,6 +140642,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pipes-break" = callPackage + ({ mkDerivation, base, bytestring, mtl, pipes, pipes-group + , pipes-parse, QuickCheck, text + }: + mkDerivation { + pname = "pipes-break"; + version = "0.2.0.6"; + sha256 = "c75a9c0707475e9f127f2820d8b04c7858648e503454c496470c575499f098b2"; + libraryHaskellDepends = [ + base bytestring pipes pipes-group pipes-parse text + ]; + testHaskellDepends = [ base bytestring mtl pipes QuickCheck ]; + homepage = "https://github.com/mindreader/pipes-break"; + description = "Pipes to group by any delimiter (such as lines with carriage returns)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipes-bytestring" = callPackage ({ mkDerivation, base, bytestring, pipes, pipes-group, pipes-parse , transformers @@ -138594,8 +141115,8 @@ self: { }: mkDerivation { pname = "pipes-lines"; - version = "1.0.3.1"; - sha256 = "6781737f9686f4e53d48eabffe8079b3cc608a4603da98ebdb34d34bf24a1efc"; + version = "1.0.3.4"; + sha256 = "41bf6e9aa081ad26d4c9ed1c309aca5e2250ad2c60dac18a9bc45fa1eb7508ae"; libraryHaskellDepends = [ base bytestring pipes pipes-group text ]; testHaskellDepends = [ base bytestring lens mtl pipes pipes-group QuickCheck @@ -139153,6 +141674,7 @@ self: { homepage = "https://github.com/ExcaliburZero/pixelated-avatar-generator"; description = "A library and application for generating pixelated avatars"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pkcs1" = callPackage @@ -139427,8 +141949,8 @@ self: { }: mkDerivation { pname = "plot"; - version = "0.2.3.6"; - sha256 = "ad606de1d746f26cea36f1818209adab83bb32bf46b562465930f64c975afdfd"; + version = "0.2.3.7"; + sha256 = "918611e37c6c2a01c00621b079e4de63dbe24a63936b64cd923f3bdb6e9757a4"; libraryHaskellDepends = [ array base cairo colour hmatrix mtl pango transformers ]; @@ -139830,8 +142352,8 @@ self: { }: mkDerivation { pname = "pointfree"; - version = "1.1.1.2"; - sha256 = "5d398b4769b47918df05ef5693c182fb5d070f75414e65e7110b98f1328ba92b"; + version = "1.1.1.3"; + sha256 = "b212674cba309fa1a09a330bd33b72bb337509c848ea1d5ec2ec3bd2c480de56"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140060,12 +142582,12 @@ self: { }) {}; "poly-arity" = callPackage - ({ mkDerivation, base, constraints, HList }: + ({ mkDerivation, base, constraints }: mkDerivation { pname = "poly-arity"; - version = "0.0.7"; - sha256 = "8a11a127ef8aa3d9cbf773623930c710a7c0e92ac602957c891ed6a385540b66"; - libraryHaskellDepends = [ base constraints HList ]; + version = "0.1.0"; + sha256 = "cb10a644fe04de8e703942f4bd0d97c4df0f9e3915d33a494994e85830cfdd29"; + libraryHaskellDepends = [ base constraints ]; description = "Tools for working with functions of undetermined arity"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -140095,6 +142617,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "polydata" = callPackage + ({ mkDerivation, base, constraint-manip, hspec, indextype }: + mkDerivation { + pname = "polydata"; + version = "0.1.0.0"; + sha256 = "1e1785b31d8fac68db19771440e564cec451a7cf0d4a8ac9f3bb634b4a2db7bb"; + libraryHaskellDepends = [ base constraint-manip indextype ]; + testHaskellDepends = [ base constraint-manip hspec indextype ]; + description = "Wrap together data and it's constraints"; + license = stdenv.lib.licenses.mit; + }) {}; + "polymap" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -140136,6 +142670,8 @@ self: { pname = "polynomial"; version = "0.7.2"; sha256 = "e19fff25579b5882da6d7ec0f3e344b88ee320ae8284fc1afefed04385ba3ff0"; + revision = "1"; + editedCabalFile = "9acba2e7f5f4e3ec6989c9670a92a6b9033ee9331b2c9bc114890b8929f45b35"; libraryHaskellDepends = [ base deepseq pretty vector vector-space vector-th-unbox ]; @@ -140285,12 +142821,16 @@ self: { }) {}; "pong-server" = callPackage - ({ mkDerivation, base, data-default, hspec, network, QuickCheck }: + ({ mkDerivation, base, bytestring, classy-prelude, exceptions + , hspec, http-types, network, QuickCheck + }: mkDerivation { pname = "pong-server"; - version = "0.0.2.1"; - sha256 = "145242c8ad672f358eb83f503ba5f92478040d943236b25010d343085f42779a"; - libraryHaskellDepends = [ base data-default network ]; + version = "0.0.3.0"; + sha256 = "dd84310b20b09d2667dcc1af7b6ecab2a47f19986395049eeebb7ddc86b8c326"; + libraryHaskellDepends = [ + base bytestring classy-prelude exceptions http-types network + ]; testHaskellDepends = [ base hspec network QuickCheck ]; homepage = "http://github.com/RobertFischer/pong-server#readme"; description = "A simple embedded pingable server that runs in the background"; @@ -140801,6 +143341,38 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "postgresql-binary_0_12_1" = callPackage + ({ mkDerivation, aeson, base, base-prelude, binary-parser + , bytestring, bytestring-strict-builder, containers, conversion + , conversion-bytestring, conversion-text, criterion, json-ast + , loch-th, network-ip, placeholders, postgresql-libpq, QuickCheck + , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text, time, transformers + , unordered-containers, uuid, vector + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.12.1"; + sha256 = "a20a9f6c102d09f220e5f08357b3cd0a06a5f8d22eff4dd7f9e6fc668e1165cd"; + libraryHaskellDepends = [ + aeson base base-prelude binary-parser bytestring + bytestring-strict-builder containers loch-th network-ip + placeholders scientific text time transformers unordered-containers + uuid vector + ]; + testHaskellDepends = [ + aeson conversion conversion-bytestring conversion-text json-ast + loch-th network-ip placeholders postgresql-libpq QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + homepage = "https://github.com/nikita-volkov/postgresql-binary"; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "postgresql-config" = callPackage ({ mkDerivation, aeson, base, bytestring, monad-control, mtl , postgresql-simple, resource-pool, time @@ -140922,8 +143494,8 @@ self: { }: mkDerivation { pname = "postgresql-query"; - version = "3.0.1"; - sha256 = "2e9ff10732967eabc091a0f7d45a3b9777a20ae23ab3fffb8827bae646fcc1a4"; + version = "3.1.0"; + sha256 = "32fbc4c4dc73c6338bfb58c61a2f823b6b6b0113b87735748a53a3e38ca7ba87"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring containers data-default either exceptions file-embed haskell-src-meta hreader @@ -140933,7 +143505,7 @@ self: { transformers-compat type-fun ]; testHaskellDepends = [ - attoparsec base derive inflections postgresql-simple QuickCheck + attoparsec base derive postgresql-simple QuickCheck quickcheck-assertions quickcheck-instances tasty tasty-hunit tasty-quickcheck tasty-th text time ]; @@ -141106,6 +143678,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "postgresql-syntax" = callPackage + ({ mkDerivation, base, base-prelude, bytestring, pg_query, rerebase + , text + }: + mkDerivation { + pname = "postgresql-syntax"; + version = "0.1"; + sha256 = "f3b442738809521d312fccd8fe6cfab247da2326a2a2571018f680029e44c5f4"; + libraryHaskellDepends = [ base base-prelude bytestring text ]; + librarySystemDepends = [ pg_query ]; + testHaskellDepends = [ rerebase ]; + homepage = "https://github.com/nikita-volkov/postgresql-syntax"; + description = "PostgreSQL SQL syntax utilities"; + license = stdenv.lib.licenses.mit; + }) {pg_query = null;}; + "postgresql-transactional" = callPackage ({ mkDerivation, base, monad-control, mtl, postgresql-simple }: mkDerivation { @@ -141127,8 +143715,8 @@ self: { }: mkDerivation { pname = "postgresql-typed"; - version = "0.5.0"; - sha256 = "c6b93a05eff7b5a315dfe26abdd6885dd9290dec3096c3cc795c16bc1395f2ff"; + version = "0.5.1"; + sha256 = "9b0f95824a14391f2d1cb39af3740ceebb93d0676bdb8817a8fa6f89ff5a792f"; libraryHaskellDepends = [ aeson array attoparsec base binary bytestring containers cryptonite haskell-src-meta HDBC memory network old-locale postgresql-binary @@ -141139,7 +143727,7 @@ self: { QuickCheck time ]; homepage = "https://github.com/dylex/postgresql-typed"; - description = "A PostgreSQL library with compile-time SQL type inference and optional HDBC backend"; + description = "PostgreSQL interface with compile-time SQL type checking, optional HDBC backend"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -141370,30 +143958,51 @@ self: { }) {}; "powerqueue" = callPackage - ({ mkDerivation, async, base, contravariant, hspec, stm }: + ({ mkDerivation, async, base, contravariant, hspec, stm, timespan + }: mkDerivation { pname = "powerqueue"; - version = "0.1.0.0"; - sha256 = "91835dd0495cb47b5a589703e7904104e7001597f06039f87067192fcdb8254c"; - libraryHaskellDepends = [ async base contravariant ]; + version = "0.2.0.0"; + sha256 = "d9c40dd39a57689dd2efef1f561e2ca8c771e9db5fab829df06c00795fda14f6"; + libraryHaskellDepends = [ async base contravariant timespan ]; testHaskellDepends = [ async base hspec stm ]; homepage = "https://github.com/agrafix/powerqueue#readme"; description = "A flexible job queue with exchangeable backends"; license = stdenv.lib.licenses.bsd3; }) {}; + "powerqueue-distributed" = callPackage + ({ mkDerivation, async, base, bytestring, cereal, cereal-conduit + , conduit, conduit-extra, hspec, mtl, powerqueue, stm, text + , timespan + }: + mkDerivation { + pname = "powerqueue-distributed"; + version = "0.1.0.0"; + sha256 = "fb20cbbb2cae4dc8d19b16820e04c566a3a47a61bffa785e4e0eab3f7483769f"; + libraryHaskellDepends = [ + base bytestring cereal cereal-conduit conduit conduit-extra mtl + powerqueue text timespan + ]; + testHaskellDepends = [ async base hspec powerqueue stm timespan ]; + homepage = "https://github.com/agrafix/powerqueue#readme"; + description = "A distributed worker backend for powerqueu"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "powerqueue-levelmem" = callPackage ({ mkDerivation, async, base, bytestring, cereal, criterion, dlist , filepath, focus, hspec, leveldb, leveldb-haskell, list-t - , powerqueue, snappy, stm, stm-containers, temporary, unagi-chan + , powerqueue, snappy, stm, stm-containers, temporary, timespan + , unagi-chan }: mkDerivation { pname = "powerqueue-levelmem"; - version = "0.1.0.0"; - sha256 = "b23d92c0b70b06e4168f03cdfedf7d38f12c85bcf493fb8874e66bd5ddc7ee76"; + version = "0.1.1.0"; + sha256 = "941fa5e052189a89ac445b027b59b599182c76c638050143a4dcd49d7cd677b8"; libraryHaskellDepends = [ async base bytestring cereal dlist filepath focus leveldb-haskell - list-t powerqueue stm stm-containers unagi-chan + list-t powerqueue stm stm-containers timespan unagi-chan ]; testHaskellDepends = [ async base cereal hspec powerqueue temporary @@ -141408,6 +144017,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) leveldb; inherit (pkgs) snappy;}; + "powerqueue-sqs" = callPackage + ({ mkDerivation, aws-simple, base, powerqueue, text, timespan }: + mkDerivation { + pname = "powerqueue-sqs"; + version = "0.1.0.0"; + sha256 = "dbb927967e79c83d699691cb7fd411a180a23142aeb4cd86beade92aa3e994ab"; + libraryHaskellDepends = [ + aws-simple base powerqueue text timespan + ]; + homepage = "https://github.com/agrafix/powerqueue#readme"; + description = "A Amazon SQS backend for powerqueue"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ppm" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -141456,12 +144079,13 @@ self: { }) {}; "pqueue" = callPackage - ({ mkDerivation, base, deepseq }: + ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { pname = "pqueue"; - version = "1.3.2"; - sha256 = "58d6c91432d91c1e9908495f5bfeb231239a53b5c59bda724fe8d7bd3873adf1"; + version = "1.3.2.2"; + sha256 = "27b5b57945325c0fb8b8447178ae27bfe243174da2d9b1ad38639e450b515035"; libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base deepseq QuickCheck ]; description = "Reliable, persistent, fast priority queues"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -141509,8 +144133,8 @@ self: { }: mkDerivation { pname = "praglude"; - version = "0.4.0.1"; - sha256 = "70996dbad7defd09b26ad792150205f878c6158a372cc2544ea1bfd7d2a74dec"; + version = "0.4.1.0"; + sha256 = "6cbbb2f06a00c3d18ed39206c654c92cd39b2a72a59a5b2a44992a76c6de5cb0"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring casing containers data-default deepseq directory filepath hashable lens mtl random @@ -141604,8 +144228,8 @@ self: { }: mkDerivation { pname = "pred-trie"; - version = "0.5.1"; - sha256 = "821e1cefa47a3090808af5c39d9997f6471e05aa4f98b46e05eccb9c4a99cdd1"; + version = "0.5.1.1"; + sha256 = "7342dab0c18f25b023da8613798dcb3e75fceb8b082a1feb57e5597de9827ecf"; libraryHaskellDepends = [ base composition-extra containers hashable hashtables mtl poly-arity pred-set QuickCheck semigroups tries @@ -141948,8 +144572,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "present"; - version = "4.0.2"; - sha256 = "1eae62ac47ca11a2f13d8bebf7930b0f11e1197a5f0d8628bafce279e000600f"; + version = "4.1.0"; + sha256 = "bae8b334817a31572cc0e771f40e89b976e72b2b55d0955e4e198502dd8a427b"; libraryHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/chrisdone/present"; description = "Make presentations for data types"; @@ -142466,20 +145090,21 @@ self: { }) {}; "prizm" = callPackage - ({ mkDerivation, base, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, text + ({ mkDerivation, base, convertible, HUnit, mono-traversable + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, text }: mkDerivation { pname = "prizm"; - version = "0.3.1.2"; - sha256 = "6909454f9aa0a10aed4dfb3d4625df3a2271bed80c1a5f6922c32387228c1758"; - libraryHaskellDepends = [ base text ]; + version = "2.0.1"; + sha256 = "2f35547b8041c51890cadfd072838140f8ed808491272e77e51b2e90097106ef"; + libraryHaskellDepends = [ base convertible mono-traversable text ]; testHaskellDepends = [ - base QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 + base convertible HUnit mono-traversable QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 ]; homepage = "https://github.com/ixmatus/prizm"; - description = "Compute with colors and differenct color spaces"; + description = "Convert colors to different color spaces, interpolate colors, and transform colors"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -142909,8 +145534,8 @@ self: { }: mkDerivation { pname = "profiteur"; - version = "0.4.2.1"; - sha256 = "6b2af36243f15aa5396e0056159d9ad38422cce9eebafa59e6d439b2a8932916"; + version = "0.4.2.2"; + sha256 = "caa7a1c197dc94b0343755506fa657ae40dd155534379adccf39701d8c0a953f"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -143280,8 +145905,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "3.4.1"; - sha256 = "b5d8f9773d4f58ab68fc036dacf7368b450e0535769bb1df28e80166cd3d2116"; + version = "4.0.2"; + sha256 = "cb659ab34b22126c0c07075e556a6f56170af3896f2e23dcd16035d70e578624"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -143400,8 +146025,8 @@ self: { }: mkDerivation { pname = "proto-lens"; - version = "0.1.0.5"; - sha256 = "d3096c4e089bc7a8e6221afde8afc0b02f8e67028e119f3be04906cf4fc67a6e"; + version = "0.2.0.0"; + sha256 = "db1ce1c786941c98ac67885d583731eed5bf6998022985e699915f5aa757b07f"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default-class lens-family parsec pretty text transformers void @@ -143418,8 +146043,8 @@ self: { }: mkDerivation { pname = "proto-lens-arbitrary"; - version = "0.1.0.1"; - sha256 = "df1ef1741af1d37d87063392ed0ce2e67bc2435a5754bdf35d0c65c8fb1e4d50"; + version = "0.1.0.2"; + sha256 = "ff1629693e57ee664489af14a430db8189febcb73cec1e1d526f3a2fab621a5f"; libraryHaskellDepends = [ base bytestring containers lens-family proto-lens QuickCheck text ]; @@ -143431,20 +146056,20 @@ self: { "proto-lens-combinators" = callPackage ({ mkDerivation, base, data-default-class, HUnit, lens-family - , proto-lens, proto-lens-protoc, test-framework + , lens-family-core, proto-lens, proto-lens-protoc, test-framework , test-framework-hunit, transformers }: mkDerivation { pname = "proto-lens-combinators"; - version = "0.1.0.4"; - sha256 = "3d153caff241c45097d2acac97176d2dc54af626b4895678f51069ce7ceb66fb"; + version = "0.1.0.6"; + sha256 = "6ceafc1d8d03120b6c57f26154899520afd292bdfa8a46c76ddb30615de6cc7f"; libraryHaskellDepends = [ base data-default-class lens-family proto-lens proto-lens-protoc transformers ]; testHaskellDepends = [ - base HUnit lens-family proto-lens proto-lens-protoc test-framework - test-framework-hunit + base HUnit lens-family lens-family-core proto-lens + proto-lens-protoc test-framework test-framework-hunit ]; homepage = "https://github.com/google/proto-lens"; description = "Utilities functions to proto-lens"; @@ -143454,15 +146079,15 @@ self: { "proto-lens-descriptors" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class - , lens-family, proto-lens, text + , lens-family, lens-labels, proto-lens, text }: mkDerivation { pname = "proto-lens-descriptors"; - version = "0.1.0.5"; - sha256 = "89e2eef7c99dc8ca669ad63dd4020a5d05133f92ddb148b1965ced523a6ad18a"; + version = "0.2.0.0"; + sha256 = "1fca9713d7678b2328e5f330eebfc690b487ccca719fe2cdf84f24af71d98bb5"; libraryHaskellDepends = [ base bytestring containers data-default-class lens-family - proto-lens text + lens-labels proto-lens text ]; description = "Protocol buffers for describing the definitions of messages"; license = stdenv.lib.licenses.bsd3; @@ -143472,8 +146097,8 @@ self: { ({ mkDerivation, base, optparse-applicative, proto-lens, text }: mkDerivation { pname = "proto-lens-optparse"; - version = "0.1.0.1"; - sha256 = "1ab3ac9137c05f6041fa2ff8527da4e80875d94eff97c77cdc43e65cc0c5dc28"; + version = "0.1.0.2"; + sha256 = "d6afb604f1b26d903648ab57b5d50c5670b70ec8d15ca49799f4ff1383c024d6"; libraryHaskellDepends = [ base optparse-applicative proto-lens text ]; @@ -143486,18 +146111,19 @@ self: { "proto-lens-protoc" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers , data-default-class, directory, filepath, haskell-src-exts - , lens-family, process, proto-lens, proto-lens-descriptors, text + , lens-family, lens-labels, process, proto-lens + , proto-lens-descriptors, text }: mkDerivation { pname = "proto-lens-protoc"; - version = "0.1.0.5"; - sha256 = "0efb5b62e2cccb3edc29b93c75aabcccc652992a01e8f5eae7bf7eae2078192e"; + version = "0.2.0.0"; + sha256 = "60df593b670ca8f984e67ac784a97425e5056b0cdf16f231f53cc228ada85376"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring Cabal containers data-default-class directory - filepath haskell-src-exts lens-family process proto-lens - proto-lens-descriptors text + filepath haskell-src-exts lens-family lens-labels process + proto-lens proto-lens-descriptors text ]; executableHaskellDepends = [ base bytestring containers data-default-class filepath @@ -143581,6 +146207,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "protobuf-simple_0_1_0_3" = callPackage + ({ mkDerivation, base, binary, bytestring, containers + , data-binary-ieee754, directory, filepath, hspec, mtl, parsec + , QuickCheck, quickcheck-instances, split, text + }: + mkDerivation { + pname = "protobuf-simple"; + version = "0.1.0.3"; + sha256 = "55e8221677f8808539b3fc3644d4b3118afe6fb7bd9ff0be4e58783e38773f6d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers data-binary-ieee754 mtl text + ]; + executableHaskellDepends = [ + base containers directory filepath mtl parsec split text + ]; + testHaskellDepends = [ + base binary bytestring containers data-binary-ieee754 filepath + hspec parsec QuickCheck quickcheck-instances split text + ]; + homepage = "https://github.com/sru-systems/protobuf-simple"; + description = "Simple Protocol Buffers library (proto2)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protocol-buffers" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , directory, filepath, mtl, parsec, syb, utf8-string @@ -144361,25 +147014,23 @@ self: { }) {}; "purescript" = callPackage - ({ mkDerivation, aeson, aeson-better-errors, aeson-pretty - , ansi-terminal, ansi-wl-pprint, base, base-compat, blaze-html - , bower-json, boxes, bytestring, cheapskate, clock, containers - , data-ordlist, deepseq, directory, dlist, edit-distance - , file-embed, filepath, foldl, fsnotify, Glob, haskeline, hspec - , hspec-discover, http-client, http-types, HUnit - , language-javascript, lens, lifted-base, monad-control - , monad-logger, mtl, network, optparse-applicative, parallel - , parsec, pattern-arrows, pipes, pipes-http, process, protolude - , regex-tdfa, safe, scientific, semigroups, silently, sourcemap - , spdx, split, stm, syb, system-filepath, text, time, transformers - , transformers-base, transformers-compat, turtle - , unordered-containers, utf8-string, vector, wai, wai-websockets - , warp, websockets + ({ mkDerivation, aeson, aeson-better-errors, ansi-terminal + , ansi-wl-pprint, base, base-compat, blaze-html, bower-json, boxes + , bytestring, cheapskate, clock, containers, data-ordlist, deepseq + , directory, dlist, edit-distance, file-embed, filepath, fsnotify + , gitrev, Glob, haskeline, hspec, hspec-discover, http-client + , http-types, HUnit, language-javascript, lens, lifted-base + , monad-control, monad-logger, mtl, network, optparse-applicative + , parallel, parsec, pattern-arrows, pipes, pipes-http, process + , protolude, regex-tdfa, safe, scientific, semigroups, silently + , sourcemap, spdx, split, stm, syb, text, time, transformers + , transformers-base, transformers-compat, unordered-containers + , utf8-string, vector, wai, wai-websockets, warp, websockets }: mkDerivation { pname = "purescript"; - version = "0.10.7"; - sha256 = "85dff2f4b6916e9d45b6a1b2674dc6c91c56ac6c1597f627d5f1cbee9d0b3a9d"; + version = "0.11.2"; + sha256 = "bf4c3c0cb3103cf4cfc2029bfbb0509ad61fa9ef07896818b522527891878144"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144394,19 +147045,29 @@ self: { unordered-containers utf8-string vector ]; executableHaskellDepends = [ - aeson aeson-pretty ansi-terminal ansi-wl-pprint base base-compat - boxes bytestring containers directory file-embed filepath foldl - Glob haskeline http-types monad-logger mtl network - optparse-applicative parsec process protolude sourcemap split stm - system-filepath text time transformers transformers-compat turtle - utf8-string wai wai-websockets warp websockets + aeson aeson-better-errors ansi-terminal ansi-wl-pprint base + base-compat blaze-html bower-json boxes bytestring cheapskate clock + containers data-ordlist deepseq directory dlist edit-distance + file-embed filepath fsnotify gitrev Glob haskeline http-client + http-types language-javascript lens lifted-base monad-control + monad-logger mtl network optparse-applicative parallel parsec + pattern-arrows pipes pipes-http process protolude regex-tdfa safe + scientific semigroups sourcemap spdx split stm syb text time + transformers transformers-base transformers-compat + unordered-containers utf8-string vector wai wai-websockets warp + websockets ]; testHaskellDepends = [ - aeson aeson-better-errors base base-compat bower-json boxes - bytestring containers directory filepath Glob haskeline hspec - hspec-discover HUnit lens monad-logger mtl optparse-applicative - parsec process protolude silently stm text time transformers - transformers-compat utf8-string vector + aeson aeson-better-errors ansi-terminal base base-compat blaze-html + bower-json boxes bytestring cheapskate clock containers + data-ordlist deepseq directory dlist edit-distance filepath + fsnotify Glob haskeline hspec hspec-discover http-client http-types + HUnit language-javascript lens lifted-base monad-control + monad-logger mtl parallel parsec pattern-arrows pipes pipes-http + process protolude regex-tdfa safe scientific semigroups silently + sourcemap spdx split stm syb text time transformers + transformers-base transformers-compat unordered-containers + utf8-string vector ]; doCheck = false; homepage = "http://www.purescript.org/"; @@ -144435,6 +147096,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "purescript-bridge_0_11_0_0" = callPackage + ({ mkDerivation, base, containers, directory, filepath + , generic-deriving, hspec, hspec-expectations-pretty-diff, lens + , mtl, text, transformers + }: + mkDerivation { + pname = "purescript-bridge"; + version = "0.11.0.0"; + sha256 = "6e4f2ea1d550d1d3ee4ede18a18d95aa37c587c2aef54d4aee22306550a45878"; + libraryHaskellDepends = [ + base containers directory filepath generic-deriving lens mtl text + transformers + ]; + testHaskellDepends = [ + base containers hspec hspec-expectations-pretty-diff text + ]; + description = "Generate PureScript data types from Haskell data types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "purescript-bundle-fast" = callPackage ({ mkDerivation, base, containers, directory, filepath , optparse-applicative, text, vector @@ -145022,6 +147704,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "qm-interpolated-string" = callPackage + ({ mkDerivation, base, bytestring, haskell-src-meta, hspec + , template-haskell, text + }: + mkDerivation { + pname = "qm-interpolated-string"; + version = "0.1.0.0"; + sha256 = "ad1dc7b40665023d553f781e2ddb67d169db6c50595cf99ff43b013495d19ef9"; + libraryHaskellDepends = [ + base bytestring haskell-src-meta template-haskell text + ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/unclechu/haskell-qm-interpolated-string"; + description = "Implementation of interpolated multiline strings"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "qr-imager" = callPackage ({ mkDerivation, aeson, base, bytestring, cryptonite, directory , haskell-qrencode, hspec, jose-jwt, JuicyPixels, lens, libqrencode @@ -145029,8 +147728,10 @@ self: { }: mkDerivation { pname = "qr-imager"; - version = "1.0.0.2"; - sha256 = "b9c758375936269cfc16bd28b82adcbab3e8ed79e48e88fc2e23a8e89ec0d504"; + version = "1.0.0.3"; + sha256 = "ff97d131702a42710d3c9a4a211055499495bd3319697908b4fa83c4a01381f4"; + revision = "1"; + editedCabalFile = "9011708b42c261b2ec8a2f7a39315fbdff193d61c8d70c73f32b60e3428fe067"; libraryHaskellDepends = [ aeson base bytestring cryptonite directory haskell-qrencode jose-jwt JuicyPixels lens MissingH optparse-applicative process @@ -145692,23 +148393,6 @@ self: { }) {}; "quickcheck-special" = callPackage - ({ mkDerivation, base, bytestring, ieee754, QuickCheck, scientific - , text - }: - mkDerivation { - pname = "quickcheck-special"; - version = "0.1.0.3"; - sha256 = "8dbe5c2cdefb35880433902402110c1d9927b96d2363df8382fb6ee7e8d3e2f7"; - libraryHaskellDepends = [ - base bytestring ieee754 QuickCheck scientific text - ]; - homepage = "https://github.com/minad/quickcheck-special#readme"; - description = "Edge cases and special values for QuickCheck Arbitrary instances"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "quickcheck-special_0_1_0_4" = callPackage ({ mkDerivation, base, bytestring, ieee754, QuickCheck, scientific , text }: @@ -146268,8 +148952,8 @@ self: { }: mkDerivation { pname = "radium"; - version = "0.6"; - sha256 = "cc03e011817649426e527cb35f31b2daf7c2f8ab90c281d308dadddfd80f8500"; + version = "0.7"; + sha256 = "f8bafb43deaf0d656a8c170cb56861948af90d1c72cd99a2c9540c1eb6f1bc23"; libraryHaskellDepends = [ base containers parsec ]; testHaskellDepends = [ base Cabal containers hspec parsec QuickCheck @@ -146984,21 +149668,23 @@ self: { "rasa" = callPackage ({ mkDerivation, async, base, bifunctors, containers, data-default - , free, hspec, lens, mtl, pipes, pipes-concurrency, pipes-parse - , profunctors, QuickCheck, quickcheck-instances, text, text-lens - , transformers, yi-rope + , eve, free, hspec, lens, mtl, pipes, pipes-concurrency + , pipes-parse, profunctors, QuickCheck, quickcheck-instances, text + , text-lens, transformers, yi-rope }: mkDerivation { pname = "rasa"; - version = "0.1.10"; - sha256 = "970bd5b3dfac3a8050e2daea281d15b3b1dc499824cad392225d1e4d483527e8"; + version = "0.1.12"; + sha256 = "5ae77122fd34c6c87ec9137c7d686106ee57baaef164090c55efd2d0bbe85f21"; + revision = "1"; + editedCabalFile = "79e6edef2ef82c0a65343db171bfddb85cbf23d45420ccffb97383e031d3979f"; libraryHaskellDepends = [ - async base bifunctors containers data-default free hspec lens mtl - pipes pipes-concurrency pipes-parse profunctors text text-lens + async base bifunctors containers data-default eve free hspec lens + mtl pipes pipes-concurrency pipes-parse profunctors text text-lens transformers yi-rope ]; testHaskellDepends = [ - base hspec lens QuickCheck quickcheck-instances text yi-rope + base eve hspec lens QuickCheck quickcheck-instances text yi-rope ]; homepage = "https://github.com/ChrisPenner/rasa#readme"; description = "A modular text editor"; @@ -147048,8 +149734,8 @@ self: { }: mkDerivation { pname = "rasa-ext-cmd"; - version = "0.1.2"; - sha256 = "f328cc06d7fca6ac2bb301aaa18b057b0404319dc0072963f27a90750644b3e9"; + version = "0.1.3"; + sha256 = "91c0a74068dfda1b661be2c64bc683428eb6b8ff6456841659ebe893b6fd23ac"; libraryHaskellDepends = [ base containers data-default lens rasa text ]; @@ -147065,8 +149751,8 @@ self: { }: mkDerivation { pname = "rasa-ext-cursors"; - version = "0.1.6"; - sha256 = "c1407b36255825f4708ccffb9b04cdb1cd93da417cc2c337033b10306626390e"; + version = "0.1.7"; + sha256 = "9c28c15968615731107ff8238fca5bce281f3dd2f24cfdb2f5539ff8744fec05"; libraryHaskellDepends = [ base data-default lens mtl rasa text text-lens yi-rope ]; @@ -147082,8 +149768,8 @@ self: { }: mkDerivation { pname = "rasa-ext-files"; - version = "0.1.4"; - sha256 = "d824e1eec8ce6b92453e957c10859351c23306463b08bdcdfc5d635471147957"; + version = "0.1.5"; + sha256 = "975995a63285aeac0a4366f25994f27a429fb80891b614b78105318525c8497a"; libraryHaskellDepends = [ base data-default lens mtl rasa rasa-ext-cmd rasa-ext-views text yi-rope @@ -147098,8 +149784,8 @@ self: { ({ mkDerivation, base, lens, mtl, rasa }: mkDerivation { pname = "rasa-ext-logger"; - version = "0.1.3"; - sha256 = "8648adfd280b15ddfed693bb771745de6311bcfe3fb3066fa3ce89694a12eb5d"; + version = "0.1.4"; + sha256 = "3ec3b328893895debaa4e4bdf90f9c62dd2523c3bf22d4435a078a84dd5c63f3"; libraryHaskellDepends = [ base lens mtl rasa ]; homepage = "https://github.com/ChrisPenner/rasa/"; description = "Rasa Ext for logging state/actions"; @@ -147113,8 +149799,8 @@ self: { }: mkDerivation { pname = "rasa-ext-slate"; - version = "0.1.7"; - sha256 = "6773e509862723cc02776cd05db0dea70a179433a57ab635f37124964738d312"; + version = "0.1.8"; + sha256 = "bf1741d7059a5ea39ca48624006c5ade1e9909441d2f68c6109773fd4a983484"; libraryHaskellDepends = [ base lens mtl rasa rasa-ext-logger rasa-ext-views recursion-schemes text vty yi-rope @@ -147157,8 +149843,8 @@ self: { }: mkDerivation { pname = "rasa-ext-views"; - version = "0.1.4"; - sha256 = "5542a37a779efe0e97ecbadbed2409414c99705a9298d0dfc5915f56682e11c0"; + version = "0.1.6"; + sha256 = "f46547242b5f08a6b10aea20ee0ec471d3691fc7c7cec51d4af1a0f86a6d4024"; libraryHaskellDepends = [ base bifunctors data-default lens mtl rasa recursion-schemes yi-rope @@ -147176,8 +149862,8 @@ self: { }: mkDerivation { pname = "rasa-ext-vim"; - version = "0.1.6"; - sha256 = "e97e6d096eee5f02ed022407276653ed33657f82ef708ad8095a3caf1fddb22a"; + version = "0.1.8"; + sha256 = "fe8f447e65ad88b6dd4e0f7f14aa436dc2b1940f38886aa96eae5ed55b1a7e02"; libraryHaskellDepends = [ base data-default lens mtl rasa rasa-ext-cursors rasa-ext-files rasa-ext-views text text-lens yi-rope @@ -147341,6 +150027,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rattletrap_2_2_0" = callPackage + ({ mkDerivation, aeson, aeson-casing, base, bimap, binary + , binary-bits, bytestring, containers, data-binary-ieee754 + , filepath, tasty, tasty-hspec, template-haskell, temporary, text + , vector + }: + mkDerivation { + pname = "rattletrap"; + version = "2.2.0"; + sha256 = "fe1ba54cce7d1d6c2b4bfe54f433bc61a31b15b866abae7ae2ee4a53b384f2c8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-casing base bimap binary binary-bits bytestring + containers data-binary-ieee754 template-haskell text vector + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring filepath tasty tasty-hspec temporary + ]; + homepage = "https://github.com/tfausak/rattletrap#readme"; + description = "Parse and generate Rocket League replays"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "raven-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit , network, random, text, time, unordered-containers, uuid @@ -147422,13 +150134,15 @@ self: { ({ mkDerivation, base, bytestring, unix }: mkDerivation { pname = "rawfilepath"; - version = "0.1.0.0"; - sha256 = "1673897fbcb4a4a194bb66ff8514a21db6c1d9f6ba0d960dc20677c9902c2614"; + version = "0.1.1"; + sha256 = "fc5c0a6177abece59cc962d08ab019d98aac2b61b4495630f00280b029988c66"; + revision = "1"; + editedCabalFile = "39c576d107385d8d240d32673c8dfd702e2e17ef87ece13f86010d1a3411c693"; libraryHaskellDepends = [ base bytestring unix ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ base bytestring ]; homepage = "https://github.com/xtendo-org/rawfilepath#readme"; description = "Use RawFilePath instead of FilePath"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.asl20; }) {}; "rawr" = callPackage @@ -147502,22 +150216,26 @@ self: { }) {}; "rbpcp-api" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring, cereal - , haskoin-core, servant, string-conversions, text + ({ mkDerivation, aeson, base, base16-bytestring + , bitcoin-payment-protocol, bytestring, cereal, haskoin-core + , http-api-data, servant, servant-client, string-conversions, text + , time }: mkDerivation { pname = "rbpcp-api"; - version = "0.1.0.0"; - sha256 = "16290f21dc85b53a4738753a7c827584bfd2455d1e0f0d11f78c2520448afd06"; + version = "0.2.0.0"; + sha256 = "958f1067973daaa1fcba4afab2bd6dbb09bd6b84aa6c342246103b442a4c1855"; libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cereal haskoin-core servant - string-conversions text + aeson base base16-bytestring bitcoin-payment-protocol bytestring + cereal haskoin-core http-api-data servant servant-client + string-conversions text time ]; homepage = "http://paychandoc.runeks.me/"; description = "RESTful Bitcoin Payment Channel Protocol Servant API description"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + broken = true; + }) {bitcoin-payment-protocol = null;}; "rbr" = callPackage ({ mkDerivation, base, bio, bytestring, containers }: @@ -148116,6 +150834,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "read-env-var_1_0_0_0" = callPackage + ({ mkDerivation, base, doctest, exceptions, Glob, transformers }: + mkDerivation { + pname = "read-env-var"; + version = "1.0.0.0"; + sha256 = "03f3c8176fc08ce838ae772f13991258e2b496712cc71edb1a00336e7ce0b75c"; + libraryHaskellDepends = [ base exceptions transformers ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/cdepillabout/read-env-var#readme"; + description = "Functions for safely reading environment variables"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "read-io" = callPackage ({ mkDerivation, base, containers, directory, filepath, hspec }: mkDerivation { @@ -148146,8 +150878,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "readcsv"; - version = "0.1"; - sha256 = "dc30c00dd05156749ff38d42eed15c73a493fc0b66b630eab256c4e359456c88"; + version = "0.1.1"; + sha256 = "de463ca78f757a19e97ea7e1764daf4652aa6311e34de3592dfac1352ae1ddb4"; + revision = "1"; + editedCabalFile = "ba0cb06393f608d7f7cc1de9797235202bc2e766478c09bd566a864d65bb8fd1"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/george-steel/readcsv"; description = "Lightweight CSV parser/emitter based on ReadP"; @@ -149291,6 +152025,8 @@ self: { pname = "regex"; version = "0.5.0.0"; sha256 = "422392384ce3986d1c5627b30c8dc9dfb05fe41044820739d11da51ff1a8c27f"; + revision = "1"; + editedCabalFile = "0ace4a3d369511cdbabee677172dd1174288af160415699626829f25c8720a91"; libraryHaskellDepends = [ array base base-compat bytestring containers hashable heredoc regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text @@ -149303,6 +152039,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "regex_0_13_0_0" = callPackage + ({ mkDerivation, array, base, base-compat, bytestring, containers + , hashable, regex-base, regex-pcre-builtin, regex-tdfa + , regex-tdfa-text, template-haskell, text, time, time-locale-compat + , transformers, unordered-containers + }: + mkDerivation { + pname = "regex"; + version = "0.13.0.0"; + sha256 = "78b7d83fb33c5e3cf45a66743db0dfe4ed4dfea77736d09c0830bd5e287b76bd"; + libraryHaskellDepends = [ + array base base-compat bytestring containers hashable regex-base + regex-pcre-builtin regex-tdfa regex-tdfa-text template-haskell text + time time-locale-compat transformers unordered-containers + ]; + homepage = "http://regex.uk"; + description = "Toolkit for regex-base"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "regex-applicative" = callPackage ({ mkDerivation, base, containers, smallcheck, tasty, tasty-hunit , tasty-smallcheck, transformers @@ -149440,35 +152197,36 @@ self: { "regex-examples" = callPackage ({ mkDerivation, array, base, base-compat, bytestring, containers - , directory, hashable, heredoc, http-conduit, regex, regex-base - , regex-pcre-builtin, regex-tdfa, regex-tdfa-text, shelly - , smallcheck, tasty, tasty-hunit, tasty-smallcheck - , template-haskell, text, time, time-locale-compat, transformers - , unordered-containers + , directory, filepath, hashable, heredoc, http-conduit, regex + , regex-base, regex-pcre-builtin, regex-tdfa, regex-tdfa-text + , regex-with-pcre, shelly, smallcheck, tasty, tasty-hunit + , tasty-smallcheck, template-haskell, text, time + , time-locale-compat, transformers, unordered-containers }: mkDerivation { pname = "regex-examples"; - version = "0.5.0.0"; - sha256 = "bfc94f67d1723fd833247512549aa2e0a9d18070aaf9409feaef87388a48a1bb"; + version = "0.13.0.0"; + sha256 = "b0dc80f421768ea9a272aeccc60722da9fbadc19feaf3bb2232446d82b7ec4f8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array base base-compat bytestring containers directory hashable - heredoc http-conduit regex regex-base regex-pcre-builtin regex-tdfa - regex-tdfa-text shelly smallcheck tasty tasty-hunit - tasty-smallcheck template-haskell text time time-locale-compat - transformers unordered-containers + array base base-compat bytestring containers directory filepath + hashable heredoc http-conduit regex regex-base regex-pcre-builtin + regex-tdfa regex-tdfa-text regex-with-pcre shelly smallcheck tasty + tasty-hunit tasty-smallcheck template-haskell text time + time-locale-compat transformers unordered-containers ]; testHaskellDepends = [ - array base base-compat bytestring containers directory hashable - heredoc http-conduit regex regex-base regex-pcre-builtin regex-tdfa - regex-tdfa-text shelly smallcheck tasty tasty-hunit - tasty-smallcheck template-haskell text time time-locale-compat - transformers unordered-containers + array base base-compat bytestring containers directory filepath + hashable heredoc http-conduit regex regex-base regex-pcre-builtin + regex-tdfa regex-tdfa-text regex-with-pcre shelly smallcheck tasty + tasty-hunit tasty-smallcheck template-haskell text time + time-locale-compat transformers unordered-containers ]; homepage = "http://regex.uk"; description = "Tutorial, tests and example programs for regex"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex-genex" = callPackage @@ -149719,6 +152477,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "regex-with-pcre" = callPackage + ({ mkDerivation, base, base-compat, bytestring, containers, regex + , regex-base, regex-pcre-builtin, regex-tdfa, template-haskell + , transformers, unordered-containers + }: + mkDerivation { + pname = "regex-with-pcre"; + version = "0.13.0.0"; + sha256 = "5a39c51ac8d8e20b1a2c5b363e6e8087ca1480e771ad7a6c2853a60738fc9983"; + libraryHaskellDepends = [ + base base-compat bytestring containers regex regex-base + regex-pcre-builtin regex-tdfa template-haskell transformers + unordered-containers + ]; + homepage = "http://regex.uk"; + description = "Toolkit for regex-base"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "regex-xmlschema" = callPackage ({ mkDerivation, base, haskell98, parsec }: mkDerivation { @@ -150111,8 +152889,8 @@ self: { }: mkDerivation { pname = "relapse"; - version = "0.1.0.1"; - sha256 = "4e6e2bb0c4c420f184c9cc928659e3bbbbce0215f2681e7641a9a6f2eb31e631"; + version = "1.0.0.0"; + sha256 = "65c68af5e3d18e67bd6f81ab62ea9cc271d8283d876f7baf1c4ee64515a9aa19"; libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ aeson base base16-bytestring bytestring containers include-file @@ -150178,6 +152956,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "relational-query_0_8_3_6" = callPackage + ({ mkDerivation, array, base, bytestring, containers, dlist + , names-th, persistable-record, quickcheck-simple, sql-words + , template-haskell, text, th-reify-compat, time, time-locale-compat + , transformers + }: + mkDerivation { + pname = "relational-query"; + version = "0.8.3.6"; + sha256 = "227d39084a0d27fdb135b4e4ee48a0fbcbd9c3e99d69ba8429c2187be6fdf94b"; + libraryHaskellDepends = [ + array base bytestring containers dlist names-th persistable-record + sql-words template-haskell text th-reify-compat time + time-locale-compat transformers + ]; + testHaskellDepends = [ + base containers quickcheck-simple transformers + ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "Typeful, Modular, Relational, algebraic query engine"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "relational-query-HDBC" = callPackage ({ mkDerivation, base, containers, convertible, dlist, HDBC , HDBC-session, names-th, persistable-record, relational-query @@ -150204,8 +153006,8 @@ self: { }: mkDerivation { pname = "relational-record"; - version = "0.1.6.1"; - sha256 = "c18bb200618b86a0baec590408ac941fb6a2a1d158ba74d6f9f4239a8d4bdada"; + version = "0.1.7.1"; + sha256 = "18fa0712dc906c056d0c21cfc262a97673906348fa37130761688b16f9cd7a2c"; libraryHaskellDepends = [ base persistable-types-HDBC-pg relational-query relational-query-HDBC @@ -151066,6 +153868,8 @@ self: { pname = "req"; version = "0.2.0"; sha256 = "e64e56622f1ec06df83e2c8516effa49058b4d7196c28127ab98190cc320ebbc"; + revision = "1"; + editedCabalFile = "b37d82306c1346da0bbaa129073d8cc8d7fa86df7ae938fb45de47925b8ed6b0"; libraryHaskellDepends = [ aeson authenticate-oauth base blaze-builder bytestring case-insensitive connection data-default-class http-api-data @@ -151439,8 +154243,8 @@ self: { pname = "rest-core"; version = "0.39"; sha256 = "d760d0547fc1a99cd949dde08b7945fb93af24f4e55d45ecf410c352d5005404"; - revision = "4"; - editedCabalFile = "261e22e228e0d1f042f24a0a9e784a7ed3ea44342006cb79cb7e4021f0e46b9a"; + revision = "6"; + editedCabalFile = "38c82ac051ac1cda463e93d4704be00680ee24fc044eb1cabcf48789306a8635"; libraryHaskellDepends = [ aeson aeson-utils base base-compat bytestring case-insensitive errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat @@ -151492,8 +154296,8 @@ self: { pname = "rest-gen"; version = "0.20.0.0"; sha256 = "81a9486136f91773371858f9d3e248b80458e7d55aab11f17cc158c3ce68d542"; - revision = "5"; - editedCabalFile = "f215b849b6a581cb87b835c7feeee8de835d6cd5039eb7c15272c4b9fdc9456a"; + revision = "7"; + editedCabalFile = "8cd3ba2ec87976c3118b1de8d9172104e3a136f0afd9443e935130435fbc4c7d"; libraryHaskellDepends = [ aeson base base-compat blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt @@ -151679,30 +154483,6 @@ self: { }) {}; "rethinkdb" = callPackage - ({ mkDerivation, aeson, async, base, base64-bytestring, binary - , bytestring, containers, criterion, data-default, doctest, mtl - , network, scientific, text, time, unordered-containers - , utf8-string, vector - }: - mkDerivation { - pname = "rethinkdb"; - version = "2.2.0.8"; - sha256 = "444938d62cba4cbe8606507e3c0abd341f45fd9acf6000102f1743ddb5a0e50f"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base64-bytestring binary bytestring containers - data-default mtl network scientific text time unordered-containers - utf8-string vector - ]; - testHaskellDepends = [ base doctest ]; - benchmarkHaskellDepends = [ aeson async base criterion text ]; - homepage = "http://github.com/atnnn/haskell-rethinkdb"; - description = "A driver for RethinkDB 2.2"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "rethinkdb_2_2_0_9" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, binary , bytestring, containers, criterion, data-default, doctest, mtl , network, scientific, text, time, unordered-containers @@ -151724,7 +154504,6 @@ self: { homepage = "http://github.com/atnnn/haskell-rethinkdb"; description = "A driver for RethinkDB 2.2"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rethinkdb-client-driver" = callPackage @@ -152808,13 +155587,13 @@ self: { }: mkDerivation { pname = "rose-trie"; - version = "1.0.0.2"; - sha256 = "94eb35048ea15968f66aed88e1598b4e742f129928a880ddbbd4e6a2b38ff99e"; + version = "1.0.0.5"; + sha256 = "9d6328c9a639585edf2777b2e2ec6aab025f6fda9132222316caa078efb6a31c"; libraryHaskellDepends = [ base containers deepseq minilens mtl transformers ]; homepage = "https://github.com/RaminHAL9001/rose-trie"; - description = "Provides \"Data.Tree.RoseTrie\": trees with polymorphic paths to nodes, combining properties of Rose Tree data structures and Trie data structures."; + description = "Trees with polymorphic paths to nodes, combining properties of Rose Trees and Tries"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -153301,29 +156080,29 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "rss-conduit_0_3_0_1" = callPackage + "rss-conduit_0_3_1_0" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators - , conduit-extra, containers, data-default, hlint, lens-simple - , mono-traversable, QuickCheck, quickcheck-instances, resourcet - , safe, safe-exceptions, tasty, tasty-hunit, tasty-quickcheck, text - , time, timerep, uri-bytestring, xml-conduit, xml-types + , containers, data-default, hlint, lens-simple, mono-traversable + , QuickCheck, quickcheck-instances, resourcet, safe + , safe-exceptions, tasty, tasty-hunit, tasty-quickcheck, text, time + , timerep, uri-bytestring, xml-conduit, xml-types }: mkDerivation { pname = "rss-conduit"; - version = "0.3.0.1"; - sha256 = "d30265d4e68f7563580e6dd3a2b39c0017145d111c60def1d9667fdb6ca3aae6"; + version = "0.3.1.0"; + sha256 = "3a12df089512275e3fcf590b91e13f2c821eaef09d60829c5244c3dd94eb3cc9"; libraryHaskellDepends = [ base conduit conduit-combinators containers lens-simple mono-traversable safe safe-exceptions text time timerep uri-bytestring xml-conduit xml-types ]; testHaskellDepends = [ - base bytestring conduit conduit-extra data-default hlint + base bytestring conduit conduit-combinators data-default hlint lens-simple mono-traversable QuickCheck quickcheck-instances resourcet safe-exceptions tasty tasty-hunit tasty-quickcheck text time uri-bytestring xml-conduit xml-types ]; - description = "Streaming parser/renderer for the RSS 2.0 standard."; + description = "Streaming parser/renderer for the RSS standard"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -153410,6 +156189,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) rtl-sdr;}; + "rtnetlink" = callPackage + ({ mkDerivation, base, bytestring, cereal, hspec, monad-loops, mtl + , pretty-hex, random, socket, transformers, unix + }: + mkDerivation { + pname = "rtnetlink"; + version = "0.1.0.4"; + sha256 = "3972a04b0b3ad757e368b6d809120a375d07b23e9f52a20ed48ef929f364077c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring cereal monad-loops mtl pretty-hex random socket + transformers unix + ]; + testHaskellDepends = [ base hspec socket unix ]; + homepage = "https://gitlab.com/formaltech/rtnetlink-hs"; + description = "Manipulate network devices, addresses, and routes on Linux"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rtorrent-rpc" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-textual , bytestring, deepseq, haxr, mtl, network, split, utf8-string @@ -153495,8 +156294,8 @@ self: { }: mkDerivation { pname = "ruby-marshal"; - version = "0.1.1"; - sha256 = "d61ceb301b82e439b064eb4b1b84b1bb21c4ac9dc0239a0dc8d361cfe1b1800e"; + version = "0.1.2"; + sha256 = "37bc92262a7b0be2a608566f3523b37ac2e017611ff591d3f722d588f509408f"; libraryHaskellDepends = [ base bytestring cereal containers mtl string-conv vector ]; @@ -153771,8 +156570,8 @@ self: { ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "safe-access"; - version = "0.3.1.0"; - sha256 = "936ddafc0664e4b62f11ebb6b2c3169f06c67e107a0d8f05e27896940eb4bf9f"; + version = "0.3.2.0"; + sha256 = "346c5ab460d9011f8dce0bc7481d0baa3ddb71666528eb63b607263f62af0b6c"; libraryHaskellDepends = [ base mtl transformers ]; homepage = "http://darcs.redspline.com/safe-access"; description = "A simple environment to control access to data"; @@ -153786,8 +156585,8 @@ self: { }: mkDerivation { pname = "safe-exceptions"; - version = "0.1.4.0"; - sha256 = "c52078c8457f8233a3796f84a3ae3f336f4668a013ba935e74c7218eeb9a41a6"; + version = "0.1.5.0"; + sha256 = "70efec3691b296c7af21b01b87c838b6f54a55af63429746dad1184c08cd1a19"; libraryHaskellDepends = [ base deepseq exceptions transformers ]; testHaskellDepends = [ base hspec void ]; homepage = "https://github.com/fpco/safe-exceptions#readme"; @@ -153803,6 +156602,8 @@ self: { pname = "safe-exceptions-checked"; version = "0.1.0"; sha256 = "d807552b828de308d80805f65ee41f3e25571506b10e6b28b0b81de4aec0ca3f"; + revision = "1"; + editedCabalFile = "eb73db3a495242ccc5bea2cc4aef48e91693dcd43301ea9e531f1c0aaea4d6da"; libraryHaskellDepends = [ base deepseq safe-exceptions transformers ]; @@ -153961,8 +156762,8 @@ self: { }: mkDerivation { pname = "safecopy"; - version = "0.9.2"; - sha256 = "ba666b242653d6b23fc9bc19dfa9d4367148aeb9235baf3738b91150ac9b6ed3"; + version = "0.9.3.1"; + sha256 = "63ee973ad84c0a4440934b726bc066aa571d27014bc27f2dd93bc9839340471a"; libraryHaskellDepends = [ array base bytestring cereal containers old-time template-haskell text time vector @@ -154288,8 +157089,8 @@ self: { ({ mkDerivation, base, numeric-prelude, sample-frame }: mkDerivation { pname = "sample-frame-np"; - version = "0.0.4"; - sha256 = "cdec6e95f9b3739ca5031dfa914465d5e82b9b6bb09c95529728c92efb21e4d0"; + version = "0.0.4.1"; + sha256 = "b1db7621b07503f5fe49390bf1e1b4257c49f4760d617121a23d845278f93624"; libraryHaskellDepends = [ base numeric-prelude sample-frame ]; homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Orphan instances for types from sample-frame and numericprelude"; @@ -155297,6 +158098,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "scientific_0_3_4_11" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, criterion + , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms + , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, text, vector + }: + mkDerivation { + pname = "scientific"; + version = "0.3.4.11"; + sha256 = "990f4ba464606eb2bf07059c527b8e1e7aa11e2f0d9e2f3c0b4e6aec9f9e7ed4"; + libraryHaskellDepends = [ + base binary bytestring containers deepseq ghc-prim hashable + integer-gmp integer-logarithms text vector + ]; + testHaskellDepends = [ + base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml + tasty-hunit tasty-quickcheck tasty-smallcheck text + ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/basvandijk/scientific"; + description = "Numbers represented using scientific notation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "scion" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , filepath, ghc, ghc-paths, ghc-syb, hslogger, json, multiset @@ -155952,15 +158778,17 @@ self: { }: mkDerivation { pname = "sdl2-compositor"; - version = "1.2.0.5"; - sha256 = "233b6fa622703849d4f7d69ac2202a0787b4e1048341b09767a3b5fa2e3ee255"; + version = "1.2.0.6"; + sha256 = "32face1df14f6944165365b383cf01ea15688711395def00f02d7774bd53b014"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base lens linear lrucache QuickCheck sdl2 StateVar stm text transformers ]; - testHaskellDepends = [ base Cabal hspec hspec-core QuickCheck ]; + testHaskellDepends = [ + base Cabal hspec hspec-core lrucache QuickCheck stm + ]; description = "image compositing with sdl2 - declarative style"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -156037,6 +158865,8 @@ self: { pname = "sdl2-ttf"; version = "1.0.0"; sha256 = "349b155e0992e2e05695d380145bdb28a9a9bd6089ca03973dca6948883fe51f"; + revision = "1"; + editedCabalFile = "d7cfd13b2e073a6c23c5433e883ab04ad527bb694e9bc2caa24050335f81e004"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base sdl2 transformers ]; @@ -156120,8 +158950,8 @@ self: { ({ mkDerivation, base, bytestring, free, mtl, text }: mkDerivation { pname = "seakale"; - version = "0.2.0.0"; - sha256 = "cdbab7220b1935ef18dd78113fd87981371492d904a1e07d2911c94dcf2b2349"; + version = "0.2.1.0"; + sha256 = "421133a7081f9b107e57cb1e055cb2b71d9ccfbb63fcb13b1b447e2ca777c72f"; libraryHaskellDepends = [ base bytestring free mtl text ]; description = "Pure SQL layer on top of other libraries"; license = stdenv.lib.licenses.bsd3; @@ -156133,8 +158963,8 @@ self: { }: mkDerivation { pname = "seakale-postgresql"; - version = "0.2.0.0"; - sha256 = "f7205329cf6388331f77da685cfc9e742130e6714d6a2103e57a5cd6cf49b9ac"; + version = "0.2.0.1"; + sha256 = "c214ab985c0bb5174acceaec0d5952e3bd01f6b998dbfd4025203bf4a78643b9"; libraryHaskellDepends = [ base bytestring free mtl postgresql-libpq seakale time ]; @@ -156148,8 +158978,8 @@ self: { }: mkDerivation { pname = "seakale-tests"; - version = "0.1.0.1"; - sha256 = "ac54690de63000b5492d85b4009e5e6d3baab645726e06d4f099b990ce707508"; + version = "0.1.0.2"; + sha256 = "70bc6f129086ea030f260babe3c8228ee8462720a3fef72d9071c4e0795d2c29"; libraryHaskellDepends = [ base bytestring free mtl recursion-schemes seakale ]; @@ -156186,6 +159016,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "search-algorithms" = callPackage + ({ mkDerivation, base, containers, doctest, hspec }: + mkDerivation { + pname = "search-algorithms"; + version = "0.1.0"; + sha256 = "4c93f0a145aefccbeee9b61e56f6c79a5a29c6398a3cff962e087d08d9ab636a"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers doctest hspec ]; + homepage = "https://github.com/devonhollowood/search-algorithms#readme"; + description = "Common graph search algorithms"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sec" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -156325,6 +159168,8 @@ self: { pname = "secret-sharing"; version = "1.0.0.3"; sha256 = "62af2ba181d30e6d6c6cfd01f83a5082b6bc378a745c90497cff42ebea2b6160"; + revision = "1"; + editedCabalFile = "61cd19283cfa3fb48b92ac636aead422be5120efb8a77b4390a1ca2d571819e1"; libraryHaskellDepends = [ base binary bytestring dice-entropy-conduit finite-field polynomial vector @@ -157163,8 +160008,8 @@ self: { }: mkDerivation { pname = "serokell-util"; - version = "0.1.4.0"; - sha256 = "ab37e7b6833fa3499501c82133dfd640875326c1b0ba96df3cf7b0380c2215cf"; + version = "0.1.5.3"; + sha256 = "049c553f26e9e8e59273851abb7897d2e6d1554b21d66a035ee43983796d3c16"; libraryHaskellDepends = [ acid-state aeson aeson-extra ansi-terminal base base16-bytestring base64-bytestring binary binary-orphans bytestring cereal @@ -157357,8 +160202,8 @@ self: { ({ mkDerivation, base, doctest, Glob, hspec, QuickCheck, yaml }: mkDerivation { pname = "servant-auth"; - version = "0.2.6.0"; - sha256 = "ca70089cb1560dc8b990437c3eb6ff4a8cea0aba387fc7cb7ef1bd0b9f17113d"; + version = "0.2.6.1"; + sha256 = "25c5d31edca69294229bc0aaeb359e8c97f4ba2014cb95cd55265ec7cc7fad59"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob hspec QuickCheck yaml ]; homepage = "http://github.com/plow-technologies/servant-auth#readme"; @@ -157374,8 +160219,8 @@ self: { }: mkDerivation { pname = "servant-auth-client"; - version = "0.2.6.0"; - sha256 = "928cd5a1e546e38f76f161332ea6591f885d62c052fd8a6cee5e4e22f35e5c36"; + version = "0.2.6.1"; + sha256 = "53855164942526c019c5b88c6b3c11ee9b80200b204b083b4313016e0960775f"; libraryHaskellDepends = [ base bytestring servant servant-auth servant-client text ]; @@ -157425,8 +160270,8 @@ self: { }: mkDerivation { pname = "servant-auth-docs"; - version = "0.2.6.0"; - sha256 = "333d3fabb345a2892aa803e5e5558356a66382032693d68e762fb95dd75cb4b2"; + version = "0.2.6.1"; + sha256 = "76c6a4e9cf4979df461de017d43df6944c837aec90bc0543b17f66ee6d280d77"; libraryHaskellDepends = [ base lens servant servant-auth servant-docs text ]; @@ -157476,47 +160321,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-auth-server_0_2_1_0" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder - , bytestring, bytestring-conversion, case-insensitive, cookie - , crypto-api, data-default-class, entropy, hspec, http-api-data - , http-client, http-types, jose, lens, lens-aeson, markdown-unlit - , monad-time, mtl, QuickCheck, servant-auth, servant-server, text - , time, transformers, unordered-containers, wai, warp, wreq - }: - mkDerivation { - pname = "servant-auth-server"; - version = "0.2.1.0"; - sha256 = "0f9e848300a916de0892c55a8b530a02d3fc8bcbc7983012780355a88e266c84"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base64-bytestring blaze-builder bytestring - bytestring-conversion case-insensitive cookie crypto-api - data-default-class entropy http-api-data jose lens monad-time mtl - servant-auth servant-server text time unordered-containers wai - ]; - executableHaskellDepends = [ - aeson base base64-bytestring blaze-builder bytestring - bytestring-conversion case-insensitive cookie crypto-api - data-default-class entropy http-api-data jose lens markdown-unlit - monad-time mtl servant-auth servant-server text time transformers - unordered-containers wai warp - ]; - testHaskellDepends = [ - aeson base base64-bytestring blaze-builder bytestring - bytestring-conversion case-insensitive cookie crypto-api - data-default-class entropy hspec http-api-data http-client - http-types jose lens lens-aeson monad-time mtl QuickCheck - servant-auth servant-server text time unordered-containers wai warp - wreq - ]; - homepage = "http://github.com/plow-technologies/servant-auth#readme"; - description = "servant-server/servant-auth compatibility"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "servant-auth-server" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder , bytestring, bytestring-conversion, case-insensitive, cookie @@ -157527,8 +160331,8 @@ self: { }: mkDerivation { pname = "servant-auth-server"; - version = "0.2.6.0"; - sha256 = "d78ab2c470731d2e18f19c2b45b8cc398541cda56ba947cdb032081737c55ea8"; + version = "0.2.6.1"; + sha256 = "5a850a6c011a72a5c3fea1285122fd8f295f31591a413b977385736d3fd8b877"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157558,6 +160362,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-auth-swagger" = callPackage + ({ mkDerivation, base, doctest, Glob, hspec, lens, QuickCheck + , servant, servant-auth, servant-swagger, swagger2, text, yaml + }: + mkDerivation { + pname = "servant-auth-swagger"; + version = "0.2.6.1"; + sha256 = "ef8001b5f9301522264ed06fdd3ef5772c23d7ae08abe8656047ba950e461a4d"; + libraryHaskellDepends = [ + base lens servant servant-auth servant-swagger swagger2 text + ]; + testHaskellDepends = [ + base doctest Glob hspec lens QuickCheck servant servant-auth + servant-swagger swagger2 text yaml + ]; + homepage = "http://github.com/plow-technologies/servant-auth#readme"; + description = "servant-swagger/servant-auth compatibility"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-auth-token" = callPackage ({ mkDerivation, aeson-injector, base, bytestring, containers, mtl , pwstore-fast, servant-auth-token-api, servant-server, text, time @@ -157565,8 +160389,8 @@ self: { }: mkDerivation { pname = "servant-auth-token"; - version = "0.4.1.1"; - sha256 = "06a2f6928bd558ad6d22542bf212ac0acdb60d68febe70eab917d37812bb3e84"; + version = "0.4.2.0"; + sha256 = "4e43edd4241521b366c9a55cfd1fce1e8f9e3963037257f3552f8c946d8ed668"; libraryHaskellDepends = [ aeson-injector base bytestring containers mtl pwstore-fast servant-auth-token-api servant-server text time transformers uuid @@ -157606,8 +160430,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-api"; - version = "0.4.0.1"; - sha256 = "0850d95cc86d0893069887f2e30ed0cb22eef0bdf7f82a6d28e1c51f551e3d83"; + version = "0.4.1.1"; + sha256 = "70c5ab5e1bbd3b29e9b8dcc558d08c6688fdd4fee4412ffef964454386dadfda"; libraryHaskellDepends = [ aeson aeson-injector base lens raw-strings-qq servant servant-docs servant-swagger swagger2 text @@ -157618,6 +160442,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-auth-token-leveldb" = callPackage + ({ mkDerivation, aeson-injector, base, bytestring, concurrent-extra + , containers, exceptions, lens, leveldb-haskell, monad-control, mtl + , resourcet, safe, safecopy-store, servant-auth-token + , servant-auth-token-api, servant-server, store, text, time + , transformers, transformers-base, uuid, vector + }: + mkDerivation { + pname = "servant-auth-token-leveldb"; + version = "0.4.1.2"; + sha256 = "516fb304f56be33491f7cc1c319acb05b30e3fb24a8c971598627a948a802fb2"; + libraryHaskellDepends = [ + aeson-injector base bytestring concurrent-extra containers + exceptions lens leveldb-haskell monad-control mtl resourcet safe + safecopy-store servant-auth-token servant-auth-token-api + servant-server store text time transformers transformers-base uuid + vector + ]; + homepage = "https://github.com/ncrashed/servant-auth-token#readme"; + description = "Leveldb backend for servant-auth-token server"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-auth-token-persistent" = callPackage ({ mkDerivation, aeson-injector, base, bytestring, containers , ghc-prim, monad-control, mtl, persistent, persistent-postgresql @@ -157770,8 +160618,8 @@ self: { }: mkDerivation { pname = "servant-db-postgresql"; - version = "0.2.1.0"; - sha256 = "6f3cefb7b24bf3d4e50efe84d903e79edc936b85950cc260855af4a50ac11071"; + version = "0.2.2.0"; + sha256 = "ed718a452f4981a83ec7db630659ba802ee6ca1bf88495603abc1b7517a22e80"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157783,6 +160631,7 @@ self: { optparse-applicative postgresql-query QuickCheck quickcheck-instances servant-db text time transformers-base ]; + homepage = "https://github.com/NCrashed/servant-db-postgresql"; description = "Derive a postgres client to database API specified by servant-db"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -158060,29 +160909,6 @@ self: { }) {}; "servant-js" = callPackage - ({ mkDerivation, base, base-compat, charset, hspec - , hspec-expectations, language-ecmascript, lens, QuickCheck - , servant, servant-foreign, text - }: - mkDerivation { - pname = "servant-js"; - version = "0.9.2"; - sha256 = "ad4676667cdd72f5bafac5c2d6de710b9c0082131b72dd117026fecb0d544369"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat charset lens servant servant-foreign text - ]; - testHaskellDepends = [ - base base-compat hspec hspec-expectations language-ecmascript lens - QuickCheck servant text - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "Automatically derive javascript functions to query servant webservices"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-js_0_9_3" = callPackage ({ mkDerivation, base, base-compat, charset, hspec , hspec-expectations, language-ecmascript, lens, QuickCheck , servant, servant-foreign, text @@ -158103,7 +160929,6 @@ self: { homepage = "http://haskell-servant.readthedocs.org/"; description = "Automatically derive javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-lucid" = callPackage @@ -158243,6 +161068,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-options" = callPackage + ({ mkDerivation, base, bytestring, http-types, servant-foreign + , servant-server, text, wai + }: + mkDerivation { + pname = "servant-options"; + version = "0.1.0.0"; + sha256 = "5cfe2e60ec6267c80dfd2c5ccfb2ce8d9d13b2bcaf646ee80de6bc32c8f49fb3"; + libraryHaskellDepends = [ + base bytestring http-types servant-foreign servant-server text wai + ]; + homepage = "https://github.com/sordina/servant-options"; + description = "Provide responses to OPTIONS requests for Servant applications"; + license = stdenv.lib.licenses.mit; + }) {}; + "servant-pandoc" = callPackage ({ mkDerivation, base, bytestring, http-media, lens, pandoc-types , servant-docs, text, unordered-containers @@ -158372,8 +161213,8 @@ self: { }: mkDerivation { pname = "servant-quickcheck"; - version = "0.0.2.2"; - sha256 = "72878553ed9d7f134bd10e11ca7eaf69ba3d341e591aa3af4c73c43c7af866c5"; + version = "0.0.2.4"; + sha256 = "628d944e9185f3c60e7711034c7535ae2772df75cace718a744aaca478cac7c9"; libraryHaskellDepends = [ aeson base base-compat bytestring case-insensitive clock data-default-class hspec http-client http-media http-types mtl @@ -158425,6 +161266,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-ruby" = callPackage + ({ mkDerivation, base, casing, doctest, lens, servant-foreign, text + }: + mkDerivation { + pname = "servant-ruby"; + version = "0.2.0.0"; + sha256 = "5ac0095edc4254edc3db4f4a0913669391f838a8a6b4c9f78ff00daa2b467e17"; + libraryHaskellDepends = [ base casing lens servant-foreign text ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/joneshf/servant-ruby#readme"; + description = "Generate a Ruby client from a Servant API with Net::HTTP"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-scotty" = callPackage ({ mkDerivation, aeson, base, http-types, scotty, servant , servant-response, text, transformers @@ -158661,7 +161516,6 @@ self: { homepage = "https://github.com/haskell-servant/servant-swagger"; description = "Generate Swagger specification for your servant API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-swagger_1_1_2_1" = callPackage @@ -158717,7 +161571,6 @@ self: { homepage = "https://github.com/phadej/servant-swagger-ui#readme"; description = "Servant swagger ui"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-yaml" = callPackage @@ -159098,6 +161951,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "setoid" = callPackage + ({ mkDerivation, base, containers, mtl, smallcheck, tasty + , tasty-discover, tasty-hunit, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "setoid"; + version = "0.1.0.0"; + sha256 = "165047a4ff8b20f0fbb404ee658a42c0836f354b8bc3477b86e8ee0e430a4b3c"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ + base containers mtl smallcheck tasty tasty-discover tasty-hunit + tasty-quickcheck tasty-smallcheck + ]; + description = "A Haskell implementation of setoid"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "setops" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -159251,18 +162122,21 @@ self: { }) {}; "sext" = callPackage - ({ mkDerivation, base, bytestring, template-haskell, text, vector + ({ mkDerivation, base, bytestring, tasty, tasty-hunit + , template-haskell, text, vector }: mkDerivation { pname = "sext"; - version = "0.1.2"; - sha256 = "c046a0613bc8275f9e0c4c0052c2a9e9e7468fa20a1fd7f64a6d6ce5f02f46a1"; + version = "0.1.3"; + sha256 = "6b1cc147120f0730ed2aa199033c9840fde2ed235d2d243667ceceb2e123ca7c"; libraryHaskellDepends = [ base bytestring template-haskell text vector ]; - testHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit template-haskell + ]; homepage = "https://github.com/dzhus/sext#readme"; - description = "Lists, Texts, ByteStrings, and Vectors with type-encoded length"; + description = "Lists, Texts, ByteStrings and Vectors with type-encoded length"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -159543,8 +162417,8 @@ self: { }: mkDerivation { pname = "shake-language-c"; - version = "0.10.0"; - sha256 = "1b0f031c37db7ac320f80e09ab79dca2bdb85ba922a48c10f0954efd6d407888"; + version = "0.10.1"; + sha256 = "ca464474f7a4d4807b6cd594bc9477549f1b17feb565f0c52c7249183d640220"; libraryHaskellDepends = [ base data-default-class fclabels process shake split unordered-containers @@ -159584,6 +162458,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "shake-path" = callPackage + ({ mkDerivation, base, path, path-io, shake }: + mkDerivation { + pname = "shake-path"; + version = "0.0.0.0"; + sha256 = "eb6290368e92a637a5a3651c084790bc84e8cd614707e6227dde6b98ea761a33"; + libraryHaskellDepends = [ base path path-io shake ]; + homepage = "http://cs-syd.eu"; + description = "path alternatives to shake functions"; + license = stdenv.lib.licenses.mit; + }) {}; + "shake-persist" = callPackage ({ mkDerivation, base, binary, directory, shake, template-haskell }: @@ -159949,7 +162835,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "shell-conduit_4_6_0" = callPackage + "shell-conduit_4_6_1" = callPackage ({ mkDerivation, async, base, bytestring, conduit, conduit-extra , control-monad-loop, directory, filepath, hspec , hspec-expectations, monad-control, monads-tf, process, resourcet @@ -159958,8 +162844,8 @@ self: { }: mkDerivation { pname = "shell-conduit"; - version = "4.6.0"; - sha256 = "9ce6230efb78589b5b28dd82396d73afbc832bbb8213f51c28ab6c946a9a12a1"; + version = "4.6.1"; + sha256 = "86d161f8b05ae72e5464fe4ade42443d750fc9ffbd5ba98d7d5587287076ad42"; libraryHaskellDepends = [ async base bytestring conduit conduit-extra control-monad-loop directory filepath monad-control monads-tf process resourcet @@ -160165,8 +163051,8 @@ self: { }: mkDerivation { pname = "shikensu"; - version = "0.2.1"; - sha256 = "3984671ee884f828df248aa5d9033ece376ecb30cb0f689a4a4aa10a93d697f8"; + version = "0.3.2"; + sha256 = "74c76ed29a086f3d8c2d4a017c358cf78505e0b862da6d931f2202b52b51301f"; libraryHaskellDepends = [ aeson base bytestring directory filepath flow Glob text unordered-containers @@ -160257,6 +163143,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shortcut" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "shortcut"; + version = "0.1"; + sha256 = "0a29d75028071579ad855b592cce687fc9f0ad2e78aeaec36152082db9f92ff1"; + revision = "1"; + editedCabalFile = "87266ab5d90db03edb789b97534f17901c77b435d95a6724e7832bebef00d793"; + libraryHaskellDepends = [ base ]; + homepage = "http://www.nomyx.net"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "shortcut-links" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -160855,8 +163754,8 @@ self: { }: mkDerivation { pname = "simple-effects"; - version = "0.7.0.1"; - sha256 = "be3d3ca1fbfc2aee432190f0e737b73478116493beb176216dcad0b1a8c0bc4d"; + version = "0.7.0.2"; + sha256 = "367158bb1e97fea1bd5f61e9390bb0a50a0ad26ab11c97c16a0fdc495be17f4c"; libraryHaskellDepends = [ array base exceptions list-t monad-control MonadRandom mtl text transformers transformers-base @@ -162036,7 +164935,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "skylighting_0_3_1" = callPackage + "skylighting_0_3_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, blaze-html , bytestring, case-insensitive, containers, criterion, Diff , directory, filepath, HUnit, hxt, mtl, pretty-show, random @@ -162045,8 +164944,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.3.1"; - sha256 = "d93ee3b15d74ab66fd729c4b56741c052fe331b4cfc78bad2a433827417d4f74"; + version = "0.3.2"; + sha256 = "fe48ff596d3971cbb285a1ce677d1527285845feaed16d46fcb49b8ad50767bc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162937,8 +165836,8 @@ self: { ({ mkDerivation, base, blaze-html, snap-core }: mkDerivation { pname = "snap-blaze"; - version = "0.2.1.4"; - sha256 = "381a8cf8f211be77b9d52c2aa6b880e7059384fe0124c69d704040b0c016302b"; + version = "0.2.1.5"; + sha256 = "b36e35bd4ba3087b3de92702e488ba6570675719243b5dbdf4eae0b819988841"; libraryHaskellDepends = [ base blaze-html snap-core ]; homepage = "http://github.com/jaspervdj/snap-blaze"; description = "blaze-html integration for Snap"; @@ -162976,31 +165875,31 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder , case-insensitive, containers, deepseq, directory, filepath , hashable, HUnit, io-streams, lifted-base, monad-control, mtl - , old-locale, parallel, QuickCheck, random, readable, regex-posix - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, time, transformers, transformers-base, unix-compat - , unordered-containers, vector, zlib + , network, network-uri, old-locale, parallel, QuickCheck, random + , readable, regex-posix, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers + , transformers-base, unix-compat, unordered-containers, vector + , zlib }: mkDerivation { pname = "snap-core"; - version = "1.0.1.0"; - sha256 = "f5d2a8b690e77b03626e7bd1856011fc2a13b286939176bde7b61c064aafa37c"; - revision = "1"; - editedCabalFile = "ef248be20bc9d535defbc2f091db3f48dd02e5b233a8305f8ad3c83f2f4548c8"; + version = "1.0.2.0"; + sha256 = "e48eba4727169b9c599c6de1791deb881eeee12e25658a30590116b450e5b65c"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder case-insensitive - containers directory filepath HUnit io-streams lifted-base - monad-control mtl old-locale random readable regex-posix text time - transformers transformers-base unix-compat unordered-containers - vector + containers directory filepath hashable HUnit io-streams lifted-base + monad-control mtl network network-uri old-locale random readable + regex-posix text time transformers transformers-base unix-compat + unordered-containers vector ]; testHaskellDepends = [ attoparsec base bytestring bytestring-builder case-insensitive containers deepseq directory filepath hashable HUnit io-streams - lifted-base monad-control mtl old-locale parallel QuickCheck random - readable regex-posix test-framework test-framework-hunit - test-framework-quickcheck2 text time transformers transformers-base - unix-compat unordered-containers vector zlib + lifted-base monad-control mtl network network-uri old-locale + parallel QuickCheck random readable regex-posix test-framework + test-framework-hunit test-framework-quickcheck2 text time + transformers transformers-base unix-compat unordered-containers + vector zlib ]; homepage = "http://snapframework.com/"; description = "Snap: A Haskell Web Framework (core interfaces and types)"; @@ -163233,6 +166132,8 @@ self: { pname = "snap-templates"; version = "1.0.0.0"; sha256 = "f6289348179d07721f6edc1dbe19bcfe989de0dd2945962c455e2ce113d2561b"; + revision = "1"; + editedCabalFile = "6a57896a679dc58684cb1b8321fa19bf778d48beeeac125434362ac2d5fa0679"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -164197,6 +167098,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "snipcheck" = callPackage + ({ mkDerivation, base, pandoc, process }: + mkDerivation { + pname = "snipcheck"; + version = "0.1.0.0"; + sha256 = "139097708760baee65463781237f2294f74a399832283d32756a26ab05ba846c"; + libraryHaskellDepends = [ base pandoc process ]; + homepage = "https://github.com/nmattia/snipcheck#readme"; + description = "Markdown tester"; + license = stdenv.lib.licenses.mit; + }) {}; + "snippet-extractor" = callPackage ({ mkDerivation, base, parsec }: mkDerivation { @@ -164702,21 +167615,24 @@ self: { }) {}; "solr" = callPackage - ({ mkDerivation, base, base-prelude, bytestring + ({ mkDerivation, attoparsec-data, base, base-prelude, bytestring , bytestring-tree-builder, case-insensitive, contravariant - , http-client, http-response-decoder, json-encoder - , json-incremental-decoder, matcher, profunctors, semigroups, text + , http-client, http-client-tls, http-response-decoder, json-encoder + , json-incremental-decoder, managed, matcher + , optparse-applicative-simple, profunctors, semigroups, text , transformers, uri-encode }: mkDerivation { pname = "solr"; - version = "0.3.3"; - sha256 = "5703365d767023c7dd9fe5584968655f0115a5ad6b65bf28762dfeb959ed325c"; + version = "0.4.1"; + sha256 = "b9499555ee76c3a185384570b8d207f707a9dfa7d3529f06413d76fb164f4016"; libraryHaskellDepends = [ - base base-prelude bytestring bytestring-tree-builder - case-insensitive contravariant http-client http-response-decoder - json-encoder json-incremental-decoder matcher profunctors - semigroups text transformers uri-encode + attoparsec-data base base-prelude bytestring + bytestring-tree-builder case-insensitive contravariant http-client + http-client-tls http-response-decoder json-encoder + json-incremental-decoder managed matcher + optparse-applicative-simple profunctors semigroups text + transformers uri-encode ]; homepage = "https://github.com/sannsyn/solr"; description = "A minimal Solr client library"; @@ -164835,20 +167751,20 @@ self: { }) {}; "sound-collage" = callPackage - ({ mkDerivation, array, base, carray, directory, fft, filepath - , numeric-prelude, optparse-applicative, sample-frame, soxlib - , storablevector, storablevector-carray, synthesizer-core - , temporary, transformers, utility-ht + ({ mkDerivation, array, base, Cabal, carray, containers, fft + , filepath, numeric-prelude, optparse-applicative, pathtype + , sample-frame, soxlib, storablevector, storablevector-carray + , synthesizer-core, temporary, transformers, utility-ht }: mkDerivation { pname = "sound-collage"; - version = "0.1"; - sha256 = "b584afca2dc682dfa7e5350b8eb3877b7cf6cedfb5f7ed9a7af006910b86fc87"; + version = "0.2"; + sha256 = "5c07cfaa39450292f4649d62c9e9d938a23ffd0baadd94feeb9db10a7e853ac2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array base carray directory fft filepath numeric-prelude - optparse-applicative sample-frame soxlib storablevector + array base Cabal carray containers fft filepath numeric-prelude + optparse-applicative pathtype sample-frame soxlib storablevector storablevector-carray synthesizer-core temporary transformers utility-ht ]; @@ -165364,6 +168280,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "speculate" = callPackage + ({ mkDerivation, base, cmdargs, containers, leancheck }: + mkDerivation { + pname = "speculate"; + version = "0.2.4"; + sha256 = "7cafbb4269289cadef7562059b3d6bbce09e933cc41369c68e7f991f8a7d1e14"; + libraryHaskellDepends = [ base cmdargs containers leancheck ]; + testHaskellDepends = [ base cmdargs containers leancheck ]; + benchmarkHaskellDepends = [ base cmdargs containers leancheck ]; + homepage = "https://github.com/rudymatela/speculate#readme"; + description = "discovery of properties about Haskell functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "speculation" = callPackage ({ mkDerivation, base, ghc-prim, stm, transformers }: mkDerivation { @@ -165476,6 +168406,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "sphinxesc" = callPackage + ({ mkDerivation, base, MissingH, optparse-applicative, parsec + , split + }: + mkDerivation { + pname = "sphinxesc"; + version = "0.1.0.1"; + sha256 = "f26952487373f7b14f3e3990b76dd5e81686b0d4dbaf76508e334213b997ea7c"; + revision = "1"; + editedCabalFile = "85317b910b35a1970e97bf69405bac67eb9ede00d54c27002caafbe742f2224a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base MissingH parsec split ]; + executableHaskellDepends = [ base optparse-applicative ]; + homepage = "https://github.com/mackeyrms/sphinxesc#readme"; + description = "Transform queries for sphinx input"; + license = stdenv.lib.licenses.mit; + }) {}; + "spice" = callPackage ({ mkDerivation, base, bytestring, containers, data-default, elerea , GLFW, JuicyPixels, JuicyPixels-repa, OpenGL @@ -165672,8 +168621,8 @@ self: { }: mkDerivation { pname = "split-record"; - version = "0.1.1.2"; - sha256 = "8d87da014bbf612290335c4f2df31e77c30882ac3a2b8daae4158eab3483877e"; + version = "0.1.1.3"; + sha256 = "12df38229ac15f8851951d3be685f9b8941ae1d9d7541c3366ffa179856bba79"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -166278,6 +169227,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sscan" = callPackage + ({ mkDerivation, async, base, brick, directory, filepath, microlens + , microlens-th, process, temporary, text, time, vty + }: + mkDerivation { + pname = "sscan"; + version = "0.1"; + sha256 = "47fadd088d4eb2d2580491975a4d7a7d0574ddda8576192c1c4b8b369d353bfb"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async base brick directory filepath microlens microlens-th process + temporary text time vty + ]; + description = "text UI for scanning with SANE"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "sscgi" = callPackage ({ mkDerivation, attoparsec, base, bytestring, case-insensitive , containers, Glob, MonadCatchIO-mtl, mtl, transformers @@ -166515,6 +169482,8 @@ self: { pname = "stable-memo"; version = "0.3.1"; sha256 = "fd8ddc1d5a6200b8cfb192195d0f078545d85088bd6f04aa3f76b310063a65e7"; + revision = "1"; + editedCabalFile = "3246671703f40d04d1f1f0087cfce88a8ba97b5b9c3774188915b9bd2e339ff2"; libraryHaskellDepends = [ base ghc-prim hashtables ]; description = "Memoization based on argument identity"; license = stdenv.lib.licenses.mit; @@ -166555,10 +169524,8 @@ self: { }: mkDerivation { pname = "stache"; - version = "0.2.0"; - sha256 = "0952d6849a297d3ef020feaeb128be4af7d25ab97fa948eb0339a7f75d0a1831"; - revision = "2"; - editedCabalFile = "4899a9a2a56b3e2524b0166f8875f7f823419c64ec1f2a74f2ff7b6010472d01"; + version = "0.2.2"; + sha256 = "66c75aaf078dc778b2e33ddef4850107b5b488fd966c81c7e2f133539276b86e"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory exceptions filepath megaparsec mtl template-haskell text unordered-containers @@ -166576,95 +169543,67 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "stache_0_2_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, criterion - , deepseq, directory, exceptions, file-embed, filepath, hspec - , hspec-megaparsec, megaparsec, mtl, template-haskell, text - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "stache"; - version = "0.2.1"; - sha256 = "f25c0a913cca7ae0056d8030e5351da809bdff53afef80d863c1ecaa0dbbd00f"; - libraryHaskellDepends = [ - aeson base bytestring containers deepseq directory exceptions - filepath megaparsec mtl template-haskell text unordered-containers - vector - ]; - testHaskellDepends = [ - aeson base bytestring containers file-embed hspec hspec-megaparsec - megaparsec text yaml - ]; - benchmarkHaskellDepends = [ - aeson base criterion deepseq megaparsec text - ]; - homepage = "https://github.com/stackbuilders/stache"; - description = "Mustache templates for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stack" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, async - , attoparsec, base, base-compat, base16-bytestring - , base64-bytestring, binary, binary-tagged, blaze-builder, byteable - , bytestring, Cabal, clock, conduit, conduit-extra, containers - , cryptohash, cryptohash-conduit, deepseq, directory, either - , errors, exceptions, extra, fast-logger, file-embed, filelock - , filepath, fsnotify, generic-deriving, gitrev, hashable, hastache + , attoparsec, base, base-compat, base64-bytestring, binary + , binary-tagged, blaze-builder, bytestring, Cabal, clock, conduit + , conduit-extra, containers, cryptonite, cryptonite-conduit + , deepseq, directory, either, errors, exceptions, extra + , fast-logger, file-embed, filelock, filepath, fsnotify + , generic-deriving, gitrev, hackage-security, hashable, hastache , hit, hpack, hpc, hspec, http-client, http-client-tls - , http-conduit, http-types, lifted-async, lifted-base, microlens - , monad-control, monad-logger, monad-unlift, mono-traversable, mtl - , neat-interpolation, open-browser, optparse-applicative - , optparse-simple, path, path-io, persistent, persistent-sqlite - , persistent-template, pid1, pretty, process, project-template - , QuickCheck, regex-applicative-text, resourcet, retry, safe - , safe-exceptions, semigroups, smallcheck, split, stm, store - , streaming-commons, tar, template-haskell, temporary, text - , text-binary, text-metrics, th-reify-many, time, tls, transformers - , transformers-base, unicode-transforms, unix, unix-compat - , unordered-containers, vector, vector-binary-instances, yaml - , zip-archive, zlib + , http-conduit, http-types, lifted-async, lifted-base, memory + , microlens, microlens-mtl, monad-control, monad-logger + , monad-unlift, mono-traversable, mtl, neat-interpolation + , network-uri, open-browser, optparse-applicative, optparse-simple + , path, path-io, persistent, persistent-sqlite, persistent-template + , pid1, pretty, process, project-template, QuickCheck + , regex-applicative-text, resourcet, retry, safe, safe-exceptions + , semigroups, smallcheck, split, stm, store, streaming-commons, tar + , template-haskell, temporary, text, text-binary, text-metrics + , th-reify-many, time, tls, transformers, transformers-base + , unicode-transforms, unix, unix-compat, unordered-containers + , vector, vector-binary-instances, yaml, zip-archive, zlib }: mkDerivation { pname = "stack"; - version = "1.3.2"; - sha256 = "488b9292ea605c92f6ebf79b233e8e374d857b21053051cb44b305dad8f0d3f7"; - revision = "2"; - editedCabalFile = "c15bab02b5aa26847ce94aab4bca3ac7bbd38e7e3c56039364f70bb107cb7968"; + version = "1.4.0"; + sha256 = "f10d6f031aa0e682da3e1f61fa12b9c31f1617150b0f99f691c873a0ce19e8b6"; + revision = "4"; + editedCabalFile = "13605cb5121333a73a680f622b29003ad03fbc720522119f740881ba1ecd4343"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal async attoparsec base - base-compat base16-bytestring base64-bytestring binary - binary-tagged blaze-builder byteable bytestring Cabal clock conduit - conduit-extra containers cryptohash cryptohash-conduit deepseq - directory either errors exceptions extra fast-logger file-embed - filelock filepath fsnotify generic-deriving hashable hastache hit - hpack hpc http-client http-client-tls http-conduit http-types - lifted-async lifted-base microlens monad-control monad-logger - monad-unlift mtl open-browser optparse-applicative path path-io - persistent persistent-sqlite persistent-template pid1 pretty - process project-template regex-applicative-text resourcet retry - safe safe-exceptions semigroups split stm store streaming-commons - tar template-haskell temporary text text-binary text-metrics time - tls transformers transformers-base unicode-transforms unix - unix-compat unordered-containers vector vector-binary-instances - yaml zip-archive zlib + base-compat base64-bytestring binary binary-tagged blaze-builder + bytestring Cabal clock conduit conduit-extra containers cryptonite + cryptonite-conduit deepseq directory either errors exceptions extra + fast-logger file-embed filelock filepath fsnotify generic-deriving + hackage-security hashable hastache hit hpack hpc http-client + http-client-tls http-conduit http-types lifted-async lifted-base + memory microlens microlens-mtl monad-control monad-logger + monad-unlift mtl network-uri open-browser optparse-applicative path + path-io persistent persistent-sqlite persistent-template pid1 + pretty process project-template regex-applicative-text resourcet + retry safe safe-exceptions semigroups split stm store + streaming-commons tar template-haskell temporary text text-binary + text-metrics time tls transformers transformers-base + unicode-transforms unix unix-compat unordered-containers vector + vector-binary-instances yaml zip-archive zlib ]; executableHaskellDepends = [ - base bytestring Cabal containers directory either filelock filepath - gitrev hpack http-client lifted-base microlens monad-control - monad-logger mtl optparse-applicative optparse-simple path path-io - text transformers + base bytestring Cabal conduit containers directory either filelock + filepath gitrev hpack http-client lifted-base microlens + monad-control monad-logger mtl optparse-applicative optparse-simple + path path-io split text transformers ]; testHaskellDepends = [ attoparsec base bytestring Cabal conduit conduit-extra containers - cryptohash directory exceptions filepath hspec http-client-tls - http-conduit monad-logger mono-traversable neat-interpolation path - path-io QuickCheck resourcet retry smallcheck store - template-haskell temporary text th-reify-many transformers vector - yaml + cryptonite directory exceptions filepath hashable hspec + http-client-tls http-conduit monad-logger mono-traversable + neat-interpolation optparse-applicative path path-io QuickCheck + resourcet retry smallcheck store template-haskell temporary text + th-reify-many transformers unordered-containers vector yaml ]; doCheck = false; preCheck = "export HOME=$TMPDIR"; @@ -167924,8 +170863,8 @@ self: { ({ mkDerivation, base, stm }: mkDerivation { pname = "stm-extras"; - version = "0.1.0.1"; - sha256 = "ffa81349733b1631c1bad5ce3e5d4bcd35eb76dee10e4790fa050d40cb98e9cd"; + version = "0.1.0.2"; + sha256 = "7ebcc998326e404e4935679db87e4961412b176756603adccb91bbf946618621"; libraryHaskellDepends = [ base stm ]; homepage = "https://github.com/louispan/stm-extras#readme"; description = "Extra STM functions"; @@ -167958,6 +170897,8 @@ self: { pname = "stm-io-hooks"; version = "1.1.0"; sha256 = "35014012b671a6964ec0d5f5de2ab13a61d8ee01cb0bbd685a3cc17385fae235"; + revision = "1"; + editedCabalFile = "b74a4d65fd2f5bbcdb0e1c52318d88db3240c513bb3fb9b2aa7a00ec00f39aa9"; libraryHaskellDepends = [ array base containers mtl stm ]; description = "STM with IO hooks"; license = stdenv.lib.licenses.bsd3; @@ -168278,8 +171219,8 @@ self: { }: mkDerivation { pname = "storablevector"; - version = "0.2.11"; - sha256 = "b2edb8234ae9de08baa4dc7b292314a2a9edaee5c090cedd7f3db405ab27c65e"; + version = "0.2.12"; + sha256 = "cb7e9eba213b609c8e08d1e84164976bba680d8450f43747d3c9edaacef7e8a6"; libraryHaskellDepends = [ base deepseq non-negative QuickCheck syb transformers unsafe utility-ht @@ -168375,7 +171316,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "store_0_4_1" = callPackage + "store_0_4_2" = callPackage ({ mkDerivation, array, async, base, base-orphans , base64-bytestring, bytestring, cereal, cereal-vector, conduit , containers, contravariant, criterion, cryptohash, deepseq @@ -168389,8 +171330,8 @@ self: { }: mkDerivation { pname = "store"; - version = "0.4.1"; - sha256 = "aee7f803b9338569b089d01c3ab3ec1384d9ae55d1ebb6c867faefb34656bdb2"; + version = "0.4.2"; + sha256 = "584fd61fd788772398a233fce40f8956b6eb7cd6b8e86f35a30b44c849a7076b"; libraryHaskellDepends = [ array async base base-orphans base64-bytestring bytestring conduit containers contravariant cryptohash deepseq directory filepath free @@ -168469,8 +171410,8 @@ self: { }: mkDerivation { pname = "stratosphere"; - version = "0.4.0"; - sha256 = "27c7b48ff3f78231711eab021b4a54b82b3b58e0dfa43e02b8c41a8be9c4527d"; + version = "0.4.1"; + sha256 = "7a8a7c8bbe4c154c1a8def4a0bb7384ff9f60198ce7a8583063c7cd0c84bc790"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168486,15 +171427,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_4_1" = callPackage + "stratosphere_0_4_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory , hashable, hlint, lens, tasty, tasty-hspec, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.4.1"; - sha256 = "7a8a7c8bbe4c154c1a8def4a0bb7384ff9f60198ce7a8583063c7cd0c84bc790"; + version = "0.4.2"; + sha256 = "37947aaff44e8732625e31f3c2e75e7e0ed380ad0ba459cbd461b93059347a66"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168758,8 +171699,8 @@ self: { }: mkDerivation { pname = "streaming-eversion"; - version = "0.3.1.0"; - sha256 = "39bb9f601dfe578abd11933d4707f1a031669384375f2167b3da34740f1add01"; + version = "0.3.1.1"; + sha256 = "4277a6cd32bef41230f4a74cb1786c57f9bb09b3ec57edf7acdec6c9eaa1da8d"; libraryHaskellDepends = [ base foldl pipes streaming transformers ]; @@ -168894,18 +171835,21 @@ self: { }) {}; "strelka" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, base64-bytestring - , bifunctors, bytestring, hashable, http-media, mtl, semigroups - , strelka-core, text, transformers, unordered-containers + ({ mkDerivation, attoparsec, attoparsec-data, base, base-prelude + , base64-bytestring, bifunctors, bytestring + , bytestring-tree-builder, hashable, http-media, mtl, scientific + , semigroups, strelka-core, text, text-builder, time, transformers + , unordered-containers, url-decoders }: mkDerivation { pname = "strelka"; - version = "1"; - sha256 = "a29e67ccb1929d3f1455ae80472098219ec3dc58b9b5bc9534cb61869ee831d5"; + version = "2"; + sha256 = "8273953fc6d54a7e1dc2c3f23c78c8ed6f4986c5e9a46222fc7e6831b2e24432"; libraryHaskellDepends = [ - attoparsec base base-prelude base64-bytestring bifunctors - bytestring hashable http-media mtl semigroups strelka-core text - transformers unordered-containers + attoparsec attoparsec-data base base-prelude base64-bytestring + bifunctors bytestring bytestring-tree-builder hashable http-media + mtl scientific semigroups strelka-core text text-builder time + transformers unordered-containers url-decoders ]; homepage = "https://github.com/nikita-volkov/strelka"; description = "A simple, flexible and composable web-router"; @@ -168919,8 +171863,8 @@ self: { }: mkDerivation { pname = "strelka-core"; - version = "0.1"; - sha256 = "9cccd19850c9b6afd0a544041476988520b035ec519061d7b92f1f781be69221"; + version = "0.3"; + sha256 = "94794ca8b44a7407bbf0256c01cbf703250fb5b06b1d06e32468f62147b30c3c"; libraryHaskellDepends = [ base base-prelude bifunctors bytestring hashable mtl semigroups text transformers unordered-containers @@ -168936,8 +171880,8 @@ self: { }: mkDerivation { pname = "strelka-wai"; - version = "1"; - sha256 = "b30e1e4732acb5c5db772609655a23e8311a627b788dcbcf99dce8cbb3f16137"; + version = "1.0.1"; + sha256 = "8c0de42044d5df2e8c7aa3d5c62ef973be6017baf35f9f57f104ee5794427f7d"; libraryHaskellDepends = [ base base-prelude bytestring case-insensitive http-types strelka-core text unordered-containers wai warp @@ -168959,6 +171903,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "strict-base" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "strict-base"; + version = "0.4.0.0"; + sha256 = "98e3776d1f4e5752629d1b14a38017bdcac46ae95b578ce3aa136719983c455a"; + revision = "1"; + editedCabalFile = "2ff4e43cb95eedf2995558d7fc34d19362846413dd39e6aa6a5b3ea8228fef9f"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/minad/strict-base"; + description = "Strict versions of base data types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "strict-base-types" = callPackage ({ mkDerivation, aeson, base, bifunctors, binary, deepseq, ghc-prim , hashable, lens, QuickCheck, strict @@ -169034,8 +171992,8 @@ self: { ({ mkDerivation, base, deepseq, extensible-exceptions }: mkDerivation { pname = "strict-io"; - version = "0.2.1"; - sha256 = "ad265e5707c8badaea8b2a89457917d38ae3cf7c19ac46bac704a81ee5777700"; + version = "0.2.2"; + sha256 = "f9a9eb58e2253d9b76c41e123d3d91ca7d26dcdb30e25dedaabd2daac30d95c9"; libraryHaskellDepends = [ base deepseq extensible-exceptions ]; description = "A library wrapping standard IO modules to provide strict IO"; license = stdenv.lib.licenses.bsd3; @@ -169668,6 +172626,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stutter" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, conduit + , conduit-combinators, conduit-extra, mtl, optparse-applicative + , resourcet, snipcheck, tasty, tasty-ant-xml, tasty-hunit, text + }: + mkDerivation { + pname = "stutter"; + version = "0.1.0.0"; + sha256 = "a3038e5881220d46a9403f6aca06944802b124e18fc04d78b1f7b51a64a1ca11"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring conduit conduit-combinators + conduit-extra mtl resourcet text + ]; + executableHaskellDepends = [ + attoparsec base conduit conduit-combinators optparse-applicative + text + ]; + testHaskellDepends = [ + attoparsec base snipcheck tasty tasty-ant-xml tasty-hunit + ]; + homepage = "https://github.com/nmattia/stutter#readme"; + description = "(Stutter Text|String)-Utterer"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stylish-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative @@ -170107,6 +173093,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "superbuffer_0_3_1_0" = callPackage + ({ mkDerivation, async, base, buffer-builder, bytestring, criterion + , HTF, QuickCheck + }: + mkDerivation { + pname = "superbuffer"; + version = "0.3.1.0"; + sha256 = "b5b747cbdd46fc9cb413a5ca2729473ce7e5daeb695b59a3a16125e59f9d35aa"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ async base bytestring HTF QuickCheck ]; + benchmarkHaskellDepends = [ + async base buffer-builder bytestring criterion + ]; + homepage = "https://github.com/agrafix/superbuffer#readme"; + description = "Efficiently build a bytestring from smaller chunks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "supercollider-ht" = callPackage ({ mkDerivation, base, hosc, hsc3, opensoundcontrol-ht, process , random, transformers @@ -170273,8 +173278,8 @@ self: { }: mkDerivation { pname = "svg-tree"; - version = "0.6"; - sha256 = "7b055b1f66fe8aeacb91bb01315275b3669ddb84b057bd28fdbed17d1e1c5732"; + version = "0.6.1"; + sha256 = "9bf58c55557d3e2675e16b17d1d77455a6f79946b087b3fdd8b4b96568045751"; libraryHaskellDepends = [ attoparsec base bytestring containers JuicyPixels lens linear mtl scientific text transformers vector xml @@ -171107,8 +174112,8 @@ self: { }: mkDerivation { pname = "synthesizer-core"; - version = "0.8.0.2"; - sha256 = "1ad216fe5cd2f22223349d584bd32be44bb12f76fcfa13e5198fc2e3108ee54f"; + version = "0.8.1"; + sha256 = "e928dc2138315d84c4057ee3eea1fe2a5c6568ebef980cab1eab07dec7781ad2"; libraryHaskellDepends = [ array base binary bytestring containers deepseq event-list explicit-exception filepath non-empty non-negative numeric-prelude @@ -172731,8 +175736,8 @@ self: { }: mkDerivation { pname = "tasty-ant-xml"; - version = "1.0.4"; - sha256 = "4d91c509e0e80919d96c16eaa3ee11089b7ee7c87fbe59a947d26bf0c5aef188"; + version = "1.0.5"; + sha256 = "642d440fcce4c4025b7d33ac49d2c4f017d72397f494bae0401843bb42925436"; libraryHaskellDepends = [ base containers directory filepath generic-deriving ghc-prim mtl stm tagged tasty transformers xml @@ -172742,15 +175747,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "tasty-ant-xml_1_0_5" = callPackage + "tasty-ant-xml_1_1_0" = callPackage ({ mkDerivation, base, containers, directory, filepath , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers , xml }: mkDerivation { pname = "tasty-ant-xml"; - version = "1.0.5"; - sha256 = "642d440fcce4c4025b7d33ac49d2c4f017d72397f494bae0401843bb42925436"; + version = "1.1.0"; + sha256 = "0dfdacf8b78ed897c2943d9a4aeeb56f3e33152d19062b5008a292f8bd27d0f6"; libraryHaskellDepends = [ base containers directory filepath generic-deriving ghc-prim mtl stm tagged tasty transformers xml @@ -172852,6 +175857,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tasty-discover_2_0_1" = callPackage + ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec + , tasty-hunit, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "tasty-discover"; + version = "2.0.1"; + sha256 = "b4a9be2c27ee29de6ee41bf2a43abcc5f155ef263f3ae3c48d9a5a281e78242c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ + base directory filepath tasty tasty-hspec tasty-hunit + tasty-quickcheck tasty-smallcheck + ]; + homepage = "https://github.com/lwm/tasty-discover#readme"; + description = "Test discovery for the tasty framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-expected-failure" = callPackage ({ mkDerivation, base, tagged, tasty }: mkDerivation { @@ -173155,6 +176182,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-silver_3_1_10" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring, containers + , deepseq, directory, filepath, mtl, optparse-applicative, process + , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit + , temporary, text, transformers + }: + mkDerivation { + pname = "tasty-silver"; + version = "3.1.10"; + sha256 = "8e886d93bff49da4221b917162613e00f83902af4a2ea014ab4bdcd9029d6efb"; + libraryHaskellDepends = [ + ansi-terminal async base bytestring containers deepseq directory + filepath mtl optparse-applicative process process-extras regex-tdfa + stm tagged tasty temporary text + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-hunit temporary + transformers + ]; + homepage = "https://github.com/phile314/tasty-silver"; + description = "A fancy test runner, including support for golden tests"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-smallcheck" = callPackage ({ mkDerivation, async, base, smallcheck, tagged, tasty }: mkDerivation { @@ -173213,6 +176265,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tasty-th_0_1_5" = callPackage + ({ mkDerivation, base, haskell-src-exts, tasty, template-haskell }: + mkDerivation { + pname = "tasty-th"; + version = "0.1.5"; + sha256 = "6452b3b65a2d59e469df598aa808084020095b4be54c64ff669802148845d372"; + libraryHaskellDepends = [ + base haskell-src-exts tasty template-haskell + ]; + homepage = "http://github.com/bennofs/tasty-th"; + description = "Automatic tasty test case discovery using TH"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tateti-tateti" = callPackage ({ mkDerivation, array, base, lens-simple, mtl, ncurses, random }: mkDerivation { @@ -173457,35 +176524,49 @@ self: { }) {}; "tdigest" = callPackage - ({ mkDerivation, base, base-compat, binary, bytes, Cabal - , cabal-doctest, Chart, Chart-diagrams, deepseq, directory, doctest - , filepath, machines, mwc-random, optparse-applicative, parallel - , reducers, semigroups, statistics, tasty, tasty-quickcheck, time - , vector, vector-algorithms + ({ mkDerivation, base, base-compat, binary, Cabal, cabal-doctest + , deepseq, doctest, reducers, semigroupoids, semigroups, tasty + , tasty-quickcheck, vector, vector-algorithms }: mkDerivation { pname = "tdigest"; - version = "0"; - sha256 = "bfadc69c58f576831b60da5c141f66eb8e0e0ed7d7b9353e04a39cb44fde37ff"; + version = "0.1"; + sha256 = "0036b3aebe6556ced3a108579846346c9123d65c9dcd09c1d44435a64e3dc54b"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base base-compat binary deepseq reducers semigroups vector - vector-algorithms + base base-compat binary deepseq reducers semigroupoids semigroups + vector vector-algorithms ]; testHaskellDepends = [ - base base-compat binary bytes deepseq directory doctest filepath - semigroups tasty tasty-quickcheck vector vector-algorithms - ]; - benchmarkHaskellDepends = [ - base base-compat binary Chart Chart-diagrams deepseq machines - mwc-random optparse-applicative parallel semigroups statistics time - vector vector-algorithms + base base-compat binary deepseq doctest semigroups tasty + tasty-quickcheck vector vector-algorithms ]; homepage = "https://github.com/futurice/haskell-tdigest#readme"; description = "On-line accumulation of rank-based statistics"; license = stdenv.lib.licenses.bsd3; }) {}; + "tdigest-Chart" = callPackage + ({ mkDerivation, base, base-compat, Chart, Chart-diagrams, colour + , lens, mwc-random, semigroupoids, semigroups, statistics, tdigest + , vector + }: + mkDerivation { + pname = "tdigest-Chart"; + version = "0"; + sha256 = "74a806695cba25ebc96d80944b832d3423be4175496e319a52b6efc7c5f470a7"; + libraryHaskellDepends = [ + base base-compat Chart colour lens semigroupoids semigroups tdigest + ]; + testHaskellDepends = [ + base base-compat Chart Chart-diagrams lens mwc-random statistics + tdigest vector + ]; + homepage = "https://github.com/futurice/haskell-tdigest#readme"; + description = "Chart generation from tdigest"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tdoc" = callPackage ({ mkDerivation, base, bytestring, template-haskell, transformers , xhtml @@ -173553,8 +176634,8 @@ self: { }: mkDerivation { pname = "telegram-api"; - version = "0.6.0.2"; - sha256 = "e5a29e558d5a5930be9c7d79cb16c66499fe12d9c5ffe663f830be683d3527f7"; + version = "0.6.1.0"; + sha256 = "8eef15f861aa178b8df0766ebf45ff6badf8cf4920af8e0d1ba31f9074cf67db"; libraryHaskellDepends = [ aeson base bytestring http-api-data http-client http-media http-types mime-types mtl servant servant-client string-conversions @@ -174036,6 +177117,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "termcolor" = callPackage + ({ mkDerivation, base, cli }: + mkDerivation { + pname = "termcolor"; + version = "0.2.0.0"; + sha256 = "b09d399a733d867cb05dc51de4ee31d5db73cd453099e342973da91c30f21a90"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base cli ]; + homepage = "https://github.com/mdibaiee/termcolor#readme"; + description = "Composable terminal colors"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "terminal-progress-bar" = callPackage ({ mkDerivation, base, HUnit, stm, stm-chans, test-framework , test-framework-hunit @@ -174263,8 +177359,8 @@ self: { pname = "test-framework-hunit"; version = "0.3.0.2"; sha256 = "95cb8ee02a850b164bfdabdf4dbc839d621361f3ac770ad21ea43a8bde360bf8"; - revision = "2"; - editedCabalFile = "f3b7d4b2bf246b88de781a03806e5c90a499c64b2b0c040be50dd980764fcc62"; + revision = "3"; + editedCabalFile = "7fd007e9cb082cd64a2213a6d36acf057f7d6df6b5343a088e81b2b3a9a23545"; libraryHaskellDepends = [ base extensible-exceptions HUnit test-framework ]; @@ -174733,8 +177829,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.9.1"; - sha256 = "cafb98d25da63bdd76f75b29bf395c9e023cf46d753db9a1534e84879cb8697e"; + version = "0.9.4"; + sha256 = "da665d069708679fb40ee2e981dcdede55e79f3165c0ae09c55621273e682195"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174844,8 +177940,8 @@ self: { }: mkDerivation { pname = "text-builder"; - version = "0.4"; - sha256 = "0931b5988b5f86fbfe9055bb4d21fa1fceaaa8b1619aa951b53921ba2b8ce0b7"; + version = "0.4.1"; + sha256 = "63b16fe4b9ad73cfa58e5dbfe493f6955742cb079ce25dd24e128c42c4fa3321"; libraryHaskellDepends = [ base base-prelude bytestring semigroups text ]; @@ -176094,8 +179190,8 @@ self: { }: mkDerivation { pname = "themoviedb"; - version = "1.1.2.0"; - sha256 = "c4dc8038b004f192854c5e8341c8cc4637f6c9d340a76e77f9e36ee412a7eb88"; + version = "1.1.3.0"; + sha256 = "2c3480876a2dda192edd72ba1ecc5fd8200b80b3a35f8b98b6cd0c4877f0832f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176491,6 +179587,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "threepenny-gui-flexbox_0_4_0_2" = callPackage + ({ mkDerivation, base, clay, text, threepenny-gui }: + mkDerivation { + pname = "threepenny-gui-flexbox"; + version = "0.4.0.2"; + sha256 = "6edbd91b86e3711bd9198e9747cbcc49603b5f852bfb175f24abceef90ce0918"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base clay text threepenny-gui ]; + executableHaskellDepends = [ base threepenny-gui ]; + homepage = "https://github.com/barischj/threepenny-gui-flexbox"; + description = "Flexbox layouts for Threepenny-gui"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "thrift" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, binary , bytestring, containers, ghc-prim, hashable, hspec, HTTP, network @@ -176637,7 +179749,7 @@ self: { , gi-gtk, gi-webkit2, gtk3, haskell-gi-base, http-types, lens , mime-types, mtl, network, process, random, scientific, split , tasty, tasty-quickcheck, text, transformers, unordered-containers - , utf8-string, vector, webkit2gtk, xdg-basedir, xmonad + , utf8-string, vector, webkitgtk, xdg-basedir, xmonad , xmonad-contrib }: mkDerivation { @@ -176655,7 +179767,7 @@ self: { mime-types mtl network process random scientific split text transformers unordered-containers utf8-string vector xdg-basedir ]; - executablePkgconfigDepends = [ gtk3 webkit2gtk ]; + executablePkgconfigDepends = [ gtk3 webkitgtk ]; testHaskellDepends = [ aeson base bytestring containers dbus directory filepath gi-gdk gi-gio gi-glib gi-gtk gi-webkit2 haskell-gi-base http-types lens @@ -176667,7 +179779,7 @@ self: { description = "A desktop bar based on WebKit"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk; webkit2gtk = null;}; + }) {gtk3 = pkgs.gnome3.gtk; inherit (pkgs.gnome3) webkitgtk;}; "tibetan-utils" = callPackage ({ mkDerivation, base, composition, either, hspec, hspec-megaparsec @@ -176675,8 +179787,8 @@ self: { }: mkDerivation { pname = "tibetan-utils"; - version = "0.1.1.1"; - sha256 = "fa38e4f2062e801c5f8bccb2afea945cfcf40bd24671d9080bf538e0533bbb2a"; + version = "0.1.1.2"; + sha256 = "8dd09d6346d04736a03965d6c4c3146edcffaf017055941cab056f3fe1dac082"; libraryHaskellDepends = [ base composition either megaparsec text text-show ]; @@ -176758,14 +179870,32 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "tidal_0_9" = callPackage + ({ mkDerivation, base, colour, containers, hashable, hosc + , mersenne-random-pure64, mtl, parsec, safe, text, time, websockets + }: + mkDerivation { + pname = "tidal"; + version = "0.9"; + sha256 = "7578110ee03cf8716cadf16a8ee25c7e963a1b9cbf7d678dc2361a03bdabac86"; + libraryHaskellDepends = [ + base colour containers hashable hosc mersenne-random-pure64 mtl + parsec safe text time websockets + ]; + homepage = "http://tidal.lurk.org/"; + description = "Pattern language for improvised music"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tidal-midi" = callPackage ({ mkDerivation, base, containers, PortMidi, tidal, time , transformers }: mkDerivation { pname = "tidal-midi"; - version = "0.8.2"; - sha256 = "3638e4d7f853d1a73929624ec34b2364469339b0c821567cf8b46c78971c8339"; + version = "0.9"; + sha256 = "09d0d4893f73f93439c571dbb2365f80d72a41d28fecb21ad76d51c5dee4e9c0"; libraryHaskellDepends = [ base containers PortMidi tidal time transformers ]; @@ -176924,17 +180054,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "time_1_8" = callPackage - ({ mkDerivation, base, deepseq, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, unix + "time_1_8_0_1" = callPackage + ({ mkDerivation, base, deepseq, QuickCheck, random, tasty + , tasty-hunit, tasty-quickcheck, unix }: mkDerivation { pname = "time"; - version = "1.8"; - sha256 = "38631adfbcd176a3f62fe3b14d9e03a44cc95e1971e4eeb7d46e1018e9e59aff"; + version = "1.8.0.1"; + sha256 = "2baa9fdc280604413ecaf9761f7fd3443fe69019eec6fdc3e0333501fe701701"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ - base deepseq QuickCheck tasty tasty-hunit tasty-quickcheck unix + base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck + unix ]; homepage = "https://github.com/haskell/time"; description = "A time library"; @@ -177234,8 +180365,8 @@ self: { }: mkDerivation { pname = "time-warp"; - version = "1.1.1.1"; - sha256 = "df2721daeee24eac57f2ba1f1eff4b0f87260340537cd5e3cbe8d6c27b1094fd"; + version = "1.1.1.2"; + sha256 = "35665ccf7bd1f5be2d50b5df2c29aa4431b266d2bc7a044ec93953d833129c59"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177248,12 +180379,6 @@ self: { streaming-commons template-haskell text text-format time time-units transformers transformers-base unordered-containers ]; - executableHaskellDepends = [ - async base binary binary-conduit conduit data-default data-msgpack - exceptions formatting hspec lens log-warper MonadRandom mtl - QuickCheck random serokell-util stm text text-format time-units - transformers - ]; testHaskellDepends = [ async base data-default data-msgpack exceptions hspec lens log-warper mtl QuickCheck random serokell-util stm text text-format @@ -177909,8 +181034,8 @@ self: { ({ mkDerivation, base, containers, HUnit, network-uri, text }: mkDerivation { pname = "tld"; - version = "0.3.0.0"; - sha256 = "feb269cd135796d7a378a01150ca89fdea380e4e7fa67b031b299fcd16acac5e"; + version = "0.3.0.1"; + sha256 = "aa433c4fe7bfd06937bb68602a2c95272e221bb65272bd11cbd0bb241567df65"; libraryHaskellDepends = [ base containers network-uri text ]; testHaskellDepends = [ base HUnit network-uri text ]; description = "This project separates subdomains, domains, and top-level-domains from URLs"; @@ -177918,6 +181043,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tldr" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, cmark, directory + , filepath, optparse-applicative, semigroups, shell-conduit, text + }: + mkDerivation { + pname = "tldr"; + version = "0.2.0"; + sha256 = "2abf1633a568f61c786ec3cfefeec3fa372b3e9d3301b9916516f6fbf0e6f69d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring cmark text + ]; + executableHaskellDepends = [ + base directory filepath optparse-applicative semigroups + shell-conduit + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/psibi/tldr-hs#readme"; + description = "Haskell tldr client"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tls" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring , cereal, criterion, cryptonite, data-default-class, hourglass @@ -177926,8 +181075,10 @@ self: { }: mkDerivation { pname = "tls"; - version = "1.3.9"; - sha256 = "81355e16528796d3097719e74f7f1f8cae50daed06926d1995731bab8e02267b"; + version = "1.3.10"; + sha256 = "9f057d0f40dda5ce8d0f0e0f2a06087be8007c41462c6cab19774538c35e0171"; + revision = "1"; + editedCabalFile = "34c1efff5206b28c0e67bbde8ea7d3428aafb572a623b832b08928d5bb72f9be"; libraryHaskellDepends = [ asn1-encoding asn1-types async base bytestring cereal cryptonite data-default-class memory mtl network transformers x509 x509-store @@ -178079,17 +181230,17 @@ self: { }) {}; "toboggan" = callPackage - ({ mkDerivation, base, clit, directory, madlang, optparse-generic - , text + ({ mkDerivation, base, directory, madlang, optparse-generic, text + , tweet-hs }: mkDerivation { pname = "toboggan"; - version = "0.1.0.0"; - sha256 = "72281351961f1d55149379c273b72e4e4d7a5134c432351044a17317152f3a67"; + version = "0.1.0.1"; + sha256 = "3eca9e54376ea057907a57205231f654916e3f7f845f0aaeb83a43b81fc408a6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base clit directory madlang optparse-generic text + base directory madlang optparse-generic text tweet-hs ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/vmchale/toboggan#readme"; @@ -178337,8 +181488,8 @@ self: { }: mkDerivation { pname = "torrent"; - version = "10000.0.1"; - sha256 = "ba7c9565f5397f7603b924a67537abe6738cdc20649ff3fb510b5731d1e18725"; + version = "10000.1.1"; + sha256 = "2009964210e229ee67254a73fead3413f60299415238887fa7ef30e40e06fa54"; libraryHaskellDepends = [ base bencode binary bytestring containers filepath syb ]; @@ -178887,6 +182038,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "transformers-continue" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "transformers-continue"; + version = "0.0.1"; + sha256 = "bdac850adeed1a39aec13119a2a50386e36ce250cf886a001c959375265c1840"; + libraryHaskellDepends = [ base transformers ]; + homepage = "http://github.com/nhibberd/transformers-continue"; + description = "Control flow data type and monad transformer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "transformers-convert" = callPackage ({ mkDerivation, base, data-easy, directory, either, errors , haskell-src-exts, hlint, hspec, HUnit, QuickCheck, text @@ -178947,6 +182110,8 @@ self: { pname = "transformers-lift"; version = "0.1.0.1"; sha256 = "c29d11f58fb9b2c1011c162f8f9f98cb0f2d12ca1317f40f4c88d9881840aa74"; + revision = "1"; + editedCabalFile = "dcc6d44fa2d58bcd6da22372824833aa78a5522a0d503e224ca03e428a2f664a"; libraryHaskellDepends = [ base transformers ]; description = "Ad-hoc type classes for lifting"; license = stdenv.lib.licenses.bsd3; @@ -178992,20 +182157,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "transient_0_5_1" = callPackage + "transient_0_5_4" = callPackage ({ mkDerivation, base, bytestring, containers, directory, mtl , random, stm, time, transformers }: mkDerivation { pname = "transient"; - version = "0.5.1"; - sha256 = "a6b90bed245013a7ffe61f8d6e5b0f5798dd64999c914c1f956b0d3a1c3a8d25"; + version = "0.5.4"; + sha256 = "653065cb45b443606e30b4295d73885bd73795c7b254f26b65d9a15bf610855e"; libraryHaskellDepends = [ base bytestring containers directory mtl random stm time transformers ]; homepage = "http://www.fpcomplete.com/user/agocorona"; - description = "Making composable programs with multithreading, events and distributed computing"; + description = "composing programs with multithreading, events and distributed computing"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -179086,6 +182251,7 @@ self: { homepage = "http://github.com/transient-haskell/transient-universe-tls"; description = "transient with secure communications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "translatable-intset" = callPackage @@ -179381,25 +182547,18 @@ self: { }: mkDerivation { pname = "tries"; - version = "0.0.4"; - sha256 = "6be9638a03b35effe69c9bbfc33b00fe92156211945b83dee871e70cf266f94a"; + version = "0.0.4.1"; + sha256 = "c0b8ba913f98dd0732efe37bc29bacc28d2ed6d6ac23584102865e0cbeaab28a"; libraryHaskellDepends = [ base bytestring bytestring-trie composition composition-extra containers deepseq hashable keys QuickCheck quickcheck-instances rose-trees semigroups sets unordered-containers ]; testHaskellDepends = [ - base bytestring bytestring-trie composition composition-extra - containers deepseq hashable keys mtl QuickCheck - quickcheck-instances rose-trees semigroups sets tasty - tasty-quickcheck unordered-containers - ]; - benchmarkHaskellDepends = [ - base bytestring bytestring-trie composition composition-extra - containers criterion deepseq hashable keys mtl QuickCheck - quickcheck-instances rose-trees semigroups sets - unordered-containers + base containers mtl QuickCheck quickcheck-instances tasty + tasty-quickcheck ]; + benchmarkHaskellDepends = [ base criterion ]; description = "Various trie implementations in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -179593,6 +182752,8 @@ self: { pname = "tskiplist"; version = "1.0.0"; sha256 = "aa20f823c787122858513b38207bc74e9eb032435ac7e6624569f1411d825e2d"; + revision = "1"; + editedCabalFile = "27204b6f7657f68fcab0bb7585905fe8d45177d2105352d17dec060b22115a98"; libraryHaskellDepends = [ array base containers random stm ]; homepage = "https://github.com/thaldyron/tskiplist"; description = "A Skip List Implementation in Software Transactional Memory (STM)"; @@ -179622,17 +182783,40 @@ self: { }) {}; "tslogger" = callPackage - ({ mkDerivation, async, base, containers, random }: + ({ mkDerivation, async, base, bytestring, containers, random, text + }: mkDerivation { pname = "tslogger"; - version = "0.1.0.0"; - sha256 = "b41d3612219cc49b7e61531587ca33e582ec11f76e24254154f44fd515a5cbf7"; - libraryHaskellDepends = [ async base containers random ]; - description = "Thread-safe logging"; + version = "0.2.1.0"; + sha256 = "f8f15b288db3071e017afbb6b0326109e074bee9e6adc468da70b2d8bbfc9eac"; + libraryHaskellDepends = [ + async base bytestring containers random text + ]; + description = "Thread-safe logging, with additional interleaving fuzz-testing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tsne" = callPackage + ({ mkDerivation, base, data-default, deepseq, hspec + , normaldistribution, pipes, time + }: + mkDerivation { + pname = "tsne"; + version = "1.3.0"; + sha256 = "28583af6f0e0bf218457885ab1ae9083c26135ab81d011185ca2e2cf7ca39869"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base data-default deepseq normaldistribution pipes + ]; + executableHaskellDepends = [ base data-default pipes time ]; + testHaskellDepends = [ base data-default hspec ]; + homepage = "https://bitbucket.org/robagar/haskell-tsne"; + description = "t-SNE"; + license = "LGPL"; + }) {}; + "tsp-viz" = callPackage ({ mkDerivation, base, gloss, stm, vector }: mkDerivation { @@ -180052,8 +183236,8 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.3.1"; - sha256 = "233d05f8d73d171278be765872d623e56f1d795234a94d33a57f1bcca98edd5e"; + version = "1.3.2"; + sha256 = "f8163bcc08be06883964907391b88c2da0480f4764668629f4ada908319e7b5d"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock directory foldl hostname managed optional-args optparse-applicative process stm @@ -180133,6 +183317,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tweet-hs" = callPackage + ({ mkDerivation, ansi-wl-pprint, authenticate-oauth, base + , bytestring, composition, criterion, data-default, directory + , extra, hspec, hspec-megaparsec, http-client, http-client-tls + , http-types, lens, megaparsec, MissingH, optparse-applicative + , split, text + }: + mkDerivation { + pname = "tweet-hs"; + version = "0.5.3.2"; + sha256 = "749ac037384f0f9e09526cffcb7c1a55375480effeb3d586b19bcbb1f1c6e40e"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint authenticate-oauth base bytestring composition + data-default directory extra http-client http-client-tls http-types + lens megaparsec MissingH optparse-applicative split text + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring hspec hspec-megaparsec megaparsec + ]; + benchmarkHaskellDepends = [ base bytestring criterion megaparsec ]; + homepage = "https://github.com/vmchale/command-line-tweeter#readme"; + description = "Command-line tool for twitter"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "twentefp" = callPackage ({ mkDerivation, base, gloss, parsec, time }: mkDerivation { @@ -180571,8 +183783,8 @@ self: { pname = "twitter-feed"; version = "0.2.0.11"; sha256 = "8b98b4ddfb88f4c14f8eb43bd74a4c4e7941a92d44b90717e9b8dbe4c454c889"; - revision = "1"; - editedCabalFile = "3d0a5d8976c482b401003571812052a97cd0d77fb3d6f0619615c30c93a0b79e"; + revision = "2"; + editedCabalFile = "40c6941bd4bc222ad94a0963036f74f66fc1ef084b8d7c5c07f5dc9f3d861a59"; libraryHaskellDepends = [ aeson authenticate-oauth base bytestring http-conduit ]; @@ -181300,6 +184512,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "typed-streams" = callPackage + ({ mkDerivation, array, base, bytestring, criterion, generic-enum + , ghc-typelits-knownnat, make-monofoldable-foldable + , mono-traversable, vector + }: + mkDerivation { + pname = "typed-streams"; + version = "0.1.0.1"; + sha256 = "046e226e18de70e34bbaeee8e652d283ab733d87b4e305dc322f9800b51a034d"; + libraryHaskellDepends = [ + array base bytestring generic-enum ghc-typelits-knownnat + make-monofoldable-foldable mono-traversable vector + ]; + testHaskellDepends = [ + array base bytestring criterion generic-enum ghc-typelits-knownnat + make-monofoldable-foldable mono-traversable vector + ]; + description = "A stream based replacement for lists"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "typed-wire" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, gitrev, HTF, http-types, mtl, optparse-applicative @@ -181543,6 +184777,23 @@ self: { license = "GPL"; }) {}; + "tyro" = callPackage + ({ mkDerivation, aeson, base, HUnit, protolude, singletons + , test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "tyro"; + version = "0.1.1.1"; + sha256 = "b225ec138b2f98c9b478143a8f10bcd48ad944e3bd9813a2227068a23ec70cce"; + libraryHaskellDepends = [ aeson base protolude singletons text ]; + testHaskellDepends = [ + aeson base HUnit protolude test-framework test-framework-hunit text + ]; + homepage = "https://github.com/rlupton20/tyro#readme"; + description = "Type derived JSON parsing using Aeson"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tz" = callPackage ({ mkDerivation, base, binary, bytestring, containers, criterion , data-default, deepseq, HUnit, lens, QuickCheck, template-haskell @@ -182070,6 +185321,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unbounded-delays_0_1_0_10" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "unbounded-delays"; + version = "0.1.0.10"; + sha256 = "1c3621437c267f313231a56cf85136bbe7ff6fea0c08a016240d482cc69ca123"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/basvandijk/unbounded-delays"; + description = "Unbounded thread delays and timeouts"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unbounded-delays-units" = callPackage ({ mkDerivation, base, unbounded-delays, units, units-defs }: mkDerivation { @@ -182526,6 +185790,8 @@ self: { pname = "union"; version = "0.1.1.1"; sha256 = "819e57439061cde958467e6a52ca9f9aeac6e61c84b8ead4f8c2489995ca44f4"; + revision = "1"; + editedCabalFile = "89e02322d70363ef5425b9c6380e5f3edab21e090d97affcb39f42bcad334c0d"; libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ]; benchmarkHaskellDepends = [ base criterion deepseq lens ]; description = "Extensible type-safe unions"; @@ -182941,19 +186207,19 @@ self: { }) {}; "universum" = callPackage - ({ mkDerivation, async, base, bytestring, containers, deepseq - , exceptions, ghc-prim, hashable, microlens, microlens-mtl, mtl - , safe, stm, text, text-format, transformers, unordered-containers - , utf8-string, vector + ({ mkDerivation, base, bytestring, containers, deepseq, exceptions + , ghc-prim, hashable, microlens, microlens-mtl, mtl, safe, stm + , text, text-format, transformers, type-operators + , unordered-containers, utf8-string, vector }: mkDerivation { pname = "universum"; - version = "0.2.1"; - sha256 = "e5f8c58824cbf559fb3632ff5a00190870e254262a0f4db9dfde7bc2bc423d21"; + version = "0.3"; + sha256 = "cc5b5056e4a0c930a40bb9e015c90a3adf8d15e483d6da586fcf9ea23693acb5"; libraryHaskellDepends = [ - async base bytestring containers deepseq exceptions ghc-prim - hashable microlens microlens-mtl mtl safe stm text text-format - transformers unordered-containers utf8-string vector + base bytestring containers deepseq exceptions ghc-prim hashable + microlens microlens-mtl mtl safe stm text text-format transformers + type-operators unordered-containers utf8-string vector ]; homepage = "https://github.com/serokell/universum"; description = "Custom prelude used in Serokell"; @@ -183183,8 +186449,8 @@ self: { }: mkDerivation { pname = "unordered-containers"; - version = "0.2.7.2"; - sha256 = "7f5c4344fcab01f6046378c64522f0dfd69e417f6c1a8858a24bdabaadb3e56e"; + version = "0.2.8.0"; + sha256 = "a4a188359ff28640359131061953f7dbb8258da8ecf0542db0d23f08bfa6eea8"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base ChasingBottoms containers hashable HUnit QuickCheck @@ -183339,8 +186605,8 @@ self: { }: mkDerivation { pname = "unsequential"; - version = "0.5.2"; - sha256 = "89e70fc1bcdb982cf832e20c5fe540524d885a22210b832d3e3ea7307e3c7b4a"; + version = "0.5.2.1"; + sha256 = "758767a7fe4757b5397e23a3c5344850298eec73414ca72f4f25397bf47e4302"; libraryHaskellDepends = [ base base-prelude dlist transformers ]; testHaskellDepends = [ attoparsec interspersed QuickCheck quickcheck-instances rebase @@ -183579,35 +186845,6 @@ self: { }) {}; "uri-bytestring" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, bytestring - , containers, criterion, deepseq, deepseq-generics, generics-sop - , HUnit, lens-simple, network-uri, QuickCheck, quickcheck-instances - , semigroups, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, th-lift-instances - }: - mkDerivation { - pname = "uri-bytestring"; - version = "0.2.3.0"; - sha256 = "50178faac44a67095602412846682040b8b72ae8af5289e73dabe2cc49a639dd"; - libraryHaskellDepends = [ - attoparsec base blaze-builder bytestring containers - template-haskell th-lift-instances - ]; - testHaskellDepends = [ - attoparsec base blaze-builder bytestring containers generics-sop - HUnit lens-simple QuickCheck quickcheck-instances semigroups tasty - tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base blaze-builder bytestring criterion deepseq deepseq-generics - network-uri - ]; - homepage = "https://github.com/Soostone/uri-bytestring"; - description = "Haskell URI parsing as ByteStrings"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "uri-bytestring_0_2_3_1" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , containers, criterion, deepseq, deepseq-generics, generics-sop , HUnit, lens-simple, network-uri, QuickCheck, quickcheck-instances @@ -183634,7 +186871,6 @@ self: { homepage = "https://github.com/Soostone/uri-bytestring"; description = "Haskell URI parsing as ByteStrings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uri-conduit" = callPackage @@ -183758,6 +186994,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "url-decoders" = callPackage + ({ mkDerivation, base, base-prelude, binary-parser, bytestring + , criterion, http-types, QuickCheck, quickcheck-instances, rerebase + , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers + }: + mkDerivation { + pname = "url-decoders"; + version = "0.2"; + sha256 = "f2ec809f09152873a7a517cf3d72cbaf68d4c180fccf63a2d5ad802af0052732"; + libraryHaskellDepends = [ + base base-prelude binary-parser bytestring text + unordered-containers + ]; + testHaskellDepends = [ + http-types QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion http-types rerebase ]; + homepage = "https://github.com/nikita-volkov/url-decoders"; + description = "Decoders for URL-encoding (aka Percent-encoding)"; + license = stdenv.lib.licenses.mit; + }) {}; + "url-generic" = callPackage ({ mkDerivation, base, mtl, syb }: mkDerivation { @@ -184162,8 +187421,8 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "utility-ht"; - version = "0.0.12"; - sha256 = "a4445f436354599c1f3e923dfb3e4463b6f65e7c1dabea1e2d34d11c4a5b05ef"; + version = "0.0.13"; + sha256 = "952b77f060177f2eca3f61e2deec0e30693bb4471e936e13a7494a3e57f94cbe"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Various small helper functions for Lists, Maybes, Tuples, Functions"; @@ -184759,8 +188018,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "validity"; - version = "0.3.2.0"; - sha256 = "e6ac32bfc76284be81817098be5192d91aac84ff9985b26ecd41a0cded54729e"; + version = "0.3.3.0"; + sha256 = "ff175f51fde2f2e928e284ece4564cfc98ddf16a96483445cc49baca3c845eb1"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity typeclass"; @@ -184771,8 +188030,8 @@ self: { ({ mkDerivation, base, bytestring, validity }: mkDerivation { pname = "validity-bytestring"; - version = "0.1.0.0"; - sha256 = "1322e47ffd6e192b9b322799c8fd8218e3de07274b5263cbd503f280f1a5d9a3"; + version = "0.1.0.1"; + sha256 = "bc4ed52d89c54a55ab859b231d58ba999ffb80d5b197fb26eee7a8281f4ae9cf"; libraryHaskellDepends = [ base bytestring validity ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity instances for bytestring"; @@ -184783,8 +188042,8 @@ self: { ({ mkDerivation, base, containers, validity }: mkDerivation { pname = "validity-containers"; - version = "0.1.0.2"; - sha256 = "22f2084de274b01e0d0dc42fc609b651b979e899123b84a8702a2fca61468cdd"; + version = "0.1.0.3"; + sha256 = "ad7104429da47cdb7701ccafa87b73e98c2cb212f9838d8600bbd5635a49458f"; libraryHaskellDepends = [ base containers validity ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity instances for containers"; @@ -184795,8 +188054,8 @@ self: { ({ mkDerivation, base, filepath, path, validity }: mkDerivation { pname = "validity-path"; - version = "0.1.0.0"; - sha256 = "cb93616b60ba80dc051474f8dd0a67c605d4388a316561b29bf0d56117fb32e0"; + version = "0.1.0.1"; + sha256 = "1fd07205e1bd953e232d9722020d46181893fb21308959d0b75c718784670e57"; libraryHaskellDepends = [ base filepath path validity ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity instances for Path"; @@ -184807,8 +188066,8 @@ self: { ({ mkDerivation, base, bytestring, text, validity }: mkDerivation { pname = "validity-text"; - version = "0.1.2.0"; - sha256 = "f08e3a0f3ebdfe57419dfc6eef7e119d2a6ce7b8d0948297384c73ad8de0913f"; + version = "0.1.2.1"; + sha256 = "59d58521c9cfd3c438d01e23a636053821b7d03aef8179138ac9bb8184c39d1b"; libraryHaskellDepends = [ base bytestring text validity ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity instances for text"; @@ -184819,8 +188078,10 @@ self: { ({ mkDerivation, base, time, validity }: mkDerivation { pname = "validity-time"; - version = "0.0.0.0"; - sha256 = "4c061a1c238c846e2e6e9838355c9a340ffc6080fb9185b18fb3c8667178af3d"; + version = "0.0.0.1"; + sha256 = "175d75b95741323047afa14f3984bab93a20ee525e5a521a01ee94fbe8c5bb69"; + revision = "1"; + editedCabalFile = "a9f20c04242b73f552159675c78028323db8b0b0db6dabb5757538997597faf0"; libraryHaskellDepends = [ base time validity ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity instances for time"; @@ -185258,15 +188519,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vector_0_12_0_0" = callPackage + "vector_0_12_0_1" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, HUnit, primitive , QuickCheck, random, template-haskell, test-framework , test-framework-hunit, test-framework-quickcheck2, transformers }: mkDerivation { pname = "vector"; - version = "0.12.0.0"; - sha256 = "27bf375d0efbff61acaeb75a2047afcbdac930191069a59da4a474b9bf80ec95"; + version = "0.12.0.1"; + sha256 = "b100ee79b9da2651276278cd3e0f08a3c152505cc52982beda507515af173d7b"; libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; testHaskellDepends = [ base HUnit QuickCheck random template-haskell test-framework @@ -185667,8 +188928,8 @@ self: { }: mkDerivation { pname = "vectortiles"; - version = "1.2.0.2"; - sha256 = "9540f0b55c63ae9185a7e2e264a4f10a5fbd0e682e3ecad33e52245d5e32a886"; + version = "1.2.0.4"; + sha256 = "0624b74d6c02f7add5cba5f3410c156a50a38fd170aeda5224ab4ceb596ec3c4"; libraryHaskellDepends = [ base bytestring cereal containers deepseq protobuf text transformers vector @@ -185949,8 +189210,8 @@ self: { }: mkDerivation { pname = "vimeta"; - version = "0.2.2.0"; - sha256 = "ce63a34e2c7fd31b2ad2a9f1e9b8c3d2c10c70e1ba5ccf2b06e8dc99770b065d"; + version = "0.2.3.0"; + sha256 = "e4450254730743448d4462907b8ee0249edc4725d81277b57f3cf85a6c964300"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186307,14 +189568,12 @@ self: { }) {}; "void" = callPackage - ({ mkDerivation, base, deepseq, ghc-prim, hashable, semigroups }: + ({ mkDerivation, base }: mkDerivation { pname = "void"; - version = "0.7.1"; - sha256 = "c9f0fd93680c029abb9654b5464be260652829961b18b7046f96a0df95e825f4"; - libraryHaskellDepends = [ - base deepseq ghc-prim hashable semigroups - ]; + version = "0.7.2"; + sha256 = "d3fffe66a03e4b53db1e459edf75ad8402385a817cae415d857ec0b03ce0cf2b"; + libraryHaskellDepends = [ base ]; homepage = "http://github.com/ekmett/void"; description = "A Haskell 98 logically uninhabited data type"; license = stdenv.lib.licenses.bsd3; @@ -186713,8 +189972,8 @@ self: { }: mkDerivation { pname = "wai-cli"; - version = "0.1.0"; - sha256 = "220d8b3eb52e7b045844be37682f09823a9730115f33ea718717896f74673007"; + version = "0.1.1"; + sha256 = "0643ebd8cbd4fcedd2076450b635d020aa2101b26e80f69ade10acd2c3252862"; libraryHaskellDepends = [ ansi-terminal base http-types monads-tf network options socket-activation stm streaming-commons unix wai wai-extra warp @@ -187162,8 +190421,8 @@ self: { }: mkDerivation { pname = "wai-middleware-auth"; - version = "0.1.1.0"; - sha256 = "f951faa7f3b143b36268b3c3b0250779d229490b0a4bad8722cda3ea0a60a1a1"; + version = "0.1.1.2"; + sha256 = "f14016ba27f24a11395661cd2969cc41cf5a5043045468c584a0e03c4ddfa896"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -187489,6 +190748,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wai-middleware-metrics_0_2_4" = callPackage + ({ mkDerivation, base, bytestring, criterion, ekg-core, http-types + , QuickCheck, scotty, tasty, tasty-hunit, tasty-quickcheck, text + , time, transformers, wai, wai-extra + }: + mkDerivation { + pname = "wai-middleware-metrics"; + version = "0.2.4"; + sha256 = "e73685a748f0ba6d16956b500cdc23f3802f794f5259a3d6b8a5b885e928ec74"; + libraryHaskellDepends = [ base ekg-core http-types text time wai ]; + testHaskellDepends = [ + base bytestring ekg-core http-types QuickCheck scotty tasty + tasty-hunit tasty-quickcheck text time transformers wai wai-extra + ]; + benchmarkHaskellDepends = [ + base bytestring criterion ekg-core http-types scotty text time wai + wai-extra + ]; + homepage = "https://github.com/Helkafen/wai-middleware-metrics"; + description = "A WAI middleware to collect EKG request metrics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-middleware-preprocessor" = callPackage ({ mkDerivation, base, Cabal, directory, mtl, split, text, wai , wai-middleware-static, warp @@ -188315,8 +191598,8 @@ self: { }: mkDerivation { pname = "wavefront"; - version = "0.7.0.3"; - sha256 = "7e6ee21fa04410c4c01f0b86fa0acdc3d4d64d3167614e2cb58ce7528bbd0d65"; + version = "0.7.1"; + sha256 = "a7598a4237dbb9008cf2c33b324fdc1625308b090b7bf969c66dba82ec442f6f"; libraryHaskellDepends = [ attoparsec base dlist filepath mtl text transformers vector ]; @@ -188516,6 +191799,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "web-output" = callPackage + ({ mkDerivation, base, directory, filepath, open-browser, temporary + , text + }: + mkDerivation { + pname = "web-output"; + version = "0.4.0.0"; + sha256 = "700bf50355a9232cb76af526c03d44d964a6829b01c66d909006db5c7e7d3404"; + libraryHaskellDepends = [ + base directory filepath open-browser temporary text + ]; + testHaskellDepends = [ + base directory filepath open-browser temporary text + ]; + homepage = "https://github.com/danse/web-output"; + description = "Library to present content to an user via their browser"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "web-page" = callPackage ({ mkDerivation, base, blaze-builder, blaze-html, bytestring, clay , containers, jmacro, lens, mtl, Stream, text, vector @@ -189054,22 +192356,23 @@ self: { }) {webkit = null;}; "webkit2gtk3-javascriptcore" = callPackage - ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit2gtk }: + ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }: mkDerivation { pname = "webkit2gtk3-javascriptcore"; version = "0.14.2.1"; sha256 = "b24b110013f96c770a2c1683d3b35d73da31f9777dbe6e09ac704aff3ae442f8"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; - libraryPkgconfigDepends = [ webkit2gtk ]; + libraryPkgconfigDepends = [ webkitgtk ]; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit2gtk = null;}; + }) {inherit (pkgs.gnome3) webkitgtk;}; "webkitgtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, glib - , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers, webkit + , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers + , webkitgtk24x }: mkDerivation { pname = "webkitgtk3"; @@ -189079,26 +192382,26 @@ self: { libraryHaskellDepends = [ base bytestring cairo glib gtk3 mtl pango text transformers ]; - libraryPkgconfigDepends = [ webkit ]; + libraryPkgconfigDepends = [ webkitgtk24x ]; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit = null;}; + }) {inherit (pkgs) webkitgtk24x;}; "webkitgtk3-javascriptcore" = callPackage - ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit }: + ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk24x }: mkDerivation { pname = "webkitgtk3-javascriptcore"; version = "0.14.2.1"; sha256 = "922080150c96c9276ea3ddd9ef19d867f5e179017b56e8fec02e2606d4cc924d"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; - libraryPkgconfigDepends = [ webkit ]; + libraryPkgconfigDepends = [ webkitgtk24x ]; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit = null;}; + }) {inherit (pkgs) webkitgtk24x;}; "webpage" = callPackage ({ mkDerivation, base, blaze-html, data-default, lucid, text }: @@ -189113,6 +192416,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "webpage_0_0_5" = callPackage + ({ mkDerivation, base, blaze-html, data-default, lucid, text }: + mkDerivation { + pname = "webpage"; + version = "0.0.5"; + sha256 = "213e92ff931d7f58becb532a70cb958a691b216fa85c43f950b429ffad3d1aad"; + libraryHaskellDepends = [ + base blaze-html data-default lucid text + ]; + description = "Organized and simple web page scaffold for blaze and lucid"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "webrtc-vad" = callPackage ({ mkDerivation, base, primitive, vector }: mkDerivation { @@ -189215,20 +192532,21 @@ self: { }) {}; "websockets-rpc" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, exceptions - , mtl, QuickCheck, quickcheck-instances, stm, tasty - , tasty-quickcheck, text, unordered-containers, wai-transformers - , websockets + ({ mkDerivation, aeson, async, base, bytestring, containers + , exceptions, mtl, QuickCheck, quickcheck-instances, stm, tasty + , tasty-quickcheck, text, transformers, unordered-containers + , wai-transformers, websockets }: mkDerivation { pname = "websockets-rpc"; - version = "0.0.0"; - sha256 = "e8a97330230f178fede76701fd2335fe18f48a124bd020c4be8120fa75ddf5bb"; + version = "0.0.2"; + sha256 = "78100b408e6e793812034ce356bdbde893f51679d7d37db8ec2b773b26cfca12"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring containers exceptions mtl QuickCheck stm text - unordered-containers wai-transformers websockets + aeson async base bytestring containers exceptions mtl QuickCheck + stm text transformers unordered-containers wai-transformers + websockets ]; testHaskellDepends = [ aeson base QuickCheck quickcheck-instances tasty tasty-quickcheck @@ -189814,16 +193132,17 @@ self: { }) {}; "wires" = callPackage - ({ mkDerivation, base, deepseq, profunctors, semigroupoids, these + ({ mkDerivation, base, deepseq, mtl, profunctors, semigroupoids + , these }: mkDerivation { pname = "wires"; - version = "0.1.0"; - sha256 = "4145f1870301d1ba7af683ec17877450dbeaa93afa002d0cf9a36b1ef4248c65"; + version = "0.2.0"; + sha256 = "dd062d0863c401b3d54c404f95392d56a358fc4615fa614db60ae73cf66091b0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base deepseq profunctors semigroupoids these + base deepseq mtl profunctors semigroupoids these ]; homepage = "https://github.com/esoeylemez/wires"; description = "Functional reactive programming library"; @@ -189852,8 +193171,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "wiringPi"; - version = "1.0"; - sha256 = "78449f9f48bab82bf8e268e0b858171e7539d7b9a61dd92c75a9ea7c1a7523d0"; + version = "1.0.1"; + sha256 = "b3acd5319bccde3142fba1a84b805099516f4b20643393520976570e618b9ac4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -189900,14 +193219,14 @@ self: { }: mkDerivation { pname = "witherable"; - version = "0.1.3.3"; - sha256 = "6fdfd607e71b442d17b48ab7e00fe3d8dda2c39cf041134d01d49da83421cf6c"; + version = "0.1.3.4"; + sha256 = "f45b124f2b7c7afd69512c09e91ebe3e3c4030caafad72fc762ba051685f0d67"; libraryHaskellDepends = [ base base-orphans containers hashable transformers unordered-containers vector ]; homepage = "https://github.com/fumieval/witherable"; - description = "Generalization of filter and catMaybes"; + description = "filterable traversable"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -190176,20 +193495,20 @@ self: { ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3 , amazonka-swf, base, bytestring, conduit, conduit-combinators , conduit-extra, directory, exceptions, filemanip, filepath - , lifted-async, monad-control, optparse-applicative + , http-types, lifted-async, monad-control, optparse-applicative , optparse-generic, preamble, process, resourcet, shakers, text , time, uuid, yaml }: mkDerivation { pname = "wolf"; - version = "0.3.8"; - sha256 = "af9021f6b883cd9f90d984e6e66535f17738d0064fa96bd0f39938eeb863dd4b"; + version = "0.3.10"; + sha256 = "37a02e1b60d7f7779dd94a3facbb54eadbecb0729e639ec30f7c7cd98fe5baae"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson amazonka amazonka-core amazonka-s3 amazonka-swf base bytestring conduit conduit-combinators conduit-extra directory - exceptions filemanip filepath lifted-async monad-control + exceptions filemanip filepath http-types lifted-async monad-control optparse-applicative preamble process resourcet text time uuid yaml ]; executableHaskellDepends = [ base optparse-generic shakers ]; @@ -190668,8 +193987,8 @@ self: { }: mkDerivation { pname = "writer-cps-lens"; - version = "0.1.0.0"; - sha256 = "23daa611fc16cddc8b8df3436818870c34ec87795b960b3cea2a3e3c408e3448"; + version = "0.1.0.1"; + sha256 = "2d6b8b6f4f86dcb3cc75bdd25d4ab186d09c2859023f3a6ef2171576b0d306ef"; libraryHaskellDepends = [ base lens profunctors transformers writer-cps-mtl writer-cps-transformers @@ -190700,8 +194019,8 @@ self: { ({ mkDerivation, base, mmorph, writer-cps-transformers }: mkDerivation { pname = "writer-cps-morph"; - version = "0.1.0.1"; - sha256 = "bd685fa9dec074ef7d0f545f95eaf20bd0b600d2fb067f3dcfdc3a3b0e678cee"; + version = "0.1.0.2"; + sha256 = "e91d07b7dce83973c8ad8f489e161ea8092bd3c7d161f4e57cddeedd2f3fd5d8"; libraryHaskellDepends = [ base mmorph writer-cps-transformers ]; homepage = "https://github.com/louispan/writer-cps-morph#readme"; description = "MFunctor instance for CPS style WriterT and RWST"; @@ -190723,6 +194042,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "writer-cps-mtl_0_1_1_3" = callPackage + ({ mkDerivation, base, mtl, transformers, writer-cps-transformers + }: + mkDerivation { + pname = "writer-cps-mtl"; + version = "0.1.1.3"; + sha256 = "b7a37f1e3183fdbd381149dbf3e55e727e7af19fef9136b0201df2600691a7f3"; + libraryHaskellDepends = [ + base mtl transformers writer-cps-transformers + ]; + homepage = "https://github.com/minad/writer-cps-mtl#readme"; + description = "MonadWriter orphan instances for writer-cps-transformers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "writer-cps-transformers" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -191364,8 +194699,8 @@ self: { }: mkDerivation { pname = "xdcc"; - version = "1.1.3"; - sha256 = "b34b1b10c8fc92347b0713b5b2d1ebb7450984fd7dd284d8501c291e016db49e"; + version = "1.1.4"; + sha256 = "a9c4f4c904bb6d4c634b224eb0587babc60cbee51a9d7ed6a487f138df266464"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -192760,8 +196095,8 @@ self: { }: mkDerivation { pname = "xmonad-vanessa"; - version = "0.1.0.6"; - sha256 = "7abfe1bdaf7a9bbecdfa89b36b7144fe590d5b6344cc4838fb287e8f5ded52c4"; + version = "0.1.1.0"; + sha256 = "775497b9cad69caee9c96f7049b4e865783b54a7fc3d4c07a0b7745a8934f439"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -193766,8 +197101,8 @@ self: { }: mkDerivation { pname = "yeshql"; - version = "2.2.0.0"; - sha256 = "3a17da3d051c19d44cd65bdccd3f47ca78c9df6b9190ca732dba16ad086c9e2d"; + version = "3.0.0.1"; + sha256 = "659327284a2293694684134911b9f7a705f05520b2cd8cf0d1b519c72e079de2"; libraryHaskellDepends = [ base containers convertible filepath HDBC parsec syb-with-class template-haskell @@ -193781,30 +197116,6 @@ self: { }) {}; "yesod" = callPackage - ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , conduit, conduit-extra, data-default-class, directory - , fast-logger, monad-control, monad-logger, resourcet, semigroups - , shakespeare, streaming-commons, template-haskell, text - , transformers, unix, unordered-containers, wai, wai-extra - , wai-logger, warp, yaml, yesod-core, yesod-form, yesod-persistent - }: - mkDerivation { - pname = "yesod"; - version = "1.4.4"; - sha256 = "5f2caade2435754ff35060c3ae58390ad87650b975e83a65f8013e80ea7bea2c"; - libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring conduit conduit-extra - data-default-class directory fast-logger monad-control monad-logger - resourcet semigroups shakespeare streaming-commons template-haskell - text transformers unix unordered-containers wai wai-extra - wai-logger warp yaml yesod-core yesod-form yesod-persistent - ]; - homepage = "http://www.yesodweb.com/"; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod_1_4_5" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , conduit, conduit-extra, data-default-class, directory , fast-logger, monad-control, monad-logger, resourcet, semigroups @@ -193826,7 +197137,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-angular" = callPackage @@ -193865,35 +197175,6 @@ self: { }) {}; "yesod-auth" = callPackage - ({ mkDerivation, aeson, authenticate, base, base16-bytestring - , base64-bytestring, binary, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, conduit, conduit-extra - , containers, cryptohash, data-default, email-validate, file-embed - , http-client, http-conduit, http-types, lifted-base, mime-mail - , network-uri, nonce, persistent, persistent-template, random - , resourcet, safe, shakespeare, template-haskell, text, time - , transformers, unordered-containers, wai, yesod-core, yesod-form - , yesod-persistent - }: - mkDerivation { - pname = "yesod-auth"; - version = "1.4.16"; - sha256 = "a2c76409522ac276b92d31e13ffa94ae51194ffdb902a41f979d25181a5182d2"; - libraryHaskellDepends = [ - aeson authenticate base base16-bytestring base64-bytestring binary - blaze-builder blaze-html blaze-markup byteable bytestring conduit - conduit-extra containers cryptohash data-default email-validate - file-embed http-client http-conduit http-types lifted-base - mime-mail network-uri nonce persistent persistent-template random - resourcet safe shakespeare template-haskell text time transformers - unordered-containers wai yesod-core yesod-form yesod-persistent - ]; - homepage = "http://www.yesodweb.com/"; - description = "Authentication for Yesod"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-auth_1_4_17" = callPackage ({ mkDerivation, aeson, authenticate, base, base16-bytestring , base64-bytestring, binary, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, conduit, conduit-extra @@ -193920,7 +197201,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Authentication for Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-account" = callPackage @@ -194275,8 +197555,8 @@ self: { }: mkDerivation { pname = "yesod-bin"; - version = "1.5.1"; - sha256 = "034114dade5a23ec39ffeb9f78a04b7bd9fc0b8942b1a11118475e4c594863cd"; + version = "1.5.2.2"; + sha256 = "313344ed5230298436500b809c294700cf251c3b5198b6d58169fe89fe6d1438"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -194295,41 +197575,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-bin_1_5_2" = callPackage - ({ mkDerivation, async, attoparsec, base, base64-bytestring - , blaze-builder, bytestring, Cabal, conduit, conduit-extra - , containers, data-default-class, deepseq, directory, file-embed - , filepath, fsnotify, http-client, http-client-tls - , http-reverse-proxy, http-types, lifted-base, network - , optparse-applicative, parsec, process, project-template - , resourcet, safe-exceptions, say, shakespeare, split, stm - , streaming-commons, tar, template-haskell, text, time - , transformers, transformers-compat, typed-process, unix-compat - , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib - }: - mkDerivation { - pname = "yesod-bin"; - version = "1.5.2"; - sha256 = "b37087eb7e167c2250dd23452e8f4858190db11570e540df44809c197219439a"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - async attoparsec base base64-bytestring blaze-builder bytestring - Cabal conduit conduit-extra containers data-default-class deepseq - directory file-embed filepath fsnotify http-client http-client-tls - http-reverse-proxy http-types lifted-base network - optparse-applicative parsec process project-template resourcet - safe-exceptions say shakespeare split stm streaming-commons tar - template-haskell text time transformers transformers-compat - typed-process unix-compat unordered-containers wai wai-extra warp - warp-tls yaml zlib - ]; - homepage = "http://www.yesodweb.com/"; - description = "The yesod helper executable"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-bootstrap" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bootstrap-types , shakespeare, text, transformers, yesod-core, yesod-elements @@ -194428,49 +197673,6 @@ self: { }) {}; "yesod-core" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-builder - , blaze-html, blaze-markup, byteable, bytestring, case-insensitive - , cereal, clientsession, conduit, conduit-extra, containers, cookie - , criterion, data-default, deepseq, deepseq-generics, directory - , exceptions, fast-logger, hspec, hspec-expectations, http-types - , HUnit, lifted-base, monad-control, monad-logger, mtl, mwc-random - , network, old-locale, parsec, path-pieces, primitive, QuickCheck - , random, resourcet, safe, semigroups, shakespeare - , streaming-commons, template-haskell, text, time, transformers - , transformers-base, unix-compat, unordered-containers, vector, wai - , wai-extra, wai-logger, warp, word8 - }: - mkDerivation { - pname = "yesod-core"; - version = "1.4.31"; - sha256 = "9a2e4c39c9ce66c2881d5da6c9a621c07492c950d935231aa7e12ed3a008d7af"; - libraryHaskellDepends = [ - aeson auto-update base blaze-builder blaze-html blaze-markup - byteable bytestring case-insensitive cereal clientsession conduit - conduit-extra containers cookie data-default deepseq - deepseq-generics directory exceptions fast-logger http-types - lifted-base monad-control monad-logger mtl mwc-random old-locale - parsec path-pieces primitive random resourcet safe semigroups - shakespeare template-haskell text time transformers - transformers-base unix-compat unordered-containers vector wai - wai-extra wai-logger warp word8 - ]; - testHaskellDepends = [ - async base blaze-builder bytestring clientsession conduit - conduit-extra containers cookie hspec hspec-expectations http-types - HUnit lifted-base mwc-random network path-pieces QuickCheck random - resourcet shakespeare streaming-commons template-haskell text - transformers wai wai-extra - ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring criterion shakespeare text transformers - ]; - homepage = "http://www.yesodweb.com/"; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-core_1_4_32" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , blaze-html, blaze-markup, byteable, bytestring, case-insensitive , cereal, clientsession, conduit, conduit-extra, containers, cookie @@ -194487,6 +197689,8 @@ self: { pname = "yesod-core"; version = "1.4.32"; sha256 = "0a3389e0e5d188c0bfcb99bb39856adcde28a1ebf572c0aebf8afa0e34946869"; + revision = "1"; + editedCabalFile = "570c6168c84e518cc4978bfbbfd7a2cc23a04879937f66a8729eb592a9492af8"; libraryHaskellDepends = [ aeson auto-update base blaze-builder blaze-html blaze-markup byteable bytestring case-insensitive cereal clientsession conduit @@ -194511,7 +197715,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-crud" = callPackage @@ -194653,23 +197856,6 @@ self: { }) {}; "yesod-eventsource" = callPackage - ({ mkDerivation, base, blaze-builder, conduit, transformers, wai - , wai-eventsource, wai-extra, yesod-core - }: - mkDerivation { - pname = "yesod-eventsource"; - version = "1.4.0.1"; - sha256 = "a5ec061ca8c426c4a8179bace45edd8100de96c947b8294445aae890dd175d48"; - libraryHaskellDepends = [ - base blaze-builder conduit transformers wai wai-eventsource - wai-extra yesod-core - ]; - homepage = "http://www.yesodweb.com/"; - description = "Server-sent events support for Yesod apps"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-eventsource_1_4_1" = callPackage ({ mkDerivation, base, blaze-builder, conduit, transformers, wai , wai-eventsource, wai-extra, yesod-core }: @@ -194684,7 +197870,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Server-sent events support for Yesod apps"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-examples" = callPackage @@ -194749,30 +197934,6 @@ self: { }) {}; "yesod-form" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, containers, data-default - , email-validate, hspec, network-uri, persistent, resourcet - , semigroups, shakespeare, template-haskell, text, time - , transformers, wai, xss-sanitize, yesod-core, yesod-persistent - }: - mkDerivation { - pname = "yesod-form"; - version = "1.4.10"; - sha256 = "ddeb72988e1dffb1c3766c35941520aa6ff6a8b09d6bdeb453d9c75d11ad8e43"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder blaze-html blaze-markup - byteable bytestring containers data-default email-validate - network-uri persistent resourcet semigroups shakespeare - template-haskell text time transformers wai xss-sanitize yesod-core - yesod-persistent - ]; - testHaskellDepends = [ base hspec text time ]; - homepage = "http://www.yesodweb.com/"; - description = "Form handling support for Yesod Web Framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-form_1_4_11" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, containers, data-default , email-validate, hspec, network-uri, persistent, resourcet @@ -194794,7 +197955,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Form handling support for Yesod Web Framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-form-json" = callPackage @@ -195102,28 +198262,6 @@ self: { }) {}; "yesod-persistent" = callPackage - ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent - , persistent-sqlite, persistent-template, resource-pool, resourcet - , text, transformers, wai-extra, yesod-core - }: - mkDerivation { - pname = "yesod-persistent"; - version = "1.4.1.1"; - sha256 = "dffd2604fc37a6b518c06391c44059df96895e3b484d4de8fbff9ff0869e7551"; - libraryHaskellDepends = [ - base blaze-builder conduit persistent persistent-template - resource-pool resourcet transformers yesod-core - ]; - testHaskellDepends = [ - base blaze-builder conduit hspec persistent persistent-sqlite text - wai-extra yesod-core - ]; - homepage = "http://www.yesodweb.com/"; - description = "Some helpers for using Persistent from Yesod"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-persistent_1_4_2" = callPackage ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent , persistent-sqlite, persistent-template, resource-pool, resourcet , text, transformers, wai-extra, yesod-core @@ -195143,7 +198281,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Some helpers for using Persistent from Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-platform" = callPackage @@ -195528,41 +198665,6 @@ self: { }) {}; "yesod-static" = callPackage - ({ mkDerivation, async, attoparsec, base, base64-bytestring - , blaze-builder, byteable, bytestring, conduit, conduit-extra - , containers, cryptohash, cryptohash-conduit, css-text - , data-default, directory, exceptions, file-embed, filepath - , hashable, hjsmin, hspec, http-types, HUnit, mime-types, old-time - , process, resourcet, template-haskell, text, transformers - , unix-compat, unordered-containers, wai, wai-app-static, wai-extra - , yesod-core, yesod-test - }: - mkDerivation { - pname = "yesod-static"; - version = "1.5.1.1"; - sha256 = "cdb50763c4cbd2b8fcdb2b9f2f2526648e82454c62d49bfd6d165af80a192a92"; - libraryHaskellDepends = [ - async attoparsec base base64-bytestring blaze-builder byteable - bytestring conduit conduit-extra containers cryptohash - cryptohash-conduit css-text data-default directory exceptions - file-embed filepath hashable hjsmin http-types mime-types old-time - process resourcet template-haskell text transformers unix-compat - unordered-containers wai wai-app-static yesod-core - ]; - testHaskellDepends = [ - async base base64-bytestring byteable bytestring conduit - conduit-extra containers cryptohash cryptohash-conduit data-default - directory exceptions file-embed filepath hjsmin hspec http-types - HUnit mime-types old-time process resourcet template-haskell text - transformers unix-compat unordered-containers wai wai-app-static - wai-extra yesod-core yesod-test - ]; - homepage = "http://www.yesodweb.com/"; - description = "Static file serving subsite for Yesod Web Framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-static_1_5_2" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring , blaze-builder, byteable, bytestring, conduit, conduit-extra , containers, cryptohash, cryptohash-conduit, css-text @@ -195595,7 +198697,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Static file serving subsite for Yesod Web Framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-static-angular" = callPackage @@ -195653,33 +198754,6 @@ self: { }) {}; "yesod-test" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, bytestring, case-insensitive, containers, cookie - , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base - , monad-control, network, persistent, pretty-show, text, time - , transformers, wai, wai-extra, xml-conduit, xml-types, yesod-core - , yesod-form - }: - mkDerivation { - pname = "yesod-test"; - version = "1.5.4.1"; - sha256 = "36c08c34d5fef656bb3469194b77b0802c60db4120af0f6dfd2b08f4a9d9659d"; - libraryHaskellDepends = [ - attoparsec base blaze-builder blaze-html blaze-markup bytestring - case-insensitive containers cookie hspec-core html-conduit - http-types HUnit monad-control network persistent pretty-show text - time transformers wai wai-extra xml-conduit xml-types yesod-core - ]; - testHaskellDepends = [ - base bytestring containers hspec html-conduit http-types HUnit - lifted-base text wai xml-conduit yesod-core yesod-form - ]; - homepage = "http://www.yesodweb.com"; - description = "integration testing for WAI/Yesod Applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-test_1_5_5" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, case-insensitive, containers, cookie , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base @@ -195704,7 +198778,6 @@ self: { homepage = "http://www.yesodweb.com"; description = "integration testing for WAI/Yesod Applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-test-json" = callPackage @@ -195808,24 +198881,6 @@ self: { }) {}; "yesod-websockets" = callPackage - ({ mkDerivation, async, base, conduit, enclosed-exceptions - , monad-control, transformers, wai, wai-websockets, websockets - , yesod-core - }: - mkDerivation { - pname = "yesod-websockets"; - version = "0.2.5"; - sha256 = "c5f609aea82035a8bd43998f29bb2fc8547f72260dafdc9fdc44a7706975c944"; - libraryHaskellDepends = [ - async base conduit enclosed-exceptions monad-control transformers - wai wai-websockets websockets yesod-core - ]; - homepage = "https://github.com/yesodweb/yesod"; - description = "WebSockets support for Yesod"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-websockets_0_2_6" = callPackage ({ mkDerivation, async, base, conduit, enclosed-exceptions , monad-control, transformers, wai, wai-websockets, websockets , yesod-core @@ -195841,7 +198896,6 @@ self: { homepage = "https://github.com/yesodweb/yesod"; description = "WebSockets support for Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-websockets-extra" = callPackage @@ -196956,6 +200010,115 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "zifter" = callPackage + ({ mkDerivation, ansi-terminal, async, base, directory, exceptions + , filepath, genvalidity, genvalidity-hspec, genvalidity-path, hspec + , optparse-applicative, path, path-io, process, QuickCheck, safe + , stm, validity, validity-path + }: + mkDerivation { + pname = "zifter"; + version = "0.0.1.1"; + sha256 = "ea8c1a721789144ae7207474a91f0471d17c42aa5a8e6962eca93c41b189de45"; + revision = "1"; + editedCabalFile = "38d76a58f2a44cbef3d535592d54e082011fb7ee539c1a659d4a58d5bbc961a1"; + libraryHaskellDepends = [ + ansi-terminal async base directory exceptions filepath + optparse-applicative path path-io process safe stm validity + validity-path + ]; + testHaskellDepends = [ + ansi-terminal base directory genvalidity genvalidity-hspec + genvalidity-path hspec path path-io QuickCheck stm + ]; + homepage = "http://cs-syd.eu"; + description = "zifter"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "zifter-cabal" = callPackage + ({ mkDerivation, base, directory, filepath, path, path-io, process + , zifter + }: + mkDerivation { + pname = "zifter-cabal"; + version = "0.0.0.0"; + sha256 = "3ea3b662b68174f44d7e7eb2b5032d928743ecad3e7fa3a466194159c47929e4"; + libraryHaskellDepends = [ + base directory filepath path path-io process zifter + ]; + homepage = "http://cs-syd.eu"; + description = "zifter-cabal"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "zifter-git" = callPackage + ({ mkDerivation, base, path, process, zifter }: + mkDerivation { + pname = "zifter-git"; + version = "0.0.0.0"; + sha256 = "92440ad0ca1e4b831d988b6b2fc339e45413ec9f8824bd6b7c6d496a8f520557"; + libraryHaskellDepends = [ base path process zifter ]; + homepage = "http://cs-syd.eu"; + description = "zifter-git"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "zifter-hindent" = callPackage + ({ mkDerivation, base, directory, filepath, path, path-io, process + , safe, zifter + }: + mkDerivation { + pname = "zifter-hindent"; + version = "0.0.0.0"; + sha256 = "39ade41a13e0aa8b675a15cfeb34605eb4caa78f035fdd2470681c4814b16d06"; + libraryHaskellDepends = [ + base directory filepath path path-io process safe zifter + ]; + homepage = "http://cs-syd.eu"; + description = "zifter-hindent"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "zifter-hlint" = callPackage + ({ mkDerivation, base, filepath, hlint, path, path-io, safe, zifter + }: + mkDerivation { + pname = "zifter-hlint"; + version = "0.0.0.0"; + sha256 = "d7588cfa7dc22acc664a1438881abca0b38789e787e1014d4a9a0a320b35772f"; + revision = "1"; + editedCabalFile = "9b56b30b5d88ccb8613851ec14d630dd4d5ec5dbcb6b6f104f5b8d475afc9523"; + libraryHaskellDepends = [ + base filepath hlint path path-io safe zifter + ]; + homepage = "http://cs-syd.eu"; + description = "zifter-hlint"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "zifter-stack" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath, path, path-io + , process, zifter + }: + mkDerivation { + pname = "zifter-stack"; + version = "0.0.0.2"; + sha256 = "b4f1152e575692a270375ff925c01b6e11b6d63e45c60ff3a02a661da9ebaad7"; + libraryHaskellDepends = [ + base Cabal directory filepath path path-io process zifter + ]; + homepage = "http://cs-syd.eu"; + description = "zifter-stack"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "zigbee-znet25" = callPackage ({ mkDerivation, base, bytestring, cereal, MissingH, mtl , QuickCheck, random, transformers @@ -197003,8 +200166,8 @@ self: { }: mkDerivation { pname = "zip"; - version = "0.1.8"; - sha256 = "3b6addaaf314df1587baf8b5e0423cbfa9fc256a09a20c70e1a746a8067370d1"; + version = "0.1.9"; + sha256 = "82dd97404ff2dde034b6786838ee51a5102da31c20835d61fef3bdfe69279860"; libraryHaskellDepends = [ base bytestring bzlib-conduit case-insensitive cereal conduit conduit-extra containers digest exceptions filepath mtl path @@ -197020,7 +200183,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; - "zip_0_1_9" = callPackage + "zip_0_1_10" = callPackage ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive , cereal, conduit, conduit-extra, containers, digest, exceptions , filepath, hspec, mtl, path, path-io, plan-b, QuickCheck @@ -197028,8 +200191,8 @@ self: { }: mkDerivation { pname = "zip"; - version = "0.1.9"; - sha256 = "82dd97404ff2dde034b6786838ee51a5102da31c20835d61fef3bdfe69279860"; + version = "0.1.10"; + sha256 = "8ec11736f49ffc9b07fa51910d7e06791358e02ba4073e5ad6346b7d3172530d"; libraryHaskellDepends = [ base bytestring bzlib-conduit case-insensitive cereal conduit conduit-extra containers digest exceptions filepath mtl path @@ -197175,6 +200338,49 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ziptastic-client" = callPackage + ({ mkDerivation, base, base-compat, hspec, http-client + , http-client-tls, http-types, iso3166-country-codes, servant + , servant-client, text, ziptastic-core + }: + mkDerivation { + pname = "ziptastic-client"; + version = "0.3.0.1"; + sha256 = "dbe176c9a0bbb2b612fdabdde49ef92b89b5313913133b6582a170b692b0649a"; + libraryHaskellDepends = [ + base base-compat http-client iso3166-country-codes servant + servant-client text ziptastic-core + ]; + testHaskellDepends = [ + base base-compat hspec http-client http-client-tls http-types + iso3166-country-codes servant-client + ]; + homepage = "https://github.com/Ziptastic/ziptastic-haskell#readme"; + description = "A type-safe client for the Ziptastic API for doing forward and reverse geocoding"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ziptastic-core" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring, here, hspec + , http-api-data, iso3166-country-codes, servant, text, tz + }: + mkDerivation { + pname = "ziptastic-core"; + version = "0.2.0.1"; + sha256 = "1512fe53b08e157895d5ae449cfe3ba65c859057394fa0bd9b4158f8c4502532"; + libraryHaskellDepends = [ + aeson base base-compat bytestring http-api-data + iso3166-country-codes servant text tz + ]; + testHaskellDepends = [ + aeson base base-compat here hspec iso3166-country-codes text tz + ]; + homepage = "https://github.com/Ziptastic/ziptastic-haskell#readme"; + description = "Core Servant specification for the Ziptastic API for doing forward and reverse geocoding"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "zlib_0_5_4_2" = callPackage ({ mkDerivation, base, bytestring, zlib }: mkDerivation { diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 2093ec2b218..912d26c806c 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -38,6 +38,9 @@ rec { addPkgconfigDepend = drv: x: addPkgconfigDepends drv [x]; addPkgconfigDepends = drv: xs: overrideCabal drv (drv: { pkgconfigDepends = (drv.pkgconfigDepends or []) ++ xs; }); + addSetupDepend = drv: x: addSetupDepends drv [x]; + addSetupDepends = drv: xs: overrideCabal drv (drv: { setupHaskellDepends = (drv.setupHaskellDepends or []) ++ xs; }); + enableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f-${x}") "-f${x}"; disableCabalFlag = drv: x: appendConfigureFlag (removeConfigureFlag drv "-f${x}") "-f-${x}"; diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix index 3dfb800afe1..527a5b2e570 100644 --- a/pkgs/development/interpreters/clojure/clooj.nix +++ b/pkgs/development/interpreters/clojure/clooj.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "clooj-${version}"; jar = fetchurl { - url = "http://download1492.mediafire.com/dptomdxrjaag/prkf64humftrmz3/clooj-0.4.4-standalone.jar"; + url = "http://download1492.mediafire.com/5bbi05sxgxog/prkf64humftrmz3/clooj-0.4.4-standalone.jar"; sha256 = "0hbc29bg2a86rm3sx9kvj7h7db9j0kbnrb706wsfiyk3zi3bavnd"; }; diff --git a/pkgs/development/interpreters/erlang/R14.nix b/pkgs/development/interpreters/erlang/R14.nix deleted file mode 100644 index 0a93726fc0a..00000000000 --- a/pkgs/development/interpreters/erlang/R14.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv, fetchurl, perl, gnum4, ncurses, openssl -, makeWrapper, gnused, gawk }: - -let version = "14B04"; in - -stdenv.mkDerivation { - name = "erlang-" + version; - - src = fetchurl { - url = "http://www.erlang.org/download/otp_src_R${version}.tar.gz"; - sha256 = "0vlvjlg8vzcy6inb4vj00bnj0aarvpchzxwhmi492nv31s8kb6q9"; - }; - - buildInputs = [ perl gnum4 ncurses openssl makeWrapper ]; - - patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; - - preConfigure = '' - export HOME=$PWD/../ - sed -e s@/bin/pwd@pwd@g -i otp_build - ''; - - configureFlags = "--with-ssl=${openssl.dev}"; - - hardeningDisable = [ "format" ]; - - postInstall = let - manpages = fetchurl { - url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz"; - sha256 = "1nh7l7wilyyaxvlwkjxgm3cq7wpd90sk6vxhgpvg7hwai8g52545"; - }; - in '' - tar xf "${manpages}" -C "$out/lib/erlang" - for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do - prefix="''${i%/*}" - ensureDir "$out/share/man/''${prefix##*/}" - ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" - done - ''; - - # Some erlang bin/ scripts run sed and awk - postFixup = '' - wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" - wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin" - ''; - - setupHook = ./setup-hook.sh; - - meta = { - homepage = "http://www.erlang.org/"; - description = "Programming language used for massively scalable soft real-time systems"; - - longDescription = '' - Erlang is a programming language used to build massively scalable - soft real-time systems with requirements on high availability. - Some of its uses are in telecoms, banking, e-commerce, computer - telephony and instant messaging. Erlang's runtime system has - built-in support for concurrency, distribution and fault - tolerance. - ''; - - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix index ed30fe1522b..e2e0151de37 100644 --- a/pkgs/development/interpreters/erlang/R16.nix +++ b/pkgs/development/interpreters/erlang/R16.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { ++ optional odbcSupport unixODBC ++ optionals stdenv.isDarwin [ Carbon Cocoa ]; + # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense + prePatch = '' + substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL' + ''; + patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; preConfigure = '' diff --git a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix index 5745ea5d98b..80f524019df 100644 --- a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix +++ b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix @@ -2,7 +2,7 @@ , gnused, gawk, makeWrapper , odbcSupport ? false, unixODBC ? null , wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null -, enableDebugInfo ? false +, enableDebugInfo ? false , Carbon ? null, Cocoa ? null }: assert wxSupport -> mesa != null && wxGTK != null && xorg != null; @@ -24,11 +24,16 @@ stdenv.mkDerivation rec { debugInfo = enableDebugInfo; buildInputs = - [ perl gnum4 ncurses openssl makeWrapper autoconf264 gcc + [ perl gnum4 ncurses openssl makeWrapper autoconf264 gcc ] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ] ++ optional odbcSupport [ unixODBC ] ++ optionals stdenv.isDarwin [ Carbon Cocoa ]; + # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense + prePatch = '' + substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL' + ''; + patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure.in erts/configure.in ''; preConfigure = '' @@ -36,22 +41,22 @@ stdenv.mkDerivation rec { export LANG=C export ERL_TOP=$(pwd) sed -e s@/bin/pwd@pwd@g -i otp_build - sed -e s@"/usr/bin/env escript"@${erlang}/bin/escript@g -i lib/diameter/bin/diameterc + sed -e s@"/usr/bin/env escript"@${erlang}/bin/escript@g -i lib/diameter/bin/diameterc ''; configureFlags= [ "--with-ssl=${openssl.dev}" - "--enable-smp-support" - "--enable-threads" - "--enable-kernel-poll" - "--disable-hipe" - "${optionalString odbcSupport "--with-odbc=${unixODBC}"}" - "${optionalString stdenv.isDarwin "--enable-darwin-64bit"}" + "--enable-smp-support" + "--enable-threads" + "--enable-kernel-poll" + "--disable-hipe" + "${optionalString odbcSupport "--with-odbc=${unixODBC}"}" + "${optionalString stdenv.isDarwin "--enable-darwin-64bit"}" "${optionalString stdenv.isLinux "--enable-m64-build"}" ]; buildPhase = '' - ./otp_build autoconf + ./otp_build autoconf ./otp_build setup -a --prefix=$out $configureFlags ''; @@ -89,7 +94,7 @@ stdenv.mkDerivation rec { telephony and instant messaging. Erlang's runtime system has built-in support for concurrency, distribution and fault tolerance. - This version of Erlang is Basho's version, forked from Ericsson's + This version of Erlang is Basho's version, forked from Ericsson's repository. ''; diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index 57323a587f8..0869285d496 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -35,7 +35,12 @@ stdenv.mkDerivation rec { ++ optional javacSupport openjdk ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; - patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; + patchPhase = '' + # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense + substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL' + + sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure + ''; debugInfo = enableDebugInfo; diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix index f9b6edc3fa4..1ed9bfbd70a 100644 --- a/pkgs/development/interpreters/erlang/R18.nix +++ b/pkgs/development/interpreters/erlang/R18.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, perl, gnum4, ncurses, openssl +{ stdenv, fetchurl, fetchpatch, fetchFromGitHub, perl, gnum4, ncurses, openssl , gnused, gawk, autoconf, libxslt, libxml2, makeWrapper , Carbon, Cocoa , odbcSupport ? false, unixODBC ? null @@ -53,6 +53,11 @@ stdenv.mkDerivation rec { sha256 = "10h5348p6g279b4q01i5jdqlljww5chcvrx5b4b0dv79pk0p0m9f"; }; + # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense + prePatch = '' + substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL' + ''; + patches = [ rmAndPwdPatch envAndCpPatch diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index 11f50b40fb3..4b1e3f4cb2f 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -46,6 +46,9 @@ stdenv.mkDerivation rec { prePatch = '' substituteInPlace configure.in \ --replace '`sw_vers -productVersion`' '10.10' + + # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense + substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL' ''; preConfigure = '' diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index bfb975f152a..4d38545a44f 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -1,36 +1,32 @@ { stdenv, fetchurl, readline, gettext, ncurses }: +with stdenv.lib; stdenv.mkDerivation rec { name = "gnu-apl-${version}"; - version = "1.6"; + version = "1.7"; src = fetchurl { url = "mirror://gnu/apl/apl-${version}.tar.gz"; - sha256 = "057zwzvvgcrrwsl52a27w86hgy31jqq6avqq629xj7yq90qah3ay"; + sha256 = "07xq8ddlmz8psvsmwr23gar108ri0lwmw0n6kpxcv8ypas1f5xlg"; }; buildInputs = [ readline gettext ncurses ]; - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + patchPhase = optionalString stdenv.isDarwin '' substituteInPlace src/LApack.cc --replace "malloc.h" "malloc/malloc.h" ''; - configureFlags = stdenv.lib.optionals stdenv.isDarwin [ - "--disable-dependency-tracking" - "--disable-silent-rules" - ]; - postInstall = '' cp -r support-files/ $out/share/doc/ find $out/share/doc/support-files -name 'Makefile*' -delete ''; - meta = with stdenv.lib; { + meta = { description = "Free interpreter for the APL programming language"; homepage = http://www.gnu.org/software/apl/; license = licenses.gpl3Plus; maintainers = [ maintainers.kovirobi ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + platforms = with platforms; linux ++ darwin; inherit version; longDescription = '' diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index b4a9282e185..1928d51d3e5 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "groovy-${version}"; - version = "2.4.8"; + version = "2.4.10"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "1zcdkarz9mbx9k5sl69nbphjjcy0xd15zjicjnhp2wq32zm6b2k6"; + sha256 = "1a8pqcrm014h4x54gqqyxp7r1vkwhphqwrfa7gnqr6nzdqxzyk8w"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix new file mode 100644 index 00000000000..04f31dda26a --- /dev/null +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -0,0 +1,120 @@ +{ fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring +, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null }: + +# Do either a coverage analysis build or a standard build. +(if coverageAnalysis != null + then coverageAnalysis + else stdenv.mkDerivation) + +(rec { + name = "guile-2.0.13"; + + src = fetchurl { + url = "mirror://gnu/guile/${name}.tar.xz"; + sha256 = "12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p"; + }; + + outputs = [ "out" "dev" "info" ]; + setOutputFlags = false; # $dev gets into the library otherwise + + nativeBuildInputs = [ makeWrapper gawk pkgconfig ]; + buildInputs = [ readline libtool libunistring libffi ]; + propagatedBuildInputs = [ gmp boehmgc ] + + # XXX: These ones aren't normally needed here, but since + # `libguile-2.0.la' reads `-lltdl -lunistring', adding them here will add + # the needed `-L' flags. As for why the `.la' file lacks the `-L' flags, + # see below. + ++ [ libtool libunistring ]; + + # A native Guile 2.0 is needed to cross-build Guile. + selfNativeBuildInput = true; + + enableParallelBuilding = true; + + patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch + (fetchpatch { + # Fixes stability issues with 00-repl-server.test + url = "http://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4"; + sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v"; + }) + ] ++ + (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch); + + # Explicitly link against libgcc_s, to work around the infamous + # "libgcc_s.so.1 must be installed for pthread_cancel to work". + + # don't have "libgcc_s.so.1" on darwin + LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; + + configureFlags = [ "--with-libreadline-prefix" ] + ++ stdenv.lib.optionals stdenv.isSunOS [ + # Make sure the right is found, and not the incompatible + # /usr/include/mp.h from OpenSolaris. See + # + # for details. + "--with-libgmp-prefix=${gmp.dev}" + + # Same for these (?). + "--with-libreadline-prefix=${readline.dev}" + "--with-libunistring-prefix=${libunistring}" + + # See below. + "--without-threads" + ]; + + postInstall = '' + wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin" + + # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for + # why `--with-libunistring-prefix' and similar options coming from + # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64. + sed -i "$out/lib/pkgconfig/guile-2.0.pc" \ + -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ; + s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ; + s|-lltdl|-L${libtool.lib}/lib -lltdl|g ; + s|includedir=$out|includedir=$dev|g + " + ''; + + # make check doesn't work on darwin + # On Linuxes+Hydra the tests are flaky; feel free to investigate deeper. + doCheck = false; + + setupHook = ./setup-hook-2.0.sh; + + crossAttrs.preConfigure = + stdenv.lib.optionalString (stdenv.cross.config == "i586-pc-gnu") + # On GNU, libgc depends on libpthread, but the cross linker doesn't + # know where to find libpthread, which leads to erroneous test failures + # in `configure', where `-pthread' and `-lpthread' aren't explicitly + # passed. So it needs some help (XXX). + "export LDFLAGS=-Wl,-rpath-link=${gnu.libpthreadCross}/lib"; + + + meta = { + description = "Embeddable Scheme implementation"; + homepage = http://www.gnu.org/software/guile/; + license = stdenv.lib.licenses.lgpl3Plus; + maintainers = with stdenv.lib.maintainers; [ ludo lovek323 ]; + platforms = stdenv.lib.platforms.all; + + longDescription = '' + GNU Guile is an implementation of the Scheme programming language, with + support for many SRFIs, packaged for use in a wide variety of + environments. In addition to implementing the R5RS Scheme standard + and a large subset of R6RS, Guile includes a module system, full access + to POSIX system calls, networking support, multiple threads, dynamic + linking, a foreign function call interface, and powerful string + processing. + ''; + }; +}) + +// + +(stdenv.lib.optionalAttrs (!stdenv.isLinux) { + # Work around . + SHELL = "/bin/sh"; + CONFIG_SHELL = "/bin/sh"; +}) diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 04f31dda26a..8a2deeddff6 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -7,11 +7,12 @@ else stdenv.mkDerivation) (rec { - name = "guile-2.0.13"; + name = "guile-${version}"; + version = "2.2.0"; src = fetchurl { url = "mirror://gnu/guile/${name}.tar.xz"; - sha256 = "12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p"; + sha256 = "05dmvhd1y135x7w5qfw4my42cfp6l8bbhjfxvchcc1cbdvzri0f1"; }; outputs = [ "out" "dev" "info" ]; @@ -32,12 +33,8 @@ enableParallelBuilding = true; - patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch - (fetchpatch { - # Fixes stability issues with 00-repl-server.test - url = "http://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4"; - sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v"; - }) + patches = [ + ./eai_system.patch ] ++ (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch); @@ -47,7 +44,7 @@ # don't have "libgcc_s.so.1" on darwin LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; - configureFlags = [ "--with-libreadline-prefix" ] + configureFlags = [ "--with-libreadline-prefix=${readline.dev}" ] ++ stdenv.lib.optionals stdenv.isSunOS [ # Make sure the right is found, and not the incompatible # /usr/include/mp.h from OpenSolaris. See @@ -56,7 +53,6 @@ "--with-libgmp-prefix=${gmp.dev}" # Same for these (?). - "--with-libreadline-prefix=${readline.dev}" "--with-libunistring-prefix=${libunistring}" # See below. @@ -69,7 +65,7 @@ # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for # why `--with-libunistring-prefix' and similar options coming from # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64. - sed -i "$out/lib/pkgconfig/guile-2.0.pc" \ + sed -i "$out/lib/pkgconfig/guile-2.2.pc" \ -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ; s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ; s|-lltdl|-L${libtool.lib}/lib -lltdl|g ; @@ -81,7 +77,7 @@ # On Linuxes+Hydra the tests are flaky; feel free to investigate deeper. doCheck = false; - setupHook = ./setup-hook-2.0.sh; + setupHook = ./setup-hook-2.2.sh; crossAttrs.preConfigure = stdenv.lib.optionalString (stdenv.cross.config == "i586-pc-gnu") @@ -96,7 +92,7 @@ description = "Embeddable Scheme implementation"; homepage = http://www.gnu.org/software/guile/; license = stdenv.lib.licenses.lgpl3Plus; - maintainers = with stdenv.lib.maintainers; [ ludo lovek323 ]; + maintainers = with stdenv.lib.maintainers; [ ludo lovek323 vrthra ]; platforms = stdenv.lib.platforms.all; longDescription = '' @@ -111,10 +107,3 @@ }; }) -// - -(stdenv.lib.optionalAttrs (!stdenv.isLinux) { - # Work around . - SHELL = "/bin/sh"; - CONFIG_SHELL = "/bin/sh"; -}) diff --git a/pkgs/development/interpreters/guile/setup-hook-2.2.sh b/pkgs/development/interpreters/guile/setup-hook-2.2.sh new file mode 100644 index 00000000000..86c1e0d3e4a --- /dev/null +++ b/pkgs/development/interpreters/guile/setup-hook-2.2.sh @@ -0,0 +1,13 @@ +addGuileLibPath () { + if test -d "$1/share/guile/site/2.2" + then + export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site/2.2" + export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/2.2" + elif test -d "$1/share/guile/site" + then + export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site" + export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site" + fi +} + +envHooks+=(addGuileLibPath) diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix index 296176148c7..78eb04601cd 100644 --- a/pkgs/development/interpreters/nix-exec/default.nix +++ b/pkgs/development/interpreters/nix-exec/default.nix @@ -1,23 +1,21 @@ -{ stdenv, fetchurl, pkgconfig, nix, git }: let +{ stdenv, fetchurl, pkgconfig, nix, git, gcc6 }: let version = "4.1.6"; in stdenv.mkDerivation { name = "nix-exec-${version}"; src = fetchurl { url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz"; - sha256 = "0slpsnzzzdkf5d9za7j4kr15jr4mn1k9klfsxibzy47b2bx1vkar"; }; - buildInputs = [ pkgconfig nix git ]; + buildInputs = [ pkgconfig nix git gcc6 ]; + + NIX_CFLAGS_COMPILE = "-std=c++1y"; meta = { description = "Run programs defined in nix expressions"; - homepage = https://github.com/shlevy/nix-exec; - license = stdenv.lib.licenses.mit; - platforms = nix.meta.platforms; }; } diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 1c8644b1889..3233baea8f4 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -41,6 +41,12 @@ stdenv.mkDerivation rec { ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ mesa libX11 ]) ; + # REMOVE ON VERSION BUMP + # Needed for Octave-4.2.1 on darwin. See https://savannah.gnu.org/bugs/?50234 + prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + sed 's/inline file_stat::~file_stat () { }/file_stat::~file_stat () { }/' -i ./liboctave/system/file-stat.cc + ''; + doCheck = !stdenv.isDarwin; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 116d4adf204..c3f56b4c664 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -306,6 +306,10 @@ let substituteInPlace configure --replace "-lstdc++" "-lc++" ''; + stripDebugList = "bin sbin lib modules"; + + outputs = [ "out" "dev" ]; + }); in { diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 98be02da3b2..a552b2719bb 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -181,10 +181,10 @@ let in { ruby_2_0_0 = generic { - version = rubyVersion "2" "0" "0" "p647"; + version = rubyVersion "2" "0" "0" "p648"; sha256 = { - src = "1v2vbvydarcx5801gx9lc6gr6dfi0i7qbzwhsavjqbn79rdsz2n8"; - git = "186pf4q9xymzn4zn1sjppl1skrl5f0159ixz5cz8g72dmmynq3g3"; + src = "1y3n4c6xw2wki7pyjpq5zpbgxnw5i3jc8mcpj6rk7hs995mvv446"; + git = "0ncjfq4hfqj9kcr8pbll6kypwnmcgs8w7l4466qqfyv7jj3yjd76"; }; }; @@ -196,27 +196,27 @@ in { }; }; - ruby_2_2_5 = generic { - version = rubyVersion "2" "2" "5" ""; + ruby_2_2_7 = generic { + version = rubyVersion "2" "2" "7" ""; sha256 = { - src = "1qrmlcyc0cy9hgafb1wny2h90rjyyh6d72nvr2h4xjm4jwbb7i1h"; - git = "0k0av6ypyq08c9axm721f0xi2bcp1443l7ydbxv4v8x4vsxdkmq2"; + src = "199xz5bvmp26c7vyzw47cpxkd8jk826kc8nlpavqzj5vqp388h9p"; + git = "0i0nsm9ldjp39m9xq47v8w6wlg821ikczz530493cs150qkqa0a1"; }; }; - ruby_2_3_3 = generic { - version = rubyVersion "2" "3" "3" ""; + ruby_2_3_4 = generic { + version = rubyVersion "2" "3" "4" ""; sha256 = { - src = "1dqmh42p6siv9aqzdjldsnhljj3f2h30m0v8cf25icjmqp40h514"; - git = "0cwjf0nrzaa5g81bw0qp65byyadhxvbnvprkshv3ckjl7yi46zf6"; + src = "1hy0zr4vwkqcjbykh2hp0d6ifkrhgskaxlzy6878sc9kr4bqzqcq"; + git = "0jjhgdjv3aayxb0flxjiny7xfzh3ggrqcpvgjv2ydm25padfbqmp"; }; }; - ruby_2_4_0 = generic { - version = rubyVersion "2" "4" "0" ""; + ruby_2_4_1 = generic { + version = rubyVersion "2" "4" "1" ""; sha256 = { - src = "0gcyn9328w2vma882l71c9v9ygmmsj2z8j1l44c4l2x92nyx0bqm"; - git = "1w9zyx8xmka8jdiha57snnbfls2r6dc9g03d8cjx0nxkmwf3r2l3"; + src = "0l0201fqwzwygnrgxay469gbb2w865bnqckq00x3prdmbh6y2c53"; + git = "1gjn31ymypzzcwkrjx62hqw59fywz1x3cyvmi1f2yb9bwb3659ss"; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index f1b82210aec..f6ecb7c8e28 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -24,24 +24,19 @@ rec { "${patchSet}/patches/ruby/2.1.8/railsexpress/08-funny-falcon-method-cache.patch" "${patchSet}/patches/ruby/2.1.8/railsexpress/09-heap-dump-support.patch" ]; - "2.2.5" = ops useRailsExpress [ - "${patchSet}/patches/ruby/2.2.5/railsexpress/01-zero-broken-tests.patch" - "${patchSet}/patches/ruby/2.2.5/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/2.2.5/railsexpress/03-display-more-detailed-stack-trace.patch" + "2.2.7" = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.2/head/railsexpress/01-zero-broken-tests.patch" + "${patchSet}/patches/ruby/2.2/head/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.2/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.3.1" = ops useRailsExpress [ + "2.3.4" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; - "2.3.3" = ops useRailsExpress [ - "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch" - "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch" - ]; - "2.4.0" = ops useRailsExpress [ - "${patchSet}/patches/ruby/2.4.0/railsexpress/01-skip-broken-tests.patch" - "${patchSet}/patches/ruby/2.4.0/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/2.4.0/railsexpress/03-display-more-detailed-stack-trace.patch" + "2.4.1" = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch" + "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch" ]; } diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix index 51db26b7823..c60d6e3728d 100644 --- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix +++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix @@ -1,8 +1,8 @@ { fetchFromGitHub }: fetchFromGitHub { - owner = "manveru"; + owner = "skaes"; repo = "rvm-patchsets"; - rev = "46e04f230ce91a786f5e583389443efec0ecd594"; - sha256 = "0ayh8zj8knyz3344an942qdf33pi42jmksqk34frb346zi1ag693"; + rev = "15f5df0fba0e2fb489856b5bdb67a52fb9745f94"; + sha256 = "0vdgr7xp3gbmsyaz4q78qlbwmp006b1gkgj0kwi6h8d80dclbzny"; } diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index f32cb9db02a..f8c98c727f4 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, pkgconfig , libjack2, libsndfile, fftw, curl, gcc -, libXt, qt55, readline +, libXt, qtbase, qttools, qtwebkit, readline , useSCEL ? false, emacs }: @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { -DSC_EL=${if useSCEL then "ON" else "OFF"} ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig qttools ]; buildInputs = [ - gcc libjack2 libsndfile fftw curl libXt qt55.qtwebkit qt55.qttools readline ] + gcc libjack2 libsndfile fftw curl libXt qtbase qtwebkit readline ] ++ optional useSCEL emacs; meta = { diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index d3d57947464..fe64569abbe 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "SDL multi-channel audio mixer library"; homepage = http://www.libsdl.org/projects/SDL_mixer/; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix index 277886d717a..4433a3df45d 100644 --- a/pkgs/development/libraries/aqbanking/default.nix +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=03&showall=1"; hydraPlatforms = []; license = licenses.gpl2Plus; - maintainers = with maintainers; [ goibhniu urkud ]; + maintainers = with maintainers; [ goibhniu ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 7f173b21156..d5a601f09ba 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,24 +1,25 @@ { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { - version = "7.700.0"; + version = "7.800.1"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "152x274hd3f59xgd27k9d3ikwb3w62v1v5hpw4lp1yzdyy8980pr"; + sha256 = "1nxq2jp4jlvinynv0l04rpdzpnkzdsng0d5vi3hilc0hlsjnbnjs"; }; - buildInputs = [ cmake openblasCompat superlu hdf5 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ openblasCompat superlu hdf5 ]; cmakeFlags = [ "-DDETECT_HDF5=ON" ]; - patches = [ ./use-unix-config-on-OS-X.patch ]; - + patches = [ ./use-unix-config-on-OS-X.patch ]; + meta = with stdenv.lib; { description = "C++ linear algebra library"; homepage = http://arma.sourceforge.net; - license = licenses.mpl20; + license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ juliendehos knedlsepp ]; }; diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index e44ad424e0c..cd2ffe55664 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; + maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; diff --git a/pkgs/development/libraries/attica/default.nix b/pkgs/development/libraries/attica/default.nix index 3174dc57667..d883100fd3c 100644 --- a/pkgs/development/libraries/attica/default.nix +++ b/pkgs/development/libraries/attica/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library to access Open Collaboration Service providers"; license = "LGPL"; - maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ]; + maintainers = [ maintainers.sander maintainers.phreedom ]; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index d3e655676e6..d3b6722b36c 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { name = "actor-framework-${version}"; @@ -11,8 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0202nsdriigdh6sxi1k3hddvmf1x54qpykbvf2ghfhzyh0m1q7j2"; }; + # See https://github.com/actor-framework/actor-framework/issues/545 and remove on next release that incorporates this + patches = [ (fetchpatch { + url = "https://github.com/actor-framework/actor-framework/commit/c5a3ee26a6e76b28dd4226f35230b280f291386d.patch"; + sha256 = "1l0323cqyqlp3lvggm709fmfm6lk6av1smdbd420adhi3ksj2vhj"; + }) ]; + nativeBuildInputs = [ cmake ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "An open source implementation of the actor model in C++"; homepage = http://actor-framework.org/; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 7df72bc0560..3db8b719f77 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -9,7 +9,7 @@ assert glSupport -> mesa_noglu != null; -with { inherit (stdenv.lib) optional optionals; }; +let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { name = "cairo-1.14.8"; @@ -19,13 +19,6 @@ stdenv.mkDerivation rec { sha1 = "c6f7b99986f93c9df78653c3e6a3b5043f65145e"; }; - infinality = fetchFromGitHub { - owner = "bohoomil"; - repo = "fontconfig-ultimate"; - rev = "730f5e77580677e86522c1f2119aa78803741759"; - sha256 = "1hbrdpm6xcczs2c2iid7by8h7dsd0jcf7an88s150njyqnjzxjg7"; - }; - patches = [ # from https://bugs.freedesktop.org/show_bug.cgi?id=98165 (fetchpatch { @@ -35,10 +28,6 @@ stdenv.mkDerivation rec { }) ]; - prePatch = '' - patches="$patches $(echo $infinality/*_cairo-iu/*.patch)" - ''; - outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; # very small diff --git a/pkgs/development/libraries/capnproto/clang4.patch b/pkgs/development/libraries/capnproto/clang4.patch new file mode 100644 index 00000000000..e83abe9f433 --- /dev/null +++ b/pkgs/development/libraries/capnproto/clang4.patch @@ -0,0 +1,22 @@ +From 0f1fd1938b19dccdb5dbfe9cb5177c4342a2a5b5 Mon Sep 17 00:00:00 2001 +From: Eric Fiselier +Date: Thu, 29 Dec 2016 14:23:40 -0700 +Subject: [PATCH] Fix conversion build error when building with Clang 4.0 + +--- + c++/src/capnp/layout.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/c++/src/capnp/layout.h b/c++/src/capnp/layout.h +index 850925a..b955f08 100644 +--- a/src/capnp/layout.h ++++ b/src/capnp/layout.h +@@ -126,7 +126,7 @@template <> struct ElementSizeForType { static constexpr ElementSize value + template <> struct ElementSizeForType { static constexpr ElementSize value = ElementSize::BIT; }; + + // Lists and blobs are pointers, not structs. +-template struct ElementSizeForType> { ++template struct ElementSizeForType> { + static constexpr ElementSize value = ElementSize::POINTER; + }; + template <> struct ElementSizeForType { diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix index 839d48e488f..0a5df88efdb 100644 --- a/pkgs/development/libraries/capnproto/default.nix +++ b/pkgs/development/libraries/capnproto/default.nix @@ -9,6 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1yvaadhgakskqq5wpv53hd6fc3pp17mrdldw4i5cvgck4iwprcfd"; }; + patches = [ + # Remove once they release a version above 0.5.3. See https://github.com/sandstorm-io/capnproto/issues/433 + ./clang4.patch + ]; + meta = with stdenv.lib; { homepage = "http://kentonv.github.io/capnproto"; description = "Cap'n Proto cerealization protocol"; diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix index a3d1a46e818..d49bd7eac1b 100644 --- a/pkgs/development/libraries/cfitsio/default.nix +++ b/pkgs/development/libraries/cfitsio/default.nix @@ -1,24 +1,21 @@ { fetchurl, stdenv }: -stdenv.mkDerivation { - name = "cfitsio-3.21"; + stdenv.mkDerivation { + name = "cfitsio-3.41"; src = fetchurl { - url = ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3210.tar.gz; - sha256 = "1ffr3p5dy2b1vj9j4li5zf22naavi9wcxsvqy236fc0ykfyip96i"; + url = "ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3410.tar.gz"; + sha256 = "0k3knn5hz1vhzzvm46xa1y6fnpliwkwgw76lnkf4amcnl5zaqmm5"; }; # Shared-only build buildFlags = "shared"; - patchPhase = - '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in + patchPhase = '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in ''; - meta = { + meta = with stdenv.lib; { homepage = http://heasarc.gsfc.nasa.gov/fitsio/; - description = "Library for reading and writing FITS data files"; - longDescription = '' CFITSIO is a library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data @@ -28,9 +25,8 @@ stdenv.mkDerivation { advanced features for manipulating and filtering the information in FITS files. ''; - # Permissive BSD-style license. license = "permissive"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix index c6523921fb5..9d7c9c4f30f 100644 --- a/pkgs/development/libraries/cln/default.nix +++ b/pkgs/development/libraries/cln/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "C/C++ library for numbers, a part of GiNaC"; homepage = http://www.ginac.de/CLN/; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = with stdenv.lib.platforms; allBut cygwin; }; } diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index ef2ac6f9385..39296f86d8e 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Clutter-GTK"; homepage = http://www.clutter-project.org/; license = stdenv.lib.licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ urkud lethalman ]; + maintainers = with stdenv.lib.maintainers; [ lethalman ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index fc80b0ec2b2..af7acb35aac 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; homepage = http://www.clutter-project.org/; - maintainers = with stdenv.lib.maintainers; [ urkud lethalman ]; + maintainers = with stdenv.lib.maintainers; [ lethalman ]; platforms = stdenv.lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/development/libraries/cre2/default.nix b/pkgs/development/libraries/cre2/default.nix new file mode 100644 index 00000000000..74619cbaaae --- /dev/null +++ b/pkgs/development/libraries/cre2/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, + libtool, pkgconfig, re2, texinfo }: + +stdenv.mkDerivation rec { + name = "cre2-${version}"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "marcomaggi"; + repo = "cre2"; + rev = version; + sha256 = "12yrdad87jjqrhbqm02hzsayan2402vf61a9x1b2iabv6d1c1bnj"; + }; + + nativeBuildInputs = [ + autoreconfHook + libtool + pkgconfig + ]; + buildInputs = [ re2 texinfo ]; + + NIX_LDFLAGS="-lre2 -lpthread"; + + configureFlags = [ + "--enable-maintainer-mode" + ]; + + meta = with stdenv.lib; { + homepage = http://marcomaggi.github.io/docs/cre2.html; + description = "C Wrapper for RE2"; + license = licenses.bsd3; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index df983ff3471..4d27552d735 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = http://dbus.freedesktop.org; license = with stdenv.lib.licenses; [ afl21 gpl2 ]; description = "Obsolete glib bindings for D-Bus lightweight IPC mechanism"; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/docopt_cpp/default.nix b/pkgs/development/libraries/docopt_cpp/default.nix new file mode 100644 index 00000000000..83466b693f5 --- /dev/null +++ b/pkgs/development/libraries/docopt_cpp/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake, python }: + +stdenv.mkDerivation rec { + version = "0.6.2"; + name = "docopt.cpp-${version}"; + + src = fetchFromGitHub { + owner = "docopt"; + repo = "docopt.cpp"; + rev = "v${version}"; + sha256 = "1rgkc8nsc2zz2lkyai0y68vrd6i6kbq63hm3vdza7ab6ghq0n1dd"; + }; + + nativeBuildInputs = [ cmake python ]; + + cmakeFlags = ["-DWITH_TESTS=ON"]; + + doCheck = true; + + checkPhase = "LD_LIBRARY_PATH=$(pwd) python ./run_tests"; + + meta = with stdenv.lib; { + description = "C++11 port of docopt"; + homepage = https://github.com/docopt/docopt.cpp; + license = with licenses; [ mit boost ]; + platforms = platforms.all; + maintainers = with maintainers; [ knedlsepp ]; + }; +} + diff --git a/pkgs/development/libraries/eigen/2.0.nix b/pkgs/development/libraries/eigen/2.0.nix index 04e7b5e38cb..8841855a24e 100644 --- a/pkgs/development/libraries/eigen/2.0.nix +++ b/pkgs/development/libraries/eigen/2.0.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; license = licenses.lgpl3Plus; homepage = http://eigen.tuxfamily.org ; - maintainers = with stdenv.lib.maintainers; [ sander urkud raskin ]; + maintainers = with stdenv.lib.maintainers; [ sander raskin ]; branch = "2"; platforms = with stdenv.lib.platforms; unix; }; diff --git a/pkgs/development/libraries/eigen/3.3.nix b/pkgs/development/libraries/eigen/3.3.nix index b4cb1029001..582b4fed9df 100644 --- a/pkgs/development/libraries/eigen/3.3.nix +++ b/pkgs/development/libraries/eigen/3.3.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { license = licenses.lgpl3Plus; homepage = http://eigen.tuxfamily.org ; platforms = platforms.unix; - maintainers = with stdenv.lib.maintainers; [ sander urkud raskin ]; + maintainers = with stdenv.lib.maintainers; [ sander raskin ]; inherit version; }; } diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index 374f52c9cb0..5869276a797 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { license = licenses.lgpl3Plus; homepage = http://eigen.tuxfamily.org ; platforms = platforms.unix; - maintainers = with stdenv.lib.maintainers; [ sander urkud raskin ]; + maintainers = with stdenv.lib.maintainers; [ sander raskin ]; inherit version; }; } diff --git a/pkgs/development/libraries/enginepkcs11/default.nix b/pkgs/development/libraries/enginepkcs11/default.nix deleted file mode 100644 index ff40a110a33..00000000000 --- a/pkgs/development/libraries/enginepkcs11/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{stdenv, fetchurl, libp11, pkgconfig, openssl}: - -stdenv.mkDerivation rec { - name = "engine_pkcs11-0.1.8"; - - src = fetchurl { - urls = [ - "http://www.opensc-project.org/files/engine_pkcs11/${name}.tar.gz" - "http://www.openadk.org/distfiles/${name}.tar.gz" - ]; - sha256 = "1rd20rxy12rfx3kwwvk5sqvc1ll87z60rqak1ksfwbf4wx0pwzfy"; - }; - - buildInputs = [ libp11 pkgconfig openssl ]; - - meta = { - homepage = http://www.opensc-project.org/engine_pkcs11/; - license = stdenv.lib.licenses.bsdOriginal; - description = "Engine for OpenSSL to use smart cards in PKCS#11 format"; - }; -} diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index 260a424038f..03473881339 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { meta = { homepage = http://www.freedesktop.org/wiki/Software/Farstream; description = "Audio/Video Communications Framework formely known as farsight"; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/fontconfig/2.10.nix b/pkgs/development/libraries/fontconfig/2.10.nix index 2705339adbf..302992fc8c8 100644 --- a/pkgs/development/libraries/fontconfig/2.10.nix +++ b/pkgs/development/libraries/fontconfig/2.10.nix @@ -8,14 +8,6 @@ stdenv.mkDerivation rec { sha256 = "0llraqw86jmw4vzv7inskp3xxm2gc64my08iwq5mzncgfdbfza4f"; }; - infinality_patch = - let subvers = "1"; - in fetchurl { - url = http://www.infinality.net/fedora/linux/zips/fontconfig-infinality-1-20130104_1.tar.bz2; - sha256 = "1fm5xx0mx2243jrq5rxk4v0ajw2nawpj23399h710bx6hd1rviq7"; - } - ; - outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config propagatedBuildInputs = [ freetype ]; @@ -44,10 +36,6 @@ stdenv.mkDerivation rec { # Don't try to write to /var/cache/fontconfig at install time. installFlags = "sysconfdir=$(out)/etc fc_cachedir=$(TMPDIR)/dummy RUN_FC_CACHE_TEST=false"; - postInstall = '' - cd "$out/etc/fonts" && tar xvf ${infinality_patch} - ''; - passthru = { # Empty for backward compatibility, there was no versioning before 2.11 configVersion = ""; diff --git a/pkgs/development/libraries/fox/clang.patch b/pkgs/development/libraries/fox/clang.patch new file mode 100644 index 00000000000..0ca2ebf0d8d --- /dev/null +++ b/pkgs/development/libraries/fox/clang.patch @@ -0,0 +1,13 @@ +diff --git a/src/FXReactor.cpp b/src/FXReactor.cpp +index 1ecdb45..9058a30 100644 +--- a/src/FXReactor.cpp ++++ b/src/FXReactor.cpp +@@ -452,7 +452,7 @@ FXint FXReactor::processActiveHandles(FXTime block,FXuint flags){ + } + + // Normal case +- if(0<=hand){ ++ if(0==hand){ + + // Any handles active? + if(0 useEncumberedCode; - let - version = "2.6.5"; + inherit (stdenv.lib) optional optionals optionalString; + version = "2.7.1"; name = "freetype-" + version; - infinality = fetchFromGitHub { - owner = "archfan"; - repo = "infinality_bundle"; - rev = "5c0949a477bf43d2ac4e57b4fc39bcc3331002ee"; - sha256 = "17389aqm6rlxl4b5mv1fx4b22x2v2n60hfhixfxqxpd8ialsdi6l"; +in stdenv.mkDerivation { + inherit name; + + meta = with stdenv.lib; { + description = "A font rendering engine"; + longDescription = '' + FreeType is a portable and efficient library for rendering fonts. It + supports TrueType, Type 1, CFF fonts, and WOFF, PCF, FNT, BDF and PFR + fonts. It has a bytecode interpreter and has an automatic hinter called + autofit which can be used instead of hinting instructions included in + fonts. + ''; + homepage = https://www.freetype.org/; + license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause) + platforms = platforms.all; + maintainers = with maintainers; [ ttuegel ]; }; -in -with { inherit (stdenv.lib) optional optionals optionalString; }; -stdenv.mkDerivation rec { - name = "freetype-${version}"; - src = fetchurl { url = "mirror://savannah/freetype/${name}.tar.bz2"; - sha256 = "1w5c87s4rpx9af5b3mk5cjd1yny3c4dq5p9iv3ixb3vr00a6w2p2"; + sha256 = "121gm15ayfg3rglby8ifh8384mcjb9dhmx9j40zl7yszw72b4frs"; }; - patches = [ - # Patch for validation of OpenType and GX/AAT tables. - (fetchurl { - name = "freetype-2.2.1-enable-valid.patch"; - url = "http://pkgs.fedoraproject.org/cgit/rpms/freetype.git/plain/freetype-2.2.1-enable-valid.patch?id=9a81147af83b1166a5f301e379f85927cc610990"; - sha256 = "0zkgqhws2s0j8ywksclf391iijhidb1a406zszd7xbdjn28kmj2l"; - }) - ] ++ optionals (!useInfinality && useEncumberedCode) [ - # Patch to enable subpixel rendering. - # See https://www.freetype.org/freetype2/docs/reference/ft2-lcd_filtering.html. - (fetchurl { - name = "freetype-2.3.0-enable-spr.patch"; - url = http://pkgs.fedoraproject.org/cgit/rpms/freetype.git/plain/freetype-2.3.0-enable-spr.patch?id=9a81147af83b1166a5f301e379f85927cc610990; - sha256 = "13ni9n5q3nla38wjmxd4f8cy29gp62kjx2l6y6nqhdyiqp8fz8nd"; - }) - ]; - - prePatch = optionalString useInfinality '' - patches="$patches $(ls ${infinality}/*_freetype2-iu/*-infinality-*.patch)" - ''; - - outputs = [ "out" "dev" ]; - propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype # dependence on harfbuzz is looser than the reverse dependence nativeBuildInputs = [ pkgconfig which ] # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. ++ optional (!stdenv.isLinux) gnumake; + patches = + [ + ./pcf-introduce-driver.patch + ./pcf-config-long-family-names.patch + ./disable-pcf-long-family-names.patch + ./enable-table-validation.patch + ] ++ + optional useEncumberedCode ./enable-subpixel-rendering.patch; + + outputs = [ "out" "dev" ]; + configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" ]; # The asm for armel is written with the 'asm' keyword. @@ -76,19 +70,4 @@ stdenv.mkDerivation rec { # know why it's on the PATH. configureFlags = "--disable-static CC_BUILD=gcc"; }; - - meta = with stdenv.lib; { - description = "A font rendering engine"; - longDescription = '' - FreeType is a portable and efficient library for rendering fonts. It - supports TrueType, Type 1, CFF fonts, and WOFF, PCF, FNT, BDF and PFR - fonts. It has a bytecode interpreter and has an automatic hinter called - autofit which can be used instead of hinting instructions included in - fonts. - ''; - homepage = https://www.freetype.org/; - license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause) - #ToDo: encumbered = useEncumberedCode; - platforms = platforms.all; - }; } diff --git a/pkgs/development/libraries/freetype/disable-pcf-long-family-names.patch b/pkgs/development/libraries/freetype/disable-pcf-long-family-names.patch new file mode 100644 index 00000000000..e3dfe4aabd6 --- /dev/null +++ b/pkgs/development/libraries/freetype/disable-pcf-long-family-names.patch @@ -0,0 +1,15 @@ +diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h +index 5676074..37a0d00 100644 +--- a/include/freetype/config/ftoption.h ++++ b/include/freetype/config/ftoption.h +@@ -856,7 +856,7 @@ FT_BEGIN_HEADER + /* If this option is activated, it can be controlled with the */ + /* `no-long-family-names' property of the pcf driver module. */ + /* */ +-#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES ++/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ + + + /*************************************************************************/ +-- +cgit v1.0-41-gc330 \ No newline at end of file diff --git a/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch b/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch new file mode 100644 index 00000000000..4f908343e8c --- /dev/null +++ b/pkgs/development/libraries/freetype/enable-subpixel-rendering.patch @@ -0,0 +1,13 @@ +Index: freetype-2.7.1/include/freetype/config/ftoption.h +=================================================================== +--- freetype-2.7.1.orig/include/freetype/config/ftoption.h ++++ freetype-2.7.1/include/freetype/config/ftoption.h +@@ -122,7 +122,7 @@ FT_BEGIN_HEADER + /* This is done to allow FreeType clients to run unmodified, forcing */ + /* them to display normal gray-level anti-aliased glyphs. */ + /* */ +-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ ++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING + + + /*************************************************************************/ diff --git a/pkgs/development/libraries/freetype/enable-table-validation.patch b/pkgs/development/libraries/freetype/enable-table-validation.patch new file mode 100644 index 00000000000..37419f14f40 --- /dev/null +++ b/pkgs/development/libraries/freetype/enable-table-validation.patch @@ -0,0 +1,22 @@ +Index: freetype-2.7.1/modules.cfg +=================================================================== +--- freetype-2.7.1.orig/modules.cfg ++++ freetype-2.7.1/modules.cfg +@@ -120,7 +120,7 @@ AUX_MODULES += cache + # TrueType GX/AAT table validation. Needs ftgxval.c below. + # + # No FT_CONFIG_OPTION_PIC support. +-# AUX_MODULES += gxvalid ++AUX_MODULES += gxvalid + + # Support for streams compressed with gzip (files with suffix .gz). + # +@@ -143,7 +143,7 @@ AUX_MODULES += bzip2 + # OpenType table validation. Needs ftotval.c below. + # + # No FT_CONFIG_OPTION_PIC support. +-# AUX_MODULES += otvalid ++AUX_MODULES += otvalid + + # Auxiliary PostScript driver component to share common code. + # diff --git a/pkgs/development/libraries/freetype/pcf-config-long-family-names.patch b/pkgs/development/libraries/freetype/pcf-config-long-family-names.patch new file mode 100644 index 00000000000..95ed83c60f8 --- /dev/null +++ b/pkgs/development/libraries/freetype/pcf-config-long-family-names.patch @@ -0,0 +1,553 @@ +diff --git a/devel/ftoption.h b/devel/ftoption.h +index 3b63931..b8b0a8d 100644 +--- a/devel/ftoption.h ++++ b/devel/ftoption.h +@@ -82,8 +82,8 @@ FT_BEGIN_HEADER + /* to control the various font drivers and modules. The controllable */ + /* properties are listed in the section `Controlling FreeType Modules' */ + /* in the reference's table of contents; currently there are properties */ +- /* for the auto-hinter (file `ftautoh.h'), CFF (file `ftcffdrv.h'), and */ +- /* TrueType (file `ftttdrv.h'). */ ++ /* for the auto-hinter (file `ftautoh.h'), CFF (file `ftcffdrv.h'), */ ++ /* TrueType (file `ftttdrv.h'), and PCF (file `ftpcfdrv.h'). */ + /* */ + /* `FREETYPE_PROPERTIES' has the following syntax form (broken here into */ + /* multiple lines for better readability). */ +@@ -835,6 +835,33 @@ FT_BEGIN_HEADER + /*************************************************************************/ + /*************************************************************************/ + /**** ****/ ++ /**** P C F D R I V E R C O N F I G U R A T I O N ****/ ++ /**** ****/ ++ /*************************************************************************/ ++ /*************************************************************************/ ++ ++ ++ /*************************************************************************/ ++ /* */ ++ /* There are many PCF fonts just called `Fixed' which look completely */ ++ /* different, and which have nothing to do with each other. When */ ++ /* selecting `Fixed' in KDE or Gnome one gets results that appear rather */ ++ /* random, the style changes often if one changes the size and one */ ++ /* cannot select some fonts at all. This option makes the PCF module */ ++ /* prepend the foundry name (plus a space) to the family name. */ ++ /* */ ++ /* We also check whether we have `wide' characters; all put together, we */ ++ /* get family names like `Sony Fixed' or `Misc Fixed Wide'. */ ++ /* */ ++ /* If this option is activated, it can be controlled with the */ ++ /* `no-long-family-names' property of the pcf driver module. */ ++ /* */ ++#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES ++ ++ ++ /*************************************************************************/ ++ /*************************************************************************/ ++ /**** ****/ + /**** A U T O F I T M O D U L E C O N F I G U R A T I O N ****/ + /**** ****/ + /*************************************************************************/ +diff --git a/docs/CHANGES b/docs/CHANGES +index cb3b327..3823395 100644 +--- a/docs/CHANGES ++++ b/docs/CHANGES +@@ -1,4 +1,20 @@ + ++CHANGES BETWEEN 2.7.1 and 2.7.2 ++ ++ I. IMPORTANT CHANGES ++ ++ - The PCF change to show more `colourful' family names (introduced ++ in version 2.7.1) was too radical; it can now be configured with ++ PCF_CONFIG_OPTION_LONG_FAMILY_NAMES at compile time. If ++ activated, it can be switched off at run time with the new pcf ++ property `no-long-family-names'. If the `FREETYPE_PROPERTIES' ++ environment variable is available, you can say ++ ++ FREETYPE_PROPERTIES=pcf:no-long-family-names=1 ++ ++ ++====================================================================== ++ + CHANGES BETWEEN 2.7 and 2.7.1 + + I. IMPORTANT CHANGES +diff --git a/include/freetype/config/ftheader.h b/include/freetype/config/ftheader.h +index 950d36c..d491af5 100644 +--- a/include/freetype/config/ftheader.h ++++ b/include/freetype/config/ftheader.h +@@ -357,6 +357,19 @@ + /************************************************************************* + * + * @macro: ++ * FT_PCF_DRIVER_H ++ * ++ * @description: ++ * A macro used in #include statements to name the file containing ++ * structures and macros related to the PCF driver module. ++ * ++ */ ++#define FT_PCF_DRIVER_H ++ ++ ++ /************************************************************************* ++ * ++ * @macro: + * FT_TYPE1_TABLES_H + * + * @description: +diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h +index f5bc540..5676074 100644 +--- a/include/freetype/config/ftoption.h ++++ b/include/freetype/config/ftoption.h +@@ -82,8 +82,8 @@ FT_BEGIN_HEADER + /* to control the various font drivers and modules. The controllable */ + /* properties are listed in the section `Controlling FreeType Modules' */ + /* in the reference's table of contents; currently there are properties */ +- /* for the auto-hinter (file `ftautoh.h'), CFF (file `ftcffdrv.h'), and */ +- /* TrueType (file `ftttdrv.h'). */ ++ /* for the auto-hinter (file `ftautoh.h'), CFF (file `ftcffdrv.h'), */ ++ /* TrueType (file `ftttdrv.h'), and PCF (file `ftpcfdrv.h'). */ + /* */ + /* `FREETYPE_PROPERTIES' has the following syntax form (broken here into */ + /* multiple lines for better readability). */ +@@ -835,6 +835,33 @@ FT_BEGIN_HEADER + /*************************************************************************/ + /*************************************************************************/ + /**** ****/ ++ /**** P C F D R I V E R C O N F I G U R A T I O N ****/ ++ /**** ****/ ++ /*************************************************************************/ ++ /*************************************************************************/ ++ ++ ++ /*************************************************************************/ ++ /* */ ++ /* There are many PCF fonts just called `Fixed' which look completely */ ++ /* different, and which have nothing to do with each other. When */ ++ /* selecting `Fixed' in KDE or Gnome one gets results that appear rather */ ++ /* random, the style changes often if one changes the size and one */ ++ /* cannot select some fonts at all. This option makes the PCF module */ ++ /* prepend the foundry name (plus a space) to the family name. */ ++ /* */ ++ /* We also check whether we have `wide' characters; all put together, we */ ++ /* get family names like `Sony Fixed' or `Misc Fixed Wide'. */ ++ /* */ ++ /* If this option is activated, it can be controlled with the */ ++ /* `no-long-family-names' property of the pcf driver module. */ ++ /* */ ++#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES ++ ++ ++ /*************************************************************************/ ++ /*************************************************************************/ ++ /**** ****/ + /**** A U T O F I T M O D U L E C O N F I G U R A T I O N ****/ + /**** ****/ + /*************************************************************************/ +diff --git a/include/freetype/ftchapters.h b/include/freetype/ftchapters.h +index ab43895..a0a121b 100644 +--- a/include/freetype/ftchapters.h ++++ b/include/freetype/ftchapters.h +@@ -77,6 +77,7 @@ + /* auto_hinter */ + /* cff_driver */ + /* tt_driver */ ++/* pcf_driver */ + /* */ + /***************************************************************************/ + +diff --git a/include/freetype/ftpcfdrv.h b/include/freetype/ftpcfdrv.h +new file mode 100644 +index 0000000..6622c93 +--- /dev/null ++++ b/include/freetype/ftpcfdrv.h +@@ -0,0 +1,105 @@ ++/***************************************************************************/ ++/* */ ++/* ftpcfdrv.h */ ++/* */ ++/* FreeType API for controlling the PCF driver (specification only). */ ++/* */ ++/* Copyright 2017 by */ ++/* David Turner, Robert Wilhelm, and Werner Lemberg. */ ++/* */ ++/* This file is part of the FreeType project, and may only be used, */ ++/* modified, and distributed under the terms of the FreeType project */ ++/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ ++/* this file you indicate that you have read the license and */ ++/* understand and accept it fully. */ ++/* */ ++/***************************************************************************/ ++ ++ ++#ifndef FTPCFDRV_H_ ++#define FTPCFDRV_H_ ++ ++#include ++#include FT_FREETYPE_H ++ ++#ifdef FREETYPE_H ++#error "freetype.h of FreeType 1 has been loaded!" ++#error "Please fix the directory search order for header files" ++#error "so that freetype.h of FreeType 2 is found first." ++#endif ++ ++ ++FT_BEGIN_HEADER ++ ++ ++ /************************************************************************** ++ * ++ * @section: ++ * pcf_driver ++ * ++ * @title: ++ * The PCF driver ++ * ++ * @abstract: ++ * Controlling the PCF driver module. ++ * ++ * @description: ++ * While FreeType's PCF driver doesn't expose API functions by itself, ++ * it is possible to control its behaviour with @FT_Property_Set and ++ * @FT_Property_Get. Right now, there is a single property ++ * `no-long-family-names' available if FreeType is compiled with ++ * PCF_CONFIG_OPTION_LONG_FAMILY_NAMES. ++ * ++ * The PCF driver's module name is `pcf'. ++ * ++ */ ++ ++ ++ /************************************************************************** ++ * ++ * @property: ++ * no-long-family-names ++ * ++ * @description: ++ * If PCF_CONFIG_OPTION_LONG_FAMILY_NAMES is active while compiling ++ * FreeType, the PCF driver constructs long family names. ++ * ++ * There are many PCF fonts just called `Fixed' which look completely ++ * different, and which have nothing to do with each other. When ++ * selecting `Fixed' in KDE or Gnome one gets results that appear rather ++ * random, the style changes often if one changes the size and one ++ * cannot select some fonts at all. The improve this situation, the PCF ++ * module prepends the foundry name (plus a space) to the family name. ++ * It also checks whether there are `wide' characters; all put together, ++ * family names like `Sony Fixed' or `Misc Fixed Wide' are constructed. ++ * ++ * If `no-long-family-names' is set, this feature gets switched off. ++ * ++ * { ++ * FT_Library library; ++ * FT_Bool no_long_family_names = TRUE; ++ * ++ * ++ * FT_Init_FreeType( &library ); ++ * ++ * FT_Property_Set( library, "pcf", ++ * "no-long-family-names", ++ * &no_long_family_names ); ++ * } ++ * ++ * @note: ++ * This property can be used with @FT_Property_Get also. ++ * ++ * This property can be set via the `FREETYPE_PROPERTIES' environment ++ * variable (using values 1 and 0 for `on' and `off', respectively). ++ * ++ */ ++ ++ ++FT_END_HEADER ++ ++ ++#endif /* FTPCFDRV_H_ */ ++ ++ ++/* END */ +diff --git a/src/pcf/pcf.h b/src/pcf/pcf.h +index 830cabe..f0390cb 100644 +--- a/src/pcf/pcf.h ++++ b/src/pcf/pcf.h +@@ -167,6 +167,8 @@ FT_BEGIN_HEADER + { + FT_DriverRec root; + ++ FT_Bool no_long_family_names; ++ + } PCF_DriverRec, *PCF_Driver; + + +diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c +index 8f4a90d..bc65423 100644 +--- a/src/pcf/pcfdrivr.c ++++ b/src/pcf/pcfdrivr.c +@@ -49,6 +49,8 @@ THE SOFTWARE. + + #include FT_SERVICE_BDF_H + #include FT_SERVICE_FONT_FORMAT_H ++#include FT_SERVICE_PROPERTIES_H ++#include FT_PCF_DRIVER_H + + + /*************************************************************************/ +@@ -667,6 +669,110 @@ THE SOFTWARE. + }; + + ++ /* ++ * PROPERTY SERVICE ++ * ++ */ ++ static FT_Error ++ pcf_property_set( FT_Module module, /* PCF_Driver */ ++ const char* property_name, ++ const void* value, ++ FT_Bool value_is_string ) ++ { ++#ifdef PCF_CONFIG_OPTION_LONG_FAMILY_NAMES ++ ++ FT_Error error = FT_Err_Ok; ++ PCF_Driver driver = (PCF_Driver)module; ++ ++#ifndef FT_CONFIG_OPTION_ENVIRONMENT_PROPERTIES ++ FT_UNUSED( value_is_string ); ++#endif ++ ++ ++ if ( !ft_strcmp( property_name, "no-long-family-names" ) ) ++ { ++#ifdef FT_CONFIG_OPTION_ENVIRONMENT_PROPERTIES ++ if ( value_is_string ) ++ { ++ const char* s = (const char*)value; ++ long lfn = ft_strtol( s, NULL, 10 ); ++ ++ ++ if ( lfn == 0 ) ++ driver->no_long_family_names = 0; ++ else if ( lfn == 1 ) ++ driver->no_long_family_names = 1; ++ else ++ return FT_THROW( Invalid_Argument ); ++ } ++ else ++#endif ++ { ++ FT_Bool* no_long_family_names = (FT_Bool*)value; ++ ++ ++ driver->no_long_family_names = *no_long_family_names; ++ } ++ ++ return error; ++ } ++ ++#else /* !PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ ++ ++ FT_UNUSED( module ); ++ FT_UNUSED( value ); ++ FT_UNUSED( value_is_string ); ++ ++#endif /* !PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ ++ ++ FT_TRACE0(( "pcf_property_set: missing property `%s'\n", ++ property_name )); ++ return FT_THROW( Missing_Property ); ++ } ++ ++ ++ static FT_Error ++ pcf_property_get( FT_Module module, /* PCF_Driver */ ++ const char* property_name, ++ const void* value ) ++ { ++#ifdef PCF_CONFIG_OPTION_LONG_FAMILY_NAMES ++ ++ FT_Error error = FT_Err_Ok; ++ PCF_Driver driver = (PCF_Driver)module; ++ ++ ++ if ( !ft_strcmp( property_name, "no-long-family-names" ) ) ++ { ++ FT_Bool no_long_family_names = driver->no_long_family_names; ++ FT_Bool* val = (FT_Bool*)value; ++ ++ ++ *val = no_long_family_names; ++ ++ return error; ++ } ++ ++#else /* !PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ ++ ++ FT_UNUSED( module ); ++ FT_UNUSED( value ); ++ ++#endif /* !PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ ++ ++ FT_TRACE0(( "pcf_property_get: missing property `%s'\n", ++ property_name )); ++ return FT_THROW( Missing_Property ); ++ } ++ ++ ++ FT_DEFINE_SERVICE_PROPERTIESREC( ++ pcf_service_properties, ++ ++ (FT_Properties_SetFunc)pcf_property_set, /* set_property */ ++ (FT_Properties_GetFunc)pcf_property_get ) /* get_property */ ++ ++ + /* + * + * SERVICE LIST +@@ -677,6 +783,7 @@ THE SOFTWARE. + { + { FT_SERVICE_ID_BDF, &pcf_service_bdf }, + { FT_SERVICE_ID_FONT_FORMAT, FT_FONT_FORMAT_PCF }, ++ { FT_SERVICE_ID_PROPERTIES, &pcf_service_properties }, + { NULL, NULL } + }; + +@@ -694,7 +801,14 @@ THE SOFTWARE. + FT_CALLBACK_DEF( FT_Error ) + pcf_driver_init( FT_Module module ) /* PCF_Driver */ + { ++#ifdef PCF_CONFIG_OPTION_LONG_FAMILY_NAMES ++ PCF_Driver driver = (PCF_Driver)module; ++ ++ ++ driver->no_long_family_names = 0; ++#else + FT_UNUSED( module ); ++#endif + + return FT_Err_Ok; + } +diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c +index 38ba110..3eacf2b 100644 +--- a/src/pcf/pcfread.c ++++ b/src/pcf/pcfread.c +@@ -1393,57 +1393,75 @@ THE SOFTWARE. + prop = pcf_find_property( face, "FAMILY_NAME" ); + if ( prop && prop->isString ) + { +- /* Prepend the foundry name plus a space to the family name. */ +- /* There are many fonts just called `Fixed' which look completely */ +- /* different, and which have nothing to do with each other. When */ +- /* selecting `Fixed' in KDE or Gnome one gets results that appear */ +- /* rather random, the style changes often if one changes the size */ +- /* and one cannot select some fonts at all. */ +- /* */ +- /* We also check whether we have `wide' characters; all put */ +- /* together, we get family names like `Sony Fixed' or `Misc Fixed */ +- /* Wide'. */ +- PCF_Property foundry_prop, point_size_prop, average_width_prop; +- +- int l = ft_strlen( prop->value.atom ) + 1; +- int wide = 0; +- +- +- foundry_prop = pcf_find_property( face, "FOUNDRY" ); +- point_size_prop = pcf_find_property( face, "POINT_SIZE" ); +- average_width_prop = pcf_find_property( face, "AVERAGE_WIDTH" ); +- +- if ( point_size_prop && average_width_prop ) ++ ++#ifdef PCF_CONFIG_OPTION_LONG_FAMILY_NAMES ++ ++ PCF_Driver driver = (PCF_Driver)FT_FACE_DRIVER( face ); ++ ++ ++ if ( !driver->no_long_family_names ) + { +- if ( average_width_prop->value.l >= point_size_prop->value.l ) ++ /* Prepend the foundry name plus a space to the family name. */ ++ /* There are many fonts just called `Fixed' which look */ ++ /* completely different, and which have nothing to do with each */ ++ /* other. When selecting `Fixed' in KDE or Gnome one gets */ ++ /* results that appear rather random, the style changes often if */ ++ /* one changes the size and one cannot select some fonts at all. */ ++ /* */ ++ /* We also check whether we have `wide' characters; all put */ ++ /* together, we get family names like `Sony Fixed' or `Misc */ ++ /* Fixed Wide'. */ ++ ++ PCF_Property foundry_prop, point_size_prop, average_width_prop; ++ ++ int l = ft_strlen( prop->value.atom ) + 1; ++ int wide = 0; ++ ++ ++ foundry_prop = pcf_find_property( face, "FOUNDRY" ); ++ point_size_prop = pcf_find_property( face, "POINT_SIZE" ); ++ average_width_prop = pcf_find_property( face, "AVERAGE_WIDTH" ); ++ ++ if ( point_size_prop && average_width_prop ) + { +- /* This font is at least square shaped or even wider */ +- wide = 1; +- l += ft_strlen( " Wide" ); ++ if ( average_width_prop->value.l >= point_size_prop->value.l ) ++ { ++ /* This font is at least square shaped or even wider */ ++ wide = 1; ++ l += ft_strlen( " Wide" ); ++ } + } +- } + +- if ( foundry_prop && foundry_prop->isString ) +- { +- l += ft_strlen( foundry_prop->value.atom ) + 1; ++ if ( foundry_prop && foundry_prop->isString ) ++ { ++ l += ft_strlen( foundry_prop->value.atom ) + 1; + +- if ( FT_NEW_ARRAY( root->family_name, l ) ) +- goto Exit; ++ if ( FT_NEW_ARRAY( root->family_name, l ) ) ++ goto Exit; ++ ++ ft_strcpy( root->family_name, foundry_prop->value.atom ); ++ ft_strcat( root->family_name, " " ); ++ ft_strcat( root->family_name, prop->value.atom ); ++ } ++ else ++ { ++ if ( FT_NEW_ARRAY( root->family_name, l ) ) ++ goto Exit; + +- ft_strcpy( root->family_name, foundry_prop->value.atom ); +- ft_strcat( root->family_name, " " ); +- ft_strcat( root->family_name, prop->value.atom ); ++ ft_strcpy( root->family_name, prop->value.atom ); ++ } ++ ++ if ( wide ) ++ ft_strcat( root->family_name, " Wide" ); + } + else ++ ++#endif /* PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ ++ + { +- if ( FT_NEW_ARRAY( root->family_name, l ) ) ++ if ( FT_STRDUP( root->family_name, prop->value.atom ) ) + goto Exit; +- +- ft_strcpy( root->family_name, prop->value.atom ); + } +- +- if ( wide ) +- ft_strcat( root->family_name, " Wide" ); + } + else + root->family_name = NULL; +-- +cgit v1.0-41-gc330 + diff --git a/pkgs/development/libraries/freetype/pcf-introduce-driver.patch b/pkgs/development/libraries/freetype/pcf-introduce-driver.patch new file mode 100644 index 00000000000..c1685c5116c --- /dev/null +++ b/pkgs/development/libraries/freetype/pcf-introduce-driver.patch @@ -0,0 +1,68 @@ +diff --git a/src/pcf/pcf.h b/src/pcf/pcf.h +index c726e5e..830cabe 100644 +--- a/src/pcf/pcf.h ++++ b/src/pcf/pcf.h +@@ -163,6 +163,13 @@ FT_BEGIN_HEADER + } PCF_FaceRec, *PCF_Face; + + ++ typedef struct PCF_DriverRec_ ++ { ++ FT_DriverRec root; ++ ++ } PCF_DriverRec, *PCF_Driver; ++ ++ + /* macros for pcf font format */ + + #define LSBFirst 0 +diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c +index 10d5c20..8f4a90d 100644 +--- a/src/pcf/pcfdrivr.c ++++ b/src/pcf/pcfdrivr.c +@@ -691,22 +691,38 @@ THE SOFTWARE. + } + + ++ FT_CALLBACK_DEF( FT_Error ) ++ pcf_driver_init( FT_Module module ) /* PCF_Driver */ ++ { ++ FT_UNUSED( module ); ++ ++ return FT_Err_Ok; ++ } ++ ++ ++ FT_CALLBACK_DEF( void ) ++ pcf_driver_done( FT_Module module ) /* PCF_Driver */ ++ { ++ FT_UNUSED( module ); ++ } ++ ++ + FT_CALLBACK_TABLE_DEF + const FT_Driver_ClassRec pcf_driver_class = + { + { + FT_MODULE_FONT_DRIVER | + FT_MODULE_DRIVER_NO_OUTLINES, +- sizeof ( FT_DriverRec ), + ++ sizeof ( PCF_DriverRec ), + "pcf", + 0x10000L, + 0x20000L, + +- NULL, /* module-specific interface */ ++ NULL, /* module-specific interface */ + +- NULL, /* FT_Module_Constructor module_init */ +- NULL, /* FT_Module_Destructor module_done */ ++ pcf_driver_init, /* FT_Module_Constructor module_init */ ++ pcf_driver_done, /* FT_Module_Destructor module_done */ + pcf_driver_requester /* FT_Module_Requester get_interface */ + }, + +-- +cgit v1.0-41-gc330 + diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/development/libraries/funambol/default.nix index 161d836bf31..d0850128ebc 100644 --- a/pkgs/development/libraries/funambol/default.nix +++ b/pkgs/development/libraries/funambol/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "SyncML client sdk by Funambol project"; homepage = http://www.funambol.com; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index 0c22cc9ff9f..8cc06f9269e 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -1,7 +1,9 @@ -{ fetchurl, stdenv, intltool, pkgconfig, glib, json_glib, libsoup, geoip +{ fetchurl, stdenv, intltool, libintlOrEmpty, pkgconfig, glib, json_glib, libsoup, geoip , dbus, dbus_glib, modemmanager, avahi }: +with stdenv.lib; + stdenv.mkDerivation rec { name = "geoclue-2.4.3"; @@ -10,23 +12,31 @@ stdenv.mkDerivation rec { sha256 = "0pk07k65dlw37nz8z5spksivsv5nh96xmbi336rf2yfxf2ldpadd"; }; - buildInputs = + buildInputs = libintlOrEmpty ++ [ intltool pkgconfig glib json_glib libsoup geoip - dbus dbus_glib modemmanager avahi - ]; + dbus dbus_glib avahi + ] ++ optionals (!stdenv.isDarwin) [ modemmanager ]; preConfigure = '' substituteInPlace configure --replace "-Werror" "" ''; - configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; + configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ] ++ + optionals stdenv.isDarwin [ + "--disable-silent-rules" + "--disable-3g-source" + "--disable-cdma-source" + "--disable-modem-gps-source" + "--disable-nmea-source" ]; + + NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"; propagatedBuildInputs = [ dbus dbus_glib glib ]; meta = with stdenv.lib; { description = "Geolocation framework and some data providers"; maintainers = with maintainers; [ raskin garbas ]; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; license = licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 9eb71fc708f..5d8d98af8d3 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { description = "C library of programming buildings blocks"; homepage = http://www.gtk.org/; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ lovek323 raskin urkud ]; + maintainers = with maintainers; [ lovek323 raskin ]; platforms = platforms.unix; longDescription = '' diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index b5cd936ce4f..14104b30d12 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, m4, cxx ? true, withStatic ? true }: -with { inherit (stdenv.lib) optional optionalString; }; +let inherit (stdenv.lib) optional optionalString; in let self = stdenv.mkDerivation rec { name = "gmp-5.1.3"; diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index 4d12ed8a8b1..bb4e40dd3a7 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, m4, cxx ? true, withStatic ? false }: -with { inherit (stdenv.lib) optional optionalString; }; +let inherit (stdenv.lib) optional optionalString; in let self = stdenv.mkDerivation rec { name = "gmp-6.1.1"; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 7154db626aa..4773cc38000 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A middleware layer between C libraries and language bindings"; homepage = http://live.gnome.org/GObjectIntrospection; - maintainers = with maintainers; [ lovek323 urkud lethalman ]; + maintainers = with maintainers; [ lovek323 lethalman ]; platforms = platforms.unix; longDescription = '' diff --git a/pkgs/development/libraries/google-gflags/default.nix b/pkgs/development/libraries/google-gflags/default.nix index 0f089d16ead..1a3a1658727 100644 --- a/pkgs/development/libraries/google-gflags/default.nix +++ b/pkgs/development/libraries/google-gflags/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # This isn't used by the build and breaks the CMake build on case-insensitive filesystems (e.g., on Darwin) + preConfigure = "rm BUILD"; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DBUILD_STATIC_LIBS=ON" diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 2ab0977004c..5601a8854ef 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -1,19 +1,11 @@ -{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan -, useGnupg1 ? false, gnupg1 ? null }: +{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan }: -assert useGnupg1 -> gnupg1 != null; -assert !useGnupg1 -> gnupg != null; - -let - gpgStorePath = if useGnupg1 then gnupg1 else gnupg; - gpgProgram = if useGnupg1 then "gpg" else "gpg2"; -in stdenv.mkDerivation rec { - name = "gpgme-1.8.0"; + name = "gpgme-1.9.0"; src = fetchurl { url = "mirror://gnupg/gpgme/${name}.tar.bz2"; - sha256 = "0csx3qnycwm0n90ql6gs65if5xi4gqyzzy21fxs2xqicghjrfq2r"; + sha256 = "1ssc0gs02r4fasabk7c6v6r865k2j02mpb5g1vkpbmzsigdzwa8v"; }; outputs = [ "out" "dev" "info" ]; @@ -24,20 +16,24 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gnupg ]; configureFlags = [ - "--enable-fixed-path=${gpgStorePath}/bin" + "--enable-fixed-path=${gnupg}/bin" ]; + # https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html NIX_CFLAGS_COMPILE = with stdenv; lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64"; - AM_CXXFLAGS = - with stdenv; lib.optional (isDarwin) "-D_POSIX_C_SOURCE=200809L"; - meta = with stdenv.lib; { - homepage = "http://www.gnupg.org/related_software/gpgme"; + homepage = "https://gnupg.org/software/gpgme/index.html"; description = "Library for making GnuPG easier to use"; - license = licenses.gpl2; + longDescription = '' + GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG + easier for applications. It provides a High-Level Crypto API for + encryption, decryption, signing, signature verification and key + management. + ''; + license = with licenses; [ lgpl21Plus gpl3Plus ]; platforms = platforms.unix; - maintainers = [ maintainers.fuuzetsu ]; + maintainers = with maintainers; [ fuuzetsu primeos ]; }; } diff --git a/pkgs/development/libraries/grantlee/5.x.nix b/pkgs/development/libraries/grantlee/5.x.nix index b4aa9414163..fb6af9c895d 100644 --- a/pkgs/development/libraries/grantlee/5.x.nix +++ b/pkgs/development/libraries/grantlee/5.x.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { and the design of Django is reused in Grantlee.''; homepage = http://gitorious.org/grantlee; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; inherit (qtbase.meta) platforms; }; } diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix index bb2461a98a1..3944d2ecab6 100644 --- a/pkgs/development/libraries/grantlee/default.nix +++ b/pkgs/development/libraries/grantlee/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { and the design of Django is reused in Grantlee.''; homepage = http://gitorious.org/grantlee; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix index d298fbd7fc3..74b1417e069 100644 --- a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gstreamer, gst-plugins-base, boost, glib, qt4, cmake +{ stdenv, fetchurl, gstreamer, gst-plugins-base, boost155, glib, qt4, cmake , automoc4, flex, bison, pkgconfig }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gstreamer gst-plugins-base glib qt4 ]; - propagatedBuildInputs = [ boost ]; + propagatedBuildInputs = [ boost155 ]; nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ]; cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF"; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index d21fef3e674..10f01294301 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; - maintainers = with maintainers; [ urkud raskin vcunat lethalman ]; + maintainers = with maintainers; [ raskin vcunat lethalman ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix index 39d5b2c792a..5a1af01c3b1 100644 --- a/pkgs/development/libraries/herqq/default.nix +++ b/pkgs/development/libraries/herqq/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { homepage = http://herqq.org; description = "A software library for building UPnP devices and control points"; inherit (qt4.meta) platforms; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix index eebd105a00d..424ffd18499 100644 --- a/pkgs/development/libraries/hspell/default.nix +++ b/pkgs/development/libraries/hspell/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "Hebrew spell checker"; homepage = http://hspell.ivrix.org.il/; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; # Note that I don't speak hebrew, so I can only fix compile problems }; } diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index ea0919caa31..b64d8c84e22 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation ({ meta = with stdenv.lib; { description = "Unicode and globalization support library"; homepage = http://site.icu-project.org/; - maintainers = with maintainers; [ raskin urkud ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.all; }; } // (if stdenv.isArm then { diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index ed742888a0e..7d07408236e 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://pkg-isocodes.alioth.debian.org/; description = "Various ISO codes packaged as XML files"; - maintainers = [ maintainers.urkud ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 7e3220d8a37..3865aa226f9 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,13 +1,20 @@ -{ stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk }: +{ stdenv, fetchurl, fetchpatch, cmake, libX11, libuuid, xz, vtk }: stdenv.mkDerivation rec { - name = "itk-4.10.0"; + name = "itk-4.11.0"; src = fetchurl { - url = mirror://sourceforge/itk/InsightToolkit-4.10.0.tar.xz; - sha256 = "0pxijhqsnwcp9jv1d8p11hsj90k8ajpwxhrnn8kk8c56k7y1207a"; + url = mirror://sourceforge/itk/InsightToolkit-4.11.0.tar.xz; + sha256 = "0axvyds0gads5914g0m70z5q16gzghr0rk0hy3qjpf1k9bkxvcq6"; }; + # Clang 4 dislikes signed comparisons of pointers against integers. Should no longer be + # necessary once we get past ITK 4.11. + patches = [ (fetchpatch { + url = "https://github.com/InsightSoftwareConsortium/ITK/commit/d1407a55910ad9c232f3d241833cfd2e59024946.patch"; + sha256 = "0h851afkv23fwgkibjss30fkbz4nkfg6rmmm4pfvkwpml23gzz7s"; + }) ]; + cmakeFlags = [ "-DBUILD_TESTING=OFF" "-DBUILD_EXAMPLES=OFF" diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index 36b2c469eaf..34e7e4a761f 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, fetchpatch, libjpeg, cmake }: stdenv.mkDerivation rec { - name = "jasper-2.0.10"; + name = "jasper-2.0.12"; src = fetchurl { # You can find this code on Github at https://github.com/mdadams/jasper # however note at https://www.ece.uvic.ca/~frodo/jasper/#download # not all tagged releases are for distribution. url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.tar.gz"; - sha256 = "1s022mfxyw8jw60fgyj60lbm9h6bc4nk2751b0in8qsjwcl59n2l"; + sha256 = "1njdbxv7d4anzrd476wjww2qsi96dd8vfnp4hri0srrqxpszl92v"; }; # newer reconf to recognize a multiout flag @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { moveToOutput bin "$bin" ''; - meta = { + meta = with stdenv.lib; { homepage = https://www.ece.uvic.ca/~frodo/jasper/; description = "JPEG2000 Library"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 84638bc01ea..8c8c181409d 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jemalloc-${version}"; - version = "4.3.1"; + version = "4.5.0"; src = fetchurl { url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${name}.tar.bz2"; - sha256 = "12r71i8nm3vwz21fc16rwbb0pwcg5s05n1qg3rwl2s85v0x1ifzp"; + sha256 = "9409d85664b4f135b77518b0b118c549009dc10f6cba14557d170476611f6780"; }; # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { # option should remove the prefix and give us a working jemalloc. configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix="; + doCheck = true; + + meta = with stdenv.lib; { homepage = http://jemalloc.net; description = "General purpose malloc(3) implementation"; diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 263f811ebc6..7343b408dff 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/frameworks/5.31/ -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/frameworks/5.32/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index 1d37c794674..3f4ae5a25c2 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -17,12 +17,5 @@ kdeFramework { ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui solid qtscript qtx11extras ]; - patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series)) - ++ [ - (fetchpatch { - name = "SanitizeURLsBeforePassingThemToFindProxyForURL.patch"; - url = "https://cgit.kde.org/kio.git/patch/?id=f9d0cb47cf94e209f6171ac0e8d774e68156a6e4"; - sha256 = "1s6rcp8rrlhc6rgy3b303y0qq0s8371n12r5lk9zbkw14wjvbix0"; - }) - ]; + patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series)); } diff --git a/pkgs/development/libraries/kde-frameworks/kwallet.nix b/pkgs/development/libraries/kde-frameworks/kwallet.nix index f02c6138df7..48181040a75 100644 --- a/pkgs/development/libraries/kde-frameworks/kwallet.nix +++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix @@ -1,6 +1,6 @@ { kdeFramework, lib, extra-cmake-modules, kconfig, kconfigwidgets , kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes -, knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt +, knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt, gpgme }: kdeFramework { @@ -9,6 +9,6 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kconfig kconfigwidgets kcoreaddons kdbusaddons ki18n kiconthemes - knotifications kservice kwidgetsaddons kwindowsystem libgcrypt + knotifications kservice kwidgetsaddons kwindowsystem libgcrypt gpgme ]; } diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index f879005da1d..4b902d4d57e 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -3,595 +3,595 @@ { attica = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/attica-5.31.0.tar.xz"; - sha256 = "0gfqxaqvw05rdgjqs2cn5bgnmijcsl16myf919fdc75xkdpg1h56"; - name = "attica-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/attica-5.32.0.tar.xz"; + sha256 = "16vl3gpwqcvfms82grv1bvqlxj085bqssv5ixjx007826pd8qhp5"; + name = "attica-5.32.0.tar.xz"; }; }; baloo = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/baloo-5.31.0.tar.xz"; - sha256 = "0n3cwq7g9zik3xjp895vl1j62b538rg6zcsm2x4h2nnq3njrnfbz"; - name = "baloo-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/baloo-5.32.0.tar.xz"; + sha256 = "0a4qwinkp4gmcbx4j0qxbj5qb40h7594s39za7sc7bymadicasy1"; + name = "baloo-5.32.0.tar.xz"; }; }; bluez-qt = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/bluez-qt-5.31.0.tar.xz"; - sha256 = "12g9jc6b8f03dka5sbjf19g536y8d1xvzkrwp2m0w98zcd0q33jl"; - name = "bluez-qt-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/bluez-qt-5.32.0.tar.xz"; + sha256 = "0pl6cp0rgjkh7d06ik35rw7qd96j5sh2flgjx4vi21zl5vf3vgyh"; + name = "bluez-qt-5.32.0.tar.xz"; }; }; breeze-icons = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/breeze-icons-5.31.0.tar.xz"; - sha256 = "1ylask25jrwyk53c81jy73k9i8cylnab3a42yyrf3f25qbvhr845"; - name = "breeze-icons-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/breeze-icons-5.32.0.tar.xz"; + sha256 = "1n51kahzk09v52yhi7k4kqgavqlz3ghqv5cx2ssz2djpyavs18r3"; + name = "breeze-icons-5.32.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/extra-cmake-modules-5.31.0.tar.xz"; - sha256 = "1srdvjgn72687r48f0x32vn7q5czvk9k1w1393bcws2l0icil9w4"; - name = "extra-cmake-modules-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/extra-cmake-modules-5.32.0.tar.xz"; + sha256 = "1iqakxzr6bcs9wgyi8if1smpq6px0bvlcyddyk0hxhindzl7pn5i"; + name = "extra-cmake-modules-5.32.0.tar.xz"; }; }; frameworkintegration = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/frameworkintegration-5.31.0.tar.xz"; - sha256 = "1wfiny11fm0k6w1ly7ca7xj3f7a1mn3b1gpvlcpaqbrib6b3dgcj"; - name = "frameworkintegration-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/frameworkintegration-5.32.0.tar.xz"; + sha256 = "022scc4pgl68973wq29l1kc9j9lspvlmpr3bc6zlyg57m8agapwa"; + name = "frameworkintegration-5.32.0.tar.xz"; }; }; kactivities = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kactivities-5.31.0.tar.xz"; - sha256 = "1v33pkjwjjp6lrqhch7l66xyyvln1pgbs0wbgi8q9c024s92jqqz"; - name = "kactivities-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kactivities-5.32.0.tar.xz"; + sha256 = "0xin4shaj0zsfsww84mwk5n4ldaqy730jhc369px2j2nq57sg9g7"; + name = "kactivities-5.32.0.tar.xz"; }; }; kactivities-stats = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kactivities-stats-5.31.0.tar.xz"; - sha256 = "1ngydmby0dzf802bjszhn3qsc0vgrhc0ya511x7jc9h49mgbp2jy"; - name = "kactivities-stats-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kactivities-stats-5.32.0.tar.xz"; + sha256 = "1b3z7bcap3vjc0155y0a9xkbd477fklmpj8dr3rs0ccyc6qxxbvw"; + name = "kactivities-stats-5.32.0.tar.xz"; }; }; kapidox = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kapidox-5.31.0.tar.xz"; - sha256 = "1lnqcgmxdy8l0qzn2jb9kww2lg1a33izw0hy78fkm7drg67g26za"; - name = "kapidox-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kapidox-5.32.0.tar.xz"; + sha256 = "1z6hdsppwrmqkcanrppxhqcrjvblg9i02rh3bz5m3pn66wwz0sdw"; + name = "kapidox-5.32.0.tar.xz"; }; }; karchive = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/karchive-5.31.0.tar.xz"; - sha256 = "1yafkgd5q9j1y3shivh5jayc4pss1skzyf3f1rmzl4psn2r6rsay"; - name = "karchive-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/karchive-5.32.0.tar.xz"; + sha256 = "1dzvphqnc09mmaydqggpxg6zwwyr56p6l4jdf1rf6ns90fzxy0m4"; + name = "karchive-5.32.0.tar.xz"; }; }; kauth = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kauth-5.31.0.tar.xz"; - sha256 = "0y4gc3n8d36wrpdmgq2jif82lkqr3xhb7v8lgg6kgaxb1d7fi2r8"; - name = "kauth-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kauth-5.32.0.tar.xz"; + sha256 = "00kdq16n9w6nf1bpwzl5lp5c2xq74g8nn6081kvnjcd4ld66ncmq"; + name = "kauth-5.32.0.tar.xz"; }; }; kbookmarks = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kbookmarks-5.31.0.tar.xz"; - sha256 = "0xdrx3gr291gkrfj360pw3aax0mz0zhhvjw7c4fcp35m0sqg1kvp"; - name = "kbookmarks-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kbookmarks-5.32.0.tar.xz"; + sha256 = "03a024phcjv46afbp5lbmj2p8hb6srfzyaslc6ln6ms473bf5k4w"; + name = "kbookmarks-5.32.0.tar.xz"; }; }; kcmutils = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kcmutils-5.31.0.tar.xz"; - sha256 = "00ngh556sxswrfhhy5vkfi8sk5jbb0srvx4np49xwpmh5xb6qzk9"; - name = "kcmutils-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kcmutils-5.32.0.tar.xz"; + sha256 = "1mr9h7wc22bfrbm92ajsjfcs16c5xpkrxbxzcma3a0s7jhy6qrm9"; + name = "kcmutils-5.32.0.tar.xz"; }; }; kcodecs = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kcodecs-5.31.0.tar.xz"; - sha256 = "1nyn4b61ymbxv1xnbq3z79dbvapsy6jg51w52l0gnqkiy2zlbz13"; - name = "kcodecs-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kcodecs-5.32.0.tar.xz"; + sha256 = "0yybkp52i8nm4qjady6jqswn6v70cqbvjqwgrghjnc88b2cly253"; + name = "kcodecs-5.32.0.tar.xz"; }; }; kcompletion = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kcompletion-5.31.0.tar.xz"; - sha256 = "0jx1lsz1fh8h20a5ixdv9q5yx6r5r7jr8hi68v7b66anmpnh2m3g"; - name = "kcompletion-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kcompletion-5.32.0.tar.xz"; + sha256 = "0fn8imr3m219r38a0rafbnylcpjq4rqhz1w66mx80sc7l10mhcni"; + name = "kcompletion-5.32.0.tar.xz"; }; }; kconfig = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kconfig-5.31.0.tar.xz"; - sha256 = "1z9jf5rizdj7c7x918zmdv4v01glpl3z44mrx7yfp2cqnjniwhxi"; - name = "kconfig-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kconfig-5.32.0.tar.xz"; + sha256 = "1pajh1l08b995shp6l75ri9z4vr6wjapvrkmrmv8hksnxvfi97dp"; + name = "kconfig-5.32.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kconfigwidgets-5.31.0.tar.xz"; - sha256 = "19y3s5qcb3mzw8xiyp57zb2sjclcmxzj3xp0iwzs41r4lqmlwajs"; - name = "kconfigwidgets-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kconfigwidgets-5.32.0.tar.xz"; + sha256 = "1cq0a3k6pvl9f098ssqqk2rddxh0xn1kk4p5kfyd7w0m3c604zw3"; + name = "kconfigwidgets-5.32.0.tar.xz"; }; }; kcoreaddons = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kcoreaddons-5.31.0.tar.xz"; - sha256 = "0175vgii8l5yx1bbbjljblkkq03nqfhb3v7in2657glag6imcb7m"; - name = "kcoreaddons-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kcoreaddons-5.32.0.tar.xz"; + sha256 = "1n1xzvwwji9pwyxrvwp4rmpc7qzp9nlis26xmn81k607jn587ksx"; + name = "kcoreaddons-5.32.0.tar.xz"; }; }; kcrash = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kcrash-5.31.0.tar.xz"; - sha256 = "0mj6dahalwks39d881nvmrd3rqm2aid06iq6s8p2grhnncf6cd4j"; - name = "kcrash-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kcrash-5.32.0.tar.xz"; + sha256 = "1zrkjrpj88ymdy5vbn9db73vxppswvmbn2gkn4gpx773dsmflhz3"; + name = "kcrash-5.32.0.tar.xz"; }; }; kdbusaddons = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kdbusaddons-5.31.0.tar.xz"; - sha256 = "1dv9yzicd2d1k0qjgjbryks0f6s0v76hr0csdb7j22nwn9pb4cfk"; - name = "kdbusaddons-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kdbusaddons-5.32.0.tar.xz"; + sha256 = "1a15jjsrkza0ll2viyk834pgdxsdgdacm0982xxwl5z937f75609"; + name = "kdbusaddons-5.32.0.tar.xz"; }; }; kdeclarative = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kdeclarative-5.31.0.tar.xz"; - sha256 = "0hw3rkmlw6j056b3wvhpaj778xfxajcqidpf5x3nyfjmqjvxsgw1"; - name = "kdeclarative-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kdeclarative-5.32.0.tar.xz"; + sha256 = "1y5g3yi1l0g1mkqhhakg265r25zm23qc2fqg55rq0g7l9ss7w7g9"; + name = "kdeclarative-5.32.0.tar.xz"; }; }; kded = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kded-5.31.0.tar.xz"; - sha256 = "0zsikbzi8i8bmlpa4kgdpcpsifkwwclsfdgafd7yf5svc4hyyl51"; - name = "kded-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kded-5.32.0.tar.xz"; + sha256 = "0pmmsvqwkw86yvxxf9i6lg13vg80m0kmhjjs88lbm60cgvr5jhq6"; + name = "kded-5.32.0.tar.xz"; }; }; kdelibs4support = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/portingAids/kdelibs4support-5.31.0.tar.xz"; - sha256 = "1yh4lr56mnwsbc0gysj1c58w1r62dlxxds16xnp5j0lyir7wx0pl"; - name = "kdelibs4support-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/portingAids/kdelibs4support-5.32.0.tar.xz"; + sha256 = "1wan5ad5rhhrwvwjjjd87n790r6d8r118gs2kw49s91pdj3iv9pb"; + name = "kdelibs4support-5.32.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kdesignerplugin-5.31.0.tar.xz"; - sha256 = "1g510f8dfvaddcq5hrvsaiwayp2hzkdryzn62zff29ipd7qpcd2x"; - name = "kdesignerplugin-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kdesignerplugin-5.32.0.tar.xz"; + sha256 = "1hapj8x8nky3m6lx2ianmxwprf00jqyjsknjz3pi4vk3i714vhnf"; + name = "kdesignerplugin-5.32.0.tar.xz"; }; }; kdesu = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kdesu-5.31.0.tar.xz"; - sha256 = "0mzvvr3zz28pgp42i3f54g5k3wplvjdg41d8jb9k6m5qcj8aryax"; - name = "kdesu-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kdesu-5.32.0.tar.xz"; + sha256 = "0zsy1hivy5bbczrpkpgj72mlx0km2nm53kpgrj2hfdy3ss0vn3hl"; + name = "kdesu-5.32.0.tar.xz"; }; }; kdewebkit = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kdewebkit-5.31.0.tar.xz"; - sha256 = "0x9v8i37apbik2krxr9n2pgq5xmcgjlhzflbrwwqaq30c2l8aid0"; - name = "kdewebkit-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kdewebkit-5.32.0.tar.xz"; + sha256 = "0y7262pqzdx0hxkyqrbawgx99rn6q85m1slr4nbn914kn350xpy0"; + name = "kdewebkit-5.32.0.tar.xz"; }; }; kdnssd = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kdnssd-5.31.0.tar.xz"; - sha256 = "1bbk9qsvx49zbjvdg0xi9s2x51f331n8wnyd320j3ay0mp4yq2kk"; - name = "kdnssd-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kdnssd-5.32.0.tar.xz"; + sha256 = "1xakbs2wm627zn01ni8fyrz64xl5jw4by0pdrb70aad7w37dijrw"; + name = "kdnssd-5.32.0.tar.xz"; }; }; kdoctools = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kdoctools-5.31.0.tar.xz"; - sha256 = "1m7l4bk5h75mcrgislp4rc7fj1szv1ij30y5yizncg2c3aq2czxk"; - name = "kdoctools-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kdoctools-5.32.0.tar.xz"; + sha256 = "0i7zgg7iw6w0sdr6cv3yf4blcr61i8zczgmyqa964ka6p3ywwjs9"; + name = "kdoctools-5.32.0.tar.xz"; }; }; kemoticons = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kemoticons-5.31.0.tar.xz"; - sha256 = "0zvps3jrx02dzy82mwf5l7dirpnj616081yhkp2m0xw3qa3i16xk"; - name = "kemoticons-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kemoticons-5.32.0.tar.xz"; + sha256 = "1ncjs9iy6z6rhk83ff7fj1b68rkylnry0h698rh4jvs98gpw8sgj"; + name = "kemoticons-5.32.0.tar.xz"; }; }; kfilemetadata = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kfilemetadata-5.31.0.tar.xz"; - sha256 = "123cin3fhai85zzz5hfr6h87cjrqvsyl9i809j7q0fshjx8c9wpd"; - name = "kfilemetadata-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kfilemetadata-5.32.0.tar.xz"; + sha256 = "01d91gmrxlax0g13ib841vc4qwmv6r4qdr10wfs77rrxsvw7z08f"; + name = "kfilemetadata-5.32.0.tar.xz"; }; }; kglobalaccel = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kglobalaccel-5.31.0.tar.xz"; - sha256 = "1l7phfk17z9rrdlcjz97zyyqlj9pps0gdpphrfqrz1fyx5ifybmc"; - name = "kglobalaccel-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kglobalaccel-5.32.0.tar.xz"; + sha256 = "0dxwjznnqlgnvn15pl34rxlzk3i21cvzn8xbgqmxakny8qiib9ry"; + name = "kglobalaccel-5.32.0.tar.xz"; }; }; kguiaddons = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kguiaddons-5.31.0.tar.xz"; - sha256 = "0bvjnbsskps2pfh0y72klxfanm54c0iflll5awaps750flb3bbp3"; - name = "kguiaddons-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kguiaddons-5.32.0.tar.xz"; + sha256 = "0rbfd0rykmwl9hs1q22pqg2by8vi9y1pgs2ishgnan4sc4w87wjb"; + name = "kguiaddons-5.32.0.tar.xz"; }; }; khtml = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/portingAids/khtml-5.31.0.tar.xz"; - sha256 = "19pf3ir3r8igrx3h90sn383kxmyjdxgmwaw66p6vjb83243dy57h"; - name = "khtml-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/portingAids/khtml-5.32.0.tar.xz"; + sha256 = "1bkxfldw55khycbpcqpwi86rpv6qyqsndvjncfd5a5knnsynwdyf"; + name = "khtml-5.32.0.tar.xz"; }; }; ki18n = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/ki18n-5.31.0.tar.xz"; - sha256 = "1q496i4a3kq2bfxpfnz6bfxk2shfdshrxcf253ab58l76l3jcy9g"; - name = "ki18n-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/ki18n-5.32.0.tar.xz"; + sha256 = "068xvw2hy4hlpj85wgjjdj0nc37fygpd8wb1dnpqcvzzy8rc1rsf"; + name = "ki18n-5.32.0.tar.xz"; }; }; kiconthemes = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kiconthemes-5.31.0.tar.xz"; - sha256 = "0kangszmlhzbwvvplnxk2i938xl8j8jpd8kpf2n9skxkqfd19qr5"; - name = "kiconthemes-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kiconthemes-5.32.0.tar.xz"; + sha256 = "00azbyk5y3jgdqv03a2nd0627kdkhq1bkghvw7w62kcnih9k8lq5"; + name = "kiconthemes-5.32.0.tar.xz"; }; }; kidletime = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kidletime-5.31.0.tar.xz"; - sha256 = "03ajdhxv2jdggqhy02s6xgbaf4pa2chj0f6d5kgz9r0wx6kxmh25"; - name = "kidletime-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kidletime-5.32.0.tar.xz"; + sha256 = "0rkxx3bnspjwm4vcy4rdfahk6vcfpkh8fldww0zfdn7s7pigqwch"; + name = "kidletime-5.32.0.tar.xz"; }; }; kimageformats = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kimageformats-5.31.0.tar.xz"; - sha256 = "17cz2xmmm5g55kndq983vy6cg7adpbiw7ahn0lpvviinnsf53s12"; - name = "kimageformats-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kimageformats-5.32.0.tar.xz"; + sha256 = "05hn8n4sc3rj5c30ki068f76k1gfgvq19zcw5jlqpnn1l5db5fvz"; + name = "kimageformats-5.32.0.tar.xz"; }; }; kinit = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kinit-5.31.0.tar.xz"; - sha256 = "082kq25163x40bq12x84ccrk3zrzmn5xpb5m4zgi06zcvzb8rl9l"; - name = "kinit-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kinit-5.32.0.tar.xz"; + sha256 = "0103lflppdw55l9xiqs68lzaq9897m5qnkmy6fp7dm9wfh9aplqn"; + name = "kinit-5.32.0.tar.xz"; }; }; kio = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kio-5.31.0.tar.xz"; - sha256 = "1rry7v9g2430hkz44b4xjcbs3lr64srs8822a52vx1w69jpkn5s9"; - name = "kio-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kio-5.32.0.tar.xz"; + sha256 = "19da02l0aj0l07x9bbklhvx9slci3v1d8q80jvam4vyzs4qdyjin"; + name = "kio-5.32.0.tar.xz"; }; }; kitemmodels = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kitemmodels-5.31.0.tar.xz"; - sha256 = "0zb9cm5v3ylqhg8l5sp3jskghm5izzihha5ik09y7fabl52cd6v5"; - name = "kitemmodels-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kitemmodels-5.32.0.tar.xz"; + sha256 = "0lxld7jdixpq23sycv8n4ckzmdr34aycrsf2zffziw6r59f0mzki"; + name = "kitemmodels-5.32.0.tar.xz"; }; }; kitemviews = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kitemviews-5.31.0.tar.xz"; - sha256 = "04r4pd5rkdgbszyg7l050r53f38skhh2p2mi3xkz4ckci132srlv"; - name = "kitemviews-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kitemviews-5.32.0.tar.xz"; + sha256 = "1h1zgawdi4vbgymdl5215lx7hpcx9jqxy7vjf5hwgs6b2cls1sws"; + name = "kitemviews-5.32.0.tar.xz"; }; }; kjobwidgets = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kjobwidgets-5.31.0.tar.xz"; - sha256 = "16grnlccmqcs84gpz62s1iz5amdwsprr76gd0q845bd49crgacfa"; - name = "kjobwidgets-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kjobwidgets-5.32.0.tar.xz"; + sha256 = "0lhv3mg2liija0g8x14jpv1mdhb0zjh868p1cs24bs9xrw1l8984"; + name = "kjobwidgets-5.32.0.tar.xz"; }; }; kjs = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/portingAids/kjs-5.31.0.tar.xz"; - sha256 = "027n2ivh5kfmrm06xgcryxm14hbxyf83cx6rbc34093kk905ghg1"; - name = "kjs-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/portingAids/kjs-5.32.0.tar.xz"; + sha256 = "022n2hl1s5kap3pqaz4y28wn5z5qh6jcypz5kini2ic94xf7ydrg"; + name = "kjs-5.32.0.tar.xz"; }; }; kjsembed = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/portingAids/kjsembed-5.31.0.tar.xz"; - sha256 = "1mss7lahczvwhmybxnbcynqwa56gjrxiyq79fcicybp7h7rvqw14"; - name = "kjsembed-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/portingAids/kjsembed-5.32.0.tar.xz"; + sha256 = "0h0p4mcvmdgvjv2xd8s4x2i554nh08mc258gxhb41bs6vm3yhiz4"; + name = "kjsembed-5.32.0.tar.xz"; }; }; kmediaplayer = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/portingAids/kmediaplayer-5.31.0.tar.xz"; - sha256 = "0vxzw5grw53bxp0nvwmiqyw9sbpglhrnfg4d1ldlg4a1gibfijx4"; - name = "kmediaplayer-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/portingAids/kmediaplayer-5.32.0.tar.xz"; + sha256 = "1s86dfzrqxrmbqmxq4yyyy1p507d9ns6d7sy6z67dhykgahacqf4"; + name = "kmediaplayer-5.32.0.tar.xz"; }; }; knewstuff = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/knewstuff-5.31.0.tar.xz"; - sha256 = "06qrgzfxrpmckyjq21ajvw08n5f5bdyqqgrnrbr1cjsfcx7xwdfl"; - name = "knewstuff-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/knewstuff-5.32.0.tar.xz"; + sha256 = "1i3ldy9wwnjhpgdd2d0bg4304k88riin89zqzdl52lpqa6hjl3fp"; + name = "knewstuff-5.32.0.tar.xz"; }; }; knotifications = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/knotifications-5.31.0.tar.xz"; - sha256 = "0nz5dkzgkv4mzcsg2mn9zzcqh484cyh5n1y8sx1831r808jd2wly"; - name = "knotifications-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/knotifications-5.32.0.tar.xz"; + sha256 = "06ap7m8c2py49pqrnhadbyl69y3nsyamzahbpwipqgh9k62sy34y"; + name = "knotifications-5.32.0.tar.xz"; }; }; knotifyconfig = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/knotifyconfig-5.31.0.tar.xz"; - sha256 = "1zdzfqqd32ykd5ibrkssl3p47v704jxs16br1rhrr32ymv4qcbpi"; - name = "knotifyconfig-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/knotifyconfig-5.32.0.tar.xz"; + sha256 = "14qc6wj4j5i45vzqsvl2wlc07c6x30hb2680gwfqsvwgiaszkzv4"; + name = "knotifyconfig-5.32.0.tar.xz"; }; }; kpackage = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kpackage-5.31.0.tar.xz"; - sha256 = "1hg8f2i10wcs31xhvw40dwgbgfrwx93w5bi5wlbrw55jcs040dfr"; - name = "kpackage-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kpackage-5.32.0.tar.xz"; + sha256 = "070zasl5c58n01fk18mjgccfizymc9griwicxizqjgzzbgvkns3r"; + name = "kpackage-5.32.0.tar.xz"; }; }; kparts = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kparts-5.31.0.tar.xz"; - sha256 = "093g5zsdqqyx9z69afsmgyszd807pv3wpzwn37x1glg399dsv7fa"; - name = "kparts-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kparts-5.32.0.tar.xz"; + sha256 = "0hrx0mdvw301nbdyw5fkvgkw60ya6kmfw6hfzmj48bws8mi33rs5"; + name = "kparts-5.32.0.tar.xz"; }; }; kpeople = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kpeople-5.31.0.tar.xz"; - sha256 = "1f71c2q8a9m463ghpq50gbhkvf5szkvvfwbamlrwwygpb89fzfjy"; - name = "kpeople-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kpeople-5.32.0.tar.xz"; + sha256 = "1xqi8zr76hajgyv016iaqlmnr5b84s71fbx412q153g92jglp4mk"; + name = "kpeople-5.32.0.tar.xz"; }; }; kplotting = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kplotting-5.31.0.tar.xz"; - sha256 = "15yv1rh1vlxhv77j50inq9kkwalhs2r1mjba82fnxy8z569i66cm"; - name = "kplotting-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kplotting-5.32.0.tar.xz"; + sha256 = "0a0pfmdlx84526lb2jvx94i2pf85km57fm2ygis4z5mjgbzsmb6v"; + name = "kplotting-5.32.0.tar.xz"; }; }; kpty = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kpty-5.31.0.tar.xz"; - sha256 = "0hfs1gdi1fqaaki5aa9b93j4pl33g4s82yxpbyc0h9k2891aq196"; - name = "kpty-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kpty-5.32.0.tar.xz"; + sha256 = "0h4318rc9902cvqj69capb8lh7s84y44jd59d11fyhq21jhy152s"; + name = "kpty-5.32.0.tar.xz"; }; }; kross = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/portingAids/kross-5.31.0.tar.xz"; - sha256 = "0lc9ijn60bw0y9nrlva2fd0hf0b4x6488jjmymrnrc8zzjnigyqp"; - name = "kross-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/portingAids/kross-5.32.0.tar.xz"; + sha256 = "0mgicb2rfhzp0hr1zckp1qzqzbdx0zy82mcjibrlsp7spmvynw5a"; + name = "kross-5.32.0.tar.xz"; }; }; krunner = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/krunner-5.31.0.tar.xz"; - sha256 = "0xqayhd179387m02arxdcl1lgk8f2h0fxlzyigy6ja6wylbwphrw"; - name = "krunner-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/krunner-5.32.0.tar.xz"; + sha256 = "1k4rg9vqr6h5aj7v51fx3i5z9kxlfpacahs81hkwksi6if8ik4kr"; + name = "krunner-5.32.0.tar.xz"; }; }; kservice = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kservice-5.31.0.tar.xz"; - sha256 = "0hjlcnypg96np88hgfvqd8g5z4cxgi4a0j5mnlfx65jrzpv5hsjg"; - name = "kservice-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kservice-5.32.0.tar.xz"; + sha256 = "02xk3ajspprmx964zhwh2l3axm4gns9h0m0pvcb1v5j8pfh9v70q"; + name = "kservice-5.32.0.tar.xz"; }; }; ktexteditor = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/ktexteditor-5.31.0.tar.xz"; - sha256 = "099axcwl8z4npvcrirycc82zg7sf9ac3yxrwpsp0f337gdl1qvln"; - name = "ktexteditor-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/ktexteditor-5.32.0.tar.xz"; + sha256 = "1sybw8k3f36mcs5qh3b51v7ynbqn4pbiiabkyxfmyi82i09m2jgw"; + name = "ktexteditor-5.32.0.tar.xz"; }; }; ktextwidgets = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/ktextwidgets-5.31.0.tar.xz"; - sha256 = "0n0v42b4bq1f6f120bjhr69qwgnvwlhnnqsh75nl9jvv8g3lyspy"; - name = "ktextwidgets-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/ktextwidgets-5.32.0.tar.xz"; + sha256 = "1s2fd4n4hfkzscxv0cdfjynjzi1f57pfi9a3fp6rrm5c5645zk7r"; + name = "ktextwidgets-5.32.0.tar.xz"; }; }; kunitconversion = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kunitconversion-5.31.0.tar.xz"; - sha256 = "190d2v3bv7ccg2wqjmd6p46d4zz59r1mf86l2wkqw212rr59pafx"; - name = "kunitconversion-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kunitconversion-5.32.0.tar.xz"; + sha256 = "0crc8riwafcx6fwhgrc8vfbwmdygd6vlz1fbbgni09gamm8mbcin"; + name = "kunitconversion-5.32.0.tar.xz"; }; }; kwallet = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kwallet-5.31.0.tar.xz"; - sha256 = "0r7n49ii8y1ygc7ncysjif4mrmsd9jq4yfm251m7lrp82drza26n"; - name = "kwallet-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kwallet-5.32.0.tar.xz"; + sha256 = "0psc4n6lck9gbx2nn7mgv33x4z2r0xp1mx1xcsgy8smvalrfv5xa"; + name = "kwallet-5.32.0.tar.xz"; }; }; kwayland = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kwayland-5.31.0.tar.xz"; - sha256 = "0f134spj1vz3f43bdrb93kr54s50x4a9xvkfhl3inlxmglbk3h8b"; - name = "kwayland-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kwayland-5.32.0.tar.xz"; + sha256 = "1kzvq7qx102rfdv975x5sd37lsl6wn0mzm2m1f9fnnn2rvii3h5d"; + name = "kwayland-5.32.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kwidgetsaddons-5.31.0.tar.xz"; - sha256 = "0yrhss1x8q4nanpq2gbzqjds9s7hjl3zzkwnd8hahh9fyg8w9815"; - name = "kwidgetsaddons-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kwidgetsaddons-5.32.0.tar.xz"; + sha256 = "1aksy326ppdfcx20zl9hxsd8j0br32j6dlx4i1xxbd976csys9b2"; + name = "kwidgetsaddons-5.32.0.tar.xz"; }; }; kwindowsystem = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kwindowsystem-5.31.0.tar.xz"; - sha256 = "0jzhsdfzzhxfgjqd4pl98ckbbqfwkv6qy5szh82078gxc2rf1wna"; - name = "kwindowsystem-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kwindowsystem-5.32.0.tar.xz"; + sha256 = "1c3kd23c4wwzdhfcyhv41czw3y2kk1492xn6ah9n3r98akrhgar1"; + name = "kwindowsystem-5.32.0.tar.xz"; }; }; kxmlgui = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kxmlgui-5.31.0.tar.xz"; - sha256 = "1rnznapp1vflg66k0jk8n8v9zci20bs0v88hci3rf0qfd5cmgnzr"; - name = "kxmlgui-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kxmlgui-5.32.0.tar.xz"; + sha256 = "1pxi4z7z3bzwcnfwq0pvjsmds401fkisyr353lyxf4rvcpwj3a65"; + name = "kxmlgui-5.32.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/kxmlrpcclient-5.31.0.tar.xz"; - sha256 = "1lrv1qxbfm1ss2hb171p9s3f3iwn8zfrsipin0gvfwnjrldi4fkb"; - name = "kxmlrpcclient-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/kxmlrpcclient-5.32.0.tar.xz"; + sha256 = "1kaczibdfdph5mpg1dldsmqb1six57w7ch3v0v7av5h6j6sx0xaq"; + name = "kxmlrpcclient-5.32.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/modemmanager-qt-5.31.0.tar.xz"; - sha256 = "0s2dfz9zvn6f9xpzs412iniipaai5zs9m06lpxss0w1nq5ig856r"; - name = "modemmanager-qt-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/modemmanager-qt-5.32.0.tar.xz"; + sha256 = "0ywyiq1kj4ya5knn0r12j9m1ig9mlyfypnrzihlvipddjrqs7jyd"; + name = "modemmanager-qt-5.32.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/networkmanager-qt-5.31.0.tar.xz"; - sha256 = "18wbmd4nsgwzqlp254k1ahy8iyydx59fshb3wci5sgxnsn435np4"; - name = "networkmanager-qt-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/networkmanager-qt-5.32.0.tar.xz"; + sha256 = "0bcy7nzfvx2xah3kxklmrjn08qbjddiny7wf7nkxsbc3kkhrxqyd"; + name = "networkmanager-qt-5.32.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/oxygen-icons5-5.31.0.tar.xz"; - sha256 = "0ka4zll8v8wahqg50vpm9mrxlyh9244y0yrprbwxzl9xpx113ppi"; - name = "oxygen-icons5-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/oxygen-icons5-5.32.0.tar.xz"; + sha256 = "05v3blgs4qbjl8s6470baahy9a98cfi3mplzp462axcgkqdj1nwf"; + name = "oxygen-icons5-5.32.0.tar.xz"; }; }; plasma-framework = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/plasma-framework-5.31.0.tar.xz"; - sha256 = "0hq3d96d9xhx6wqrrhnyygwajg69vfxbjc8dlpf5nwc3kqv2wim2"; - name = "plasma-framework-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/plasma-framework-5.32.0.tar.xz"; + sha256 = "1hrnmilc30d1kh20cky329i5ji3qyy7m4f8jzax5cgl7nrjca31h"; + name = "plasma-framework-5.32.0.tar.xz"; }; }; prison = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/prison-5.31.0.tar.xz"; - sha256 = "0qaqj5gazby4fdq9yii67cmr04i007blhl27h9c5p169khh9ck2s"; - name = "prison-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/prison-5.32.0.tar.xz"; + sha256 = "0q5cs60293bdm3mynhx39rjsh87mfxngxsqa2fqm2gsqjvlciyvr"; + name = "prison-5.32.0.tar.xz"; }; }; solid = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/solid-5.31.0.tar.xz"; - sha256 = "05rgzdzwbnmnvzkf4gz3z5i1ggwyd21y0yli7shas4i8l29kjd7m"; - name = "solid-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/solid-5.32.0.tar.xz"; + sha256 = "1jhymivravgix0sa0szkax50j09l5fl55xi3fbyjxlb4cil114v5"; + name = "solid-5.32.0.tar.xz"; }; }; sonnet = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/sonnet-5.31.0.tar.xz"; - sha256 = "16vzdhppb2w5vyfr332bcvw4dyw9cz4apxain28d43p0ir03xxz3"; - name = "sonnet-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/sonnet-5.32.0.tar.xz"; + sha256 = "17sjv48b3z5fgplsy16ilcw6p7mlqjs61ib6jqd1mqzv4xrr27yi"; + name = "sonnet-5.32.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/syntax-highlighting-5.31.0.tar.xz"; - sha256 = "0igd6jpbck94gl8gs5a5dgj2cxbv370prnk22037clqry6y38v1a"; - name = "syntax-highlighting-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/syntax-highlighting-5.32.0.tar.xz"; + sha256 = "1d9m7x53mwggwmhhba1c7b8v4f8qjql889y674ldpzs2nrk5y7x3"; + name = "syntax-highlighting-5.32.0.tar.xz"; }; }; threadweaver = { - version = "5.31.0"; + version = "5.32.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.31/threadweaver-5.31.0.tar.xz"; - sha256 = "0wsdv135mxpka0rfg9zwhnzp0svfkvd4idyj38rgipxbada0hb7f"; - name = "threadweaver-5.31.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.32/threadweaver-5.32.0.tar.xz"; + sha256 = "1qpy2rzqyd4ap5fibkfk87z66ijh2h79cd7f0h506jh2dbx20g0h"; + name = "threadweaver-5.32.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index 776a7646bd7..bd740b75758 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = [ maintainers.urkud ]; + maintainers = [ ]; license = stdenv.lib.licenses.lgpl3; description = "An opensource database of photographic lenses and their characteristics"; homepage = http://lensfun.sourceforge.net/; diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index ff256fb73c8..0c1c51d6f47 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -27,12 +27,17 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf ]; + propagatedBuildInputs = + if gtkVersion == "2" + then [ gtk2 libdbusmenu-gtk2 ] + else [ gtk3 libdbusmenu-gtk3 ]; + buildInputs = [ glib dbus_glib python pygobject2 pygtk gobjectIntrospection vala_0_23 ] ++ (if gtkVersion == "2" - then [ gtk2 libindicator-gtk2 libdbusmenu-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] - else [ gtk3 libindicator-gtk3 libdbusmenu-gtk3 ]); + then [ libindicator-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] + else [ libindicator-gtk3 ]); postPatch = '' substituteInPlace configure.ac \ diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 3528edcba12..b3345c47732 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/libass/libass; license = licenses.isc; platforms = platforms.unix; - maintainers = with maintainers; [ codyopel urkud ]; + maintainers = with maintainers; [ codyopel ]; repositories.git = git://github.com/libass/libass.git; }; } diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 6d81a284040..e0b4babc970 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -17,7 +17,7 @@ assert faacSupport -> enableUnfree; -with { inherit (stdenv.lib) optional optionals hasPrefix; }; +let inherit (stdenv.lib) optional optionals hasPrefix; in /* ToDo: - more deps, inspiration: http://packages.ubuntu.com/raring/libav-tools diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix new file mode 100644 index 00000000000..83bd81456c0 --- /dev/null +++ b/pkgs/development/libraries/libbap/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, bap, ocaml, findlib, ctypes, autoreconfHook, + which }: + +stdenv.mkDerivation rec { + name = "libbap-${version}"; + version = "master-2017-02-08"; + + src = fetchFromGitHub { + owner = "BinaryAnalysisPlatform"; + repo = "bap-bindings"; + rev = "b3da5bd5cdb3d646015ccdeb886b5ea8fd85a108"; + sha256 = "0cwfyfpxbi9bm4kkpamyd7mgsm5b6j1rh217fqb5gi05wg45rkbb"; + }; + + nativeBuildInputs = [ autoreconfHook which ]; + buildInputs = [ ocaml bap findlib ctypes ]; + + preInstall = '' + mkdir -p $out/lib + mkdir -p $out/include + ''; + + meta = { + homepage = http://github.com/binaryanalysisplatform/bap-bindings; + description = "A C library for interacting with BAP"; + maintainers = [ stdenv.lib.maintainers.maurer ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libblocksruntime/default.nix b/pkgs/development/libraries/libblocksruntime/default.nix new file mode 100644 index 00000000000..34ab70e0adc --- /dev/null +++ b/pkgs/development/libraries/libblocksruntime/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, clang }: + +stdenv.mkDerivation { + name = "blocksruntime"; + + src = fetchFromGitHub { + owner = "mackyle"; + repo = "blocksruntime"; + rev = "b5c5274daf1e0e46ecc9ad8f6f69889bce0a0a5d"; + sha256 = "0ic4lagagkylcvwgf10mg0s1i57h4i25ds2fzvms22xj4zwzk1sd"; + }; + + buildInputs = [ clang ]; + + configurePhase = '' + export CC=clang + export CXX=clang++ + ''; + + buildPhase = "./buildlib"; + + checkPhase = "./checktests"; + + doCheck = false; # hasdescriptor.c test fails, hrm. + + installPhase = ''prefix="/" DESTDIR=$out ./installlib''; +} diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index c5bf7fd7f98..8b67d52b875 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -19,13 +19,15 @@ assert withFonts -> freetype != null; stdenv.mkDerivation rec { name = "libbluray-${version}"; - version = "0.9.2"; + version = "1.0.0"; src = fetchurl { url = "http://get.videolan.org/libbluray/${version}/${name}.tar.bz2"; - sha256 = "1sp71j4agcsg17g6b85cqz78pn5vknl5pl39rvr6mkib5ps99jgg"; + sha256 = "1k3lag4lxi2jjd3zh4wcb5l3hadzm54j5kagh92yzfy76p9svqzp"; }; + patches = optional withJava ./BDJ-JARFILE-path.patch; + nativeBuildInputs = [ pkgconfig autoreconfHook ] ++ optionals withJava [ ant ] ; @@ -36,12 +38,15 @@ stdenv.mkDerivation rec { ++ optional withFonts freetype ; - propagatedBuildInputs = stdenv.lib.optional withAACS libaacs; + propagatedBuildInputs = optional withAACS libaacs; + + NIX_LDFLAGS = [ + (optionalString withAACS "-L${libaacs}/lib -laacs") + (optionalString withBDplus "-L${libbdplus}/lib -lbdplus") + ]; preConfigure = '' ${optionalString withJava ''export JDK_HOME="${jdk.home}"''} - ${optionalString withAACS ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${libaacs}/lib -laacs"''} - ${optionalString withBDplus ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${libbdplus}/lib -lbdplus"''} ''; configureFlags = with stdenv.lib; @@ -50,14 +55,11 @@ stdenv.mkDerivation rec { ++ optional (! withFonts) "--without-freetype" ; - # Fix search path for BDJ jarfile - patches = stdenv.lib.optional withJava ./BDJ-JARFILE-path.patch; - meta = with stdenv.lib; { - homepage = "http://www.videolan.org/developers/libbluray.html"; + homepage = http://www.videolan.org/developers/libbluray.html; description = "Library to access Blu-Ray disks for video playback"; license = licenses.lgpl21; - maintainers = [ maintainers.abbradar ]; + maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix index d49f4cc6a72..34ba39d799e 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/default.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Provides a Qt implementation of the DBusMenu spec"; inherit homepage; - maintainers = [ maintainers.urkud ]; + maintainers = [ ]; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/development/libraries/libdc1394/darwin-fixes.patch b/pkgs/development/libraries/libdc1394/darwin-fixes.patch new file mode 100644 index 00000000000..5356a111112 --- /dev/null +++ b/pkgs/development/libraries/libdc1394/darwin-fixes.patch @@ -0,0 +1,24 @@ +diff -Naur libdc1394-2.2.5-old/dc1394/bayer.c libdc1394-2.2.5-new/dc1394/bayer.c +--- libdc1394-2.2.5-old/dc1394/bayer.c 2016-10-11 02:19:10.000000000 -0400 ++++ libdc1394-2.2.5-new/dc1394/bayer.c 2017-03-28 17:59:02.000000000 -0400 +@@ -775,7 +775,7 @@ + { + uint8_t *outR, *outG, *outB; + register int i, j; +- uint tmp; ++ uint32_t tmp; + int st=sx*sy; + int p; + int sx2=sx<<1; +diff -Naur libdc1394-2.2.5-old/dc1394/macosx/capture.c libdc1394-2.2.5-new/dc1394/macosx/capture.c +--- libdc1394-2.2.5-old/dc1394/macosx/capture.c 2016-12-20 08:10:34.000000000 -0500 ++++ libdc1394-2.2.5-new/dc1394/macosx/capture.c 2017-03-28 17:58:38.000000000 -0400 +@@ -614,7 +614,7 @@ + dc1394video_frame_t * frame_tmp = capture->frames + next; + char ch; + +- if(craw->frames==NULL || craw->capture_is_set==0) { ++ if(craw->capture.frames==NULL || craw->capture_is_set==0) { + *frame=NULL; + return DC1394_CAPTURE_IS_NOT_SET; + } diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index c1d11ce87ee..036adcef74c 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isLinux libraw1394 ++ stdenv.lib.optional stdenv.isDarwin CoreServices; + patches = stdenv.lib.optional stdenv.isDarwin ./darwin-fixes.patch; + meta = with stdenv.lib; { homepage = http://sourceforge.net/projects/libdc1394/; description = "Capture and control API for IIDC compliant cameras"; diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index 68bd72f3e0f..20e74cdc151 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats"; license = licenses.lgpl2; platforms = platforms.mesaPlatforms; - maintainers = [ maintainers.phreedom maintainers.urkud ]; + maintainers = [ maintainers.phreedom ]; }; } diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/development/libraries/libdmtx/default.nix index 26cf2c023eb..390bb4ea9e4 100644 --- a/pkgs/development/libraries/libdmtx/default.nix +++ b/pkgs/development/libraries/libdmtx/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { description = "An open source software for reading and writing Data Matrix barcodes"; homepage = http://libdmtx.org; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index 3ff40141b16..a91acb23052 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "libevdev-1.4.6"; + name = "libevdev-1.5.6"; src = fetchurl { - url = "http://www.freedesktop.org/software/libevdev/${name}.tar.xz"; - sha256 = "1lrja526iyg48yw6i0dxdhyj63q9gwbgvj6xk1hskxzrqyhf2akv"; + url = "https://www.freedesktop.org/software/libevdev/${name}.tar.xz"; + sha256 = "1256ypz93039n6km4macg158fpmjgylhmcmk20pnklxicsfpxv7c"; }; buildInputs = [ python ]; diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index e35da9e8087..60400712e30 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -33,6 +33,6 @@ in stdenv.mkDerivation rec { description = "Library used by gtkpod to access the contents of an ipod"; license = "LGPL"; platforms = stdenv.lib.platforms.gnu; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index a22b99be8da..f2f062785b6 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2 , python, perl, gdk_pixbuf, libiconv, libintlOrEmpty }: -with { inherit (stdenv.lib) optionals; }; +let inherit (stdenv.lib) optionals; in stdenv.mkDerivation rec { name = "libgsf-1.14.41"; @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libxml2 glib gdk_pixbuf libiconv ] ++ libintlOrEmpty; + outputs = [ "out" "dev" ]; + doCheck = true; preCheck = "patchShebangs ./tests/"; diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 8901fef21fd..02e75788d01 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper , ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex -, gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen }: +, gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen, libapparmor }: stdenv.mkDerivation rec { name = "libguestfs-${version}"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { makeWrapper pkgconfig autoreconfHook ncurses cpio gperf perl cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig systemd fuse yajl libvirt gmp readline file hivex libintlperl GetoptLong - SysVirt numactl xen + SysVirt numactl xen libapparmor ]; configureFlags = "--disable-appliance --disable-daemon"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { postInstall = '' for bin in $out/bin/*; do wrapProgram "$bin" \ - --prefix "PATH" : "$out/bin:${hivex}/bin" \ + --prefix "PATH" : "$out/bin:${hivex}/bin:${qemu}/bin" \ --prefix "PERL5LIB" : "$PERL5LIB:$out/lib/perl5/site_perl" done ''; diff --git a/pkgs/development/libraries/libircclient/default.nix b/pkgs/development/libraries/libircclient/default.nix index 14e41961e0a..fef5e7278b8 100644 --- a/pkgs/development/libraries/libircclient/default.nix +++ b/pkgs/development/libraries/libircclient/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = http://www.ulduzsoft.com/libircclient/; license = licenses.lgpl3; maintainers = with maintainers; [ obadz ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libkate/default.nix b/pkgs/development/libraries/libkate/default.nix index aee95b1f1af..7a3eb9caa66 100644 --- a/pkgs/development/libraries/libkate/default.nix +++ b/pkgs/development/libraries/libkate/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { in an Ogg container. It can carry Unicode text, images, and animate them.''; homepage = http://code.google.com/p/libkate; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index ad578ac272b..0beb689090a 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { repositories.git = git://github.com/lastfm/liblastfm.git; description = "Official LastFM library"; inherit (qt4.meta) platforms; - maintainers = with stdenv.lib.maintainers; [ urkud phreedom ]; + maintainers = with stdenv.lib.maintainers; [ phreedom ]; }; } diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix index 3af1227c69b..e505871eb02 100644 --- a/pkgs/development/libraries/liblqr-1/default.nix +++ b/pkgs/development/libraries/liblqr-1/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { homepage = http://liblqr.wikidot.com; description = "Seam-carving C/C++ library called Liquid Rescaling"; platforms = platforms.all; - maintainers = [ maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libmms/default.nix b/pkgs/development/libraries/libmms/default.nix index 441b4ea7f9a..d1dd7860de4 100644 --- a/pkgs/development/libraries/libmms/default.nix +++ b/pkgs/development/libraries/libmms/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://libmms.sourceforge.net; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix index 103595bc035..ff627499855 100644 --- a/pkgs/development/libraries/libmng/default.nix +++ b/pkgs/development/libraries/libmng/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics"; homepage = http://www.libmng.com; license = licenses.zlib; - maintainers = with maintainers; [ marcweber urkud ]; + maintainers = with maintainers; [ marcweber ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index e1902263ac2..b187c213bee 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { systems. We implement MTP Basic, the stuff proposed for standardization. ''; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libmusicbrainz/2.x.nix b/pkgs/development/libraries/libmusicbrainz/2.x.nix index 4cad0c0f9f6..f12b854e778 100644 --- a/pkgs/development/libraries/libmusicbrainz/2.x.nix +++ b/pkgs/development/libraries/libmusicbrainz/2.x.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { The libmusicbrainz (also known as mb_client or MusicBrainz Client Library) is a development library geared towards developers who wish to add MusicBrainz lookup capabilities to their applications.''; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libmusicbrainz/5.x.nix b/pkgs/development/libraries/libmusicbrainz/5.x.nix index 5ec8f80f7e0..4765e90c6df 100644 --- a/pkgs/development/libraries/libmusicbrainz/5.x.nix +++ b/pkgs/development/libraries/libmusicbrainz/5.x.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { The libmusicbrainz (also known as mb_client or MusicBrainz Client Library) is a development library geared towards developers who wish to add MusicBrainz lookup capabilities to their applications.''; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/development/libraries/libmusicbrainz/default.nix index 99c253cdb35..596399c4fa8 100644 --- a/pkgs/development/libraries/libmusicbrainz/default.nix +++ b/pkgs/development/libraries/libmusicbrainz/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { The libmusicbrainz (also known as mb_client or MusicBrainz Client Library) is a development library geared towards developers who wish to add MusicBrainz lookup capabilities to their applications.''; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix index cdde02c361f..fe38755f10c 100644 --- a/pkgs/development/libraries/libnatspec/default.nix +++ b/pkgs/development/libraries/libnatspec/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (rec { homepage = http://natspec.sourceforge.net/ ; description = "A library intended to smooth national specificities in using of programs"; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } // stdenv.lib.optionalAttrs (!stdenv.isLinux) { NIX_LDFLAGS = "-liconv"; diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index 396e8e92acf..7927dba8983 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { homepage = http://libofx.sourceforge.net/; license = "LGPL"; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/development/libraries/liboggz/default.nix index 0689be2c621..83bb80cc320 100644 --- a/pkgs/development/libraries/liboggz/default.nix +++ b/pkgs/development/libraries/liboggz/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { interleaving data container developed by Monty at Xiph.Org, originally to support the Ogg Vorbis audio format but now used for many free codecs including Dirac, FLAC, Speex and Theora.''; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index b98fdbdb470..7ff44db52a8 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { meta = { homepage = http://github.com/JonathanBeck/libplist; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; knownVulnerabilities = [ "CVE-2017-5209: base64decode function in base64.c allows attackers to obtain sensitive information from process memory or cause a denial of service" "CVE-2017-5545: attackers to obtain sensitive information from process memory or cause a denial of service" diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 97929d29b37..163357a0c0f 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, pkgconfig, cmake -, dbus, networkmanager, spidermonkey_1_8_5 }: +, dbus, networkmanager, webkitgtk214x, pcre, python2 }: stdenv.mkDerivation rec { name = "libproxy-${version}"; @@ -16,7 +16,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ dbus networkmanager spidermonkey_1_8_5 ]; + buildInputs = [ dbus networkmanager webkitgtk214x pcre ]; + + cmakeFlags = [ + "-DWITH_WEBKIT3=ON" + "-DWITH_MOZJS=OFF" + "-DPYTHON_SITEPKG_DIR=$(out)/${python2.sitePackages}" + ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 734760c8830..abc0eb4a228 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An advanced calculator library"; homepage = http://qalculate.github.io; - maintainers = with maintainers; [ urkud gebner ]; + maintainers = with maintainers; [ gebner ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix index f84cfa044c6..1271089060b 100644 --- a/pkgs/development/libraries/librdf/raptor2.nix +++ b/pkgs/development/libraries/librdf/raptor2.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { description = "The RDF Parser Toolkit"; homepage = "http://librdf.org/raptor"; license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; - maintainers = with stdenv.lib.maintainers; [ marcweber urkud ]; + maintainers = with stdenv.lib.maintainers; [ marcweber ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix index 6a5e4578cac..8a0ca6f000d 100644 --- a/pkgs/development/libraries/librdf/rasqal.nix +++ b/pkgs/development/libraries/librdf/rasqal.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "Library that handles Resource Description Framework (RDF)"; homepage = "http://librdf.org/rasqal"; license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; - maintainers = with stdenv.lib.maintainers; [ marcweber urkud ]; + maintainers = with stdenv.lib.maintainers; [ marcweber ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix new file mode 100644 index 00000000000..dcec6b058fc --- /dev/null +++ b/pkgs/development/libraries/libspiro/default.nix @@ -0,0 +1,18 @@ +{stdenv, pkgconfig, fetchurl}: + +stdenv.mkDerivation rec { + name = "libspiro-${version}"; + version = "0.5.20150702"; + src = fetchurl { + url = "https://github.com/fontforge/libspiro/releases/download/${version}/${name}.tar.gz"; + sha256 = "0z4zpxd3nwwchqdsbmmjbp13aw5jg8v5p1993190bpykkrjlh6nv"; + }; + + nativeBuildInputs = [pkgconfig]; + + meta = with stdenv.lib; { + description = "A library that simplifies the drawing of beautiful curves"; + homepage = "https://github.com/fontforge/libspiro"; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 025a2ee37ff..1db053ef398 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SSH client library"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ sander urkud ]; + maintainers = with maintainers; [ sander ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index 0e53d27c889..4320cacc590 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { description = "A client-side C library implementing the SSH2 protocol"; homepage = http://www.libssh2.org; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 3a00408c7ca..d92674e59ef 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libtoxcore-${version}"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "TokTok"; repo = "c-toxcore"; rev = "v${version}"; - sha256 = "0a00gjar6ibaqa2cm81867nk7chsd141v360268v7ym2mxwa0ya6"; + sha256 = "11lqq825id174xdjxm0cy5dbyvmdy841hjy9q3l51yiya9f82d5b"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 947a10c0e47..5a76a93b8e3 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = http://www.libusb.info; description = "User-space USB library"; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index 0018e38a9f9..8cebaeee2af 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl , nettle, libgcrypt, pythonPackages, gobjectIntrospection, libcap_ng, numactl -, xen +, xen, libapparmor }: let @@ -15,9 +15,11 @@ in stdenv.mkDerivation rec { buildInputs = [ pkgconfig libvirt glib libxml2 intltool libtool yajl nettle libgcrypt - python pygobject2 gobjectIntrospection libcap_ng numactl xen + python pygobject2 gobjectIntrospection libcap_ng numactl xen libapparmor ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Library for working with virtual machines"; longDescription = '' diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 5fcdd153c99..96649a0927e 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,36 +1,38 @@ { stdenv, fetchurl, fetchpatch , pkgconfig, makeWrapper -, libxml2, gnutls, devicemapper, perl, python2 +, libxml2, gnutls, devicemapper, perl, python2, attr , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext -, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng +, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages , curl, libiconv, gmp, xen, zfs }: + +with stdenv.lib; + # if you update, also bump pythonPackages.libvirt or it will break stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.xz"; - sha256 = "0php6wxjcilpir0miwg06yd2ha25zi9fv2apvvgv5c8k1svjd7cx"; + sha256 = "1a9j6yqfy7i5yv414wk6nv26a5bpfyyg0rpcps6ybi6a1yd04ybq"; }; patches = [ ./build-on-bsd.patch ]; nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ - libxml2 gnutls perl python2 readline - gettext libtasn1 libgcrypt yajl - libxslt xhtml1 perlPackages.XMLXPath curl libpcap - ] ++ stdenv.lib.optionals stdenv.isLinux [ - libpciaccess devicemapper lvm2 utillinux systemd libcap_ng - libnl numad numactl xen zfs - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl + attr libxslt xhtml1 perlPackages.XMLXPath curl libpcap + ] ++ optionals stdenv.isLinux [ + libpciaccess devicemapper lvm2 utillinux systemd libnl numad zfs + libapparmor libcap_ng numactl xen + ] ++ optionals stdenv.isDarwin [ libiconv gmp ]; - preConfigure = stdenv.lib.optionalString stdenv.isLinux '' + preConfigure = optionalString stdenv.isLinux '' PATH=${stdenv.lib.makeBinPath [ iproute iptables ebtables lvm2 systemd ]}:$PATH substituteInPlace configure \ --replace 'as_dummy="/bin:/usr/bin:/usr/sbin"' 'as_dummy="${numad}/bin"' @@ -48,13 +50,16 @@ stdenv.mkDerivation rec { "--with-test" "--with-esx" "--with-remote" - ] ++ stdenv.lib.optionals stdenv.isLinux [ + ] ++ optionals stdenv.isLinux [ + "--with-attr" + "--with-apparmor" + "--with-secdriver-apparmor" "--with-numad" "--with-macvtap" "--with-virtualport" - "--with-init-script=redhat" + "--with-init-script=systemd+redhat" "--with-storage-zfs" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ optionals stdenv.isDarwin [ "--with-init-script=none" ]; @@ -66,17 +71,19 @@ stdenv.mkDerivation rec { postInstall = '' sed -i 's/ON_SHUTDOWN=suspend/ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}/' $out/libexec/libvirt-guests.sh substituteInPlace $out/libexec/libvirt-guests.sh \ - --replace "$out/bin" "${gettext}/bin" - '' + stdenv.lib.optionalString stdenv.isLinux '' + --replace "$out/bin" "${gettext}/bin" \ + --replace "lock/subsys" "lock" + rm $out/lib/systemd/system/{virtlockd,virtlogd}.* + '' + optionalString stdenv.isLinux '' wrapProgram $out/sbin/libvirtd \ - --prefix PATH : ${stdenv.lib.makeBinPath [ iptables iproute pmutils numad numactl ]} + --prefix PATH : ${makeBinPath [ iptables iproute pmutils numad numactl ]} ''; enableParallelBuilding = true; NIX_CFLAGS_COMPILE = "-fno-stack-protector"; - meta = with stdenv.lib; { + meta = { homepage = http://libvirt.org/; repositories.git = git://libvirt.org/libvirt.git; description = '' diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix index 0cb405d4837..57dfe34132f 100644 --- a/pkgs/development/libraries/libwpg/default.nix +++ b/pkgs/development/libraries/libwpg/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://libwpg.sourceforge.net; description = "C++ library to parse WPG"; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix new file mode 100644 index 00000000000..391606d59e6 --- /dev/null +++ b/pkgs/development/libraries/liquid-dsp/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "liquid-dsp-${version}"; + version = "20170307"; + + src = fetchFromGitHub { + owner = "jgaeddert"; + repo = "liquid-dsp"; + rev = "8c1978fa4f5662b8849fe712be716958f29cec0e"; + sha256 = "0zpxvdsrw0vzzp3iaag3wh4z8ygl7fkswgjppp2fz2zhhqh93k2w"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = { + homepage = http://liquidsdr.org/; + description = "Digital signal processing library for software-defined radios"; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; + }; + +} diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index 4259e52510b..03a940801e9 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace CMakeLists.txt \ + --replace " icule iculx" "" \ --replace "tidy/tidy.h" "tidy.h" \ --replace "/usr/include/tidy" "${libtidy}/include" \ --replace "/usr/include/libxml2" "${libxml2.dev}/include/libxml2" diff --git a/pkgs/development/libraries/martyr/builder.sh b/pkgs/development/libraries/martyr/builder.sh deleted file mode 100644 index 3ee7fc012d9..00000000000 --- a/pkgs/development/libraries/martyr/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -source $stdenv/setup - -mkdir -p $out -unpackPhase -cd $name -$apacheAnt/bin/ant -cp -R ./* $out diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix index 7fbd44b3fa4..3b610271539 100644 --- a/pkgs/development/libraries/martyr/default.nix +++ b/pkgs/development/libraries/martyr/default.nix @@ -1,11 +1,24 @@ -{stdenv, fetchurl, apacheAnt}: +{stdenv, fetchurl, ant, jdk}: -stdenv.mkDerivation { - name = "martyr-0.3.9"; - builder = ./builder.sh; +stdenv.mkDerivation rec { + name = "martyr-${version}"; + version = "0.3.9"; src = fetchurl { - url = "mirror://sourceforge/martyr/martyr-0.3.9.tar.gz"; + url = "mirror://sourceforge/martyr/${name}.tar.gz"; sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59"; }; - inherit stdenv apacheAnt; + + buildInputs = [ ant jdk ]; + + buildPhase = "ant"; + + installPhase = '' + mkdir -p "$out/share/java" + cp -v *.jar "$out/share/java" + ''; + + meta = { + description = "Martyr is a Java framework around the IRC protocol to allow application writers easy manipulation of the protocol and client state"; + homepage = http://martyr.sourceforge.net/; + }; } diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 1987bbd323e..ea8bd57766b 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -5,7 +5,9 @@ , libelf, libvdpau, python2 , grsecEnabled ? false , enableRadv ? false -, enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt +# Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa. +# It's overridden for mesa_drivers. +, enableTextureFloats ? false , galliumDrivers ? null , driDrivers ? null , vulkanDrivers ? null @@ -30,8 +32,10 @@ else let defaultGalliumDrivers = - if (stdenv.isArm || stdenv.isAarch64) - then ["nouveau" "freedreno" "vc4" "etnaviv"] + if stdenv.isArm + then ["nouveau" "freedreno" "vc4" "etnaviv" "imx"] + else if stdenv.isAarch64 + then ["nouveau" "vc4" ] else ["i915" "ilo" "r300" "r600" "radeonsi" "nouveau"]; defaultDriDrivers = if (stdenv.isArm || stdenv.isAarch64) @@ -63,7 +67,7 @@ let in let - version = "17.0.1"; + version = "17.0.2"; branch = head (splitString "." version); driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -78,7 +82,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" ]; - sha256 = "96fd70ef5f31d276a17e424e7e1bb79447ccbbe822b56844213ef932e7ad1b0c"; + sha256 = "f8f191f909e01e65de38d5bdea5fb057f21649a3aed20948be02348e77a689d4"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 2e51492f142..a28936fee49 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -32,6 +32,11 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 + + # Remove an unnecessary reference to movit.dev. + s=${movit.dev}/include + t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done) + sed -i $out/lib/mlt/libmltopengl.so -e "s|$s|$t|g" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 5b255bd2d2b..1d56d58c68d 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { ladspa-sdk ]; + outputs = [ "out" "dev" ]; + # Mostly taken from: # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine configureFlags = [ @@ -31,6 +33,16 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 + + # Remove an unnecessary reference to movit.dev. + s=${movit.dev}/include + t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done) + sed -i $out/lib/mlt/libmltopengl.so -e "s|$s|$t|g" + + # Remove an unnecessary reference to movit.dev. + s=${qtbase.dev}/include + t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done) + sed -i $out/lib/mlt/libmltqt.so -e "s|$s|$t|g" ''; passthru = { diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix index 48abf2b6151..741ca96348d 100644 --- a/pkgs/development/libraries/mp4v2/default.nix +++ b/pkgs/development/libraries/mp4v2/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.google.com/p/mp4v2; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index aee0b3d7116..3033c4301af 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig # Optional Dependencies -, openssl ? null, libev ? null, zlib ? null, libcares ? null +, openssl ? null, libev ? null, zlib ? null, c-ares ? null , enableHpack ? false, jansson ? null , enableAsioLib ? false, boost ? null , enableGetAssets ? false, libxml2 ? null @@ -13,22 +13,22 @@ assert enableAsioLib -> boost != null; assert enableGetAssets -> libxml2 != null; assert enableJemalloc -> jemalloc != null; -with { inherit (stdenv.lib) optional; }; +let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { name = "nghttp2-${version}"; - version = "1.19.0"; + version = "1.20.0"; # Don't use fetchFromGitHub since this needs a bootstrap curl src = fetchurl { url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2"; - sha256 = "477466eee27158d37b4478d9335dd091497cae4d7f2375fc6657beab67db9e7a"; + sha256 = "fb29d0500b194f11680203aed21aafab241063ec1397cc51ab5cc0957341141b"; }; outputs = [ "out" "dev" "lib" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl libev zlib libcares ] + buildInputs = [ openssl libev zlib c-ares ] ++ optional enableHpack jansson ++ optional enableAsioLib boost ++ optional enableGetAssets libxml2 @@ -36,8 +36,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + configureFlags = [ "--with-spdylay=no" "--disable-examples" "--disable-python-bindings" ] + ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib"; + + #doCheck = true; # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc + + meta = with stdenv.lib; { - homepage = http://nghttp2.org/; + homepage = https://nghttp2.org/; description = "A C implementation of HTTP/2"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index 8a5d5495260..2dcc7e9a53d 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -1,17 +1,16 @@ -{ stdenv, fetchgit, nix }: - +{ stdenv, fetchFromGitHub, nix, boehmgc }: +let version = "2.0.7"; in stdenv.mkDerivation { - name = "nix-plugins-1.0.0"; + name = "nix-plugins-${version}"; - src = fetchgit { - url = git://github.com/shlevy/nix-plugins.git; - rev = "refs/tags/1.0.0"; - sha256 = "1w7l4mdwgf5w1g48mbng4lcg2nihixvp835mg2j7gghnya309fxl"; + src = fetchFromGitHub { + owner = "shlevy"; + repo = "nix-plugins"; + rev = version; + sha256 = "1q4ydp2w114wbfm41m4qgrabha7ifa17xyz5dr137vvnj6njp4vs"; }; - buildInputs = [ nix ]; - - buildFlags = [ "NIX_INCLUDE=${nix}/include" ]; + buildFlags = [ "NIX_INCLUDE=${nix.dev}/include" "GC_INCLUDE=${boehmgc.dev}/include" ]; installFlags = [ "PREFIX=$(out)" ]; @@ -20,6 +19,5 @@ stdenv.mkDerivation { homepage = https://github.com/shlevy/nix-plugins; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; - broken = true; }; } diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 294371dde7a..e378c5b8a8a 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -16,7 +16,9 @@ in stdenv.mkDerivation rec { sha256 = "1wrx2ig6yvgywjs25hzy4szgml21hwhd7ds0ghyfybhkiq7lyg6x"; }; - buildInputs = [ nspr perl zlib sqlite ]; + buildInputs = [ perl zlib sqlite ]; + + propagatedBuildInputs = [ nspr ]; prePatch = '' xz -d < ${nssPEM} | patch -p1 diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index 564bf9f62e3..3483d4bed77 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { description = "Network Connectivity Tracking library for Desktop Applications"; homepage = https://launchpad.net/ntrack; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix index b124e592f36..61024a33113 100644 --- a/pkgs/development/libraries/openbabel/default.nix +++ b/pkgs/development/libraries/openbabel/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 2591a43f1d4..2009daa1cc8 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -9,7 +9,7 @@ let opensslCrossSystem = stdenv.cross.openssl.system or (throw "openssl needs its platform name cross building"); - common = args@{ version, sha256, patches ? [], configureFlags ? [], makeDepend ? false }: stdenv.mkDerivation rec { + common = args@{ version, sha256, patches ? [] }: stdenv.mkDerivation rec { name = "openssl-${version}"; src = fetchurl { @@ -19,7 +19,9 @@ let patches = (args.patches or []) - ++ optional (versionOlder version "1.1.0") ./use-etc-ssl-certs.patch + ++ [ ./nix-ssl-cert-file.patch ] + ++ optional (versionOlder version "1.1.0") + (if stdenv.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch) ++ optional stdenv.isCygwin ./1.0.1-cygwin64.patch ++ optional (versionOlder version "1.0.2" && (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem"))) @@ -45,10 +47,7 @@ let ] ++ stdenv.lib.optionals withCryptodev [ "-DHAVE_CRYPTODEV" "-DUSE_CRYPTODEV_DIGESTS" - ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2" - ++ args.configureFlags or []; - - postConfigure = if makeDepend then "make depend" else null; + ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2"; makeFlags = [ "MANDIR=$(man)/share/man" ]; @@ -119,12 +118,4 @@ in { sha256 = "0k47sdd9gs6yxfv6ldlgpld2lyzrkcv9kz4cf88ck04xjwc8dgjp"; }; - openssl_1_0_2-steam = common { - version = "1.0.2k"; - sha256 = "1h6qi35w6hv6rd73p4cdgdzg732pdrfgpp37cgwz1v9a3z37ffbb"; - configureFlags = [ "no-engine" ]; - makeDepend = true; - patches = [ ./openssl-fix-cpuid_setup.patch ]; - }; - } diff --git a/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch b/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch new file mode 100644 index 00000000000..b615f1482b7 --- /dev/null +++ b/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch @@ -0,0 +1,14 @@ +diff -ru -x '*~' openssl-1.0.2j-orig/crypto/x509/by_file.c openssl-1.0.2j/crypto/x509/by_file.c +--- openssl-1.0.2j-orig/crypto/x509/by_file.c 2016-09-26 11:49:07.000000000 +0200 ++++ openssl-1.0.2j/crypto/x509/by_file.c 2016-10-13 16:54:31.400288302 +0200 +@@ -97,7 +97,9 @@ + switch (cmd) { + case X509_L_FILE_LOAD: + if (argl == X509_FILETYPE_DEFAULT) { +- file = (char *)getenv(X509_get_default_cert_file_env()); ++ file = (char *)getenv("NIX_SSL_CERT_FILE"); ++ if (!file) ++ file = (char *)getenv(X509_get_default_cert_file_env()); + if (file) + ok = (X509_load_cert_crl_file(ctx, file, + X509_FILETYPE_PEM) != 0); diff --git a/pkgs/development/libraries/openssl/openssl-fix-cpuid_setup.patch b/pkgs/development/libraries/openssl/openssl-fix-cpuid_setup.patch deleted file mode 100644 index 4a2384ca3da..00000000000 --- a/pkgs/development/libraries/openssl/openssl-fix-cpuid_setup.patch +++ /dev/null @@ -1,105 +0,0 @@ -diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c -index 1925428..d2e42d2 100644 ---- a/crypto/cryptlib.c -+++ b/crypto/cryptlib.c -@@ -676,10 +676,15 @@ typedef unsigned __int64 IA32CAP; - # else - typedef unsigned long long IA32CAP; - # endif -+ -+/* Compat function for STEAM */ -+extern IA32CAP OPENSSL_ia32_cpuid_new(unsigned int*); -+IA32CAP OPENSSL_ia32_cpuid(void) { return OPENSSL_ia32_cpuid_new(OPENSSL_ia32cap_P); } -+ - void OPENSSL_cpuid_setup(void) - { - static int trigger = 0; -- IA32CAP OPENSSL_ia32_cpuid(unsigned int *); -+ IA32CAP OPENSSL_ia32_cpuid_new(unsigned int *); - IA32CAP vec; - char *env; - -@@ -697,9 +702,9 @@ void OPENSSL_cpuid_setup(void) - vec = strtoul(env + off, NULL, 0); - # endif - if (off) -- vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P) & ~vec; -+ vec = OPENSSL_ia32_cpuid_new(OPENSSL_ia32cap_P) & ~vec; - else if (env[0] == ':') -- vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P); -+ vec = OPENSSL_ia32_cpuid_new(OPENSSL_ia32cap_P); - - OPENSSL_ia32cap_P[2] = 0; - if ((env = strchr(env, ':'))) { -@@ -713,7 +718,7 @@ void OPENSSL_cpuid_setup(void) - OPENSSL_ia32cap_P[2] = vecx; - } - } else -- vec = OPENSSL_ia32_cpuid(OPENSSL_ia32cap_P); -+ vec = OPENSSL_ia32_cpuid_new(OPENSSL_ia32cap_P); - - /* - * |(1<<10) sets a reserved bit to signal that variable -diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h -index fba180a..b927c79 100644 ---- a/crypto/cryptlib.h -+++ b/crypto/cryptlib.h -@@ -99,6 +99,9 @@ extern "C" { - # define HEX_SIZE(type) (sizeof(type)*2) - - void OPENSSL_cpuid_setup(void); -+#pragma GCC visibility push(hidden) -+unsigned long long OPENSSL_ia32_cpuid(void); -+#pragma GCC visibility pop - extern unsigned int OPENSSL_ia32cap_P[]; - void OPENSSL_showfatal(const char *fmta, ...); - void *OPENSSL_stderr(void); -diff --git a/crypto/x86_64cpuid.pl b/crypto/x86_64cpuid.pl -index d208d02..d4c0b24 100644 ---- a/crypto/x86_64cpuid.pl -+++ b/crypto/x86_64cpuid.pl -@@ -52,10 +52,10 @@ OPENSSL_rdtsc: - ret - .size OPENSSL_rdtsc,.-OPENSSL_rdtsc - --.globl OPENSSL_ia32_cpuid --.type OPENSSL_ia32_cpuid,\@function,1 -+.globl OPENSSL_ia32_cpuid_new -+.type OPENSSL_ia32_cpuid_new,\@function,1 - .align 16 --OPENSSL_ia32_cpuid: -+OPENSSL_ia32_cpuid_new: - mov %rbx,%r8 # save %rbx - - xor %eax,%eax -@@ -181,7 +181,7 @@ OPENSSL_ia32_cpuid: - mov %r8,%rbx # restore %rbx - or %r9,%rax - ret --.size OPENSSL_ia32_cpuid,.-OPENSSL_ia32_cpuid -+.size OPENSSL_ia32_cpuid_new,.-OPENSSL_ia32_cpuid_new - - .globl OPENSSL_cleanse - .type OPENSSL_cleanse,\@abi-omnipotent -diff --git a/crypto/x86cpuid.pl b/crypto/x86cpuid.pl -index e95f627..0781010 100644 ---- a/crypto/x86cpuid.pl -+++ b/crypto/x86cpuid.pl -@@ -8,7 +8,7 @@ require "x86asm.pl"; - - for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } - --&function_begin("OPENSSL_ia32_cpuid"); -+&function_begin("OPENSSL_ia32_cpuid_new"); - &xor ("edx","edx"); - &pushf (); - &pop ("eax"); -@@ -153,7 +153,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); } - &mov ("eax","esi"); - &mov ("edx","ebp"); - &set_label("nocpuid"); --&function_end("OPENSSL_ia32_cpuid"); -+&function_end("OPENSSL_ia32_cpuid_new"); - - &external_label("OPENSSL_ia32cap_P"); - diff --git a/pkgs/development/libraries/openssl/use-etc-ssl-certs-darwin.patch b/pkgs/development/libraries/openssl/use-etc-ssl-certs-darwin.patch new file mode 100644 index 00000000000..3d9ee7e6a82 --- /dev/null +++ b/pkgs/development/libraries/openssl/use-etc-ssl-certs-darwin.patch @@ -0,0 +1,13 @@ +diff -ru -x '*~' openssl-1.0.1r-orig/crypto/cryptlib.h openssl-1.0.1r/crypto/cryptlib.h +--- openssl-1.0.1r-orig/crypto/cryptlib.h 2016-01-28 14:38:30.000000000 +0100 ++++ openssl-1.0.1r/crypto/cryptlib.h 2016-02-03 12:54:29.193165176 +0100 +@@ -81,8 +81,8 @@ + + # ifndef OPENSSL_SYS_VMS + # define X509_CERT_AREA OPENSSLDIR + # define X509_CERT_DIR OPENSSLDIR "/certs" +-# define X509_CERT_FILE OPENSSLDIR "/cert.pem" ++# define X509_CERT_FILE "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt" + # define X509_PRIVATE_DIR OPENSSLDIR "/private" + # else + # define X509_CERT_AREA "SSLROOT:[000000]" diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index c29a5da9f21..d0085752623 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -1,29 +1,39 @@ -{ stdenv, requireFile, libelf, gcc, glibc, patchelf, unzip, rpmextract, libaio }: +{ stdenv, requireFile, libelf, gcc, glibc, patchelf, unzip, rpmextract, libaio +, odbcSupport ? false, unixODBC +}: -let requireSource = version: part: hash: (requireFile rec { - name = "oracle-instantclient12.1-${part}-${version}.x86_64.rpm"; - message = '' - This Nix expression requires that ${name} already - be part of the store. Download the file - manually at +assert odbcSupport -> unixODBC != null; - http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html +let optional = stdenv.lib.optional; + optionalString = stdenv.lib.optionalString; + requireSource = version: part: hash: (requireFile rec { + name = "oracle-instantclient12.1-${part}-${version}.x86_64.rpm"; + message = '' + This Nix expression requires that ${name} already + be part of the store. Download the file + manually at - and add it to the Nix store with the following command: + http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html - nix-prefetch-url file://${name} ${hash} --type sha256 -''; - url = "http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html"; - sha256 = hash; -}); in stdenv.mkDerivation rec { + and add it to the Nix store using either: + nix-store --add-fixed sha256 ${name} + or + nix-prefetch-url --type sha256 file:///path/to/${name} + ''; + url = "http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html"; + sha256 = hash; + }); +in stdenv.mkDerivation rec { version = "12.1.0.2.0-1"; name = "oracle-instantclient-${version}"; srcBase = (requireSource version "basic" "f0e51e247cc3f210b950fd939ab1f696de9ca678d1eb179ba49ac73acb9a20ed"); srcDevel = (requireSource version "devel" "13b638882f07d6cfc06c85dc6b9eb5cac37064d3d594194b6b09d33483a08296"); srcSqlplus = (requireSource version "sqlplus" "16d87w1lii0ag47c8srnr7v4wfm9q4hy6gka8m3v6gp9cc065vam"); + srcOdbc = optionalString odbcSupport (requireSource version "odbc" "d3aa1a4957a2f15ced05921dab551ba823aa7925d8fcb58d5b3a7f624e4df063"); - buildInputs = [ glibc patchelf rpmextract ]; + buildInputs = [ glibc patchelf rpmextract ] ++ + optional odbcSupport unixODBC; buildCommand = '' mkdir -p "${name}" @@ -31,6 +41,9 @@ let requireSource = version: part: hash: (requireFile rec { ${rpmextract}/bin/rpmextract "${srcBase}" ${rpmextract}/bin/rpmextract "${srcDevel}" ${rpmextract}/bin/rpmextract "${srcSqlplus}" + ${optionalString odbcSupport '' + ${rpmextract}/bin/rpmextract "${srcOdbc}" + ''} mkdir -p "$out/"{bin,include,lib,"share/${name}/demo/"} mv "usr/share/oracle/12.1/client64/demo/"* "$out/share/${name}/demo/" @@ -46,6 +59,13 @@ let requireSource = version: part: hash: (requireFile rec { $lib done + for lib in $out/lib/libsqora*; do + test -f $lib || continue + chmod +x $lib + patchelf --force-rpath --set-rpath "$out/lib:${unixODBC}/lib" \ + $lib + done + for exe in $out/bin/sqlplus; do patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --force-rpath --set-rpath "$out/lib:${libaio}/lib" \ diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index fc63c1942c2..0888fba4eca 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://p11-glue.freedesktop.org/; platforms = platforms.all; - maintainers = with maintainers; [ urkud wkennington ]; + maintainers = with maintainers; [ wkennington ]; license = licenses.mit; }; } diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 22cf7be84d0..b90ff39dc1f 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { homepage = http://www.pango.org/; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ raskin urkud ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/pcre/CVE-2017-7186.patch b/pkgs/development/libraries/pcre/CVE-2017-7186.patch new file mode 100644 index 00000000000..e9e1997e47c --- /dev/null +++ b/pkgs/development/libraries/pcre/CVE-2017-7186.patch @@ -0,0 +1,52 @@ +--- a/pcre_internal.h 2016/05/21 13:34:44 1649 ++++ b/pcre_internal.h 2017/02/24 17:30:30 1688 +@@ -2772,6 +2772,9 @@ + extern const pcre_uint16 PRIV(ucd_stage2)[]; + extern const pcre_uint32 PRIV(ucp_gentype)[]; + extern const pcre_uint32 PRIV(ucp_gbtable)[]; ++#ifdef COMPILE_PCRE32 ++extern const ucd_record PRIV(dummy_ucd_record)[]; ++#endif + #ifdef SUPPORT_JIT + extern const int PRIV(ucp_typerange)[]; + #endif +@@ -2780,9 +2783,15 @@ + /* UCD access macros */ + + #define UCD_BLOCK_SIZE 128 +-#define GET_UCD(ch) (PRIV(ucd_records) + \ ++#define REAL_GET_UCD(ch) (PRIV(ucd_records) + \ + PRIV(ucd_stage2)[PRIV(ucd_stage1)[(int)(ch) / UCD_BLOCK_SIZE] * \ + UCD_BLOCK_SIZE + (int)(ch) % UCD_BLOCK_SIZE]) ++ ++#ifdef COMPILE_PCRE32 ++#define GET_UCD(ch) ((ch > 0x10ffff)? PRIV(dummy_ucd_record) : REAL_GET_UCD(ch)) ++#else ++#define GET_UCD(ch) REAL_GET_UCD(ch) ++#endif + + #define UCD_CHARTYPE(ch) GET_UCD(ch)->chartype + #define UCD_SCRIPT(ch) GET_UCD(ch)->script +--- a/pcre_ucd.c 2014/06/19 07:51:39 1490 ++++ b/pcre_ucd.c 2017/02/24 17:30:30 1688 +@@ -38,6 +38,20 @@ + const pcre_uint32 PRIV(ucd_caseless_sets)[] = {0}; + #else + ++/* If the 32-bit library is run in non-32-bit mode, character values ++greater than 0x10ffff may be encountered. For these we set up a ++special record. */ ++ ++#ifdef COMPILE_PCRE32 ++const ucd_record PRIV(dummy_ucd_record)[] = {{ ++ ucp_Common, /* script */ ++ ucp_Cn, /* type unassigned */ ++ ucp_gbOther, /* grapheme break property */ ++ 0, /* case set */ ++ 0, /* other case */ ++ }}; ++#endif ++ + /* When recompiling tables with a new Unicode version, please check the + types in this structure definition from pcre_internal.h (the actual + field names will be different): diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index d3499f3e15c..21de038f7d6 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; assert elem variant [ null "cpp" "pcre16" "pcre32" ]; let - version = "8.39"; + version = "8.40"; pname = if (variant == null) then "pcre" else if (variant == "cpp") then "pcre-cpp" else variant; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${version}.tar.bz2"; - sha256 = "12wyajlqx2v7dsh39ra9v9m5hibjkrl129q90bp32c28haghjn5q"; + sha256 = "1x7lpjn7jhk0n3sdvggxrlrhab8kkfjwl7qix0ypw9nlx8lpmqh0"; }; outputs = [ "bin" "dev" "out" "doc" "man" ]; @@ -29,6 +29,8 @@ in stdenv.mkDerivation rec { ] ++ optional (variant != null) "--enable-${variant}"; + patches = [ ./CVE-2017-7186.patch ]; + doCheck = with stdenv; !(isCygwin || isFreeBSD); # XXX: test failure on Cygwin # we are running out of stack on both freeBSDs on Hydra diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index d226a51d0f8..8df18530472 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "pcre2-${version}"; - version = "10.22"; + version = "10.23"; src = fetchurl { url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2"; - sha256 = "05pl338962d7syd1rbkg96916mq7d3amz1n2fjnm0v5cyhcldd5j"; + sha256 = "0vn5g0mkkp99mmzpissa06hpyj6pk9s4mlwbjqrjvw3ihy8rpiyz"; }; configureFlags = [ @@ -14,6 +14,23 @@ stdenv.mkDerivation rec { "--enable-jit" ]; + patches = [ + (fetchpatch { + name = "CVE-2017-7186-part1.patch"; + url = "https://vcs.pcre.org/pcre2/code/trunk/src/pcre2_ucd.c?view=patch&r1=316&r2=670&sortby=date"; + sha256 = "10yzglvbn7h06hg7zffr5zh378i5jihvx7d5gggkynws79vgwvfr"; + stripLen = 2; + addPrefixes = true; + }) + (fetchpatch { + name = "CVE-2017-7186-part2.patch"; + url = "https://vcs.pcre.org/pcre2/code/trunk/src/pcre2_internal.h?view=patch&r1=600&r2=670&sortby=date"; + sha256 = "1bggk7vd5hg0bjg96lj4h1lacmr6grq68dm6iz1n7vg3zf7virjn"; + stripLen = 2; + addPrefixes = true; + }) + ]; + outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ]; postFixup = '' diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix new file mode 100644 index 00000000000..0f971cff64d --- /dev/null +++ b/pkgs/development/libraries/poco/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, cmake, pkgconfig, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysql }: + +stdenv.mkDerivation rec { + name = "poco-${version}"; + + version = "1.7.8"; + + src = fetchurl { + url = "https://pocoproject.org/releases/${name}/${name}-all.tar.gz"; + sha256 = "17y6kvj4qdpb3p1im8n9qfylfh4bd2xsvbpn24jv97x7f146nhjf"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ zlib pcre expat sqlite openssl unixODBC libmysql ]; + + cmakeFlags = [ + "-DMYSQL_INCLUDE_DIR=${libmysql.dev}/include/mysql" + "-DPOCO_UNBUNDLED=ON" + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://pocoproject.org/; + description = "Cross-platform C++ libraries with a network/internet focus"; + license = licenses.boost; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index d7569c017a7..1ba82354033 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -10,8 +10,12 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng libidn expat ]; - nativeBuildInputs = [ cmake gcc5 pkgconfig ]; - buildInputs = [ lua5 stdenv.cc.libc ]; + + # Does Linux really need gcc5? Darwin doesn't seem to... + nativeBuildInputs = [ cmake pkgconfig ] ++ stdenv.lib.optional stdenv.isLinux gcc5; + + # Does Linux really need libc here? Darwin doesn't seem to... + buildInputs = [ lua5 ] ++ stdenv.lib.optional stdenv.isLinux stdenv.cc.libc; crossAttrs = { propagatedBuildInputs = [ zlib.crossDrv freetype.crossDrv libjpeg.crossDrv @@ -25,6 +29,6 @@ stdenv.mkDerivation rec { homepage = http://podofo.sourceforge.net; description = "A library to work with the PDF file format"; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 27482743d2c..c1f8725f6f7 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -72,6 +72,6 @@ stdenv.mkDerivation rec { homepage = http://www.freedesktop.org/wiki/Software/polkit; description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes"; platforms = platforms.linux; - maintainers = [ maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/prison/default.nix b/pkgs/development/libraries/prison/default.nix index 7beb93eb462..29ff988a226 100644 --- a/pkgs/development/libraries/prison/default.nix +++ b/pkgs/development/libraries/prison/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Qt4 library for QR-codes"; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index 6a951fddb79..2265d0df394 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Qt Cryptographic Architecture"; license = "LGPL"; homepage = http://delta.affinix.com/qca; - maintainers = [ maintainers.sander maintainers.urkud ]; + maintainers = [ maintainers.sander ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix index 1d4da00bf4c..6ab134a0306 100644 --- a/pkgs/development/libraries/qjson/default.nix +++ b/pkgs/development/libraries/qjson/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake qt4 ]; meta = { - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix index 5a448d33067..48a63e41234 100644 --- a/pkgs/development/libraries/qoauth/default.nix +++ b/pkgs/development/libraries/qoauth/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { meta = { description = "Qt library for OAuth authentication"; inherit (qt4.meta) platforms; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index d4b85e0dfe4..46bb7a4e8fa 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -54,6 +54,12 @@ stdenv.mkDerivation rec { # there might be more references, but this is the only one I could find substituteInPlace tools/macdeployqt/tests/tst_deployment_mac.cpp \ --replace /usr/lib/libstdc++.6.dylib "${stdenv.cc}/lib/libstdc++.6.dylib" + '' + stdenv.lib.optionalString stdenv.cc.isClang '' + substituteInPlace src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp \ + --replace 'optionalHeight > 0' 'optionalHeight != NULL' + + substituteInPlace ./tools/linguist/linguist/messagemodel.cpp \ + --replace 'm->comment()) >= 0' 'm->comment()) != NULL' ''; patches = @@ -211,7 +217,7 @@ stdenv.mkDerivation rec { homepage = http://qt-project.org/; description = "A cross-platform application framework for C++"; license = licenses.lgpl21Plus; # or gpl3 - maintainers = with maintainers; [ lovek323 phreedom sander urkud ]; + maintainers = with maintainers; [ lovek323 phreedom sander ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix deleted file mode 100644 index b7e8fb33387..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/default.nix +++ /dev/null @@ -1,130 +0,0 @@ -/* - -# Minor Updates - -1. Edit ./fetchsrcs.sh to point to the updated URL. -2. Run ./fetchsrcs.sh. -3. Build and enjoy. - -# Major Updates - -1. Make a copy of this directory. (We like to keep the old version around - for a short time after major updates.) -2. Delete the tmp/ subdirectory of the copy. -3. Follow the minor update instructions above. -4. Package any new Qt modules, if necessary. - -*/ - -{ - newScope, - stdenv, fetchurl, makeSetupHook, makeWrapper, - bison, cups ? null, harfbuzz, mesa, perl, - libgnomeui, GConf, gnome_vfs, - gstreamer, gst-plugins-base, - - # options - developerBuild ? false, - decryptSslTraffic ? false, -}: - -with stdenv.lib; - -let - - mirror = "http://download.qt.io"; - srcs = import ./srcs.nix { inherit mirror; inherit fetchurl; }; - - qtSubmodule = args: - let - inherit (args) name; - inherit (srcs."${args.name}") version src; - inherit (stdenv) mkDerivation; - in mkDerivation (args // { - name = "${name}-${version}"; - inherit src; - - propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); - nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ self.qmakeHook ]; - - NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true; - - outputs = args.outputs or [ "out" "dev" ]; - setOutputFlags = args.setOutputFlags or false; - - setupHook = ../qtsubmodule-setup-hook.sh; - - enableParallelBuilding = args.enableParallelBuilding or true; - - meta = self.qtbase.meta // (args.meta or {}); - }); - - addPackages = self: with self; - let - callPackage = self.newScope { inherit qtSubmodule srcs; }; - in { - - qtbase = callPackage ./qtbase { - inherit bison cups harfbuzz mesa; - # GNOME dependencies are not used unless gtkStyle == true - inherit libgnomeui GConf gnome_vfs; - inherit developerBuild decryptSslTraffic; - }; - - /* qt3d = not packaged */ - /* qtactiveqt = not packaged */ - /* qtandroidextras = not packaged */ - /* qtcanvas3d = not packaged */ - qtconnectivity = callPackage ./qtconnectivity.nix {}; - qtdeclarative = callPackage ./qtdeclarative {}; - qtdoc = callPackage ./qtdoc.nix {}; - qtenginio = callPackage ./qtenginio.nix {}; - qtgraphicaleffects = callPackage ./qtgraphicaleffects.nix {}; - qtimageformats = callPackage ./qtimageformats.nix {}; - qtlocation = callPackage ./qtlocation.nix {}; - /* qtmacextras = not packaged */ - qtmultimedia = callPackage ./qtmultimedia.nix { - inherit gstreamer gst-plugins-base; - }; - qtquick1 = callPackage ./qtquick1 {}; - qtquickcontrols = callPackage ./qtquickcontrols.nix {}; - qtquickcontrols2 = null; - qtscript = callPackage ./qtscript {}; - qtsensors = callPackage ./qtsensors.nix {}; - qtserialport = callPackage ./qtserialport {}; - qtsvg = callPackage ./qtsvg.nix {}; - qttools = callPackage ./qttools {}; - qttranslations = callPackage ./qttranslations.nix {}; - /* qtwayland = not packaged */ - /* qtwebchannel = not packaged */ - /* qtwebengine = not packaged */ - qtwebkit = callPackage ./qtwebkit {}; - qtwebkit-examples = callPackage ./qtwebkit-examples.nix {}; - qtwebsockets = callPackage ./qtwebsockets.nix {}; - /* qtwinextras = not packaged */ - qtx11extras = callPackage ./qtx11extras.nix {}; - qtxmlpatterns = callPackage ./qtxmlpatterns.nix {}; - - env = callPackage ../qt-env.nix {}; - full = env "qt-${qtbase.version}" [ - qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects qtimageformats - qtlocation qtmultimedia qtquick1 qtquickcontrols qtscript qtsensors qtserialport - qtsvg qttools qttranslations qtwebkit qtwebkit-examples qtwebsockets qtx11extras - qtxmlpatterns - ]; - - makeQtWrapper = - makeSetupHook - { deps = [ makeWrapper ]; } - ../make-qt-wrapper.sh; - - qmakeHook = - makeSetupHook - { deps = [ self.qtbase.dev ]; } - ../qmake-hook.sh; - - }; - - self = makeScope newScope addPackages; - -in self diff --git a/pkgs/development/libraries/qt-5/5.5/fetch.sh b/pkgs/development/libraries/qt-5/5.5/fetch.sh deleted file mode 100755 index 512d985f346..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/fetch.sh +++ /dev/null @@ -1,3 +0,0 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/ \ - http://download.qt.io/community_releases/5.5/5.5.1/ \ - -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/cmake-paths.patch deleted file mode 100644 index 63c4ab7256a..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/cmake-paths.patch +++ /dev/null @@ -1,321 +0,0 @@ -Index: qtbase-opensource-src-5.6.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -=================================================================== ---- qtbase-opensource-src-5.6.0.orig/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -+++ qtbase-opensource-src-5.6.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) - endif() - !!ENDIF - --!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) --!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) --set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") --!!ELSE --get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH) --# Use original install prefix when loaded through a --# cross-prefix symbolic link such as /lib -> /usr/lib. --get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH) --get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH) --if(_realCurr STREQUAL _realOrig) -- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE) --else() -- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) --endif() --unset(_realOrig) --unset(_realCurr) --unset(_IMPORT_PREFIX) --!!ENDIF --!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) --get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) --!!ELSE --set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") --!!ENDIF -- - !!IF !equals(TEMPLATE, aux) - # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. - set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)") -@@ -59,7 +35,10 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - - !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") -+ set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") -+ if(NOT EXISTS \"${imported_location}\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") -+ endif() - !!ELSE - set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") - !!ENDIF -@@ -74,45 +53,18 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta - \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" - ) - --!!IF !isEmpty(CMAKE_WINDOWS_BUILD) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") --!!ELSE -- set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") --!!ENDIF -- _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) -- if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") -- set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -- \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib} -- ) -- endif() --!!ENDIF - endmacro() - !!ENDIF - - if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - - !!IF !no_module_headers --!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) -- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\" -- ) --!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) -- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" -- ) --!!ELSE -- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") --!!ENDIF --!!ELSE - !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) -- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") -+ set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR\" \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") - !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" -+ \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" -+ \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" - ) - !!ELSE - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") -@@ -128,7 +80,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") - !!ENDIF - !!ENDIF --!!ENDIF -+ - !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) - include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) - !!ENDIF -@@ -253,28 +205,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME - - !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) - !!IF isEmpty(CMAKE_DEBUG_TYPE) --!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE -- if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE -- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) --!!ELSE // CMAKE_STATIC_WINDOWS_BUILD - if (EXISTS - !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" -+ \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" - !!ELSE - \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" - !!ENDIF - AND EXISTS - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) -+ \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) - !!ELSE - \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) - !!ENDIF - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - endif() - !!ENDIF // CMAKE_DEBUG_TYPE - !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD -@@ -282,36 +225,23 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME - !!ENDIF // CMAKE_RELEASE_TYPE - - !!IF !isEmpty(CMAKE_DEBUG_TYPE) --!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) -- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) --!!ELSE - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - - !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) - !!IF isEmpty(CMAKE_RELEASE_TYPE) --!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE -- if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE -- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" ) --!!ELSE // CMAKE_STATIC_WINDOWS_BUILD - if (EXISTS - !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" -+ \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" - !!ELSE - \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" - !!ENDIF - AND EXISTS - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) -+ \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) - !!ELSE - \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) - !!ENDIF - _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - endif() - !!ENDIF // CMAKE_RELEASE_TYPE - !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD -@@ -329,7 +259,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME - set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - - !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") -+ set(imported_location \"@NIX_OUT@/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") - !!ELSE - set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") - !!ENDIF -Index: qtbase-opensource-src-5.6.0/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in -=================================================================== ---- qtbase-opensource-src-5.6.0.orig/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in -+++ qtbase-opensource-src-5.6.0/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in -@@ -2,7 +2,7 @@ - !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) - - !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) --set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\") -+set(Qt5Gui_EGL_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR/QtANGLE\") - !!ELSE - set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") - !!ENDIF -@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_propert - set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - - !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") -+ set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") - !!ELSE - set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") - !!ENDIF - - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") -+ set(imported_implib \"@NIX_DEV@/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") - !!ELSE - set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") - !!ENDIF -Index: qtbase-opensource-src-5.6.0/qtbase/src/widgets/Qt5WidgetsConfigExtras.cmake.in -=================================================================== ---- qtbase-opensource-src-5.6.0.orig/qtbase/src/widgets/Qt5WidgetsConfigExtras.cmake.in -+++ qtbase-opensource-src-5.6.0/qtbase/src/widgets/Qt5WidgetsConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) - add_executable(Qt5::uic IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") - !!ENDIF -Index: qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtras.cmake.in -=================================================================== ---- qtbase-opensource-src-5.6.0.orig/qtbase/src/corelib/Qt5CoreConfigExtras.cmake.in -+++ qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) - add_executable(Qt5::qmake IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) - add_executable(Qt5::moc IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc) - add_executable(Qt5::rcc IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -131,7 +131,7 @@ if (NOT TARGET Qt5::WinMain) - !!IF !isEmpty(CMAKE_RELEASE_TYPE) - set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") - !!ELSE - set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") - !!ENDIF -@@ -145,7 +145,7 @@ if (NOT TARGET Qt5::WinMain) - set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) - - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") - !!ELSE - set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") - !!ENDIF -Index: qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -=================================================================== ---- qtbase-opensource-src-5.6.0.orig/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -+++ qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -@@ -1,6 +1,6 @@ - - !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) --set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") -+set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") - !!ELSE - set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") - !!ENDIF -Index: qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -=================================================================== ---- qtbase-opensource-src-5.6.0.orig/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -+++ qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -@@ -1,6 +1,6 @@ - - !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) --set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") -+set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") - !!ELSE - set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") - !!ENDIF -Index: qtbase-opensource-src-5.6.0/src/qtbase/dbus/Qt5DBusConfigExtras.cmake.in -=================================================================== ---- qtbase-opensource-src-5.6.0.orig/qtbase/src/dbus/Qt5DBusConfigExtras.cmake.in -+++ qtbase-opensource-src-5.6.0/qtbase/src/dbus/Qt5DBusConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) - add_executable(Qt5::qdbuscpp2xml IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp) - add_executable(Qt5::qdbusxml2cpp IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") - !!ENDIF diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/compose-search-path.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/compose-search-path.patch deleted file mode 100644 index 08d12087f08..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/compose-search-path.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -=================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -@@ -68,10 +68,7 @@ void TableGenerator::initPossibleLocatio - // the QTCOMPOSE environment variable - if (qEnvironmentVariableIsSet("QTCOMPOSE")) - m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE"))); -- m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale")); -- m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale")); -- m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale")); -- m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale")); -+ m_possibleLocations.append(QStringLiteral("${libX11}/share/X11/locale")); - m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale")); - m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale")); - } diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/decrypt-ssl-traffic.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/decrypt-ssl-traffic.patch deleted file mode 100644 index 2cb3f7dfa70..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/decrypt-ssl-traffic.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/ssl/qsslsocket_openssl.cpp -=================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/ssl/qsslsocket_openssl.cpp -+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/ssl/qsslsocket_openssl.cpp -@@ -48,7 +48,7 @@ - ****************************************************************************/ - - //#define QSSLSOCKET_DEBUG --//#define QT_DECRYPT_SSL_TRAFFIC -+#define QT_DECRYPT_SSL_TRAFFIC - - #include "qssl_p.h" - #include "qsslsocket_openssl_p.h" diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix deleted file mode 100644 index c4e7689efa2..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix +++ /dev/null @@ -1,293 +0,0 @@ -{ stdenv, lib, fetchpatch, copyPathsToStore -, srcs - -, xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi -, xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon -, fontconfig, freetype, harfbuzz -, openssl, dbus, glib, udev, libxml2, libxslt, pcre16 -, zlib, libjpeg, libpng, libtiff, sqlite, icu - -, coreutils, bison, flex, gdb, gperf, lndir -, patchelf, perl, pkgconfig, python2 - -# optional dependencies -, cups ? null -, mysql ? null, postgresql ? null - -# options -, mesaSupported, mesa -, buildExamples ? false -, buildTests ? false -, developerBuild ? false -, libgnomeui, GConf, gnome_vfs, gtk2 -, decryptSslTraffic ? false -}: - -let - inherit (srcs.qt5) version; - system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64; - - # Search path for Gtk plugin - gtkLibPath = lib.makeLibraryPath [ gtk2 gnome_vfs libgnomeui GConf ]; - - dontInvalidateBacking = fetchpatch { - url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=0f68f8920573cdce1729a285a92ac8582df32841;hp=24c50f8dcf7fa61ac3c3d4d6295c259a104a2b8c"; - name = "qtbug-48321-dont-invalidate-backing-store.patch"; - sha256 = "1wynm2hhbhpvzvsz4vpzzkl0ss5skac6934bva8brcpi5xq68h1q"; - }; -in - -stdenv.mkDerivation { - - name = "qtbase-${version}"; - inherit version; - - srcs = with srcs; [ qt5.src qtbase.src ]; - - sourceRoot = "qt-everywhere-opensource-src-${version}"; - - outputs = [ "out" "dev" "gtk" ]; - - postUnpack = '' - mv qtbase-opensource-src-${version} ./qt-everywhere-opensource-src-${version}/qtbase - ''; - - patches = - copyPathsToStore (lib.readPathsFromFile ./. ./series) - ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch - ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; - - postPatch = - '' - cd qtbase - patch -p1 <${dontInvalidateBacking} - cd .. - - substituteInPlace configure --replace /bin/pwd pwd - substituteInPlace qtbase/configure --replace /bin/pwd pwd - substituteInPlace qtbase/src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls - sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf - - sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5Config.cmake.in" - sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5CoreMacros.cmake" - sed -i 's/NO_DEFAULT_PATH//' "qtbase/src/gui/Qt5GuiConfigExtras.cmake.in" - sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in" - - substituteInPlace qtbase/src/network/kernel/qdnslookup_unix.cpp \ - --replace "@glibc@" "${stdenv.cc.libc.out}" - substituteInPlace qtbase/src/network/kernel/qhostinfo_unix.cpp \ - --replace "@glibc@" "${stdenv.cc.libc.out}" - - substituteInPlace qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp \ - --replace "@libXcursor@" "${libXcursor.out}" - - substituteInPlace qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp \ - --replace "@openssl@" "${openssl.out}" - - substituteInPlace qtbase/src/dbus/qdbus_symbols.cpp \ - --replace "@dbus_libs@" "${dbus.lib}" - - substituteInPlace \ - qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ - --replace "@libX11@" "${libX11.out}" - '' - + lib.optionalString mesaSupported '' - substituteInPlace \ - qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \ - --replace "@mesa_lib@" "${mesa.out}" - substituteInPlace qtbase/mkspecs/common/linux.conf \ - --replace "@mesa_lib@" "${mesa.out}" \ - --replace "@mesa_inc@" "${mesa.dev}" - ''; - - - setOutputFlags = false; - preConfigure = '' - export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$LD_LIBRARY_PATH" - export MAKEFLAGS=-j$NIX_BUILD_CORES - - configureFlags+="\ - -plugindir $out/lib/qt5/plugins \ - -importdir $out/lib/qt5/imports \ - -qmldir $out/lib/qt5/qml \ - -docdir $out/share/doc/qt5" - ''; - - prefixKey = "-prefix "; - - # -no-eglfs, -no-directfb, -no-linuxfb and -no-kms because of the current minimalist mesa - # TODO Remove obsolete and useless flags once the build will be totally mastered - configureFlags = '' - -verbose - -confirm-license - -opensource - - -release - -shared - -c++11 - ${lib.optionalString developerBuild "-developer-build"} - -largefile - -accessibility - -rpath - -optimized-qmake - -strip - -no-reduce-relocations - -system-proxies - -pkg-config - - -gui - -widgets - -opengl desktop - -qml-debug - -nis - -iconv - -icu - -pch - -glib - -xcb - -qpa xcb - -${lib.optionalString (cups == null) "no-"}cups - -gtkstyle - - -no-eglfs - -no-directfb - -no-linuxfb - -no-kms - - ${lib.optionalString (!system-x86_64) "-no-sse2"} - -no-sse3 - -no-ssse3 - -no-sse4.1 - -no-sse4.2 - -no-avx - -no-avx2 - -no-mips_dsp - -no-mips_dspr2 - - -system-zlib - -system-libpng - -system-libjpeg - -system-harfbuzz - -system-xcb - -system-xkbcommon - -system-pcre - -openssl-linked - -dbus-linked - - -system-sqlite - -${if mysql != null then "plugin" else "no"}-sql-mysql - -${if postgresql != null then "plugin" else "no"}-sql-psql - - -make libs - -make tools - -${lib.optionalString (buildExamples == false) "no"}make examples - -${lib.optionalString (buildTests == false) "no"}make tests - ''; - - # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag - # if dependency paths contain the string "pq", which can occur in the hash. - # To prevent these failures, we need to override PostgreSQL detection. - PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq"; - - propagatedBuildInputs = [ - dbus glib libxml2 libxslt openssl pcre16 sqlite udev zlib - - # Image formats - libjpeg libpng libtiff - - # Text rendering - fontconfig freetype harfbuzz icu - - # X11 libs - xlibs.libXcomposite libX11 libxcb libXext libXrender libXi - xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon - ] - ++ lib.optional mesaSupported mesa; - - buildInputs = - [ bison flex gperf ] - ++ lib.optional developerBuild gdb - ++ lib.optional (cups != null) cups - ++ lib.optional (mysql != null) mysql.lib - ++ lib.optional (postgresql != null) postgresql - # FIXME: move to the main list on rebuild. - ++ [gnome_vfs.out libgnomeui.out gtk2 GConf]; - - nativeBuildInputs = [ lndir patchelf perl pkgconfig python2 ]; - - # freetype-2.5.4 changed signedness of some struct fields - NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; - - postInstall = '' - find "$out" -name "*.cmake" | while read file; do - substituteInPlace "$file" \ - --subst-var-by NIX_OUT "$out" \ - --subst-var-by NIX_DEV "$dev" - done - ''; - - preFixup = '' - # We cannot simply set these paths in configureFlags because libQtCore retains - # references to the paths it was built with. - moveToOutput "bin" "$dev" - moveToOutput "include" "$dev" - moveToOutput "mkspecs" "$dev" - - # The destination directory must exist or moveToOutput will do nothing - mkdir -p "$dev/share" - moveToOutput "share/doc" "$dev" - - # Move the QGtkStyle plugin to the gtk output - mkdir -p "$gtk/lib/qt5/plugins/platformthemes" - mv "$out/lib/qt5/plugins/platformthemes/libqgtk2.so" "$gtk/lib/qt5/plugins/platformthemes" - rm "$out/lib/cmake/Qt5Gui/Qt5Gui_QGtk2ThemePlugin.cmake" - - # Set RPATH for QGtkStyle plugin - qgtk2="$gtk/lib/qt5/plugins/platformthemes/libqgtk2.so" - qgtk2_RPATH="$(patchelf --print-rpath "$qgtk2")" - qgtk2_RPATH="$qgtk2_RPATH''${qgtk2_RPATH:+:}${gtkLibPath}" - patchelf "$qgtk2" \ - --add-needed libgtk-x11-2.0.so \ - --add-needed libgnomeui-2.so \ - --add-needed libgnomevfs-2.so \ - --add-needed libgconf-2.so \ - --set-rpath "$qgtk2_RPATH" - ''; - - postFixup = - '' - # Don't retain build-time dependencies like gdb. - sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri - - # Move libtool archives and qmake projects - if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then - pushd "''${!outputLib}" - find lib -name '*.a' -o -name '*.la' -o -name '*.prl' | \ - while read -r file; do - mkdir -p "''${!outputDev}/$(dirname "$file")" - mv "''${!outputLib}/$file" "''${!outputDev}/$file" - done - popd - fi - '' - - # fixup .pc file (where to find 'moc' etc.) - + lib.optionalString (!stdenv.isDarwin) '' - sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \ - -e "/^host_bins=/ c host_bins=$dev/bin" - ''; - - inherit lndir; - setupHook = ../../qtbase-setup-hook.sh; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = http://www.qt.io; - description = "A cross-platform application framework for C++"; - license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; - maintainers = with maintainers; [ bbenoist qknight ttuegel ]; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-dbus.patch deleted file mode 100644 index 401cfd5c295..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-dbus.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/dbus/qdbus_symbols.cpp -=================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/dbus/qdbus_symbols.cpp -+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/dbus/qdbus_symbols.cpp -@@ -89,7 +89,7 @@ bool qdbus_loadLibDBus() - #ifdef Q_OS_WIN - QLatin1String("dbus-1"), - #endif -- QLatin1String("libdbus-1") -+ QLatin1String("@dbus_libs@/lib/libdbus-1") - }; - - lib->unload(); diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch deleted file mode 100644 index 59f510ac54d..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -=================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -@@ -563,7 +563,12 @@ void (*QGLXContext::getProcAddress(const - { - extern const QString qt_gl_library_name(); - // QLibrary lib(qt_gl_library_name()); -+ // Check system library paths first - QLibrary lib(QLatin1String("GL")); -+ if (!lib.load()) { -+ // Fallback to Mesa driver -+ lib.setFileName(QLatin1String("@mesa_lib@/lib/libGL")); -+ } - glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); - } - } diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-libXcursor.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-libXcursor.patch deleted file mode 100644 index e66ce1676d3..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-libXcursor.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp -=================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp -+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp -@@ -303,10 +303,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *c - #ifdef XCB_USE_XLIB - static bool function_ptrs_not_initialized = true; - if (function_ptrs_not_initialized) { -- QLibrary xcursorLib(QLatin1String("Xcursor"), 1); -+ QLibrary xcursorLib(QLatin1String("@libXcursor@/lib/libXcursor"), 1); - bool xcursorFound = xcursorLib.load(); - if (!xcursorFound) { // try without the version number -- xcursorLib.setFileName(QLatin1String("Xcursor")); -+ xcursorLib.setFileName(QLatin1String("@libXcursor@/lib/Xcursor")); - xcursorFound = xcursorLib.load(); - } - if (xcursorFound) { diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-openssl.patch deleted file mode 100644 index 1cc6fac583b..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-openssl.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp -=================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp -+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp -@@ -640,8 +640,8 @@ static QPair loadO - #endif - #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so - // first attempt: the canonical name is libssl.so. -- libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER)); -- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER)); -+ libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), QLatin1String(SHLIB_VERSION_NUMBER)); -+ libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER)); - if (libcrypto->load() && libssl->load()) { - // libssl.so. and libcrypto.so. found - return pair; -@@ -658,8 +658,8 @@ static QPair loadO - // OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third - // attempt, _after_ /Contents/Frameworks has been searched. - // iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place. -- libssl->setFileNameAndVersion(QLatin1String("ssl"), -1); -- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1); -+ libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), -1); -+ libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), -1); - if (libcrypto->load() && libssl->load()) { - // libssl.so.0 and libcrypto.so.0 found - return pair; diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch deleted file mode 100644 index 20e56bf3149..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qdnslookup_unix.cpp -=================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/kernel/qdnslookup_unix.cpp -+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qdnslookup_unix.cpp -@@ -79,7 +79,7 @@ static void resolveLibrary() - if (!lib.load()) - #endif - { -- lib.setFileName(QLatin1String("resolv")); -+ lib.setFileName(QLatin1String("@glibc@/lib/resolv")); - if (!lib.load()) - return; - } -Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qhostinfo_unix.cpp -=================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/kernel/qhostinfo_unix.cpp -+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qhostinfo_unix.cpp -@@ -95,7 +95,7 @@ static void resolveLibrary() - if (!lib.load()) - #endif - { -- lib.setFileName(QLatin1String("resolv")); -+ lib.setFileName(QLatin1String("@glibc@/lib/libresolv")); - if (!lib.load()) - return; - } diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/libressl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/libressl.patch deleted file mode 100644 index e483ad14e05..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/libressl.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 81494e67eccba04fc3fe554d76a9ca6fe7f2250e Mon Sep 17 00:00:00 2001 -From: hasufell -Date: Sat, 10 Oct 2015 01:15:01 +0200 -Subject: [PATCH] Fix compilation with libressl - -By additionally checking for defined(SSL_CTRL_SET_CURVES), which -is defined in openssl, but not in libressl. ---- - src/network/ssl/qsslcontext_openssl.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/qtbase/src/network/ssl/qsslcontext_openssl.cpp b/qtbase/src/network/ssl/qsslcontext_openssl.cpp -index b88ab54..cfc4f6d 100644 ---- a/qtbase/src/network/ssl/qsslcontext_openssl.cpp -+++ b/qtbase/src/network/ssl/qsslcontext_openssl.cpp -@@ -338,7 +338,7 @@ init_context: - - const QVector qcurves = sslContext->sslConfiguration.ellipticCurves(); - if (!qcurves.isEmpty()) { --#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC) - // Set the curves to be used - if (q_SSLeay() >= 0x10002000L) { - // SSL_CTX_ctrl wants a non-const pointer as last argument, -@@ -352,7 +352,7 @@ init_context: - return sslContext; - } - } else --#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) -+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC) - { - // specific curves requested, but not possible to set -> error - sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version too old, need at least v1.0.2")); --- -2.6.0 - diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch deleted file mode 100644 index 56ee0a411d4..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: qt-everywhere-opensource-src-5.5.1/qtbase/mkspecs/common/linux.conf -=================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/mkspecs/common/linux.conf -+++ qt-everywhere-opensource-src-5.5.1/qtbase/mkspecs/common/linux.conf -@@ -12,8 +12,8 @@ QMAKE_INCDIR = - QMAKE_LIBDIR = - QMAKE_INCDIR_X11 = - QMAKE_LIBDIR_X11 = --QMAKE_INCDIR_OPENGL = --QMAKE_LIBDIR_OPENGL = -+QMAKE_INCDIR_OPENGL = @mesa_inc@/include -+QMAKE_LIBDIR_OPENGL = @mesa_lib@/lib - QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL - QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL - QMAKE_INCDIR_EGL = diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/nix-profiles-library-paths.patch deleted file mode 100644 index b4561db6e77..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/nix-profiles-library-paths.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/kernel/qcoreapplication.cpp -=================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/corelib/kernel/qcoreapplication.cpp -+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/kernel/qcoreapplication.cpp -@@ -2498,6 +2498,16 @@ QStringList QCoreApplication::libraryPat - } - } - } -+ qunsetenv("QT_PLUGIN_PATH"); // do not propagate to child processes -+ -+ // Add library paths derived from NIX_PROFILES. -+ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' '); -+ const QString plugindir = QString::fromLatin1("/lib/qt5/plugins"); -+ Q_FOREACH (const QByteArray &profile, profiles) { -+ if (!profile.isEmpty()) { -+ app_libpaths->append(QFile::decodeName(profile) + plugindir); -+ } -+ } - } - return *(coreappdata()->app_libpaths); - } diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/series b/pkgs/development/libraries/qt-5/5.5/qtbase/series deleted file mode 100644 index 1dfd8ac2683..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/series +++ /dev/null @@ -1,10 +0,0 @@ -dlopen-resolv.patch -tzdir.patch -dlopen-libXcursor.patch -dlopen-openssl.patch -dlopen-dbus.patch -xdg-config-dirs.patch -nix-profiles-library-paths.patch -compose-search-path.patch -libressl.patch -cmake-paths.patch \ No newline at end of file diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/tzdir.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/tzdir.patch deleted file mode 100644 index 92adeda8273..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/tzdir.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp -=================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp -+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp -@@ -62,7 +62,10 @@ typedef QHash Q - // Parse zone.tab table, assume lists all installed zones, if not will need to read directories - static QTzTimeZoneHash loadTzTimeZones() - { -- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); -+ QString path = qgetenv("TZDIR"); -+ path += "/zone.tab"; -+ if (!QFile::exists(path)) -+ path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); - if (!QFile::exists(path)) - path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); - -@@ -560,12 +563,18 @@ void QTzTimeZonePrivate::init(const QByt - if (!tzif.open(QIODevice::ReadOnly)) - return; - } else { -- // Open named tz, try modern path first, if fails try legacy path -- tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ // Try TZDIR first -+ QString zoneinfoDir = qgetenv("TZDIR"); -+ zoneinfoDir += "/" + QString::fromLocal8Bit(ianaId); -+ tzif.setFileName(zoneinfoDir); - if (!tzif.open(QIODevice::ReadOnly)) { -- tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -- if (!tzif.open(QIODevice::ReadOnly)) -- return; -+ // Open named tz, try modern path first, if fails try legacy path -+ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ if (!tzif.open(QIODevice::ReadOnly)) { -+ tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ if (!tzif.open(QIODevice::ReadOnly)) -+ return; -+ } - } - } - diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/xdg-config-dirs.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/xdg-config-dirs.patch deleted file mode 100644 index 24dc3bde148..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/xdg-config-dirs.patch +++ /dev/null @@ -1,42 +0,0 @@ -Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/io/qsettings.cpp -=================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/corelib/io/qsettings.cpp -+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/io/qsettings.cpp -@@ -1131,6 +1131,24 @@ QConfFileSettingsPrivate::QConfFileSetti - if (!application.isEmpty()) - confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false)); - confFiles[F_System | F_Organization].reset(QConfFile::fromName(systemPath + orgFile, false)); -+ -+#if !defined(Q_OS_WIN) -+ // Add directories specified in $XDG_CONFIG_DIRS -+ const QString pathEnv = QString::fromLocal8Bit(getenv("XDG_CONFIG_DIRS")); -+ if (!pathEnv.isEmpty()) { -+ const QStringList pathEntries = pathEnv.split(QLatin1Char(':'), QString::SkipEmptyParts); -+ if (!pathEntries.isEmpty()) { -+ int j = 4; // This is the number of confFiles set above -- we need to start adding $XDG_CONFIG_DIRS after those. -+ for (int k = 0; k < pathEntries.size() && j < NumConfFiles - 1; ++k) { -+ const QString& path = pathEntries.at(k); -+ if (!application.isEmpty()) -+ confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + appFile, false)); -+ confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + orgFile, false)); -+ } -+ } -+ } -+#endif -+ - #else - QString confName = getPath(format, QSettings::UserScope) + org; - if (!application.isEmpty()) -Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/io/qsettings_p.h -=================================================================== ---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/corelib/io/qsettings_p.h -+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/corelib/io/qsettings_p.h -@@ -240,7 +240,7 @@ public: - F_Organization = 0x1, - F_User = 0x0, - F_System = 0x2, -- NumConfFiles = 4 -+ NumConfFiles = 40 // HACK: increase NumConfFiles from 4 to 40 in order to accommodate more paths in $XDG_CONFIG_DIRS -- ellis - #else - SandboxConfFile = 0, - NumConfFiles = 1 diff --git a/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix deleted file mode 100644 index 95cd6fea79b..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtbase, qtdeclarative }: - -qtSubmodule { - name = "qtconnectivity"; - qtInputs = [ qtbase qtdeclarative ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix deleted file mode 100644 index 9b6a6c46176..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ qtSubmodule, lib, copyPathsToStore, python2, qtbase, qtsvg, qtxmlpatterns }: - -qtSubmodule { - name = "qtdeclarative"; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - qtInputs = [ qtbase qtsvg qtxmlpatterns ]; - nativeBuildInputs = [ python2 ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/nix-profiles-import-paths.patch deleted file mode 100644 index 06b244b974f..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/nix-profiles-import-paths.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp -=================================================================== ---- qtdeclarative-opensource-src-5.5.1.orig/src/qml/qml/qqmlimport.cpp -+++ qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp -@@ -1549,6 +1549,15 @@ QQmlImportDatabase::QQmlImportDatabase(Q - QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); - addImportPath(installImportsPath); - -+ // Add library paths derived from NIX_PROFILES. -+ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' '); -+ const QString qmldir = QString::fromLatin1("/lib/qt5/qml"); -+ Q_FOREACH (const QByteArray &profile, profiles) { -+ if (!profile.isEmpty()) { -+ addImportPath(QFile::decodeName(profile) + qmldir); -+ } -+ } -+ - // env import paths - QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH"); - if (!envImportPath.isEmpty()) { diff --git a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/series b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/series deleted file mode 100644 index 7dbe197c56e..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/series +++ /dev/null @@ -1 +0,0 @@ -nix-profiles-import-paths.patch diff --git a/pkgs/development/libraries/qt-5/5.5/qtdoc.nix b/pkgs/development/libraries/qt-5/5.5/qtdoc.nix deleted file mode 100644 index 578ea6ba0b2..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtdoc.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtdeclarative }: - -qtSubmodule { - name = "qtdoc"; - qtInputs = [ qtdeclarative ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtenginio.nix b/pkgs/development/libraries/qt-5/5.5/qtenginio.nix deleted file mode 100644 index b860a73ef89..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtenginio.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtdeclarative }: - -qtSubmodule { - name = "qtenginio"; - qtInputs = [ qtdeclarative ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtgraphicaleffects.nix b/pkgs/development/libraries/qt-5/5.5/qtgraphicaleffects.nix deleted file mode 100644 index 3273f12eb83..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtgraphicaleffects.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtdeclarative }: - -qtSubmodule { - name = "qtgraphicaleffects"; - qtInputs = [ qtdeclarative ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtimageformats.nix b/pkgs/development/libraries/qt-5/5.5/qtimageformats.nix deleted file mode 100644 index 03d0fffbe80..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtimageformats.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtbase }: - -qtSubmodule { - name = "qtimageformats"; - qtInputs = [ qtbase ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtlocation.nix b/pkgs/development/libraries/qt-5/5.5/qtlocation.nix deleted file mode 100644 index 1e134057c4b..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtlocation.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtbase, qtmultimedia }: - -qtSubmodule { - name = "qtlocation"; - qtInputs = [ qtbase qtmultimedia ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix deleted file mode 100644 index 7c1cc5da07e..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ qtSubmodule, qtbase, qtdeclarative, pkgconfig -, alsaLib, gstreamer, gst-plugins-base, libpulseaudio -}: - -qtSubmodule { - name = "qtmultimedia"; - qtInputs = [ qtbase qtdeclarative ]; - buildInputs = [ - pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio - ]; - qmakeFlags = [ "GST_VERSION=1.0" ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix b/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix deleted file mode 100644 index 64937b3dcd3..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ qtSubmodule, lib, copyPathsToStore, qtscript, qtsvg, qtwebkit, qtxmlpatterns }: - -qtSubmodule { - name = "qtquick1"; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - qtInputs = [ qtscript qtsvg qtwebkit qtxmlpatterns ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtquick1/nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtquick1/nix-profiles-import-paths.patch deleted file mode 100644 index c01061d3378..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtquick1/nix-profiles-import-paths.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: qtquick1-opensource-src-5.5.1/src/declarative/qml/qdeclarativeimport.cpp -=================================================================== ---- qtquick1-opensource-src-5.5.1.orig/src/declarative/qml/qdeclarativeimport.cpp -+++ qtquick1-opensource-src-5.5.1/src/declarative/qml/qdeclarativeimport.cpp -@@ -725,6 +725,15 @@ QDeclarativeImportDatabase::QDeclarative - - addImportPath(installImportsPath); - -+ // Add library paths derived from NIX_PROFILES. -+ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' '); -+ const QString importdir = QString::fromLatin1("/lib/qt5/imports"); -+ Q_FOREACH (const QByteArray &profile, profiles) { -+ if (!profile.isEmpty()) { -+ addImportPath(QFile::decodeName(profile) + importdir); -+ } -+ } -+ - // env import paths - QByteArray envImportPath = qgetenv("QML_IMPORT_PATH"); - if (!envImportPath.isEmpty()) { diff --git a/pkgs/development/libraries/qt-5/5.5/qtquick1/series b/pkgs/development/libraries/qt-5/5.5/qtquick1/series deleted file mode 100644 index 7dbe197c56e..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtquick1/series +++ /dev/null @@ -1 +0,0 @@ -nix-profiles-import-paths.patch diff --git a/pkgs/development/libraries/qt-5/5.5/qtquickcontrols.nix b/pkgs/development/libraries/qt-5/5.5/qtquickcontrols.nix deleted file mode 100644 index 93a864621b8..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtquickcontrols.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtdeclarative }: - -qtSubmodule { - name = "qtquickcontrols"; - qtInputs = [ qtdeclarative ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtscript/0001-glib-2.32.patch b/pkgs/development/libraries/qt-5/5.5/qtscript/0001-glib-2.32.patch deleted file mode 100644 index 887e107b6c1..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtscript/0001-glib-2.32.patch +++ /dev/null @@ -1,25 +0,0 @@ -From abd80356449bb36c8adcc5c9ca1df6b47715d265 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 23 Aug 2015 09:13:34 -0500 -Subject: [PATCH] glib-2.32 - ---- - src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -index 1f6d25e..087c3fb 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -@@ -81,7 +81,7 @@ - #include - #elif PLATFORM(GTK) - #include --typedef struct _GMutex GMutex; -+typedef union _GMutex GMutex; - typedef struct _GCond GCond; - #endif - --- -2.5.0 - diff --git a/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix b/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix deleted file mode 100644 index 127766e2ebd..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ qtSubmodule, qtbase, qttools }: - -qtSubmodule { - name = "qtscript"; - qtInputs = [ qtbase qttools ]; - patches = [ ./0001-glib-2.32.patch ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtsensors.nix b/pkgs/development/libraries/qt-5/5.5/qtsensors.nix deleted file mode 100644 index 61e64dc47e4..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtsensors.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtbase, qtdeclarative }: - -qtSubmodule { - name = "qtsensors"; - qtInputs = [ qtbase qtdeclarative ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtserialport/0001-dlopen-serialport-udev.patch b/pkgs/development/libraries/qt-5/5.5/qtserialport/0001-dlopen-serialport-udev.patch deleted file mode 100644 index 3a813dc8007..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtserialport/0001-dlopen-serialport-udev.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d81c2c870b9bea8fb8e6b85baefb06542f568338 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 23 Aug 2015 09:16:02 -0500 -Subject: [PATCH] dlopen serialport udev - ---- - src/serialport/qtudev_p.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h -index 6f2cabd..81b9849 100644 ---- a/src/serialport/qtudev_p.h -+++ b/src/serialport/qtudev_p.h -@@ -105,9 +105,9 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN - inline bool resolveSymbols(QLibrary *udevLibrary) - { - if (!udevLibrary->isLoaded()) { -- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1); -+ udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1); - if (!udevLibrary->load()) { -- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0); -+ udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0); - if (!udevLibrary->load()) { - qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0); - return false; --- -2.5.0 - diff --git a/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix deleted file mode 100644 index 2bffd0a2bd6..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ qtSubmodule, qtbase, substituteAll, systemd }: - -qtSubmodule { - name = "qtserialport"; - qtInputs = [ qtbase ]; - patches = [ - (substituteAll { - src = ./0001-dlopen-serialport-udev.patch; - libudev = systemd.lib; - }) - ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtsvg.nix b/pkgs/development/libraries/qt-5/5.5/qtsvg.nix deleted file mode 100644 index b9ccac7cf93..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtsvg.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtbase }: - -qtSubmodule { - name = "qtsvg"; - qtInputs = [ qtbase ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qttools/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.5/qttools/cmake-paths.patch deleted file mode 100644 index fe5bcadbe9a..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qttools/cmake-paths.patch +++ /dev/null @@ -1,72 +0,0 @@ -Index: qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in -=================================================================== ---- qttools-opensource-src-5.5.1.orig/src/assistant/help/Qt5HelpConfigExtras.cmake.in -+++ qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in -@@ -2,11 +2,10 @@ - if (NOT TARGET Qt5::qcollectiongenerator) - add_executable(Qt5::qcollectiongenerator IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\") --!!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\") --!!ENDIF -+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\") -+ if(NOT EXISTS \"${imported_location}\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\") -+ endif() - _qt5_Help_check_file_exists(${imported_location}) - - set_target_properties(Qt5::qcollectiongenerator PROPERTIES -Index: qttools-opensource-src-5.5.1/src/linguist/Qt5LinguistToolsConfig.cmake.in -=================================================================== ---- qttools-opensource-src-5.5.1.orig/src/linguist/Qt5LinguistToolsConfig.cmake.in -+++ qttools-opensource-src-5.5.1/src/linguist/Qt5LinguistToolsConfig.cmake.in -@@ -44,11 +44,10 @@ endmacro() - if (NOT TARGET Qt5::lrelease) - add_executable(Qt5::lrelease IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") --!!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") --!!ENDIF -+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") -+ if(NOT EXISTS \"${imported_location}\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") -+ endif() - _qt5_LinguistTools_check_file_exists(${imported_location}) - - set_target_properties(Qt5::lrelease PROPERTIES -@@ -59,11 +58,10 @@ endif() - if (NOT TARGET Qt5::lupdate) - add_executable(Qt5::lupdate IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") --!!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") --!!ENDIF -+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") -+ if(NOT EXISTS \"${imported_location}\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") -+ endif() - _qt5_LinguistTools_check_file_exists(${imported_location}) - - set_target_properties(Qt5::lupdate PROPERTIES -@@ -74,11 +72,10 @@ endif() - if (NOT TARGET Qt5::lconvert) - add_executable(Qt5::lconvert IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") --!!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") --!!ENDIF -+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") -+ if(NOT EXISTS \"${imported_location}\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") -+ endif() - _qt5_LinguistTools_check_file_exists(${imported_location}) - - set_target_properties(Qt5::lconvert PROPERTIES diff --git a/pkgs/development/libraries/qt-5/5.5/qttools/default.nix b/pkgs/development/libraries/qt-5/5.5/qttools/default.nix deleted file mode 100644 index d72d7b6c64c..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qttools/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ qtSubmodule, lib, copyPathsToStore, qtbase }: - -qtSubmodule { - name = "qttools"; - qtInputs = [ qtbase ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - postFixup = '' - moveToOutput "bin/qdbus" "$out" - moveToOutput "bin/qtpaths" "$out" - ''; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qttools/series b/pkgs/development/libraries/qt-5/5.5/qttools/series deleted file mode 100644 index 6cc1d3b87bc..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qttools/series +++ /dev/null @@ -1 +0,0 @@ -cmake-paths.patch diff --git a/pkgs/development/libraries/qt-5/5.5/qttranslations.nix b/pkgs/development/libraries/qt-5/5.5/qttranslations.nix deleted file mode 100644 index 50fc8cf6826..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qttranslations.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qttools }: - -qtSubmodule { - name = "qttranslations"; - qtInputs = [ qttools ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit-examples.nix b/pkgs/development/libraries/qt-5/5.5/qtwebkit-examples.nix deleted file mode 100644 index 64f85c42d19..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtwebkit-examples.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qttools, qtwebkit }: - -qtSubmodule { - name = "qtwebkit-examples"; - qtInputs = [ qttools qtwebkit ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0001-dlopen-webkit-nsplugin.patch b/pkgs/development/libraries/qt-5/5.5/qtwebkit/0001-dlopen-webkit-nsplugin.patch deleted file mode 100644 index 0eeacce1bc0..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0001-dlopen-webkit-nsplugin.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 862ce7d357a3ec32683ac6ec7c0ebdc9346b44ba Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 23 Aug 2015 09:18:54 -0500 -Subject: [PATCH 1/3] dlopen webkit nsplugin - ---- - Source/WebCore/plugins/qt/PluginPackageQt.cpp | 2 +- - Source/WebCore/plugins/qt/PluginViewQt.cpp | 2 +- - Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp -index a923d49..2731d05 100644 ---- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp -+++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp -@@ -136,7 +136,7 @@ static void initializeGtk(QLibrary* module = 0) - } - } - -- QLibrary library(QLatin1String("libgtk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); - if (library.load()) { - typedef void *(*gtk_init_check_ptr)(int*, char***); - gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check"); -diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp -index de06a2f..363bde5 100644 ---- a/Source/WebCore/plugins/qt/PluginViewQt.cpp -+++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp -@@ -697,7 +697,7 @@ static Display *getPluginDisplay() - // support gdk based plugins (like flash) that use a different X connection. - // The code below has the same effect as this one: - // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); -- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0); - if (!library.load()) - return 0; - -diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -index d734ff6..62a2197 100644 ---- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -@@ -64,7 +64,7 @@ static Display* getPluginDisplay() - // The code below has the same effect as this one: - // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); - -- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gdk_pixbuf@/libgdk-x11-2.0"), 0); - if (!library.load()) - return 0; - --- -2.5.0 - diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0002-dlopen-webkit-gtk.patch b/pkgs/development/libraries/qt-5/5.5/qtwebkit/0002-dlopen-webkit-gtk.patch deleted file mode 100644 index bb5d1f74364..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0002-dlopen-webkit-gtk.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6a407d30357c2551abceac75c82f4a1688e47437 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 23 Aug 2015 09:19:16 -0500 -Subject: [PATCH 2/3] dlopen webkit gtk - ---- - Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp -index 8de6521..0b25748 100644 ---- a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp -+++ b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp -@@ -53,7 +53,7 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr - - static bool initializeGtk() - { -- QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0); -+ QLibrary gtkLibrary(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); - if (!gtkLibrary.load()) - return false; - typedef void* (*gtk_init_ptr)(void*, void*); --- -2.5.0 - diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0003-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/5.5/qtwebkit/0003-dlopen-webkit-udev.patch deleted file mode 100644 index 1c360cd81aa..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0003-dlopen-webkit-udev.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 864020dd47c3b6d532d9f26b82185904cf9324f2 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 23 Aug 2015 09:19:29 -0500 -Subject: [PATCH 3/3] dlopen webkit udev - ---- - Source/WebCore/platform/qt/GamepadsQt.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Source/WebCore/platform/qt/GamepadsQt.cpp b/Source/WebCore/platform/qt/GamepadsQt.cpp -index 60ff317..da8ac69 100644 ---- a/Source/WebCore/platform/qt/GamepadsQt.cpp -+++ b/Source/WebCore/platform/qt/GamepadsQt.cpp -@@ -111,12 +111,12 @@ private: - bool load() - { - m_libUdev.setLoadHints(QLibrary::ResolveAllSymbolsHint); -- m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 1); -+ m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1); - m_loaded = m_libUdev.load(); - if (resolveMethods()) - return true; - -- m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 0); -+ m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0); - m_loaded = m_libUdev.load(); - return resolveMethods(); - } --- -2.5.0 - diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix deleted file mode 100644 index 35568c1eb2f..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors -, fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt -, sqlite, systemd, glib, gst_all_1 -, bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby -, substituteAll -, flashplayerFix ? false -}: - -with stdenv.lib; - -qtSubmodule { - name = "qtwebkit"; - qtInputs = [ qtdeclarative qtlocation qtsensors ]; - buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; - nativeBuildInputs = [ - bison2 flex gdb gperf perl pkgconfig python2 ruby - ]; - patches = - let dlopen-webkit-nsplugin = substituteAll { - src = ./0001-dlopen-webkit-nsplugin.patch; - gtk = gtk2.out; - gdk_pixbuf = gdk_pixbuf.out; - }; - dlopen-webkit-gtk = substituteAll { - src = ./0002-dlopen-webkit-gtk.patch; - gtk = gtk2.out; - }; - dlopen-webkit-udev = substituteAll { - src = ./0003-dlopen-webkit-udev.patch; - libudev = systemd.lib; - }; - in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ] - ++ [ dlopen-webkit-udev ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix deleted file mode 100644 index fbdfbbcf0db..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtbase, qtdeclarative }: - -qtSubmodule { - name = "qtwebsockets"; - qtInputs = [ qtbase qtdeclarative ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix b/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix deleted file mode 100644 index a765161e2d7..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtbase }: - -qtSubmodule { - name = "qtx11extras"; - qtInputs = [ qtbase ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix deleted file mode 100644 index 9a8ddbba2bd..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtbase }: - -qtSubmodule { - name = "qtxmlpatterns"; - qtInputs = [ qtbase ]; -} diff --git a/pkgs/development/libraries/qt-5/5.5/srcs.nix b/pkgs/development/libraries/qt-5/5.5/srcs.nix deleted file mode 100644 index 20aa28a55da..00000000000 --- a/pkgs/development/libraries/qt-5/5.5/srcs.nix +++ /dev/null @@ -1,261 +0,0 @@ -# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh -{ fetchurl, mirror }: - -{ - qt3d = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qt3d-opensource-src-5.5.1.tar.xz"; - sha256 = "1xqvifsy5x2vj7p51c2z1ly7k2yq7l3byhshnkd2bn6b5dp91073"; - name = "qt3d-opensource-src-5.5.1.tar.xz"; - }; - }; - qt5 = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qt5-opensource-src-5.5.1.tar.xz"; - sha256 = "0g83vzsj6hdjmagccy6gxgc1l8q0q6663r9xj58ix4lj7hsphf26"; - name = "qt5-opensource-src-5.5.1.tar.xz"; - }; - }; - qtactiveqt = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtactiveqt-opensource-src-5.5.1.tar.xz"; - sha256 = "09dz5jj7gxa9ds2gw6xw8lacmv27ydhi64370q1ncc7khd0p6g3m"; - name = "qtactiveqt-opensource-src-5.5.1.tar.xz"; - }; - }; - qtandroidextras = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtandroidextras-opensource-src-5.5.1.tar.xz"; - sha256 = "1cam9zd0kxgyplnaijy91rl8p30j2jbp2ikq9rnigcsglfnx5hd4"; - name = "qtandroidextras-opensource-src-5.5.1.tar.xz"; - }; - }; - qtbase = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz"; - sha256 = "05p91m1d9b3gdfm5pgmxw63rk0fdxqz87s77hn9bdip4syjfi96z"; - name = "qtbase-opensource-src-5.5.1.tar.xz"; - }; - }; - qtcanvas3d = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtcanvas3d-opensource-src-5.5.1.tar.xz"; - sha256 = "105hl3mvsdif416l4dvpxl7r1iw42if8hhrnji8hf4fp6081g6vm"; - name = "qtcanvas3d-opensource-src-5.5.1.tar.xz"; - }; - }; - qtconnectivity = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtconnectivity-opensource-src-5.5.1.tar.xz"; - sha256 = "08sh4hzib5l26l6mc6iil4nvl807cn9rn5w46vxw0bsqz3gfcdrn"; - name = "qtconnectivity-opensource-src-5.5.1.tar.xz"; - }; - }; - qtdeclarative = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtdeclarative-opensource-src-5.5.1.tar.xz"; - sha256 = "14b7naaa0rk4q6cxf0w62gvamxk812kr65k82zxkdzrzp3plxlaz"; - name = "qtdeclarative-opensource-src-5.5.1.tar.xz"; - }; - }; - qtdoc = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtdoc-opensource-src-5.5.1.tar.xz"; - sha256 = "11hgw1i1qm2yqzfyg0jsvjda9092hjas35l0bmxn6pvnl5asy3cz"; - name = "qtdoc-opensource-src-5.5.1.tar.xz"; - }; - }; - qtenginio = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtenginio-opensource-src-5.5.1.tar.xz"; - sha256 = "1qpg9pcniqp5xxi2qrc6indqdyn850djk0njiniandbabfykd6d7"; - name = "qtenginio-opensource-src-5.5.1.tar.xz"; - }; - }; - qtgraphicaleffects = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtgraphicaleffects-opensource-src-5.5.1.tar.xz"; - sha256 = "0irdq4lfbv740mbvd40x62k3zzj0aj8h95gsxg79wa54nf6hzjlv"; - name = "qtgraphicaleffects-opensource-src-5.5.1.tar.xz"; - }; - }; - qtimageformats = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtimageformats-opensource-src-5.5.1.tar.xz"; - sha256 = "19alny9bm2lzzlxicbvw56ra4qcxdrnm9054zs4z1y82qq0fwzy9"; - name = "qtimageformats-opensource-src-5.5.1.tar.xz"; - }; - }; - qtlocation = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtlocation-opensource-src-5.5.1.tar.xz"; - sha256 = "05k31nm1p444fixplspgh1d5j4f3xz6z674jpr8497v4hz5lis8z"; - name = "qtlocation-opensource-src-5.5.1.tar.xz"; - }; - }; - qtmacextras = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtmacextras-opensource-src-5.5.1.tar.xz"; - sha256 = "0n4hxi9xhnyvp5cxklr9ygg4ficvahak2w73kr9ihqckrkym0lq2"; - name = "qtmacextras-opensource-src-5.5.1.tar.xz"; - }; - }; - qtmultimedia = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtmultimedia-opensource-src-5.5.1.tar.xz"; - sha256 = "0zwmgmiix56c567qw5xnijd1y43mbjg4jw1n624c31qmyjcwmivw"; - name = "qtmultimedia-opensource-src-5.5.1.tar.xz"; - }; - }; - qtquick1 = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtquick1-opensource-src-5.5.1.tar.xz"; - sha256 = "0b0znnwy2fv5rn368nw7ph2fypz16fchb09id63hm7wbkbjsf4n8"; - name = "qtquick1-opensource-src-5.5.1.tar.xz"; - }; - }; - qtquickcontrols = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtquickcontrols-opensource-src-5.5.1.tar.xz"; - sha256 = "1w7w87c8i6v3p78psmjb30fh9sx7745m5jyjkdi6q1jnss4q6yhv"; - name = "qtquickcontrols-opensource-src-5.5.1.tar.xz"; - }; - }; - qtscript = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtscript-opensource-src-5.5.1.tar.xz"; - sha256 = "1z98x3758mk24wf0nxxw4lphbxw1xxzl1q27cjqbq8lgk7fxsind"; - name = "qtscript-opensource-src-5.5.1.tar.xz"; - }; - }; - qtsensors = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtsensors-opensource-src-5.5.1.tar.xz"; - sha256 = "1spfr2pn8zz5vz3qz9lzs0wfshmim6hdgf2fpmwpcpcsfb04y9jx"; - name = "qtsensors-opensource-src-5.5.1.tar.xz"; - }; - }; - qtserialport = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtserialport-opensource-src-5.5.1.tar.xz"; - sha256 = "0ylgjscmql3lspzv0cr5n4g1v354frz0yfalvswvkc9x0bxxnd50"; - name = "qtserialport-opensource-src-5.5.1.tar.xz"; - }; - }; - qtsvg = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtsvg-opensource-src-5.5.1.tar.xz"; - sha256 = "1iwibbh835cpxbfh7rnrpvl9k20valr6h256np59rzdy92z8ixgp"; - name = "qtsvg-opensource-src-5.5.1.tar.xz"; - }; - }; - qttools = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz"; - sha256 = "1zbvr039sv0jzd41ngarxif6954bl50pha8814b5hw3i977gcqa3"; - name = "qttools-opensource-src-5.5.1.tar.xz"; - }; - }; - qttranslations = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qttranslations-opensource-src-5.5.1.tar.xz"; - sha256 = "1im4qzpyp1wqrrrlwc4r56b46w5y4bxg2m0y7wkcmihb1xqh1y21"; - name = "qttranslations-opensource-src-5.5.1.tar.xz"; - }; - }; - qtwayland = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwayland-opensource-src-5.5.1.tar.xz"; - sha256 = "19nxifpg9q785ahzaii2fd2911cg5m0dpk5v041sylm997f4p063"; - name = "qtwayland-opensource-src-5.5.1.tar.xz"; - }; - }; - qtwebchannel = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwebchannel-opensource-src-5.5.1.tar.xz"; - sha256 = "1l0m5xjxg5va9dwvgf52r52inl4dl3954d16rfiwnkndazp9ahkz"; - name = "qtwebchannel-opensource-src-5.5.1.tar.xz"; - }; - }; - qtwebengine = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwebengine-opensource-src-5.5.1.tar.xz"; - sha256 = "141bgr3x7n2vjbsydgll44aq0pcf99gn2l1l1jpim685sf6k4kbw"; - name = "qtwebengine-opensource-src-5.5.1.tar.xz"; - }; - }; - qtwebkit-examples = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwebkit-examples-opensource-src-5.5.1.tar.xz"; - sha256 = "1ij65v3nzh5f6rdq43w6vmljjgfw1vky8dd6s4kr093d5ns3b289"; - name = "qtwebkit-examples-opensource-src-5.5.1.tar.xz"; - }; - }; - qtwebkit = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwebkit-opensource-src-5.5.1.tar.xz"; - sha256 = "0sbdglcf57lmgbcybimvvbpqikn3blb1pxvd71sdhsiypnfkyn3p"; - name = "qtwebkit-opensource-src-5.5.1.tar.xz"; - }; - }; - qtwebsockets = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwebsockets-opensource-src-5.5.1.tar.xz"; - sha256 = "1srdn668z62j95q1wwhg6xk2dic407r4wl5yi1qk743vhr586kng"; - name = "qtwebsockets-opensource-src-5.5.1.tar.xz"; - }; - }; - qtwinextras = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwinextras-opensource-src-5.5.1.tar.xz"; - sha256 = "07w5ipiwvvapasjswk0g4ndcp0lq65pz2n6l348zwfb0gand406b"; - name = "qtwinextras-opensource-src-5.5.1.tar.xz"; - }; - }; - qtx11extras = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtx11extras-opensource-src-5.5.1.tar.xz"; - sha256 = "0rgbxgp5l212c4vg8z685zv008j9s03mx8p576ny2qibjwfs11v3"; - name = "qtx11extras-opensource-src-5.5.1.tar.xz"; - }; - }; - qtxmlpatterns = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtxmlpatterns-opensource-src-5.5.1.tar.xz"; - sha256 = "1v78s0jygg83yzyldwms8zb72cwp718cc5ialc2ki3lqa81fndxm"; - name = "qtxmlpatterns-opensource-src-5.5.1.tar.xz"; - }; - }; -} diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix index 60a3896abaf..b26fc7faf9d 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { copyPathsToStore (lib.readPathsFromFile ./. ./series) ++ [(if stdenv.isDarwin then ./cmake-paths-darwin.patch else ./cmake-paths.patch)] ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch - ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; + ++ lib.optionals mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; postPatch = '' @@ -80,7 +80,7 @@ stdenv.mkDerivation { sed -i \ -e 's|! /usr/bin/xcode-select --print-path >/dev/null 2>&1;|false;|' \ -e 's|! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1;|false;|' \ - -e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot="${darwin.apple_sdk.sdk}"|' \ + -e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot=/nonsense|' \ -e 's|QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`|QMAKE_CXX="clang++"\nQMAKE_CONF_COMPILER="clang++"|' \ -e 's|XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`|XCRUN="clang -v 2>&1"|' \ -e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \ @@ -208,7 +208,7 @@ stdenv.mkDerivation { xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices CoreServices AppKit Carbon OpenGL AGL Cocoa - DiskArbitration darwin.cf-private libiconv darwin.apple_sdk.sdk + DiskArbitration darwin.cf-private libiconv ]); buildInputs = @@ -307,7 +307,7 @@ stdenv.mkDerivation { homepage = http://www.qt.io; description = "A cross-platform application framework for C++"; license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; - maintainers = with maintainers; [ bbenoist qknight ttuegel ]; + maintainers = with maintainers; [ qknight ttuegel ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/qt-5/5.7/default.nix b/pkgs/development/libraries/qt-5/5.7/default.nix deleted file mode 100644 index f387a242101..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/default.nix +++ /dev/null @@ -1,122 +0,0 @@ -/* - -# Updates - -Before a major version update, make a copy of this directory. (We like to -keep the old version around for a short time after major updates.) Add a -top-level attribute to `top-level/all-packages.nix`. - -1. Update the URL in `maintainers/scripts/generate-qt.sh`. -2. From the top of the Nixpkgs tree, run - `./maintainers/scripts/generate-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. -3. Check that the new packages build correctly. -4. Commit the changes and open a pull request. - -*/ - -{ - newScope, - stdenv, fetchurl, makeSetupHook, makeWrapper, - bison, cups ? null, harfbuzz, mesa, perl, - gstreamer, gst-plugins-base, - - # options - developerBuild ? false, - decryptSslTraffic ? false, -}: - -with stdenv.lib; - -let - - mirror = "http://download.qt.io"; - srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; - - qtSubmodule = args: - let - inherit (args) name; - version = args.version or srcs."${name}".version; - src = args.src or srcs."${name}".src; - inherit (stdenv) mkDerivation; - in mkDerivation (args // { - name = "${name}-${version}"; - inherit src; - - propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); - nativeBuildInputs = - (args.nativeBuildInputs or []) - ++ [ perl self.qmakeHook ]; - - NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true; - - outputs = args.outputs or [ "out" "dev" ]; - setOutputFlags = args.setOutputFlags or false; - - setupHook = ../qtsubmodule-setup-hook.sh; - - enableParallelBuilding = args.enableParallelBuilding or true; - - meta = self.qtbase.meta // (args.meta or {}); - }); - - addPackages = self: with self; - let - callPackage = self.newScope { inherit qtSubmodule srcs; }; - in { - - qtbase = callPackage ./qtbase { - inherit (srcs.qtbase) src version; - inherit bison cups harfbuzz mesa; - inherit developerBuild decryptSslTraffic; - }; - - qtconnectivity = callPackage ./qtconnectivity.nix {}; - qtdeclarative = callPackage ./qtdeclarative {}; - qtdoc = callPackage ./qtdoc.nix {}; - qtgraphicaleffects = callPackage ./qtgraphicaleffects.nix {}; - qtimageformats = callPackage ./qtimageformats.nix {}; - qtlocation = callPackage ./qtlocation.nix {}; - qtmultimedia = callPackage ./qtmultimedia.nix { - inherit gstreamer gst-plugins-base; - }; - qtquick1 = null; - qtquickcontrols = callPackage ./qtquickcontrols.nix {}; - qtquickcontrols2 = callPackage ./qtquickcontrols2.nix {}; - qtscript = callPackage ./qtscript {}; - qtsensors = callPackage ./qtsensors.nix {}; - qtserialport = callPackage ./qtserialport {}; - qtsvg = callPackage ./qtsvg.nix {}; - qttools = callPackage ./qttools {}; - qttranslations = callPackage ./qttranslations.nix {}; - qtwayland = callPackage ./qtwayland.nix {}; - qtwebchannel = callPackage ./qtwebchannel.nix {}; - qtwebengine = callPackage ./qtwebengine {}; - qtwebkit = callPackage ./qtwebkit {}; - qtwebsockets = callPackage ./qtwebsockets.nix {}; - qtx11extras = callPackage ./qtx11extras.nix {}; - qtxmlpatterns = callPackage ./qtxmlpatterns.nix {}; - - env = callPackage ../qt-env.nix {}; - full = env "qt-${qtbase.version}" [ - qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats - qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript - qtsensors qtserialport qtsvg qttools qttranslations qtwayland - qtwebchannel qtwebengine qtwebkit qtwebsockets qtx11extras - qtxmlpatterns - ]; - - makeQtWrapper = - makeSetupHook - { deps = [ makeWrapper ]; } - (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh); - - qmakeHook = - makeSetupHook - { deps = [ self.qtbase.dev ]; } - (if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh); - - }; - - self = makeScope newScope addPackages; - -in self diff --git a/pkgs/development/libraries/qt-5/5.7/fetch.sh b/pkgs/development/libraries/qt-5/5.7/fetch.sh deleted file mode 100644 index 6a6a34d520d..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/fetch.sh +++ /dev/null @@ -1,3 +0,0 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/ \ - http://download.qt.io/community_releases/5.7/5.7.1/ \ - -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths.patch deleted file mode 100644 index 0d5c2d51092..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths.patch +++ /dev/null @@ -1,385 +0,0 @@ -Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -=================================================================== ---- qtbase-opensource-src-5.7.0.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -+++ qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) - endif() - !!ENDIF - --!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) --!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) --set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") --!!ELSE --get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH) --# Use original install prefix when loaded through a --# cross-prefix symbolic link such as /lib -> /usr/lib. --get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH) --get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH) --if(_realCurr STREQUAL _realOrig) -- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE) --else() -- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) --endif() --unset(_realOrig) --unset(_realCurr) --unset(_IMPORT_PREFIX) --!!ENDIF --!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) --get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) --!!ELSE --set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") --!!ENDIF -- - !!IF !equals(TEMPLATE, aux) - # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. - set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)") -@@ -59,7 +35,10 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - - !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") -+ set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") -+ if(NOT EXISTS \"${imported_location}\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") -+ endif() - !!ELSE - set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") - !!ENDIF -@@ -74,45 +53,18 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta - \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" - ) - --!!IF !isEmpty(CMAKE_WINDOWS_BUILD) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") --!!ELSE -- set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") --!!ENDIF -- _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) -- if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") -- set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -- \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib} -- ) -- endif() --!!ENDIF - endmacro() - !!ENDIF - - if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - - !!IF !no_module_headers --!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) -- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\" -- ) --!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) -- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" -- ) --!!ELSE -- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") --!!ENDIF --!!ELSE - !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) -- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") -+ set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR\" \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") - !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" -+ \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" -+ \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" - ) - !!ELSE - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") -@@ -128,7 +80,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") - !!ENDIF - !!ENDIF --!!ENDIF -+ - !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) - include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) - !!ENDIF -@@ -253,28 +205,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME - - !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) - !!IF isEmpty(CMAKE_DEBUG_TYPE) --!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE -- if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE -- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) --!!ELSE // CMAKE_STATIC_WINDOWS_BUILD - if (EXISTS - !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" -+ \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" - !!ELSE - \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" - !!ENDIF - AND EXISTS - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) -+ \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) - !!ELSE - \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) - !!ENDIF - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - endif() - !!ENDIF // CMAKE_DEBUG_TYPE - !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD -@@ -282,36 +225,23 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME - !!ENDIF // CMAKE_RELEASE_TYPE - - !!IF !isEmpty(CMAKE_DEBUG_TYPE) --!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) -- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) --!!ELSE - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - - !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) - !!IF isEmpty(CMAKE_RELEASE_TYPE) --!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE -- if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE -- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" ) --!!ELSE // CMAKE_STATIC_WINDOWS_BUILD - if (EXISTS - !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" -+ \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" - !!ELSE - \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" - !!ENDIF - AND EXISTS - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) -+ \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) - !!ELSE - \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) - !!ENDIF - _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - endif() - !!ENDIF // CMAKE_RELEASE_TYPE - !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD -@@ -328,11 +258,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME - macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) - set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - --!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") --!!ELSE -- set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") --!!ENDIF -+ set(imported_location \"${PLUGIN_LOCATION}\") - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) - set_target_properties(Qt5::${Plugin} PROPERTIES - \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} -Index: qtbase-opensource-src-5.7.0/src/gui/Qt5GuiConfigExtras.cmake.in -=================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/gui/Qt5GuiConfigExtras.cmake.in -+++ qtbase-opensource-src-5.7.0/src/gui/Qt5GuiConfigExtras.cmake.in -@@ -2,7 +2,7 @@ - !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) - - !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) --set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\") -+set(Qt5Gui_EGL_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR/QtANGLE\") - !!ELSE - set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") - !!ENDIF -@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_propert - set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - - !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") -+ set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") - !!ELSE - set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") - !!ENDIF - - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") -+ set(imported_implib \"@NIX_DEV@/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") - !!ELSE - set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") - !!ENDIF -Index: qtbase-opensource-src-5.7.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in -=================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in -+++ qtbase-opensource-src-5.7.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) - add_executable(Qt5::uic IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") - !!ENDIF -Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtras.cmake.in -=================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/corelib/Qt5CoreConfigExtras.cmake.in -+++ qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) - add_executable(Qt5::qmake IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) - add_executable(Qt5::moc IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc) - add_executable(Qt5::rcc IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -133,7 +133,7 @@ if (NOT TARGET Qt5::WinMain) - !!IF !isEmpty(CMAKE_RELEASE_TYPE) - set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") - !!ELSE - set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") - !!ENDIF -@@ -147,7 +147,7 @@ if (NOT TARGET Qt5::WinMain) - set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) - - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") - !!ELSE - set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") - !!ENDIF -Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -=================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -+++ qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -@@ -1,6 +1,6 @@ - - !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) --set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") -+set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") - !!ELSE - set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") - !!ENDIF -Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -=================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -+++ qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -@@ -1,6 +1,6 @@ - - !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) --set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") -+set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") - !!ELSE - set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") - !!ENDIF -Index: qtbase-opensource-src-5.7.0/src/dbus/Qt5DBusConfigExtras.cmake.in -=================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/dbus/Qt5DBusConfigExtras.cmake.in -+++ qtbase-opensource-src-5.7.0/src/dbus/Qt5DBusConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) - add_executable(Qt5::qdbuscpp2xml IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp) - add_executable(Qt5::qdbusxml2cpp IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") - !!ENDIF -Index: qtbase-opensource-src-5.7.0/mkspecs/features/create_cmake.prf -=================================================================== ---- qtbase-opensource-src-5.7.0.orig/mkspecs/features/create_cmake.prf -+++ qtbase-opensource-src-5.7.0/mkspecs/features/create_cmake.prf -@@ -136,28 +136,28 @@ contains(CONFIG, plugin) { - - win32 { - isEmpty(CMAKE_STATIC_TYPE) { -- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.dll -- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.dll -+ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.dll -+ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.dll - } else:mingw { -- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}.a -- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}d.a -+ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}/$$PLUGIN_TYPE/lib$${TARGET}.a -+ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}d.a - } else { # MSVC static -- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.lib -- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.lib -+ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.lib -+ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.lib - } - } else { - mac { - isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib - else: CMAKE_PlUGIN_EXT = .a - -- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} -- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} -+ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} -+ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} - } else { - isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .so - else: CMAKE_PlUGIN_EXT = .a - -- CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} -- CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} -+ CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} -+ CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} - } - } - cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in -Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -=================================================================== ---- qtbase-opensource-src-5.7.0.orig/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -+++ qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -@@ -2,10 +2,10 @@ - add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED) - - !!IF !isEmpty(CMAKE_RELEASE_TYPE) --_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\") -+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_RELEASE}\") - !!ENDIF - !!IF !isEmpty(CMAKE_DEBUG_TYPE) --_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\") -+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\") - !!ENDIF - - list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/compose-search-path.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/compose-search-path.patch deleted file mode 100644 index a0e344a7bc6..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/compose-search-path.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: qtbase-opensource-src-5.7.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -=================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -+++ qtbase-opensource-src-5.7.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp -@@ -257,10 +257,7 @@ void TableGenerator::initPossibleLocatio - // the QTCOMPOSE environment variable - if (qEnvironmentVariableIsSet("QTCOMPOSE")) - m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE"))); -- m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale")); -- m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale")); -- m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale")); -- m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale")); -+ m_possibleLocations.append(QStringLiteral("${libX11}/share/X11/locale")); - m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale")); - m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale")); - } diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/decrypt-ssl-traffic.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/decrypt-ssl-traffic.patch deleted file mode 100644 index 495db07cfbb..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/decrypt-ssl-traffic.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: qtbase-opensource-src-5.5.1/src/network/ssl/qsslsocket_openssl.cpp -=================================================================== ---- qtbase-opensource-src-5.5.1.orig/src/network/ssl/qsslsocket_openssl.cpp -+++ qtbase-opensource-src-5.5.1/src/network/ssl/qsslsocket_openssl.cpp -@@ -48,7 +48,7 @@ - ****************************************************************************/ - - //#define QSSLSOCKET_DEBUG --//#define QT_DECRYPT_SSL_TRAFFIC -+#define QT_DECRYPT_SSL_TRAFFIC - - #include "qssl_p.h" - #include "qsslsocket_openssl_p.h" diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix deleted file mode 100644 index 57b64bca1ea..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix +++ /dev/null @@ -1,313 +0,0 @@ -{ - stdenv, lib, copyPathsToStore, - src, version, - - coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2, - ruby, - darwin, libiconv, - - dbus, fontconfig, freetype, glib, gtk3, harfbuzz, icu, libX11, libXcomposite, - libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff, - libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre16, sqlite, udev, - xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm, xlibs, - zlib, - - # optional dependencies - cups ? null, mysql ? null, postgresql ? null, - - # options - mesaSupported ? (!stdenv.isDarwin), - mesa, - buildExamples ? false, - buildTests ? false, - developerBuild ? false, - decryptSslTraffic ? false -}: - -let - system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64; -in - -stdenv.mkDerivation { - - name = "qtbase-${version}"; - inherit src version; - - outputs = [ "out" "dev" ]; - - patches = - copyPathsToStore (lib.readPathsFromFile ./. ./series) - ++ [(if stdenv.isDarwin then ./cmake-paths-darwin.patch else ./cmake-paths.patch)] - ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch - ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; - - postPatch = - '' - substituteInPlace configure --replace /bin/pwd pwd - substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls - sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf - - sed -i 's/PATHS.*NO_DEFAULT_PATH//' "src/corelib/Qt5Config.cmake.in" - sed -i 's/PATHS.*NO_DEFAULT_PATH//' "src/corelib/Qt5CoreMacros.cmake" - sed -i 's/NO_DEFAULT_PATH//' "src/gui/Qt5GuiConfigExtras.cmake.in" - sed -i 's/PATHS.*NO_DEFAULT_PATH//' "mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in" - - substituteInPlace src/network/kernel/qdnslookup_unix.cpp \ - --replace "@glibc@" "${stdenv.cc.libc.out}" - substituteInPlace src/network/kernel/qhostinfo_unix.cpp \ - --replace "@glibc@" "${stdenv.cc.libc.out}" - - substituteInPlace src/network/ssl/qsslsocket_openssl_symbols.cpp \ - --replace "@openssl@" "${openssl.out}" - '' + lib.optionalString stdenv.isLinux '' - substituteInPlace src/plugins/platforms/xcb/qxcbcursor.cpp \ - --replace "@libXcursor@" "${libXcursor.out}" - - substituteInPlace src/dbus/qdbus_symbols.cpp \ - --replace "@dbus_libs@" "${dbus.lib}" - - substituteInPlace \ - src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ - --replace "@libX11@" "${libX11.out}" - '' - + lib.optionalString mesaSupported '' - substituteInPlace \ - src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \ - --replace "@mesa_lib@" "${mesa.out}" - substituteInPlace mkspecs/common/linux.conf \ - --replace "@mesa_lib@" "${mesa.out}" \ - --replace "@mesa_inc@" "${mesa.dev or mesa}" - ''+ lib.optionalString stdenv.isDarwin '' - sed -i \ - -e 's|! /usr/bin/xcode-select --print-path >/dev/null 2>&1;|false;|' \ - -e 's|! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1;|false;|' \ - -e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot="${darwin.apple_sdk.sdk}"|' \ - -e 's|QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`|QMAKE_CXX="clang++"\nQMAKE_CONF_COMPILER="clang++"|' \ - -e 's|XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`|XCRUN="clang -v 2>&1"|' \ - -e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \ - -e 's#val=$(echo $sdk_val $(echo $val | cut -s -d \x27 \x27 -f 2-))##' \ - ./configure - sed -i '3,$d' ./mkspecs/features/mac/default_pre.prf - sed -i '26,$d' ./mkspecs/features/mac/default_post.prf - sed -i '1,$d' ./mkspecs/features/mac/sdk.prf - sed 's/QMAKE_LFLAGS_RPATH = -Wl,-rpath,/QMAKE_LFLAGS_RPATH =/' -i ./mkspecs/common/mac.conf - ''; - # Note on the above: \x27 is a way if including a single-quote - # character in the sed string arguments. - - setOutputFlags = false; - preConfigure = '' - export LD_LIBRARY_PATH="$PWD/lib:$PWD/plugins/platforms:$LD_LIBRARY_PATH" - export MAKEFLAGS=-j$NIX_BUILD_CORES - - configureFlags+="\ - -plugindir $out/lib/qt5/plugins \ - -importdir $out/lib/qt5/imports \ - -qmldir $out/lib/qt5/qml \ - -docdir $out/share/doc/qt5" - ''; - - prefixKey = "-prefix "; - - # -no-eglfs, -no-directfb, -no-linuxfb and -no-kms because of the current minimalist mesa - # TODO Remove obsolete and useless flags once the build will be totally mastered - configureFlags = '' - -verbose - -confirm-license - -opensource - - -release - -shared - ${lib.optionalString developerBuild "-developer-build"} - -largefile - -accessibility - -optimized-qmake - -strip - -no-reduce-relocations - -system-proxies - -pkg-config - - -gui - -widgets - -opengl desktop - -qml-debug - -iconv - -icu - -pch - - ${lib.optionalString (!system-x86_64) "-no-sse2"} - -no-sse3 - -no-ssse3 - -no-sse4.1 - -no-sse4.2 - -no-avx - -no-avx2 - -no-mips_dsp - -no-mips_dspr2 - - -system-zlib - -system-libpng - -system-libjpeg - -system-harfbuzz - -system-pcre - -openssl-linked - - -system-sqlite - -${if mysql != null then "plugin" else "no"}-sql-mysql - -${if postgresql != null then "plugin" else "no"}-sql-psql - - -make libs - -make tools - -${lib.optionalString (buildExamples == false) "no"}make examples - -${lib.optionalString (buildTests == false) "no"}make tests - -v - '' + lib.optionalString (!stdenv.isDarwin) '' - -no-rpath - -glib - -xcb - -qpa xcb - - -${lib.optionalString (cups == null) "no-"}cups - - -no-eglfs - -no-directfb - -no-linuxfb - -no-kms - - -libinput - -gtk - -system-xcb - -system-xkbcommon - -dbus-linked - '' + lib.optionalString stdenv.isDarwin '' - -platform macx-clang - -no-use-gold-linker - -no-fontconfig - -qt-freetype - ''; - - # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag - # if dependency paths contain the string "pq", which can occur in the hash. - # To prevent these failures, we need to override PostgreSQL detection. - PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq"; - - propagatedBuildInputs = [ - libxml2 libxslt openssl pcre16 sqlite zlib - - # Text rendering - harfbuzz icu - - # Image formats - libjpeg libpng libtiff - ] - ++ lib.optional mesaSupported mesa - ++ lib.optionals (!stdenv.isDarwin) [ - dbus glib udev - - # Text rendering - fontconfig freetype - - # X11 libs - libX11 libXcomposite libXext libXi libXrender libxcb libxkbcommon xcbutil - xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - ApplicationServices CoreServices AppKit Carbon OpenGL AGL Cocoa - DiskArbitration darwin.cf-private libiconv darwin.apple_sdk.sdk - ]); - - buildInputs = [ ] - ++ lib.optionals (!stdenv.isDarwin) [ gtk3 libinput ] - ++ lib.optional developerBuild gdb - ++ lib.optional (cups != null) cups - ++ lib.optional (mysql != null) mysql.lib - ++ lib.optional (postgresql != null) postgresql; - - nativeBuildInputs = [ bison flex gperf lndir perl pkgconfig python2 ] ++ lib.optional (!stdenv.isDarwin) patchelf; - - # freetype-2.5.4 changed signedness of some struct fields - NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare" - + lib.optionalString stdenv.isDarwin " -D__MAC_OS_X_VERSION_MAX_ALLOWED=1090 -D__AVAILABILITY_INTERNAL__MAC_10_10=__attribute__((availability(macosx,introduced=10.10)))"; - # Note that nixpkgs's objc4 is from macOS 10.11 while the SDK is - # 10.9 which necessitates the above macro definition that mentions - # 10.10 - - postInstall = '' - find "$out" -name "*.cmake" | while read file; do - substituteInPlace "$file" \ - --subst-var-by NIX_OUT "$out" \ - --subst-var-by NIX_DEV "$dev" - done - ''; - - preFixup = '' - # We cannot simply set these paths in configureFlags because libQtCore retains - # references to the paths it was built with. - moveToOutput "bin" "$dev" - moveToOutput "include" "$dev" - moveToOutput "mkspecs" "$dev" - - # The destination directory must exist or moveToOutput will do nothing - mkdir -p "$dev/share" - moveToOutput "share/doc" "$dev" - ''; - - postFixup = - '' - # Don't retain build-time dependencies like gdb. - sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri - - # Move libtool archives and qmake projects - if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then - pushd "''${!outputLib}" - find lib -name '*.a' -o -name '*.la'${if stdenv.isDarwin then "" else "-o -name '*.prl'"} | \ - while read -r file; do - mkdir -p "''${!outputDev}/$(dirname "$file")" - mv "''${!outputLib}/$file" "''${!outputDev}/$file" - done - popd - fi - '' - - # fixup .pc file (where to find 'moc' etc.) - + lib.optionalString (!stdenv.isDarwin) '' - sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \ - -e "/^host_bins=/ c host_bins=$dev/bin" - '' - - # Don't move .prl files on darwin because they end up in - # "dev/lib/Foo.framework/Foo.prl" which interferes with subsequent - # use of lndir in the qtbase setup-hook. On Linux, the .prl files - # are in lib, and so do not cause a subsequent recreation of deep - # framework directory trees. - + lib.optionalString stdenv.isDarwin '' - fixDarwinDylibNames_rpath() { - local flags=() - - for fn in "$@"; do - flags+=(-change "@rpath/$fn.framework/Versions/5/$fn" "$out/lib/$fn.framework/Versions/5/$fn") - done - - for fn in "$@"; do - echo "$fn: fixing dylib" - install_name_tool -id "$out/lib/$fn.framework/Versions/5/$fn" "''${flags[@]}" "$out/lib/$fn.framework/Versions/5/$fn" - done - } - fixDarwinDylibNames_rpath "QtConcurrent" "QtPrintSupport" "QtCore" "QtSql" "QtDBus" "QtTest" "QtGui" "QtWidgets" "QtNetwork" "QtXml" "QtOpenGL" - ''; - - inherit lndir; - setupHook = if stdenv.isDarwin - then ../../qtbase-setup-hook-darwin.sh - else ../../qtbase-setup-hook.sh; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = http://www.qt.io; - description = "A cross-platform application framework for C++"; - license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; - maintainers = with maintainers; [ bbenoist qknight ttuegel ]; - platforms = platforms.unix; - }; - -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-dbus.patch deleted file mode 100644 index 10b0b6701dd..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-dbus.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: qtbase-opensource-src-5.7.0/src/dbus/qdbus_symbols.cpp -=================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/dbus/qdbus_symbols.cpp -+++ qtbase-opensource-src-5.7.0/src/dbus/qdbus_symbols.cpp -@@ -97,7 +97,7 @@ bool qdbus_loadLibDBus() - #ifdef Q_OS_WIN - QLatin1String("dbus-1"), - #endif -- QLatin1String("libdbus-1") -+ QLatin1String("@dbus_libs@/lib/libdbus-1") - }; - - lib->unload(); diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gl.patch deleted file mode 100644 index ea3073ced50..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gl.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: qtbase-opensource-src-5.5.1/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -=================================================================== ---- qtbase-opensource-src-5.5.1.orig/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -+++ qtbase-opensource-src-5.5.1/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp -@@ -563,7 +563,12 @@ void (*QGLXContext::getProcAddress(const - { - extern const QString qt_gl_library_name(); - // QLibrary lib(qt_gl_library_name()); -+ // Check system library paths first - QLibrary lib(QLatin1String("GL")); -+ if (!lib.load()) { -+ // Fallback to Mesa driver -+ lib.setFileName(QLatin1String("@mesa_lib@/lib/libGL")); -+ } - glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); - } - } diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gtkstyle.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gtkstyle.patch deleted file mode 100644 index 755b0965cf5..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gtkstyle.patch +++ /dev/null @@ -1,50 +0,0 @@ -Index: qtbase-opensource-src-5.5.1/src/widgets/styles/qgtk2painter.cpp -=================================================================== ---- qtbase-opensource-src-5.5.1.orig/src/widgets/styles/qgtk2painter.cpp -+++ qtbase-opensource-src-5.5.1/src/widgets/styles/qgtk2painter.cpp -@@ -96,7 +96,7 @@ static void initGtk() - static bool initialized = false; - if (!initialized) { - // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0 -- QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0); -+ QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0); - - QGtk2PainterPrivate::gdk_pixmap_new = (Ptr_gdk_pixmap_new)libgtk.resolve("gdk_pixmap_new"); - QGtk2PainterPrivate::gdk_pixbuf_get_from_drawable = (Ptr_gdk_pixbuf_get_from_drawable)libgtk.resolve("gdk_pixbuf_get_from_drawable"); -Index: qtbase-opensource-src-5.5.1/src/widgets/styles/qgtkstyle_p.cpp -=================================================================== ---- qtbase-opensource-src-5.5.1.orig/src/widgets/styles/qgtkstyle_p.cpp -+++ qtbase-opensource-src-5.5.1/src/widgets/styles/qgtkstyle_p.cpp -@@ -327,7 +327,7 @@ void QGtkStylePrivate::gtkWidgetSetFocus - void QGtkStylePrivate::resolveGtk() const - { - // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0 -- QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0); -+ QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0); - - gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init"); - gtk_window_new = (Ptr_gtk_window_new)libgtk.resolve("gtk_window_new"); -@@ -425,8 +425,8 @@ void QGtkStylePrivate::resolveGtk() cons - pango_font_description_get_family = (Ptr_pango_font_description_get_family)libgtk.resolve("pango_font_description_get_family"); - pango_font_description_get_style = (Ptr_pango_font_description_get_style)libgtk.resolve("pango_font_description_get_style"); - -- gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("gnomeui-2"), 0, "gnome_icon_lookup_sync"); -- gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("gnomevfs-2"), 0, "gnome_vfs_init"); -+ gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("@libgnomeui@/lib/libgnomeui-2"), 0, "gnome_icon_lookup_sync"); -+ gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("@gnome_vfs@/lib/libgnomevfs-2"), 0, "gnome_vfs_init"); - } - - /* \internal -@@ -594,9 +594,9 @@ void QGtkStylePrivate::cleanupGtkWidgets - static bool resolveGConf() - { - if (!QGtkStylePrivate::gconf_client_get_default) { -- QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_default"); -- QGtkStylePrivate::gconf_client_get_string = (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_string"); -- QGtkStylePrivate::gconf_client_get_bool = (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_bool"); -+ QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_default"); -+ QGtkStylePrivate::gconf_client_get_string = (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_string"); -+ QGtkStylePrivate::gconf_client_get_bool = (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_bool"); - } - return (QGtkStylePrivate::gconf_client_get_default !=0); - } diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-libXcursor.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-libXcursor.patch deleted file mode 100644 index 02b7efb73d2..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-libXcursor.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: qtbase-opensource-src-5.7.0/src/plugins/platforms/xcb/qxcbcursor.cpp -=================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/plugins/platforms/xcb/qxcbcursor.cpp -+++ qtbase-opensource-src-5.7.0/src/plugins/platforms/xcb/qxcbcursor.cpp -@@ -309,10 +309,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *c - #if defined(XCB_USE_XLIB) && !defined(QT_NO_LIBRARY) - static bool function_ptrs_not_initialized = true; - if (function_ptrs_not_initialized) { -- QLibrary xcursorLib(QLatin1String("Xcursor"), 1); -+ QLibrary xcursorLib(QLatin1String("@libXcursor@/lib/libXcursor"), 1); - bool xcursorFound = xcursorLib.load(); - if (!xcursorFound) { // try without the version number -- xcursorLib.setFileName(QLatin1String("Xcursor")); -+ xcursorLib.setFileName(QLatin1String("@libXcursor@/lib/Xcursor")); - xcursorFound = xcursorLib.load(); - } - if (xcursorFound) { diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-openssl.patch deleted file mode 100644 index 9891bfeac5b..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-openssl.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: qtbase-opensource-src-5.7.0/src/network/ssl/qsslsocket_openssl_symbols.cpp -=================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/network/ssl/qsslsocket_openssl_symbols.cpp -+++ qtbase-opensource-src-5.7.0/src/network/ssl/qsslsocket_openssl_symbols.cpp -@@ -658,8 +658,8 @@ static QPair loadO - #endif - #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so - // first attempt: the canonical name is libssl.so. -- libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER)); -- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER)); -+ libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), QLatin1String(SHLIB_VERSION_NUMBER)); -+ libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER)); - if (libcrypto->load() && libssl->load()) { - // libssl.so. and libcrypto.so. found - return pair; -@@ -676,8 +676,8 @@ static QPair loadO - // OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third - // attempt, _after_ /Contents/Frameworks has been searched. - // iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place. -- libssl->setFileNameAndVersion(QLatin1String("ssl"), -1); -- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1); -+ libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), -1); -+ libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), -1); - if (libcrypto->load() && libssl->load()) { - // libssl.so.0 and libcrypto.so.0 found - return pair; diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-resolv.patch deleted file mode 100644 index 98a3610f5fb..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-resolv.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: qtbase-opensource-src-5.7.0/src/network/kernel/qdnslookup_unix.cpp -=================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/network/kernel/qdnslookup_unix.cpp -+++ qtbase-opensource-src-5.7.0/src/network/kernel/qdnslookup_unix.cpp -@@ -85,7 +85,7 @@ static bool resolveLibraryInternal() - if (!lib.load()) - #endif - { -- lib.setFileName(QLatin1String("resolv")); -+ lib.setFileName(QLatin1String("@glibc@/lib/resolv")); - if (!lib.load()) - return false; - } -Index: qtbase-opensource-src-5.7.0/src/network/kernel/qhostinfo_unix.cpp -=================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/network/kernel/qhostinfo_unix.cpp -+++ qtbase-opensource-src-5.7.0/src/network/kernel/qhostinfo_unix.cpp -@@ -100,7 +100,7 @@ static bool resolveLibraryInternal() - if (!lib.load()) - #endif - { -- lib.setFileName(QLatin1String("resolv")); -+ lib.setFileName(QLatin1String("@glibc@/lib/libresolv")); - if (!lib.load()) - return false; - } diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/libressl.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/libressl.patch deleted file mode 100644 index 4390db977a7..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/libressl.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 81494e67eccba04fc3fe554d76a9ca6fe7f2250e Mon Sep 17 00:00:00 2001 -From: hasufell -Date: Sat, 10 Oct 2015 01:15:01 +0200 -Subject: [PATCH] Fix compilation with libressl - -By additionally checking for defined(SSL_CTRL_SET_CURVES), which -is defined in openssl, but not in libressl. ---- - src/network/ssl/qsslcontext_openssl.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: qtbase-opensource-src-5.7.0/src/network/ssl/qsslcontext_openssl.cpp -=================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/network/ssl/qsslcontext_openssl.cpp -+++ qtbase-opensource-src-5.7.0/src/network/ssl/qsslcontext_openssl.cpp -@@ -347,7 +347,7 @@ init_context: - - const QVector qcurves = sslContext->sslConfiguration.ellipticCurves(); - if (!qcurves.isEmpty()) { --#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) -+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC) - // Set the curves to be used - if (q_SSLeay() >= 0x10002000L) { - // SSL_CTX_ctrl wants a non-const pointer as last argument, -@@ -360,7 +360,7 @@ init_context: - sslContext->errorCode = QSslError::UnspecifiedError; - } - } else --#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) -+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC) - { - // specific curves requested, but not possible to set -> error - sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version too old, need at least v1.0.2")); diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/mkspecs-libgl.patch deleted file mode 100644 index fda3d3e3653..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/mkspecs-libgl.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: qtbase-opensource-src-5.5.1/mkspecs/common/linux.conf -=================================================================== ---- qtbase-opensource-src-5.5.1.orig/mkspecs/common/linux.conf -+++ qtbase-opensource-src-5.5.1/mkspecs/common/linux.conf -@@ -12,8 +12,8 @@ QMAKE_INCDIR = - QMAKE_LIBDIR = - QMAKE_INCDIR_X11 = - QMAKE_LIBDIR_X11 = --QMAKE_INCDIR_OPENGL = --QMAKE_LIBDIR_OPENGL = -+QMAKE_INCDIR_OPENGL = @mesa_inc@/include -+QMAKE_LIBDIR_OPENGL = @mesa_lib@/lib - QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL - QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL - QMAKE_INCDIR_EGL = diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/nix-profiles-library-paths.patch deleted file mode 100644 index ebaf3651a6d..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/nix-profiles-library-paths.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: qtbase-opensource-src-5.7.0/src/corelib/kernel/qcoreapplication.cpp -=================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/corelib/kernel/qcoreapplication.cpp -+++ qtbase-opensource-src-5.7.0/src/corelib/kernel/qcoreapplication.cpp -@@ -2487,7 +2487,17 @@ QStringList QCoreApplication::libraryPat - QStringList *app_libpaths = new QStringList; - coreappdata()->app_libpaths.reset(app_libpaths); - -+ // Add library paths derived from NIX_PROFILES. -+ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' '); -+ const QString plugindir = QString::fromLatin1("/lib/qt5/plugins"); -+ for (const QByteArray &profile: profiles) { -+ if (!profile.isEmpty()) { -+ app_libpaths->append(QFile::decodeName(profile) + plugindir); -+ } -+ } -+ - const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH"); -+ qunsetenv("QT_PLUGIN_PATH"); // do not propagate to child processes - if (!libPathEnv.isEmpty()) { - QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); - for (QStringList::const_iterator it = paths.constBegin(); it != paths.constEnd(); ++it) { diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/series b/pkgs/development/libraries/qt-5/5.7/qtbase/series deleted file mode 100644 index 2196d838375..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/series +++ /dev/null @@ -1,9 +0,0 @@ -dlopen-resolv.patch -tzdir.patch -dlopen-libXcursor.patch -dlopen-openssl.patch -dlopen-dbus.patch -xdg-config-dirs.patch -nix-profiles-library-paths.patch -compose-search-path.patch -libressl.patch diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/tzdir.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/tzdir.patch deleted file mode 100644 index f4056dd9cc9..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/tzdir.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: qtbase-opensource-src-5.7.0/src/corelib/tools/qtimezoneprivate_tz.cpp -=================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/corelib/tools/qtimezoneprivate_tz.cpp -+++ qtbase-opensource-src-5.7.0/src/corelib/tools/qtimezoneprivate_tz.cpp -@@ -68,7 +68,10 @@ typedef QHash Q - // Parse zone.tab table, assume lists all installed zones, if not will need to read directories - static QTzTimeZoneHash loadTzTimeZones() - { -- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); -+ QString path = qgetenv("TZDIR"); -+ path += "/zone.tab"; -+ if (!QFile::exists(path)) -+ path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); - if (!QFile::exists(path)) - path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); - -@@ -566,12 +569,18 @@ void QTzTimeZonePrivate::init(const QByt - if (!tzif.open(QIODevice::ReadOnly)) - return; - } else { -- // Open named tz, try modern path first, if fails try legacy path -- tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ // Try TZDIR first -+ QString zoneinfoDir = qgetenv("TZDIR"); -+ zoneinfoDir += "/" + QString::fromLocal8Bit(ianaId); -+ tzif.setFileName(zoneinfoDir); - if (!tzif.open(QIODevice::ReadOnly)) { -- tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -- if (!tzif.open(QIODevice::ReadOnly)) -- return; -+ // Open named tz, try modern path first, if fails try legacy path -+ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ if (!tzif.open(QIODevice::ReadOnly)) { -+ tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ if (!tzif.open(QIODevice::ReadOnly)) -+ return; -+ } - } - } - diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/xdg-config-dirs.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/xdg-config-dirs.patch deleted file mode 100644 index 1f2f316c5b2..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/xdg-config-dirs.patch +++ /dev/null @@ -1,41 +0,0 @@ -Index: qtbase-opensource-src-5.7.0/src/corelib/io/qsettings.cpp -=================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/corelib/io/qsettings.cpp -+++ qtbase-opensource-src-5.7.0/src/corelib/io/qsettings.cpp -@@ -1161,6 +1161,23 @@ QConfFileSettingsPrivate::QConfFileSetti - confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false)); - confFiles[F_System | F_Organization].reset(QConfFile::fromName(systemPath + orgFile, false)); - -+#if !defined(Q_OS_WIN) -+ // Add directories specified in $XDG_CONFIG_DIRS -+ const QString pathEnv = QString::fromLocal8Bit(getenv("XDG_CONFIG_DIRS")); -+ if (!pathEnv.isEmpty()) { -+ const QStringList pathEntries = pathEnv.split(QLatin1Char(':'), QString::SkipEmptyParts); -+ if (!pathEntries.isEmpty()) { -+ int j = 4; // This is the number of confFiles set above -- we need to start adding $XDG_CONFIG_DIRS after those. -+ for (int k = 0; k < pathEntries.size() && j < NumConfFiles - 1; ++k) { -+ const QString& path = pathEntries.at(k); -+ if (!application.isEmpty()) -+ confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + appFile, false)); -+ confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + orgFile, false)); -+ } -+ } -+ } -+#endif -+ - for (i = 0; i < NumConfFiles; ++i) { - if (confFiles[i]) { - spec = i; -Index: qtbase-opensource-src-5.7.0/src/corelib/io/qsettings_p.h -=================================================================== ---- qtbase-opensource-src-5.7.0.orig/src/corelib/io/qsettings_p.h -+++ qtbase-opensource-src-5.7.0/src/corelib/io/qsettings_p.h -@@ -246,7 +246,7 @@ public: - F_Organization = 0x1, - F_User = 0x0, - F_System = 0x2, -- NumConfFiles = 4 -+ NumConfFiles = 40 // HACK: increase NumConfFiles from 4 to 40 in order to accommodate more paths in $XDG_CONFIG_DIRS -- ellis - }; - - QSettings::Format format; diff --git a/pkgs/development/libraries/qt-5/5.7/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.7/qtconnectivity.nix deleted file mode 100644 index 95cd6fea79b..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtconnectivity.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtbase, qtdeclarative }: - -qtSubmodule { - name = "qtconnectivity"; - qtInputs = [ qtbase qtdeclarative ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.7/qtdeclarative/default.nix deleted file mode 100644 index 9b6a6c46176..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ qtSubmodule, lib, copyPathsToStore, python2, qtbase, qtsvg, qtxmlpatterns }: - -qtSubmodule { - name = "qtdeclarative"; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - qtInputs = [ qtbase qtsvg qtxmlpatterns ]; - nativeBuildInputs = [ python2 ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.7/qtdeclarative/nix-profiles-import-paths.patch deleted file mode 100644 index 06b244b974f..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/nix-profiles-import-paths.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp -=================================================================== ---- qtdeclarative-opensource-src-5.5.1.orig/src/qml/qml/qqmlimport.cpp -+++ qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp -@@ -1549,6 +1549,15 @@ QQmlImportDatabase::QQmlImportDatabase(Q - QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); - addImportPath(installImportsPath); - -+ // Add library paths derived from NIX_PROFILES. -+ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' '); -+ const QString qmldir = QString::fromLatin1("/lib/qt5/qml"); -+ Q_FOREACH (const QByteArray &profile, profiles) { -+ if (!profile.isEmpty()) { -+ addImportPath(QFile::decodeName(profile) + qmldir); -+ } -+ } -+ - // env import paths - QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH"); - if (!envImportPath.isEmpty()) { diff --git a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/series b/pkgs/development/libraries/qt-5/5.7/qtdeclarative/series deleted file mode 100644 index 7dbe197c56e..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/series +++ /dev/null @@ -1 +0,0 @@ -nix-profiles-import-paths.patch diff --git a/pkgs/development/libraries/qt-5/5.7/qtdoc.nix b/pkgs/development/libraries/qt-5/5.7/qtdoc.nix deleted file mode 100644 index 578ea6ba0b2..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtdoc.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtdeclarative }: - -qtSubmodule { - name = "qtdoc"; - qtInputs = [ qtdeclarative ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtgraphicaleffects.nix b/pkgs/development/libraries/qt-5/5.7/qtgraphicaleffects.nix deleted file mode 100644 index 3273f12eb83..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtgraphicaleffects.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtdeclarative }: - -qtSubmodule { - name = "qtgraphicaleffects"; - qtInputs = [ qtdeclarative ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtimageformats.nix b/pkgs/development/libraries/qt-5/5.7/qtimageformats.nix deleted file mode 100644 index 03d0fffbe80..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtimageformats.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtbase }: - -qtSubmodule { - name = "qtimageformats"; - qtInputs = [ qtbase ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtlocation.nix b/pkgs/development/libraries/qt-5/5.7/qtlocation.nix deleted file mode 100644 index 1e134057c4b..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtlocation.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtbase, qtmultimedia }: - -qtSubmodule { - name = "qtlocation"; - qtInputs = [ qtbase qtmultimedia ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix deleted file mode 100644 index a48dd38ae6d..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, qtSubmodule, qtbase, qtdeclarative, pkgconfig -, alsaLib, gstreamer, gst-plugins-base, libpulseaudio -}: - -qtSubmodule { - name = "qtmultimedia"; - qtInputs = [ qtbase qtdeclarative ]; - buildInputs = [ - pkgconfig gstreamer gst-plugins-base libpulseaudio - ] ++ stdenv.lib.optional stdenv.isLinux alsaLib; - qmakeFlags = [ "GST_VERSION=1.0" ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtquickcontrols.nix b/pkgs/development/libraries/qt-5/5.7/qtquickcontrols.nix deleted file mode 100644 index 93a864621b8..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtquickcontrols.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtdeclarative }: - -qtSubmodule { - name = "qtquickcontrols"; - qtInputs = [ qtdeclarative ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtquickcontrols2.nix b/pkgs/development/libraries/qt-5/5.7/qtquickcontrols2.nix deleted file mode 100644 index 19750f2fd99..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtquickcontrols2.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtdeclarative }: - -qtSubmodule { - name = "qtquickcontrols2"; - qtInputs = [ qtdeclarative ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtscript/0001-glib-2.32.patch b/pkgs/development/libraries/qt-5/5.7/qtscript/0001-glib-2.32.patch deleted file mode 100644 index 887e107b6c1..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtscript/0001-glib-2.32.patch +++ /dev/null @@ -1,25 +0,0 @@ -From abd80356449bb36c8adcc5c9ca1df6b47715d265 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 23 Aug 2015 09:13:34 -0500 -Subject: [PATCH] glib-2.32 - ---- - src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -index 1f6d25e..087c3fb 100644 ---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h -@@ -81,7 +81,7 @@ - #include - #elif PLATFORM(GTK) - #include --typedef struct _GMutex GMutex; -+typedef union _GMutex GMutex; - typedef struct _GCond GCond; - #endif - --- -2.5.0 - diff --git a/pkgs/development/libraries/qt-5/5.7/qtscript/default.nix b/pkgs/development/libraries/qt-5/5.7/qtscript/default.nix deleted file mode 100644 index 127766e2ebd..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtscript/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ qtSubmodule, qtbase, qttools }: - -qtSubmodule { - name = "qtscript"; - qtInputs = [ qtbase qttools ]; - patches = [ ./0001-glib-2.32.patch ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtsensors.nix b/pkgs/development/libraries/qt-5/5.7/qtsensors.nix deleted file mode 100644 index 61e64dc47e4..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtsensors.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtbase, qtdeclarative }: - -qtSubmodule { - name = "qtsensors"; - qtInputs = [ qtbase qtdeclarative ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtserialport/0001-dlopen-serialport-udev.patch b/pkgs/development/libraries/qt-5/5.7/qtserialport/0001-dlopen-serialport-udev.patch deleted file mode 100644 index 3a813dc8007..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtserialport/0001-dlopen-serialport-udev.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d81c2c870b9bea8fb8e6b85baefb06542f568338 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 23 Aug 2015 09:16:02 -0500 -Subject: [PATCH] dlopen serialport udev - ---- - src/serialport/qtudev_p.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h -index 6f2cabd..81b9849 100644 ---- a/src/serialport/qtudev_p.h -+++ b/src/serialport/qtudev_p.h -@@ -105,9 +105,9 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN - inline bool resolveSymbols(QLibrary *udevLibrary) - { - if (!udevLibrary->isLoaded()) { -- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1); -+ udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1); - if (!udevLibrary->load()) { -- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0); -+ udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0); - if (!udevLibrary->load()) { - qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0); - return false; --- -2.5.0 - diff --git a/pkgs/development/libraries/qt-5/5.7/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.7/qtserialport/default.nix deleted file mode 100644 index 2bffd0a2bd6..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtserialport/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ qtSubmodule, qtbase, substituteAll, systemd }: - -qtSubmodule { - name = "qtserialport"; - qtInputs = [ qtbase ]; - patches = [ - (substituteAll { - src = ./0001-dlopen-serialport-udev.patch; - libudev = systemd.lib; - }) - ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtsvg.nix b/pkgs/development/libraries/qt-5/5.7/qtsvg.nix deleted file mode 100644 index b9ccac7cf93..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtsvg.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtbase }: - -qtSubmodule { - name = "qtsvg"; - qtInputs = [ qtbase ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qttools/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.7/qttools/cmake-paths.patch deleted file mode 100644 index e3db17e978c..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qttools/cmake-paths.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -Naur qttools-opensource-src-5.7.1.orig/src/assistant/help/Qt5HelpConfigExtras.cmake.in qttools-opensource-src-5.7.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in ---- qttools-opensource-src-5.7.1.orig/src/assistant/help/Qt5HelpConfigExtras.cmake.in 2016-11-03 09:31:16.000000000 +0100 -+++ qttools-opensource-src-5.7.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in 2017-02-28 16:37:20.130457615 +0100 -@@ -2,11 +2,10 @@ - if (NOT TARGET Qt5::qcollectiongenerator) - add_executable(Qt5::qcollectiongenerator IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\") --!!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\") --!!ENDIF -+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\") -+ if(NOT EXISTS \"${imported_location}\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\") -+ endif() - _qt5_Help_check_file_exists(${imported_location}) - - set_target_properties(Qt5::qcollectiongenerator PROPERTIES -@@ -17,11 +16,10 @@ - if (NOT TARGET Qt5::qhelpgenerator) - add_executable(Qt5::qhelpgenerator IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\") --!!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\") --!!ENDIF -+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\") -+ if(NOT EXISTS \"${imported_location}\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\") -+ endif() - _qt5_Help_check_file_exists(${imported_location}) - - set_target_properties(Qt5::qhelpgenerator PROPERTIES -diff -Naur qttools-opensource-src-5.7.1.orig/src/linguist/Qt5LinguistToolsConfig.cmake.in qttools-opensource-src-5.7.1/src/linguist/Qt5LinguistToolsConfig.cmake.in ---- qttools-opensource-src-5.7.1.orig/src/linguist/Qt5LinguistToolsConfig.cmake.in 2016-11-03 09:31:16.000000000 +0100 -+++ qttools-opensource-src-5.7.1/src/linguist/Qt5LinguistToolsConfig.cmake.in 2017-02-28 16:35:40.470100681 +0100 -@@ -44,11 +44,10 @@ - if (NOT TARGET Qt5::lrelease) - add_executable(Qt5::lrelease IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") --!!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") --!!ENDIF -+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") -+ if(NOT EXISTS \"${imported_location}\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\") -+ endif() - _qt5_LinguistTools_check_file_exists(${imported_location}) - - set_target_properties(Qt5::lrelease PROPERTIES -@@ -59,11 +58,10 @@ - if (NOT TARGET Qt5::lupdate) - add_executable(Qt5::lupdate IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") --!!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") --!!ENDIF -+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") -+ if(NOT EXISTS \"${imported_location}\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\") -+ endif() - _qt5_LinguistTools_check_file_exists(${imported_location}) - - set_target_properties(Qt5::lupdate PROPERTIES -@@ -74,11 +72,10 @@ - if (NOT TARGET Qt5::lconvert) - add_executable(Qt5::lconvert IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") --!!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") --!!ENDIF -+ set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") -+ if(NOT EXISTS \"${imported_location}\") -+ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\") -+ endif() - _qt5_LinguistTools_check_file_exists(${imported_location}) - - set_target_properties(Qt5::lconvert PROPERTIES diff --git a/pkgs/development/libraries/qt-5/5.7/qttools/default.nix b/pkgs/development/libraries/qt-5/5.7/qttools/default.nix deleted file mode 100644 index d72d7b6c64c..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qttools/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ qtSubmodule, lib, copyPathsToStore, qtbase }: - -qtSubmodule { - name = "qttools"; - qtInputs = [ qtbase ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - postFixup = '' - moveToOutput "bin/qdbus" "$out" - moveToOutput "bin/qtpaths" "$out" - ''; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qttools/series b/pkgs/development/libraries/qt-5/5.7/qttools/series deleted file mode 100644 index 6cc1d3b87bc..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qttools/series +++ /dev/null @@ -1 +0,0 @@ -cmake-paths.patch diff --git a/pkgs/development/libraries/qt-5/5.7/qttranslations.nix b/pkgs/development/libraries/qt-5/5.7/qttranslations.nix deleted file mode 100644 index 50fc8cf6826..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qttranslations.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qttools }: - -qtSubmodule { - name = "qttranslations"; - qtInputs = [ qttools ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtwayland.nix b/pkgs/development/libraries/qt-5/5.7/qtwayland.nix deleted file mode 100644 index 6d887f7c650..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtwayland.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ qtSubmodule, qtbase, qtquickcontrols, wayland, pkgconfig }: - -qtSubmodule { - name = "qtwayland"; - qtInputs = [ qtbase qtquickcontrols ]; - buildInputs = [ wayland ]; - nativeBuildInputs = [ pkgconfig ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebchannel.nix b/pkgs/development/libraries/qt-5/5.7/qtwebchannel.nix deleted file mode 100644 index fd7a3c52026..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtwebchannel.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ qtSubmodule, qtbase, qtdeclarative }: - -qtSubmodule { - name = "qtwebchannel"; - qtInputs = [ qtbase qtdeclarative ]; -} - diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix deleted file mode 100644 index a42dda1b36c..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ qtSubmodule, qtquickcontrols, qtlocation, qtwebchannel - -, xlibs, libXcursor, libXScrnSaver, libXrandr, libXtst -, fontconfig, freetype, harfbuzz, icu, dbus -, zlib, libjpeg, libpng, libtiff -, alsaLib -, libcap -, pciutils - -, bison, flex, git, which, gperf -, coreutils -, pkgconfig, python2 - -, stdenv # lib.optional, needsPax -}: - -qtSubmodule { - name = "qtwebengine"; - qtInputs = [ qtquickcontrols qtlocation qtwebchannel ]; - buildInputs = [ bison flex git which gperf ]; - nativeBuildInputs = [ pkgconfig python2 coreutils ]; - doCheck = true; - - enableParallelBuilding = true; - - preConfigure = '' - export MAKEFLAGS=-j$NIX_BUILD_CORES - substituteInPlace ./src/3rdparty/chromium/build/common.gypi \ - --replace /bin/echo ${coreutils}/bin/echo - substituteInPlace ./src/3rdparty/chromium/v8/build/toolchain.gypi \ - --replace /bin/echo ${coreutils}/bin/echo - substituteInPlace ./src/3rdparty/chromium/v8/build/standalone.gypi \ - --replace /bin/echo ${coreutils}/bin/echo - - # fix default SSL bundle location - sed -i -e 's,/cert.pem,/certs/ca-bundle.crt,' src/3rdparty/chromium/third_party/boringssl/src/crypto/x509/x509_def.c - - # Fix library paths - sed -i \ - -e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \ - -e "s,QLibraryInfo::location(QLibraryInfo::TranslationsPath),QLatin1String(\"$out/translations\"),g" \ - -e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \ - src/core/web_engine_library_info.cpp - - configureFlags+="\ - -plugindir $out/lib/qt5/plugins \ - -importdir $out/lib/qt5/imports \ - -qmldir $out/lib/qt5/qml \ - -docdir $out/share/doc/qt5" - ''; - propagatedBuildInputs = [ - dbus zlib alsaLib - - # Image formats - libjpeg libpng libtiff - - # Text rendering - fontconfig freetype harfbuzz icu - - # X11 libs - xlibs.xrandr libXScrnSaver libXcursor libXrandr xlibs.libpciaccess libXtst - xlibs.libXcomposite - - libcap - pciutils - ]; - patches = stdenv.lib.optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; - postInstall = '' - cat > $out/libexec/qt.conf < -Date: Sun, 23 Aug 2015 09:18:54 -0500 -Subject: [PATCH 1/3] dlopen webkit nsplugin - ---- - Source/WebCore/plugins/qt/PluginPackageQt.cpp | 2 +- - Source/WebCore/plugins/qt/PluginViewQt.cpp | 2 +- - Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp -index a923d49..2731d05 100644 ---- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp -+++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp -@@ -136,7 +136,7 @@ static void initializeGtk(QLibrary* module = 0) - } - } - -- QLibrary library(QLatin1String("libgtk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); - if (library.load()) { - typedef void *(*gtk_init_check_ptr)(int*, char***); - gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check"); -diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp -index de06a2f..363bde5 100644 ---- a/Source/WebCore/plugins/qt/PluginViewQt.cpp -+++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp -@@ -697,7 +697,7 @@ static Display *getPluginDisplay() - // support gdk based plugins (like flash) that use a different X connection. - // The code below has the same effect as this one: - // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); -- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0); - if (!library.load()) - return 0; - -diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -index d734ff6..62a2197 100644 ---- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp -@@ -64,7 +64,7 @@ static Display* getPluginDisplay() - // The code below has the same effect as this one: - // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); - -- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gdk_pixbuf@/libgdk-x11-2.0"), 0); - if (!library.load()) - return 0; - --- -2.5.0 - diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebkit/0002-dlopen-webkit-gtk.patch b/pkgs/development/libraries/qt-5/5.7/qtwebkit/0002-dlopen-webkit-gtk.patch deleted file mode 100644 index bb5d1f74364..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtwebkit/0002-dlopen-webkit-gtk.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6a407d30357c2551abceac75c82f4a1688e47437 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 23 Aug 2015 09:19:16 -0500 -Subject: [PATCH 2/3] dlopen webkit gtk - ---- - Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp -index 8de6521..0b25748 100644 ---- a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp -+++ b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp -@@ -53,7 +53,7 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr - - static bool initializeGtk() - { -- QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0); -+ QLibrary gtkLibrary(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); - if (!gtkLibrary.load()) - return false; - typedef void* (*gtk_init_ptr)(void*, void*); --- -2.5.0 - diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebkit/0003-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/5.7/qtwebkit/0003-dlopen-webkit-udev.patch deleted file mode 100644 index 1c360cd81aa..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtwebkit/0003-dlopen-webkit-udev.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 864020dd47c3b6d532d9f26b82185904cf9324f2 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 23 Aug 2015 09:19:29 -0500 -Subject: [PATCH 3/3] dlopen webkit udev - ---- - Source/WebCore/platform/qt/GamepadsQt.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Source/WebCore/platform/qt/GamepadsQt.cpp b/Source/WebCore/platform/qt/GamepadsQt.cpp -index 60ff317..da8ac69 100644 ---- a/Source/WebCore/platform/qt/GamepadsQt.cpp -+++ b/Source/WebCore/platform/qt/GamepadsQt.cpp -@@ -111,12 +111,12 @@ private: - bool load() - { - m_libUdev.setLoadHints(QLibrary::ResolveAllSymbolsHint); -- m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 1); -+ m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1); - m_loaded = m_libUdev.load(); - if (resolveMethods()) - return true; - -- m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 0); -+ m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0); - m_loaded = m_libUdev.load(); - return resolveMethods(); - } --- -2.5.0 - diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix deleted file mode 100644 index 915a6bcae8a..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors -, fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt -, sqlite, systemd, glib, gst_all_1 -, bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby -, substituteAll -, flashplayerFix ? false -}: - -with stdenv.lib; - -qtSubmodule { - name = "qtwebkit"; - qtInputs = [ qtdeclarative qtlocation qtsensors ]; - buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; - nativeBuildInputs = [ - bison2 flex gdb gperf perl pkgconfig python2 ruby - ]; - patches = - let dlopen-webkit-nsplugin = substituteAll { - src = ./0001-dlopen-webkit-nsplugin.patch; - gtk = gtk2.out; - gdk_pixbuf = gdk_pixbuf.out; - }; - dlopen-webkit-gtk = substituteAll { - src = ./0002-dlopen-webkit-gtk.patch; - gtk = gtk2.out; - }; - dlopen-webkit-udev = substituteAll { - src = ./0003-dlopen-webkit-udev.patch; - libudev = systemd.lib; - }; - in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ] - ++ [ dlopen-webkit-udev ]; - meta.maintainers = with stdenv.lib.maintainers; [ abbradar ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.7/qtwebsockets.nix deleted file mode 100644 index fbdfbbcf0db..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtwebsockets.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtbase, qtdeclarative }: - -qtSubmodule { - name = "qtwebsockets"; - qtInputs = [ qtbase qtdeclarative ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtx11extras.nix b/pkgs/development/libraries/qt-5/5.7/qtx11extras.nix deleted file mode 100644 index a765161e2d7..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtx11extras.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtbase }: - -qtSubmodule { - name = "qtx11extras"; - qtInputs = [ qtbase ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/5.7/qtxmlpatterns.nix deleted file mode 100644 index 9a8ddbba2bd..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/qtxmlpatterns.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ qtSubmodule, qtbase }: - -qtSubmodule { - name = "qtxmlpatterns"; - qtInputs = [ qtbase ]; -} diff --git a/pkgs/development/libraries/qt-5/5.7/srcs.nix b/pkgs/development/libraries/qt-5/5.7/srcs.nix deleted file mode 100644 index 3fc4fab4ea5..00000000000 --- a/pkgs/development/libraries/qt-5/5.7/srcs.nix +++ /dev/null @@ -1,317 +0,0 @@ -# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh -{ fetchurl, mirror }: - -{ - qt3d = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qt3d-opensource-src-5.7.1.tar.xz"; - sha256 = "1sh7yz8nb9iqz3bp6bfc2kmji70zq39d9c0sfxnhif3p2x1wyx0x"; - name = "qt3d-opensource-src-5.7.1.tar.xz"; - }; - }; - qtactiveqt = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtactiveqt-opensource-src-5.7.1.tar.xz"; - sha256 = "1md14jdgwsdczpfvc0qkk5agxqk7a9qs91k41zj15ykkw86r428c"; - name = "qtactiveqt-opensource-src-5.7.1.tar.xz"; - }; - }; - qtandroidextras = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtandroidextras-opensource-src-5.7.1.tar.xz"; - sha256 = "1wq9m7a3dh9k8z006cw6m96awc53yf5vnq3wdqf5yfclfz696lhg"; - name = "qtandroidextras-opensource-src-5.7.1.tar.xz"; - }; - }; - qtbase = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz"; - sha256 = "0zjmcrmnnmaz1lr9wc5i6y565hsvl8ycn790ivqaz62dv54zbkgd"; - name = "qtbase-opensource-src-5.7.1.tar.xz"; - }; - }; - qtcanvas3d = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtcanvas3d-opensource-src-5.7.1.tar.xz"; - sha256 = "1d5xpq3mhjg4ipxzap7s2vnlfcd02d3yq720npv10xxp2ww0i1x8"; - name = "qtcanvas3d-opensource-src-5.7.1.tar.xz"; - }; - }; - qtcharts = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtcharts-opensource-src-5.7.1.tar.xz"; - sha256 = "1qrzcddwff2hxsbxrraff16j4abah2zkra2756s1mvydj9lyxzl5"; - name = "qtcharts-opensource-src-5.7.1.tar.xz"; - }; - }; - qtconnectivity = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtconnectivity-opensource-src-5.7.1.tar.xz"; - sha256 = "0rmr7bd4skby7bax9hpj2sid2bq3098nkw7xm02mdp04hc3bks5k"; - name = "qtconnectivity-opensource-src-5.7.1.tar.xz"; - }; - }; - qtdatavis3d = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtdatavis3d-opensource-src-5.7.1.tar.xz"; - sha256 = "1y00p0wyj5cw9c2925y537vpmmg9q3kpf7qr1s7sv67dvvf8bzqv"; - name = "qtdatavis3d-opensource-src-5.7.1.tar.xz"; - }; - }; - qtdeclarative = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtdeclarative-opensource-src-5.7.1.tar.xz"; - sha256 = "0mjxfwnplpx60jc6y94krg00isddl9bfwc7dayl981njb4qds4zx"; - name = "qtdeclarative-opensource-src-5.7.1.tar.xz"; - }; - }; - qtdeclarative-render2d = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtdeclarative-render2d-opensource-src-5.7.1.tar.xz"; - sha256 = "0zwch9vn17f3bpy300jcfxx6cx9qymk5j7khx0x9k1xqid4166c3"; - name = "qtdeclarative-render2d-opensource-src-5.7.1.tar.xz"; - }; - }; - qtdoc = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtdoc-opensource-src-5.7.1.tar.xz"; - sha256 = "1nyrgfw3d8ja2cqb12vyq5mwryw89976f3xkpdhy49mvsws03ysm"; - name = "qtdoc-opensource-src-5.7.1.tar.xz"; - }; - }; - qtgamepad = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtgamepad-opensource-src-5.7.1.tar.xz"; - sha256 = "10lijbsg9xx5ddbbjymdgl41nxz99yn1qgiww2kkggxwwdjj2axv"; - name = "qtgamepad-opensource-src-5.7.1.tar.xz"; - }; - }; - qtgraphicaleffects = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtgraphicaleffects-opensource-src-5.7.1.tar.xz"; - sha256 = "1j2drnx7zp3w6cgvy7bn00fyk5v7vw1j1hidaqcg78lzb6zgls1c"; - name = "qtgraphicaleffects-opensource-src-5.7.1.tar.xz"; - }; - }; - qtimageformats = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtimageformats-opensource-src-5.7.1.tar.xz"; - sha256 = "1x3p1xmw7spxa4bwriyrwsfrq31jabsdjsi5fras9y39naia55sg"; - name = "qtimageformats-opensource-src-5.7.1.tar.xz"; - }; - }; - qtlocation = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtlocation-opensource-src-5.7.1.tar.xz"; - sha256 = "17zkzffzwbg6aqhsggs23cmwzq4y45m938842lsc423hfm7fdsgr"; - name = "qtlocation-opensource-src-5.7.1.tar.xz"; - }; - }; - qtmacextras = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtmacextras-opensource-src-5.7.1.tar.xz"; - sha256 = "0rr6nl1j6bq47lcq87zsqyma3cdqysamnngwbaccxvpznpcx7jhx"; - name = "qtmacextras-opensource-src-5.7.1.tar.xz"; - }; - }; - qtmultimedia = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtmultimedia-opensource-src-5.7.1.tar.xz"; - sha256 = "1vvxmgmvjnz9w1h2ph1j2fy77ij141ycx5fric60lq02pxzifax5"; - name = "qtmultimedia-opensource-src-5.7.1.tar.xz"; - }; - }; - qtpurchasing = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtpurchasing-opensource-src-5.7.1.tar.xz"; - sha256 = "0hkvrgafz1hx9q4yc3nskv3pd3fszghvvd5a7mj33ynf55wpb57n"; - name = "qtpurchasing-opensource-src-5.7.1.tar.xz"; - }; - }; - qtquickcontrols = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtquickcontrols-opensource-src-5.7.1.tar.xz"; - sha256 = "17cyfyqzjbm9dhq9pjscz36y84y16rmxwk6h826gjfprddrimsvg"; - name = "qtquickcontrols-opensource-src-5.7.1.tar.xz"; - }; - }; - qtquickcontrols2 = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtquickcontrols2-opensource-src-5.7.1.tar.xz"; - sha256 = "1v77ydy4k15lksp3bi2kgha2h7m79g4n7c2qhbr09xnvpb8ars7j"; - name = "qtquickcontrols2-opensource-src-5.7.1.tar.xz"; - }; - }; - qtscript = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtscript-opensource-src-5.7.1.tar.xz"; - sha256 = "09m41n95448pszr7inlg03ycb66s1a9hzfylaka92382acf1myav"; - name = "qtscript-opensource-src-5.7.1.tar.xz"; - }; - }; - qtscxml = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtscxml-opensource-src-5.7.1.tar.xz"; - sha256 = "135kknqdmib2cjryfmvfgv7a2qx9pyba3m7i7nkbc5d742r4mbcx"; - name = "qtscxml-opensource-src-5.7.1.tar.xz"; - }; - }; - qtsensors = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtsensors-opensource-src-5.7.1.tar.xz"; - sha256 = "041v1x8pwfzpyk6y0sy5zgm915pi15xdhiy18fd5wqayvcp99cyc"; - name = "qtsensors-opensource-src-5.7.1.tar.xz"; - }; - }; - qtserialbus = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtserialbus-opensource-src-5.7.1.tar.xz"; - sha256 = "0mxi43l2inpbar8rmg21qjg33bv3f1ycxjgvzjf12ncnybhdnzkj"; - name = "qtserialbus-opensource-src-5.7.1.tar.xz"; - }; - }; - qtserialport = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtserialport-opensource-src-5.7.1.tar.xz"; - sha256 = "09jsryc0z49cz9783kq48rkn42f10c6krzivp812ddwjsfdy3mbn"; - name = "qtserialport-opensource-src-5.7.1.tar.xz"; - }; - }; - qtsvg = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtsvg-opensource-src-5.7.1.tar.xz"; - sha256 = "0irr9h566hl9nx8p919rz276zbfvvd6vqdb6i9g6b3piikdigw5h"; - name = "qtsvg-opensource-src-5.7.1.tar.xz"; - }; - }; - qttools = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz"; - sha256 = "1b6zqa5690b8lqms7rrhb8rcq0xg5hp117v3m08qngbcd0i706b4"; - name = "qttools-opensource-src-5.7.1.tar.xz"; - }; - }; - qttranslations = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qttranslations-opensource-src-5.7.1.tar.xz"; - sha256 = "1rsq0bp6p8yf41h1nxrbclxr4xq8v025cbi0lq7yh917ac4xpv0n"; - name = "qttranslations-opensource-src-5.7.1.tar.xz"; - }; - }; - qtvirtualkeyboard = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtvirtualkeyboard-opensource-src-5.7.1.tar.xz"; - sha256 = "1p9acm75am5lybmn8j2339vck808dmayk4xwbr67jpfigs9qp2xj"; - name = "qtvirtualkeyboard-opensource-src-5.7.1.tar.xz"; - }; - }; - qtwayland = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwayland-opensource-src-5.7.1.tar.xz"; - sha256 = "1iq1c89y4ggq0dxjlf62jyhh8a9l3x7y914x84w5pby8h3hwagzj"; - name = "qtwayland-opensource-src-5.7.1.tar.xz"; - }; - }; - qtwebchannel = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwebchannel-opensource-src-5.7.1.tar.xz"; - sha256 = "16rij92dxy4k5231l3dpmhy7cnz0cjkn50cpzaf014zrdz3kmav3"; - name = "qtwebchannel-opensource-src-5.7.1.tar.xz"; - }; - }; - qtwebengine = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwebengine-opensource-src-5.7.1.tar.xz"; - sha256 = "0ayc3j17nampy7pg464nbi09wr2d3pfbpqql789m0av37lz8h091"; - name = "qtwebengine-opensource-src-5.7.1.tar.xz"; - }; - }; - qtwebkit = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/community_releases/5.7/5.7.1/qtwebkit-opensource-src-5.7.1.tar.xz"; - sha256 = "00szgcra6pf2myfjrdbsr1gmrxycpbjqlzkplna5yr1rjg4gfv54"; - name = "qtwebkit-opensource-src-5.7.1.tar.xz"; - }; - }; - qtwebkit-examples = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/community_releases/5.7/5.7.1/qtwebkit-examples-opensource-src-5.7.1.tar.xz"; - sha256 = "09c2ni3nf7vdsw1y9yhpbal9zs8jgvi1wndnva6mgdbcnm8h23fm"; - name = "qtwebkit-examples-opensource-src-5.7.1.tar.xz"; - }; - }; - qtwebsockets = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwebsockets-opensource-src-5.7.1.tar.xz"; - sha256 = "1laj0slwibs0bg69kgrdhc9k1s6yisq3pcsr0r9rhbkzisv7aajw"; - name = "qtwebsockets-opensource-src-5.7.1.tar.xz"; - }; - }; - qtwebview = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwebview-opensource-src-5.7.1.tar.xz"; - sha256 = "17qmyayy67ji4d3i3cq0wb8s7hqjrw224zr2blzjc1827rlzkg5k"; - name = "qtwebview-opensource-src-5.7.1.tar.xz"; - }; - }; - qtwinextras = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtwinextras-opensource-src-5.7.1.tar.xz"; - sha256 = "1k7kiq0k7qwsn06p6sg13lr8hnnz7lvvsx18gas46dggkyj66514"; - name = "qtwinextras-opensource-src-5.7.1.tar.xz"; - }; - }; - qtx11extras = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtx11extras-opensource-src-5.7.1.tar.xz"; - sha256 = "09z49jm70f5i0gcdz9a16z00pg96x8pz7vri5wpirh3fqqn0qnjz"; - name = "qtx11extras-opensource-src-5.7.1.tar.xz"; - }; - }; - qtxmlpatterns = { - version = "5.7.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.1/submodules/qtxmlpatterns-opensource-src-5.7.1.tar.xz"; - sha256 = "1rgqnpg64gn5agmvjwy0am8hp5fpxl3cdkixr1yrsdxi5a6961d8"; - name = "qtxmlpatterns-opensource-src-5.7.1.tar.xz"; - }; - }; -} diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.8/default.nix index 85b38c6fc6c..eb26f88f725 100644 --- a/pkgs/development/libraries/qt-5/5.8/default.nix +++ b/pkgs/development/libraries/qt-5/5.8/default.nix @@ -18,7 +18,7 @@ top-level attribute to `top-level/all-packages.nix`. newScope, stdenv, fetchurl, makeSetupHook, makeWrapper, bison, cups ? null, harfbuzz, mesa, perl, - gstreamer, gst-plugins-base, + gstreamer, gst-plugins-base, gtk3, dconf, # options developerBuild ? false, @@ -106,13 +106,13 @@ let makeQtWrapper = makeSetupHook - { deps = [ makeWrapper ]; } - ../make-qt-wrapper.sh; + { deps = [ makeWrapper ] ++ optionals (!stdenv.isDarwin) [ dconf.lib gtk3 ]; } + (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh); qmakeHook = makeSetupHook { deps = [ self.qtbase.dev ]; } - ../qmake-hook.sh; + (if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh); }; diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths-darwin.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths-darwin.patch similarity index 91% rename from pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths-darwin.patch rename to pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths-darwin.patch index 2fda5ed8cf0..da7f36542ef 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths-darwin.patch +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths-darwin.patch @@ -1,11 +1,11 @@ -Index: qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +Index: qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in =================================================================== ---- qtbase-opensource-src-5.7.1.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -+++ qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +--- qtbase-opensource-src-5.8.0.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) endif() !!ENDIF - + -!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) -!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") @@ -35,7 +35,7 @@ Index: qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5BasicConfig.cm set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)") @@ -59,7 +35,10 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) - set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") @@ -48,7 +48,7 @@ Index: qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5BasicConfig.cm @@ -74,45 +53,17 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" ) - + -!!IF !isEmpty(CMAKE_WINDOWS_BUILD) -!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) - set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") @@ -64,9 +64,9 @@ Index: qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5BasicConfig.cm -!!ENDIF endmacro() !!ENDIF - + if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - + !!IF !no_module_headers -!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) - set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS @@ -103,7 +103,7 @@ Index: qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5BasicConfig.cm include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) !!ENDIF @@ -253,28 +205,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME - + !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) !!IF isEmpty(CMAKE_DEBUG_TYPE) -!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) @@ -135,14 +135,14 @@ Index: qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5BasicConfig.cm !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD @@ -282,36 +225,23 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME !!ENDIF // CMAKE_RELEASE_TYPE - + !!IF !isEmpty(CMAKE_DEBUG_TYPE) -!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) -!!ELSE _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) -!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - + !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) !!IF isEmpty(CMAKE_RELEASE_TYPE) -!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) @@ -175,7 +175,7 @@ Index: qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5BasicConfig.cm @@ -328,11 +258,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - + -!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) - set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") -!!ELSE @@ -185,13 +185,13 @@ Index: qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5BasicConfig.cm _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) set_target_properties(Qt5::${Plugin} PROPERTIES \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} -Index: qtbase-opensource-src-5.7.1/src/gui/Qt5GuiConfigExtras.cmake.in +Index: qtbase-opensource-src-5.8.0/src/gui/Qt5GuiConfigExtras.cmake.in =================================================================== ---- qtbase-opensource-src-5.7.1.orig/src/gui/Qt5GuiConfigExtras.cmake.in -+++ qtbase-opensource-src-5.7.1/src/gui/Qt5GuiConfigExtras.cmake.in +--- qtbase-opensource-src-5.8.0.orig/src/gui/Qt5GuiConfigExtras.cmake.in ++++ qtbase-opensource-src-5.8.0/src/gui/Qt5GuiConfigExtras.cmake.in @@ -2,7 +2,7 @@ !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) - + !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) -set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\") +set(Qt5Gui_EGL_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR/QtANGLE\") @@ -200,40 +200,40 @@ Index: qtbase-opensource-src-5.7.1/src/gui/Qt5GuiConfigExtras.cmake.in !!ENDIF @@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_propert set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) - set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") !!ELSE set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") !!ENDIF - + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) - set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + set(imported_implib \"@NIX_DEV@/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ELSE set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF -Index: qtbase-opensource-src-5.7.1/src/widgets/Qt5WidgetsConfigExtras.cmake.in +Index: qtbase-opensource-src-5.8.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in =================================================================== ---- qtbase-opensource-src-5.7.1.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in -+++ qtbase-opensource-src-5.7.1/src/widgets/Qt5WidgetsConfigExtras.cmake.in +--- qtbase-opensource-src-5.8.0.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in ++++ qtbase-opensource-src-5.8.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) add_executable(Qt5::uic IMPORTED) - + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) - set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") + set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") !!ELSE set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") !!ENDIF -Index: qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtras.cmake.in +Index: qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtras.cmake.in =================================================================== ---- qtbase-opensource-src-5.7.1.orig/src/corelib/Qt5CoreConfigExtras.cmake.in -+++ qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtras.cmake.in +--- qtbase-opensource-src-5.8.0.orig/src/corelib/Qt5CoreConfigExtras.cmake.in ++++ qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) add_executable(Qt5::qmake IMPORTED) - + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) - set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") @@ -242,7 +242,7 @@ Index: qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtras.cmake.in !!ENDIF @@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) add_executable(Qt5::moc IMPORTED) - + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) - set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") @@ -251,7 +251,7 @@ Index: qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtras.cmake.in !!ENDIF @@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc) add_executable(Qt5::rcc IMPORTED) - + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) - set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") @@ -269,44 +269,44 @@ Index: qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtras.cmake.in !!ENDIF @@ -145,7 +145,7 @@ if (NOT TARGET Qt5::WinMain) set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) - + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) - set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") !!ELSE set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") !!ENDIF -Index: qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +Index: qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in =================================================================== ---- qtbase-opensource-src-5.7.1.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -+++ qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +--- qtbase-opensource-src-5.8.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in ++++ qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in @@ -1,6 +1,6 @@ - + !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) -set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") +set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") !!ELSE set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") !!ENDIF -Index: qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +Index: qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in =================================================================== ---- qtbase-opensource-src-5.7.1.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -+++ qtbase-opensource-src-5.7.1/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +--- qtbase-opensource-src-5.8.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in ++++ qtbase-opensource-src-5.8.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in @@ -1,6 +1,6 @@ - + !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) -set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") +set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") !!ELSE set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") !!ENDIF -Index: qtbase-opensource-src-5.7.1/src/dbus/Qt5DBusConfigExtras.cmake.in +Index: qtbase-opensource-src-5.8.0/src/dbus/Qt5DBusConfigExtras.cmake.in =================================================================== ---- qtbase-opensource-src-5.7.1.orig/src/dbus/Qt5DBusConfigExtras.cmake.in -+++ qtbase-opensource-src-5.7.1/src/dbus/Qt5DBusConfigExtras.cmake.in +--- qtbase-opensource-src-5.8.0.orig/src/dbus/Qt5DBusConfigExtras.cmake.in ++++ qtbase-opensource-src-5.8.0/src/dbus/Qt5DBusConfigExtras.cmake.in @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) add_executable(Qt5::qdbuscpp2xml IMPORTED) - + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) - set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") + set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") @@ -315,19 +315,19 @@ Index: qtbase-opensource-src-5.7.1/src/dbus/Qt5DBusConfigExtras.cmake.in !!ENDIF @@ -18,7 +18,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp) add_executable(Qt5::qdbusxml2cpp IMPORTED) - + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) - set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") + set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") !!ELSE set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") !!ENDIF -Index: qtbase-opensource-src-5.7.1/mkspecs/features/create_cmake.prf +Index: qtbase-opensource-src-5.8.0/mkspecs/features/create_cmake.prf =================================================================== ---- qtbase-opensource-src-5.7.1.orig/mkspecs/features/create_cmake.prf -+++ qtbase-opensource-src-5.7.1/mkspecs/features/create_cmake.prf +--- qtbase-opensource-src-5.8.0.orig/mkspecs/features/create_cmake.prf ++++ qtbase-opensource-src-5.8.0/mkspecs/features/create_cmake.prf @@ -136,28 +136,28 @@ contains(CONFIG, plugin) { - + win32 { isEmpty(CMAKE_STATIC_TYPE) { - CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.dll @@ -349,7 +349,7 @@ Index: qtbase-opensource-src-5.7.1/mkspecs/features/create_cmake.prf mac { isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib else: CMAKE_PlUGIN_EXT = .a - + - CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} - CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} + CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} @@ -357,7 +357,7 @@ Index: qtbase-opensource-src-5.7.1/mkspecs/features/create_cmake.prf } else { isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .so else: CMAKE_PlUGIN_EXT = .a - + - CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} - CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} + CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT} @@ -365,13 +365,13 @@ Index: qtbase-opensource-src-5.7.1/mkspecs/features/create_cmake.prf } } cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in -Index: qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +Index: qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in =================================================================== ---- qtbase-opensource-src-5.7.1.orig/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -+++ qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +--- qtbase-opensource-src-5.8.0.orig/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in ++++ qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in @@ -2,10 +2,10 @@ add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED) - + !!IF !isEmpty(CMAKE_RELEASE_TYPE) -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\") +_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_RELEASE}\") @@ -380,5 +380,5 @@ Index: qtbase-opensource-src-5.7.1/mkspecs/features/data/cmake/Qt5PluginTarget.c -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\") +_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\") !!ENDIF - + list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix index a48c5dbb07a..9642b613677 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix @@ -4,6 +4,8 @@ coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2, ruby, + # darwin support + darwin, libiconv, libcxx, dbus, fontconfig, freetype, glib, gtk3, harfbuzz, icu, libX11, libXcomposite, libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff, @@ -15,7 +17,8 @@ cups ? null, mysql ? null, postgresql ? null, # options - mesaSupported, mesa, + mesaSupported ? (!stdenv.isDarwin), + mesa, buildExamples ? false, buildTests ? false, developerBuild ? false, @@ -35,8 +38,9 @@ stdenv.mkDerivation { patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) + ++ [(if stdenv.isDarwin then ./cmake-paths-darwin.patch else ./cmake-paths.patch)] ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch - ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; + ++ lib.optionals mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; postPatch = '' @@ -54,11 +58,11 @@ stdenv.mkDerivation { substituteInPlace src/network/kernel/qhostinfo_unix.cpp \ --replace "@glibc@" "${stdenv.cc.libc.out}" - substituteInPlace src/plugins/platforms/xcb/qxcbcursor.cpp \ - --replace "@libXcursor@" "${libXcursor.out}" - substituteInPlace src/network/ssl/qsslsocket_openssl_symbols.cpp \ --replace "@openssl@" "${openssl.out}" + '' + lib.optionalString stdenv.isLinux '' + substituteInPlace src/plugins/platforms/xcb/qxcbcursor.cpp \ + --replace "@libXcursor@" "${libXcursor.out}" substituteInPlace src/dbus/qdbus_symbols.cpp \ --replace "@dbus_libs@" "${dbus.lib}" @@ -74,8 +78,23 @@ stdenv.mkDerivation { substituteInPlace mkspecs/common/linux.conf \ --replace "@mesa_lib@" "${mesa.out}" \ --replace "@mesa_inc@" "${mesa.dev or mesa}" - ''; - + ''+ lib.optionalString stdenv.isDarwin '' + sed -i \ + -e 's|! /usr/bin/xcode-select --print-path >/dev/null 2>&1;|false;|' \ + -e 's|! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1;|false;|' \ + -e 's|sysroot=$(/usr/bin/xcodebuild -sdk $sdk -version Path 2>/dev/null)|sysroot=/nonsense|' \ + -e 's|QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`|QMAKE_CXX="clang++"\nQMAKE_CONF_COMPILER="clang++"|' \ + -e 's|XCRUN=`/usr/bin/xcrun -sdk macosx clang -v 2>&1`|XCRUN="clang -v 2>&1"|' \ + -e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \ + -e 's#val=$(echo $sdk_val $(echo $val | cut -s -d \x27 \x27 -f 2-))##' \ + ./configure + sed -i '3,$d' ./mkspecs/features/mac/default_pre.prf + sed -i '26,$d' ./mkspecs/features/mac/default_post.prf + sed -i '1,$d' ./mkspecs/features/mac/sdk.prf + sed -i 's/QMAKE_LFLAGS_RPATH = -Wl,-rpath,/QMAKE_LFLAGS_RPATH =/' ./mkspecs/common/mac.conf + ''; + # Note on the above: \x27 is a way if including a single-quote + # character in the sed string arguments. setOutputFlags = false; preConfigure = '' @@ -102,7 +121,7 @@ stdenv.mkDerivation { -shared ${lib.optionalString developerBuild "-developer-build"} -accessibility - -rpath + -optimized-qmake -strip -no-reduce-relocations -system-proxies @@ -114,15 +133,6 @@ stdenv.mkDerivation { -qml-debug -icu -pch - -glib - -xcb - -qpa xcb - -${lib.optionalString (cups == null) "no-"}cups - - -no-eglfs - -no-directfb - -no-linuxfb - -no-kms ${lib.optionalString (!system-x86_64) "-no-sse2"} -no-sse3 @@ -135,16 +145,10 @@ stdenv.mkDerivation { -no-mips_dspr2 -system-zlib - -system-libpng -system-libjpeg -system-harfbuzz - -system-xcb - -system-xkbcommon -system-pcre -openssl-linked - -dbus-linked - -libinput - -gtk -system-sqlite -${if mysql != null then "plugin" else "no"}-sql-mysql @@ -155,6 +159,31 @@ stdenv.mkDerivation { -${lib.optionalString (buildExamples == false) "no"}make examples -${lib.optionalString (buildTests == false) "no"}make tests -v + '' + lib.optionalString (!stdenv.isDarwin) '' + -rpath + -glib + -xcb + -qpa xcb + + -${lib.optionalString (cups == null) "no-"}cups + + -no-eglfs + -no-directfb + -no-linuxfb + -no-kms + + -libinput + -gtk + -system-libpng + -system-xcb + -system-xkbcommon + -dbus-linked + '' + lib.optionalString stdenv.isDarwin '' + -platform macx-clang + -no-use-gold-linker + -no-fontconfig + -qt-freetype + -qt-libpng ''; # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag @@ -163,32 +192,44 @@ stdenv.mkDerivation { PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq"; propagatedBuildInputs = [ - dbus glib libxml2 libxslt openssl pcre16 sqlite udev zlib + libxml2 libxslt openssl pcre16 sqlite zlib + + # Text rendering + harfbuzz icu # Image formats libjpeg libpng libtiff + ] + ++ lib.optional mesaSupported mesa + ++ lib.optionals (!stdenv.isDarwin) [ + dbus glib udev # Text rendering - fontconfig freetype harfbuzz icu + fontconfig freetype # X11 libs libX11 libXcomposite libXext libXi libXrender libxcb libxkbcommon xcbutil xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm - ] - ++ lib.optional mesaSupported mesa; + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ApplicationServices Foundation CoreServices AppKit Carbon OpenGL AGL Cocoa + DiskArbitration darwin.cf-private libiconv + ]); - buildInputs = - [ gtk3 libinput ] + buildInputs = [ ] + ++ lib.optionals (!stdenv.isDarwin) [ gtk3 libinput ] ++ lib.optional developerBuild gdb ++ lib.optional (cups != null) cups ++ lib.optional (mysql != null) mysql.lib ++ lib.optional (postgresql != null) postgresql; - nativeBuildInputs = - [ bison flex gperf lndir patchelf perl pkgconfig python2 ]; + nativeBuildInputs = [ bison flex gperf lndir perl pkgconfig python2 ] ++ lib.optional (!stdenv.isDarwin) patchelf; # freetype-2.5.4 changed signedness of some struct fields - NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; + NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare" + + lib.optionalString stdenv.isDarwin " -D__MAC_OS_X_VERSION_MAX_ALLOWED=1090 -D__AVAILABILITY_INTERNAL__MAC_10_10=__attribute__((availability(macosx,introduced=10.10)))"; + # Note that nixpkgs's objc4 is from macOS 10.11 while the SDK is + # 10.9 which necessitates the above macro definition that mentions + # 10.10 postInstall = '' find "$out" -name "*.cmake" | while read file; do @@ -218,7 +259,7 @@ stdenv.mkDerivation { # Move libtool archives and qmake projects if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then pushd "''${!outputLib}" - find lib -name '*.a' -o -name '*.la' -o -name '*.prl' | \ + find lib -name '*.a' -o -name '*.la'${if stdenv.isDarwin then "" else "-o -name '*.prl'"} | \ while read -r file; do mkdir -p "''${!outputDev}/$(dirname "$file")" mv "''${!outputLib}/$file" "''${!outputDev}/$file" @@ -226,14 +267,12 @@ stdenv.mkDerivation { popd fi '' - # fixup .pc file (where to find 'moc' etc.) + lib.optionalString (!stdenv.isDarwin) '' sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \ -e "/^host_bins=/ c host_bins=$dev/bin" '' - - # Don't move .prl files on darwin because they end up in + # Don' move .prl files on darwin because they end up in # "dev/lib/Foo.framework/Foo.prl" which interferes with subsequent # use of lndir in the qtbase setup-hook. On Linux, the .prl files # are in lib, and so do not cause a subsequent recreation of deep @@ -265,8 +304,8 @@ stdenv.mkDerivation { homepage = http://www.qt.io; description = "A cross-platform application framework for C++"; license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; - maintainers = with maintainers; [ bbenoist qknight ttuegel ]; - platforms = platforms.linux; + maintainers = with maintainers; [ qknight ttuegel periklis ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/series b/pkgs/development/libraries/qt-5/5.8/qtbase/series index 44e2d904080..2196d838375 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/series +++ b/pkgs/development/libraries/qt-5/5.8/qtbase/series @@ -7,4 +7,3 @@ xdg-config-dirs.patch nix-profiles-library-paths.patch compose-search-path.patch libressl.patch -cmake-paths.patch diff --git a/pkgs/development/libraries/qt-5/5.8/qttools/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.8/qttools/cmake-paths.patch index 3d557c4c023..dfcba9045a7 100644 --- a/pkgs/development/libraries/qt-5/5.8/qttools/cmake-paths.patch +++ b/pkgs/development/libraries/qt-5/5.8/qttools/cmake-paths.patch @@ -18,7 +18,7 @@ Index: qttools-opensource-src-5.8.0/src/assistant/help/Qt5HelpConfigExtras.cmake _qt5_Help_check_file_exists(${imported_location}) set_target_properties(Qt5::qcollectiongenerator PROPERTIES -@@ -17,11 +16,7 @@ endif() +@@ -17,11 +16,10 @@ endif() if (NOT TARGET Qt5::qhelpgenerator) add_executable(Qt5::qhelpgenerator IMPORTED) @@ -28,6 +28,9 @@ Index: qttools-opensource-src-5.8.0/src/assistant/help/Qt5HelpConfigExtras.cmake - set(imported_location \"$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\") -!!ENDIF + set(imported_location \"@NIX_OUT@/$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\") ++ if(NOT EXISTS \"${imported_location}\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\") ++ endif() _qt5_Help_check_file_exists(${imported_location}) set_target_properties(Qt5::qhelpgenerator PROPERTIES diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix index 9d63f848cba..1edb0846029 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix @@ -2,16 +2,19 @@ , xlibs, libXcursor, libXScrnSaver, libXrandr, libXtst , fontconfig, freetype, harfbuzz, icu, dbus -, zlib, libjpeg, libpng, libtiff +, zlib, minizip, libjpeg, libpng, libtiff, libwebp, libopus +, jsoncpp, protobuf, libvpx, srtp, snappy, nss, libevent , alsaLib , libcap , pciutils +, systemd , bison, flex, git, which, gperf , coreutils , pkgconfig, python2 +, enableProprietaryCodecs ? true -, stdenv # lib.optional, needsPax +, lib, stdenv # lib.optional, needsPax }: qtSubmodule { @@ -32,20 +35,33 @@ qtSubmodule { substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/standalone.gypi \ --replace /bin/echo ${coreutils}/bin/echo - # fix default SSL bundle location - sed -i -e 's,/cert.pem,/certs/ca-bundle.crt,' src/3rdparty/chromium/third_party/boringssl/src/crypto/x509/x509_def.c + # Fix library paths + sed -i \ + -e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \ + -e "s,QLibraryInfo::location(QLibraryInfo::TranslationsPath),QLatin1String(\"$out/translations\"),g" \ + -e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \ + src/core/web_engine_library_info.cpp - configureFlags+="\ - -plugindir $out/lib/qt5/plugins \ - -importdir $out/lib/qt5/imports \ - -qmldir $out/lib/qt5/qml \ - -docdir $out/share/doc/qt5" + sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \ + src/3rdparty/chromium/device/udev_linux/udev?_loader.cc + + sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ + src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc ''; + + qmakeFlags = lib.optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs"; + propagatedBuildInputs = [ - dbus zlib alsaLib + dbus zlib minizip alsaLib snappy nss protobuf jsoncpp libevent # Image formats - libjpeg libpng libtiff + libjpeg libpng libtiff libwebp + + # Video formats + srtp libvpx + + # Audio formats + alsaLib libopus # Text rendering fontconfig freetype harfbuzz icu @@ -57,7 +73,7 @@ qtSubmodule { libcap pciutils ]; - patches = stdenv.lib.optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; + patches = lib.optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; postInstall = '' cat > $out/libexec/qt.conf < -Date: Wed, 8 Feb 2017 21:58:43 -0500 -Subject: [PATCH] Adapting the following patch, from - http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0003-main-channel-Prevent-overflow-reading-messages-from-.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d - -> From: Frediano Ziglio -> Date: Tue, 29 Nov 2016 16:46:56 +0000 -> Subject: [spice-server 3/3] main-channel: Prevent overflow reading messages -> from client -> -> Caller is supposed the function return a buffer able to store -> size bytes. -> -> Signed-off-by: Frediano Ziglio -> Acked-by: Christophe Fergeau -> --- -> server/main-channel.c | 3 +++ -> 1 file changed, 3 insertions(+) -> -> diff --git a/server/main-channel.c b/server/main-channel.c -> index 24dd448..1124506 100644 -> --- a/server/main-channel.c -> +++ b/server/main-channel.c -> @@ -258,6 +258,9 @@ static uint8_t *main_channel_alloc_msg_rcv_buf(RedChannelClient *rcc, -> -> if (type == SPICE_MSGC_MAIN_AGENT_DATA) { -> return reds_get_agent_data_buffer(red_channel_get_server(channel), mcc, size); -> + } else if (size > sizeof(main_chan->recv_buf)) { -> + /* message too large, caller will log a message and close the connection */ -> + return NULL; -> } else { -> return main_chan->recv_buf; -> } -> -- -> 2.9.3 -> --- - server/main_channel.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/server/main_channel.c b/server/main_channel.c -index 0ecc9df..1fc3915 100644 ---- a/server/main_channel.c -+++ b/server/main_channel.c -@@ -1026,6 +1026,9 @@ static uint8_t *main_channel_alloc_msg_rcv_buf(RedChannelClient *rcc, - - if (type == SPICE_MSGC_MAIN_AGENT_DATA) { - return reds_get_agent_data_buffer(mcc, size); -+ } else if (size > sizeof(main_chan->recv_buf)) { -+ /* message too large, caller will log a message and close the connection */ -+ return NULL; - } else { - return main_chan->recv_buf; - } --- -2.10.0 diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index 61952c3b323..808bfd4f811 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -6,14 +6,15 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "spice-0.12.8"; + name = "spice-0.13.3"; src = fetchurl { url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "0za03i77j8i3g5l2np2j7vy8cqsdbkm9wbv4hjnaqq9xhz2sa0gr"; + sha256 = "17mqgwamdhj8sx8vhahrjl5937x693kjnw6cp6v0akjrwz011xrh"; }; patches = [ + # the following three patches fix CVE-2016-9577 and CVE-2016-9578 (fetchpatch { name = "0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch"; url = "http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d"; @@ -24,9 +25,11 @@ stdenv.mkDerivation rec { url = "http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0002-Prevent-integer-overflows-in-capability-checks.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d"; sha256 = "1r1bhq98w93cvvrlrz6jwdfsy261xl3xqs0ppchaa2igyxvxv5z5"; }) - # Originally from http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0003-main-channel-Prevent-overflow-reading-messages-from-.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d - # but main-channel.c was renamed to main_channel.c - ./0001-Adapting-the-following-patch-from-http-pkgs.fedorapr.patch + (fetchpatch { + name = "0003-main-channel-Prevent-overflow-reading-messages-from.patch"; + url = "https://cgit.freedesktop.org/spice/spice/patch/?id=1d3e26c0ee75712fa4bbbcfa09d8d5866b66c8af"; + sha256 = "030mm551aipck99rqiz39vsvk071pn8715zynr5j6chwzgpflwm3"; + }) ]; buildInputs = [ pixman celt alsaLib openssl libjpeg zlib diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix index ba213dc98e7..27194aabd1b 100644 --- a/pkgs/development/libraries/srtp/default.nix +++ b/pkgs/development/libraries/srtp/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { "--disable-debug" ] ++ optional (openssl != null) "--enable-openssl"; + buildFlags = [ "shared_library" ]; + postInstall = '' rm -rf $out/bin ''; diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix index faba57d155f..1961160cbc9 100644 --- a/pkgs/development/libraries/strigi/default.nix +++ b/pkgs/development/libraries/strigi/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { homepage = http://strigi.sourceforge.net; description = "A very fast and efficient crawler to index data on your harddrive"; license = "LGPL"; - maintainers = with stdenv.lib.maintainers; [ sander urkud ]; + maintainers = with stdenv.lib.maintainers; [ sander ]; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/development/libraries/taglib/1.9.nix b/pkgs/development/libraries/taglib/1.9.nix index 41087044e49..71b8a764eed 100644 --- a/pkgs/development/libraries/taglib/1.9.nix +++ b/pkgs/development/libraries/taglib/1.9.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { description = "A library for reading and editing the meta-data of several popular audio formats"; inherit (cmake.meta) platforms; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix index 0937b2fe8cf..602aab852cc 100644 --- a/pkgs/development/libraries/taglib/default.nix +++ b/pkgs/development/libraries/taglib/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { description = "A library for reading and editing the meta-data of several popular audio formats"; inherit (cmake.meta) platforms; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/tclgpg/default.nix b/pkgs/development/libraries/tclgpg/default.nix deleted file mode 100644 index d8bea7f14e3..00000000000 --- a/pkgs/development/libraries/tclgpg/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchsvn, autoconf, automake, tcl, tcllib, gnupg }: - -stdenv.mkDerivation rec { - name = "tclgpg-${version}"; - version = "1.0pre"; - - src = fetchsvn { - url = "http://tclgpg.googlecode.com/svn/trunk"; - rev = 74; - sha256 = "5207b1d246fea6d4527e8c044579dae45a2e31eeaa5633f4f97c7e7b54ec27c5"; - }; - - configureFlags = "--with-tcl=" + tcl + "/lib " - + "--with-tclinclude=" + tcl + "/include "; - - preConfigure = '' - configureFlags="--exec_prefix=$prefix $configureFlags" - sed -i -e 's|dtplite|TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" &|' Makefile.in - autoreconf -vfi - ''; - - prePatch = '' - sed -i -e 's|\[auto_execok gpg\]|"${gnupg}/bin/gpg2"|' tclgpg.tcl - ''; - - passthru = { - libPrefix = "gpg1.0"; - }; - - buildInputs = [ autoconf automake tcl tcllib ]; - - meta = { - homepage = http://code.google.com/p/tclgpg/; - description = "A Tcl interface to GNU Privacy Guard"; - license = stdenv.lib.licenses.bsd2; - }; -} diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix index 09909f6546a..8fa974a95e2 100644 --- a/pkgs/development/libraries/udunits/default.nix +++ b/pkgs/development/libraries/udunits/default.nix @@ -3,10 +3,10 @@ }: stdenv.mkDerivation rec { - name = "udunits-2.2.23"; + name = "udunits-2.2.24"; src = fetchurl { url = "ftp://ftp.unidata.ucar.edu/pub/udunits/${name}.tar.gz"; - sha256 = "0ya93jrv8qzfkdj77grl4dpyb0ap4jccmqx3rkkgaggnklhjfwkr"; + sha256 = "15bz2wv46wiwdzai8770gzy05prgj120x6j2hmihavv5y89cbfi0"; }; nativeBuildInputs = [ bison flex file ]; diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 083f4a9140a..5b0bdb4ee74 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { description = "Open source libraries for 3D computer graphics, image processing and visualization"; homepage = http://www.vtk.org/; license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ viric bbenoist ]; + maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix index 33f8fa64a0f..603df0407ea 100644 --- a/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/pkgs/development/libraries/webkitgtk/2.4.nix @@ -65,6 +65,8 @@ stdenv.mkDerivation rec { "--disable-x11-target" "--enable-quartz-target" "--disable-web-audio" + "CFLAGS=-DJSC_OBJC_API_ENABLED=0" + "CXXFLAGS=-DJSC_OBJC_API_ENABLED=0" ] ++ optionals (!enableCredentialStorage) [ "--disable-credential-storage" ]; diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix index 95ba2a05ad9..931d4064400 100644 --- a/pkgs/development/libraries/xbase/default.nix +++ b/pkgs/development/libraries/xbase/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { homepage = http://linux.techass.com/projects/xdb/; description = "C++ class library formerly known as XDB"; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/lisp-modules/asdf/2.26.nix b/pkgs/development/lisp-modules/asdf/2.26.nix new file mode 100644 index 00000000000..2afdf05546f --- /dev/null +++ b/pkgs/development/lisp-modules/asdf/2.26.nix @@ -0,0 +1,41 @@ +{stdenv, fetchurl, texinfo, texLive, perl}: +let + s = # Generated upstream information + rec { + baseName="asdf"; + version="2.26"; + name="${baseName}-${version}"; + url="http://common-lisp.net/project/asdf/archives/asdf-${version}.tar.gz"; + sha256="1qzp444rgnqf1cz9v48nh0yvz7wjq9fjdpimifsfcjswaqi2xrdn"; + }; + buildInputs = [ + texinfo texLive perl + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + + buildPhase = '' + make asdf.lisp + mkdir build + ln -s ../asdf.lisp build + ''; + installPhase = '' + mkdir -p "$out"/lib/common-lisp/asdf/ + mkdir -p "$out"/share/doc/asdf/ + cp -r ./* "$out"/lib/common-lisp/asdf/ + cp -r doc/* "$out"/share/doc/asdf/ + ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop} + ''; + meta = { + inherit (s) version; + description = ''Standard software-system definition library for Common Lisp''; + license = stdenv.lib.licenses.mit ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/lisp-modules/asdf/3.1.nix b/pkgs/development/lisp-modules/asdf/3.1.nix new file mode 100644 index 00000000000..0e5c6a40087 --- /dev/null +++ b/pkgs/development/lisp-modules/asdf/3.1.nix @@ -0,0 +1,40 @@ +{stdenv, fetchurl, texinfo, texLive, perl}: +let + s = # Generated upstream information + rec { + baseName="asdf"; + version="3.1.7"; + name="${baseName}-${version}"; + url="http://common-lisp.net/project/asdf/archives/asdf-${version}.tar.gz"; + sha256="1g8wp3vi7gwrs22gnjy9lvrxqag3m8apxnryfs8n5bv6rln8bzzq"; + }; + buildInputs = [ + texinfo texLive perl + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + + buildPhase = '' + make build/asdf.lisp + make -C doc asdf.info asdf.html + ''; + installPhase = '' + mkdir -p "$out"/lib/common-lisp/asdf/ + mkdir -p "$out"/share/doc/asdf/ + cp -r ./* "$out"/lib/common-lisp/asdf/ + cp -r doc/* "$out"/share/doc/asdf/ + ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop} + ''; + meta = { + inherit (s) version; + description = ''Standard software-system definition library for Common Lisp''; + license = stdenv.lib.licenses.mit ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix index 7e05dfa585a..ef07a65f96b 100644 --- a/pkgs/development/lisp-modules/asdf/default.nix +++ b/pkgs/development/lisp-modules/asdf/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation { mkdir -p "$out"/share/doc/asdf/ cp -r ./* "$out"/lib/common-lisp/asdf/ cp -r doc/* "$out"/share/doc/asdf/ + ln -s "$out"/lib/common-lisp/{asdf/uiop,uiop} ''; meta = { inherit (s) version; diff --git a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh index 5bf375a4eff..97add524d17 100755 --- a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh +++ b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#!@stdenv_shell@ # Part of NixPkgs package collection # This script can be used at your option under the same license as NixPkgs or # under MIT/X11 license @@ -15,38 +15,51 @@ export NIX_LISP NIX_LISP_LOAD_FILE NIX_LISP_EXEC_CODE NIX_LISP_COMMAND NIX_LISP_ test -n "$NIX_LISP_LD_LIBRARY_PATH" && export LD_LIBRARY_PATH="$LD_LIBRARY_PATH${LD_LIBRARY_PATH+:}$NIX_LISP_LD_LIBRARY_PATH" +declare -a NIX_LISP_FINAL_PARAMETERS; + case "$NIX_LISP" in sbcl) NIX_LISP_LOAD_FILE="--load" NIX_LISP_EXEC_CODE="--eval" NIX_LISP_QUIT="(quit)" + NIX_LISP_NODEBUG='--non-interactive' NIX_LISP_FINAL_PARAMETERS= ;; ecl) NIX_LISP_LOAD_FILE="-load" NIX_LISP_EXEC_CODE="-eval" NIX_LISP_QUIT="(quit)" + NIX_LISP_NODEBUG='--nodebug' NIX_LISP_FINAL_PARAMETERS= ;; clisp) NIX_LISP_LOAD_FILE="-c -l" NIX_LISP_EXEC_CODE="-x" NIX_LISP_QUIT="(quit)" + NIX_LISP_NODEBUG='-on-error exit' NIX_LISP_FINAL_PARAMETERS="-repl" ;; esac NIX_LISP_ASDF_REGISTRY_CODE=" (progn - (setf asdf:*default-source-registries* '(asdf/source-registry:environment-source-registry)) + #+asdf3 (setf asdf:*default-source-registries* + '(asdf/source-registry:environment-source-registry)) (asdf:initialize-source-registry) ) " -NIX_LISP_ASDF="${NIX_LISP_ASDF:-@asdf@}" +NIX_LISP_ASDF="${NIX_LISP_ASDF:-@out@}" + +nix_lisp_run_single_form(){ + NIX_LISP_FINAL_PARAMETERS=("$NIX_LISP_EXEC_CODE" "$1" + "$NIX_LISP_EXEC_CODE" "$NIX_LISP_QUIT" $NIX_LISP_NODEBUG) +} + +eval "$NIX_LISP_PRELAUNCH_HOOK" [ -z "$NIX_LISP_SKIP_CODE" ] && "$NIX_LISP_COMMAND" $NIX_LISP_EARLY_OPTIONS \ - $NIX_LISP_EXEC_CODE "(load \"$NIX_LISP_ASDF/lib/common-lisp/asdf/build/asdf.lisp\")" \ + $NIX_LISP_EXEC_CODE "${NIX_LISP_ASDF_LOAD:-"(load \"$NIX_LISP_ASDF/lib/common-lisp/asdf/build/asdf.lisp\")"}" \ $NIX_LISP_EXEC_CODE "$NIX_LISP_ASDF_REGISTRY_CODE" \ - $NIX_LISP_FINAL_PARAMETERS \ + ${NIX_LISP_FINAL_PARAMETERS[*]:+"${NIX_LISP_FINAL_PARAMETERS[@]}"} \ "$@" diff --git a/pkgs/development/lisp-modules/clwrapper/common-lisp.sh b/pkgs/development/lisp-modules/clwrapper/common-lisp.sh index 43349cc7f8a..9f5a2b80689 100755 --- a/pkgs/development/lisp-modules/clwrapper/common-lisp.sh +++ b/pkgs/development/lisp-modules/clwrapper/common-lisp.sh @@ -1,3 +1,3 @@ #! /bin/sh -source "@out@"/bin/cl-wrapper.sh "${NIX_LISP_COMMAND:-$(ls "@lisp@/bin"/* | head -n 1)}" "$@" +source "@out@"/bin/cl-wrapper.sh "${NIX_LISP_COMMAND:-$(@ls@ "@lisp@/bin"/* | @head@ -n 1)}" "$@" diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix index 172af31f834..4599c630d83 100644 --- a/pkgs/development/lisp-modules/clwrapper/default.nix +++ b/pkgs/development/lisp-modules/clwrapper/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, asdf, lisp ? null}: +{stdenv, fetchurl, asdf, which, lisp ? null}: stdenv.mkDerivation { name = "cl-wrapper-script"; @@ -6,19 +6,40 @@ stdenv.mkDerivation { installPhase='' mkdir -p "$out"/bin + export head="$(which head)" + export ls="$(which ls)" substituteAll ${./common-lisp.sh} "$out"/bin/common-lisp.sh substituteAll "${./build-with-lisp.sh}" "$out/bin/build-with-lisp.sh" substituteAll "${./cl-wrapper.sh}" "$out/bin/cl-wrapper.sh" chmod a+x "$out"/bin/* + + substituteAll "${./setup-hook.sh}" "setup-hook-parsed" + source setup-hook-parsed + setLisp "${lisp}" + echo "$NIX_LISP" + + mkdir -p "$out/lib/common-lisp/" + cp -r "${asdf}/lib/common-lisp"/* "$out/lib/common-lisp/" + chmod u+rw -R "$out/lib/common-lisp/" + + NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(progn + (uiop/lisp-build:compile-file* \"'"$out"'/lib/common-lisp/asdf/build/asdf.lisp\") + (asdf:load-system :uiop :force :all) + (asdf:load-system :asdf :force :all) + )"' \ + "$out/bin/common-lisp.sh" ''; + buildInputs = [which]; + inherit asdf lisp; + stdenv_shell = stdenv.shell; setupHook = ./setup-hook.sh; phases="installPhase fixupPhase"; - preferLocalBuild = true; + ASDF_OUTPUT_TRANSLATIONS="${builtins.storeDir}/:${builtins.storeDir}"; passthru = { inherit lisp; diff --git a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh index b48f916ac7a..7ac8c70d59f 100644 --- a/pkgs/development/lisp-modules/clwrapper/setup-hook.sh +++ b/pkgs/development/lisp-modules/clwrapper/setup-hook.sh @@ -1,12 +1,10 @@ -NIX_LISP_ASDF="@asdf@" +NIX_LISP_ASDF="@out@" -CL_SOURCE_REGISTRY="@asdf@/lib/common-lisp/asdf/:@asdf@/lib/common-lisp/asdf/uiop/" +CL_SOURCE_REGISTRY="${CL_SOURCE_REGISTRY:+$CL_SOURCE_REGISTRY:}@out@/lib/common-lisp/asdf/" addASDFPaths () { - for j in "$1"/lib/common-lisp/*; do - if [ -d "$j" ]; then - CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$j/" - fi + for j in "$1"/lib/common-lisp-settings/*-path-config.sh; do + source "$j" done } diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix index 8623032ed37..520e224e6da 100644 --- a/pkgs/development/lisp-modules/define-package.nix +++ b/pkgs/development/lisp-modules/define-package.nix @@ -1,18 +1,35 @@ -args @ {stdenv, clwrapper, baseName, version ? "latest", src, description, deps, - buildInputs ? [], meta ? {}, overrides?(x: {}), propagatedBuildInputs ? []}: +args @ {stdenv, clwrapper, baseName, testSystems ? [baseName], version ? "latest" + , src, description, deps, buildInputs ? [], meta ? {}, overrides?(x: {}) + , propagatedBuildInputs ? []}: let deployConfigScript = '' + outhash="$out" + outhash="''${outhash##*/}" + outhash="''${outhash%%-*}" config_script="$out"/lib/common-lisp-settings/${args.baseName}-shell-config.sh + path_config_script="$out"/lib/common-lisp-settings/${args.baseName}-path-config.sh + store_translation="$(dirname "$out"):$(dirname "$out")" mkdir -p "$(dirname "$config_script")" touch "$config_script" + touch "$path_config_script" chmod a+x "$config_script" + chmod a+x "$path_config_script" + echo "if test -z \"\''${_''${outhash}_NIX_LISP_CONFIG}\"; then export _''${outhash}_NIX_LISP_CONFIG=1; " >> "$config_script" + echo "export NIX_CFLAGS_COMPILE='$NIX_CFLAGS_COMPILE'\"\''${NIX_CFLAGS_COMPILE:+ \$NIX_CFLAGS_COMPILE}\"" >> "$config_script" + echo "export NIX_LDFLAGS='$NIX_LDFLAGS'\"\''${NIX_LDFLAGS:+ \$NIX_LDFLAGS}\"" >> "$config_script" echo "export NIX_LISP_COMMAND='$NIX_LISP_COMMAND'" >> "$config_script" echo "export NIX_LISP_ASDF='$NIX_LISP_ASDF'" >> "$config_script" - echo "export CL_SOURCE_REGISTRY="\$CL_SOURCE_REGISTRY\''${CL_SOURCE_REGISTRY:+:}"'$CL_SOURCE_REGISTRY:$out/lib/common-lisp/${args.baseName}/'" >> "$config_script" + echo "export PATH=\"\''${PATH:+\$PATH:}$PATH\"" >> "$config_script" + echo "echo \"\$ASDF_OUTPUT_TRANSLATIONS\" | grep -E '(^|:)$store_translation(:|\$)' >/dev/null || export ASDF_OUTPUT_TRANSLATIONS=\"\''${ASDF_OUTPUT_TRANSLATIONS:+\$ASDF_OUTPUT_TRANSLATIONS:}\"'$store_translation'" >> "$config_script" + echo "source '$path_config_script'" >> "$config_script" + echo "fi" >> "$config_script" + echo "if test -z \"\''${_''${outhash}_NIX_LISP_PATH_CONFIG}\"; then export _''${outhash}_NIX_LISP_PATH_CONFIG=1; " >> "$path_config_script" + echo "for i in \"''${CL_SOURCE_REGISTRY//:/\" \"}\" \"$out/lib/common-lisp/${args.baseName}/\" ; do echo \"\$CL_SOURCE_REGISTRY\" | grep -E \"(^|:)\$i(:|\\\$)\" >/dev/null || export CL_SOURCE_REGISTRY=\"\$CL_SOURCE_REGISTRY\''${CL_SOURCE_REGISTRY:+:}\$i\"; done;" >> "$path_config_script" test -n "$LD_LIBRARY_PATH" && - echo "export LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\"'$LD_LIBRARY_PATH'" >> "$config_script" + echo "export LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\"'$LD_LIBRARY_PATH'" >> "$path_config_script" test -n "$NIX_LISP_LD_LIBRARY_PATH" && - echo "export NIX_LISP_LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${NIX_LISP_LD_LIBRARY_PATH:+:}\"'$NIX_LISP_LD_LIBRARY_PATH'" >> "$config_script" + echo "export NIX_LISP_LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${NIX_LISP_LD_LIBRARY_PATH:+:}\"'$NIX_LISP_LD_LIBRARY_PATH'" >> "$path_config_script" + echo "fi" >> "$path_config_script" ''; deployLaunchScript = '' launch_script="$out"/bin/${args.baseName}-lisp-launcher.sh @@ -40,12 +57,27 @@ basePackage = { ${deployConfigScript} ${deployLaunchScript} + ${stdenv.lib.concatMapStrings (testSystem: '' + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK='nix_lisp_run_single_form "(progn + (asdf:compile-system :${testSystem}) + (asdf:load-system :${testSystem}) + (asdf:operate (quote asdf::compile-bundle-op) :${testSystem}) + (ignore-errors (asdf:operate (quote asdf::deploy-asd-op) :${testSystem})) + )"' \ + "$out/bin/${args.baseName}-lisp-launcher.sh" "" + '') testSystems} + eval "$postInstall" ''; - propagatedBuildInputs = (args.deps or []) ++ [clwrapper clwrapper.lisp] + propagatedBuildInputs = (args.deps or []) ++ [clwrapper clwrapper.lisp clwrapper.asdf] ++ (args.propagatedBuildInputs or []); buildInputs = buildInputs; dontStrip=true; + + ASDF_OUTPUT_TRANSLATIONS="${builtins.storeDir}/:${builtins.storeDir}"; + meta = { inherit description version; } // meta; diff --git a/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh b/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh index 8693a304899..d2d846b78f2 100755 --- a/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh +++ b/pkgs/development/lisp-modules/from-quicklisp/barebones-quicklisp-expression.sh @@ -34,7 +34,7 @@ url="${ql_src##* }" [ "$ql_src_type" = "kmr-git" ] && { ql_src_type=git - url="http://git.b9.com/$url.git" + url="http://git.kpe.io/$url.git" export NIX_PREFETCH_GIT_DEEP_CLONE=1 } diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 537e754d57a..275a6d405c8 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -6,567 +6,24 @@ let lispPackages = rec { buildLispPackage = callPackage ./define-package.nix; - cl-ppcre = buildLispPackage rec { - baseName = "cl-ppcre"; - version = "2.0.4"; - description = "Regular expression library for Common Lisp"; - deps = []; - src = pkgs.fetchurl { - url = "https://github.com/edicl/cl-ppcre/archive/v${version}.tar.gz"; - sha256 = "16nkfg6j7nn8qkzxn462kqpdlbajpz2p55pdl12sia6yqkj3lh97"; - }; - }; - - clx = buildLispPackage rec { - baseName = "clx"; - version = "git-20170201"; - description = "An implementation of the X Window System protocol in Lisp"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/sharplispers/clx''; - sha256 = "08jw4d2sx49kq1xw44s3fvyq94wm1if4v1jbf1137fvlkzw1pf5m"; - rev = ''c6d2446a10abd9eade2c52342b9662c9dd8579dc''; - name = "clx-git-checkout-${version}"; - }; - }; - - iterate = buildLispPackage rec { - baseName = "iterate"; - version = "darcs-2014-11-01"; - description = "Iteration package for Common Lisp"; - deps = []; - src = (pkgs.lib.overrideDerivation (pkgs.fetchdarcs { - url = "https://common-lisp.net/project/iterate/darcs/iterate"; - sha256 = "0gm05s3laiivsqgqjfj1rkz83c2c0jyn4msfgbv6sz42znjpam25"; - context = ./iterate.darcs-context; - }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ssl/certs/ca-bundle.crt";})); - overrides = x: { - configurePhase="buildPhase(){ true; }"; - }; - }; - - alexandria = buildLispPackage rec { - baseName = "alexandria"; - version = "git-20131029"; - description = "A collection of portable public domain utilities"; - deps = []; - src = pkgs.fetchgit { - url = "https://gitlab.common-lisp.net/alexandria/alexandria.git"; - sha256 = "1gx642w00cnnkbkcsnzmg1w147r6yvc0ayns7ha4k0qcvfnb1zvs"; - rev = ''2b1eb4067fb34bc501e527de75d09166a8ba9ceb''; - }; - }; - esrap-peg = buildLispPackage rec { baseName = "esrap-peg"; - version = "git-20131029"; + version = "git-20170320"; description = "A wrapper around Esrap to allow generating Esrap grammars from PEG definitions"; - deps = [alexandria cl-unification esrap iterate]; + deps = with (pkgs.quicklispPackagesFor clwrapper); [alexandria cl-ppcre-template cl-unification esrap iterate]; src = pkgs.fetchgit { url = "https://github.com/fb08af68/esrap-peg.git"; - sha256 = "48e616a697aca95e90e55052fdc9a7f96bf29b3208b1b4012fcd3189c2eceeb1"; - rev = ''1f2f21e32e618f71ed664cdc5e7005f8b6b0f7c8''; - }; - }; - - cl-unification = buildLispPackage rec { - baseName = "cl-unification"; - version = "git-2015-07-01"; - description = ""; - deps = []; - src = pkgs.fetchgit { - url = "https://gitlab.common-lisp.net/cl-unification/cl-unification.git"; - sha256 = "0b7yik1ma7ciwscald624325dl6265fbq52iwy6jh46nvv085dqk"; - rev = ''283c94d38d11c806a1fc9db022f0b54dced93bab''; - }; - }; - - esrap = buildLispPackage rec { - baseName = "esrap"; - version = "git-20131029"; - description = "A Packrat / Parsing Grammar / TDPL parser for Common Lisp"; - deps = [alexandria]; - src = pkgs.fetchgit { - url = "https://github.com/scymtym/esrap.git"; - sha256 = "175jsv309yir0yi03aa2995xg84zjgk34kgnbql5l4vy4as5x665"; - rev = ''c71933b84e220f21e8a509ec26afe3e3871e2e26''; - }; - }; - - clx-truetype = buildLispPackage rec { - baseName = "clx-truetype"; - version = "git-20141112"; - description = "A pure Common Lisp solution for antialiased TrueType font rendering using CLX and the XRender extension"; - deps = [cl-fad cl-store cl-vectors clx trivial-features zpb-ttf]; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/filonenko-mikhail/clx-truetype''; - sha256 = "14wx9s1fd56l25ms2ns1w9a5rxgqr00vgw6jdarfkqk7mfrxxzs1"; - rev = ''6f72905c6886a656e5a1c8167097f12375c6da7d''; - }; - overrides = x:{ - configurePhase = "rm Makefile"; - }; - }; - - cl-fad = buildLispPackage rec { - baseName = "cl-fad"; - version = "v0.7.2"; - description = "Portable pathname library"; - deps = [alexandria bordeaux-threads]; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/edicl/cl-fad''; - sha256 = "87917ab4af4f713ad41faa72c7eaed2872f8dac47f49c0668ba8782590fdbca4"; - rev = ''refs/tags/v0.7.2''; - }; - }; - - bordeaux-threads = buildLispPackage rec { - baseName = "bordeaux-threads"; - version = "0.8.3"; - description = "Bordeaux Threads makes writing portable multi-threaded apps simple"; - deps = [alexandria]; - # Source type: http - src = pkgs.fetchurl { - url = ''http://common-lisp.net/project/bordeaux-threads/releases/bordeaux-threads-0.8.3.tar.gz''; - sha256 = "0c3n7qsx4jc3lg8s0n9kxfvhhyl0s7123f3038nsb96rf0bvb5hy"; - }; - }; - - zpb-ttf = buildLispPackage rec { - baseName = "zpb-ttf"; - version = "release-1.0.3"; - description = "Access TrueType font metrics and outlines from Common Lisp"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/xach/zpb-ttf''; - sha256 = "3092a3ba9f27b091224d11c0ccfb09c9a4632ebfd6c3986df3147f19e53606f2"; - rev = ''refs/tags/release-1.0.3''; - }; - }; - - cl-store = buildLispPackage rec { - baseName = "cl-store"; - version = "git-20141112"; - description = "Serialization package"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/skypher/cl-store''; - sha256 = "7096ad38d5c77d58f7aa0ef8df1884411173c140408cb7967922b315ab505472"; - rev = ''2d2455c024fe64ee24cbf914c82254fa5bd09cab''; - }; - }; - - cl-vectors = buildLispPackage rec { - baseName = "cl-vectors"; - version = "git-20141112"; - description = "cl-paths: vectorial paths manipulation"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/fjolliton/cl-vectors''; - sha256 = "2d1428911cd2699513a0b886661e9b54d1edf78558277ac83723a22c7fc9dea7"; - rev = ''7b3e5d6a8abe3de307c1dc0c4347f4efa4f25f29''; - }; - }; - - trivial-features = buildLispPackage rec { - baseName = "trivial-features"; - version = "git-20141112"; - description = "Ensures consistent *FEATURES* across multiple CLs"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/trivial-features/trivial-features''; - sha256 = "2006aebe0c2bfed1c39a2195639e221fdc52a443b6c8522e535cbef2370a07fc"; - rev = ''2b7cdc3b8073eb33655850b51223770b535da6d9''; - }; - }; - - clsql = buildLispPackage rec { - baseName = "clsql"; - version = "git-20150514"; - description = "Common Lisp SQL Interface library"; - deps = [uffi]; - buildInputs = [pkgs.mysql.client pkgs.zlib]; - # Source type: git - src = pkgs.fetchgit { - url = - #''http://git.kpe.io/clsql.git'' - "http://repo.or.cz/r/clsql.git" - ; - sha256 = "073rh2zxwkcd417qfcflv14j273d1j174slsbzidxvy4zgq5r3n6"; - rev = ''a646f558b54191eda1d64f2926eee7b4fa763f89''; - }; - overrides = x:{ - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${stdenv.lib.getDev pkgs.mysql.client}/include/mysql" - export NIX_LDFLAGS="$NIX_LDFLAGS -L${stdenv.lib.getLib pkgs.mysql.client}/lib/mysql" - ''; - }; - }; - - uffi = buildLispPackage rec { - baseName = "uffi"; - version = "git-20141112"; - description = "Universal Foreign Function Library for Common Lisp"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''http://git.kpe.io/uffi.git''; - sha256 = "1hqszvz0a3wk4s9faa83sc3vjxcb5rxmjclyr17yzwg55z733kry"; - rev = ''a63da5b764b6fa30e32fcda4ddac88de385c9d5b''; - }; - }; - - query-fs = buildLispPackage rec { - baseName = "query-fs"; - version = "git-20150523"; - description = "High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries"; - deps = [bordeaux-threads cl-fuse cl-fuse-meta-fs cl-ppcre command-line-arguments iterate trivial-backtrace]; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/fb08af68/query-fs''; - sha256 = "19h6hscza7p93bc7jvb6ya7ghg96dr1c1v4imlxpjqfdhhdpxsq6"; - rev = ''0f28e3f31a4cd3636a8edb346230482e68af86c2''; - }; - overrides = x: { - linkedSystems = []; - postInstall = '' - export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$out/lib/common-lisp/query-fs" - export HOME=$PWD - build-with-lisp.sh sbcl \ - ":query-fs $(echo "$linkedSystems" | sed -re 's/(^| )([^ :])/ :\2/g')" \ - "$out/bin/query-fs" \ - "(query-fs:run-fs-with-cmdline-args)" - ''; - }; - }; - - cl-fuse = buildLispPackage rec { - baseName = "cl-fuse"; - version = "git-20141113"; - description = "CFFI bindings to FUSE (Filesystem in user space)"; - deps = [bordeaux-threads cffi cl-utilities iterate trivial-backtrace trivial-utf-8]; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/fb08af68/cl-fuse''; - sha256 = "1l4ydxbwzlj6gkb1c9vc96rfbj951snaidpx10pxz4wdnzg3kq99"; - rev = ''6feffaa34a21cfc7890b25357284858f924e8cb3''; - }; - propagatedBuildInputs = [pkgs.fuse]; - overrides = x : { - configurePhase = '' - export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$PWD" - export makeFlags="$makeFlags LISP=common-lisp.sh" - ''; - }; - }; - - cffi = buildLispPackage rec { - baseName = "cffi"; - version = "0.14.0"; - description = "The Common Foreign Function Interface"; - deps = [alexandria babel trivial-features]; - # Source type: http - src = pkgs.fetchurl { - url = ''http://common-lisp.net/project/cffi/releases/cffi_${version}.tar.gz''; - sha256 = "155igjh096vrp7n71c0xcg9qbcpj6547qjvzi9shxbpi6piw6fkw"; - }; - }; - - babel = buildLispPackage rec { - baseName = "babel"; - version = "git-20141113"; - description = "A charset conversion library"; - deps = [alexandria trivial-features]; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/cl-babel/babel''; - sha256 = "abe7150f25ceb7eded520d95f1665a46f4233cf13b577fd02c3f6be54c32facc"; - rev = ''74b35ea79b769c4f9aefad933923778ffa7915ab''; - }; - }; - - cl-utilities = buildLispPackage rec { - baseName = "cl-utilities"; - version = "1.2.4"; - description = "A collection of Common Lisp utility functions"; - deps = []; - # Source type: http - src = pkgs.fetchurl { - url = ''http://common-lisp.net/project/cl-utilities/cl-utilities-${version}.tar.gz''; - sha256 = "1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87"; - }; - }; - - trivial-utf-8 = buildLispPackage rec { - baseName = "trivial-utf-8"; - version = "2011-09-08"; - description = "A UTF-8 encoding library"; - deps = []; - # Source type: darcs - src = (pkgs.lib.overrideDerivation (pkgs.fetchdarcs { - url = ''http://common-lisp.net/project/trivial-utf-8/darcs/trivial-utf-8/''; - sha256 = "1jz27gz8gvqdmvp3k9bxschs6d5b3qgk94qp2bj6nv1d0jc3m1l1"; - }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ssl/certs/ca-bundle.crt";})); - }; - - cl-fuse-meta-fs = buildLispPackage rec { - baseName = "cl-fuse-meta-fs"; - version = "git-20150523"; - description = "CFFI bindings to FUSE (Filesystem in user space)"; - deps = [bordeaux-threads cl-fuse iterate pcall]; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/fb08af68/cl-fuse-meta-fs''; - sha256 = "0cpxwsc0ma1ypl54n3n37wbgdxhz5j67h28q6rhghjn96dgy4ac9"; - rev = ''6ab92ebbb8e6f1f69d179214032915e3744d8c03''; - }; - }; - - pcall = buildLispPackage rec { - baseName = "pcall"; - version = "0.3"; - description = "Common Lisp library intended to simplify 'result-oriented' parallelism"; - deps = [bordeaux-threads]; - # Source type: http - src = pkgs.fetchgit { - url = ''https://github.com/marijnh/pcall''; - sha256 = "00ix5d9ljymrrpwsri0hhh3d592jqr2lvgbvkhav3k96rwq974ps"; - rev = "4e1ef32c33c2ca18fd8ab9afb4fa793c179a3578"; - }; - }; - - command-line-arguments = buildLispPackage rec { - baseName = "command-line-arguments"; - version = "git-20151120"; - description = "Small library to deal with command-line arguments"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''http://common-lisp.net/project/qitab/git/command-line-arguments.git''; - sha256 = "0qx33j0bq8dshiyyv8rjwd0zvhqhqx5gby6xrghfy8ylcwf11r5j"; - rev = ''003bdbc05e2816e43293530f58efb529e9e89a20''; - }; - }; - - trivial-backtrace = buildLispPackage rec { - baseName = "trivial-backtrace"; - version = "git-2014-11-01"; - description = "trivial-backtrace"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''http://common-lisp.net/project/trivial-backtrace/trivial-backtrace.git''; - sha256 = "0bclk05lqijpp72yfzrz0wmw142z0mwnpfl4gqv6gl4fpz1qr56s"; - rev = ''48a6b081e00b0d85f1e001c7258393ed34d06bc9''; - }; - }; - - drakma = buildLispPackage rec { - baseName = "drakma"; - version = "v1.3.10"; - description = "Full-featured http/https client based on usocket"; - deps = [chipz chunga cl-ssl cl-base64 cl-ppcre flexi-streams puri usocket]; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/edicl/drakma''; - sha256 = "0ecc37c9d5cc91a3b86746c4f20c0b1609969db01041df04ff6a9df1d021b30a"; - rev = ''refs/tags/v1.3.10''; - }; - }; - - chipz = buildLispPackage rec { - baseName = "chipz"; - version = "git-20141113"; - description = "A library for decompressing deflate, zlib, and gzip data"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/froydnj/chipz''; - sha256 = "0963nyg8173q0svqhk0ggbvfr4i57jk3swkf0r87jh3yi2l983sl"; - rev = ''3402c94df1d0af7742df08d3ffa23fd5c04c9bf2''; - }; - }; - - chunga = buildLispPackage rec { - baseName = "chunga"; - version = "v1.1.5"; - description = "Portable chunked streams"; - deps = [trivial-gray-streams]; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/edicl/chunga''; - sha256 = "5d045882be34b158185c491da85cfd4671f456435c9ff8fa311a864f633b0446"; - rev = ''refs/tags/v1.1.5''; - }; - }; - - trivial-gray-streams = buildLispPackage rec { - baseName = "trivial-gray-streams"; - version = "git-20141113"; - description = "Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams)"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/trivial-gray-streams/trivial-gray-streams''; - sha256 = "8d5c041f95eb31aa313adc433edf91bb14656400cae1e0ec98ad7ed085bb7954"; - rev = ''0483ade330508b4b2edeabdb47d16ec9437ee1cb''; - }; - }; - - cl-ssl = buildLispPackage rec { - baseName = "cl+ssl"; - version = "git-20141113"; - description = "Common Lisp interface to OpenSSL"; - deps = [bordeaux-threads cffi flexi-streams trivial-garbage trivial-gray-streams]; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/cl-plus-ssl/cl-plus-ssl''; - sha256 = "6b99fc49ac38e49ee69a47ce5791606b8b811c01e5563bfd3164d393db6c4040"; - rev = ''f8695c5df48ebc3557f76a8a08dd96429bdf8df2''; - }; - propagatedBuildInputs = [pkgs.openssl]; - }; - - flexi-streams = buildLispPackage rec { - baseName = "flexi-streams"; - version = "v1.0.13"; - description = "Flexible bivalent streams for Common Lisp"; - deps = [trivial-gray-streams]; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/edicl/flexi-streams''; - sha256 = "46d6b056cffc9ea201dedde847b071db744dfbadf0a21a261717272fe3d85cab"; - rev = ''refs/tags/v1.0.13''; - }; - }; - - trivial-garbage = buildLispPackage rec { - baseName = "trivial-garbage"; - version = "git-20141113"; - description = "Portable finalizers, weak hash-tables and weak pointers"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/trivial-garbage/trivial-garbage''; - sha256 = "0r029lfl5srmhanmmh7bb692pdwb32cnbq2navx6cm3iqda9q87i"; - rev = ''2721d36d71748d9736a82fe5afe333c52bae3084''; - }; - }; - - cl-base64 = buildLispPackage rec { - baseName = "cl-base64"; - version = "git-20141113"; - description = "Base64 encoding and decoding with URI support"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''http://git.kpe.io/cl-base64.git''; - sha256 = "0cq3dxac3l0z2xp3c3gkgj893hvaz4vvxdz0nsc8c9q28q3nwf4p"; - rev = ''f375d1fc3a6616e95ae88bb33493bb99f920ba13''; - }; - }; - - puri = buildLispPackage rec { - baseName = "puri"; - version = "git-20141113"; - description = "Portable Universal Resource Indentifier Library"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''http://git.kpe.io/puri.git''; - sha256 = "1l7d8i9615kyi7n69l07a6ri0d1k13cya0kbg3fmfqanwn5kzv2i"; - rev = ''68260dbf320c01089c8cee54ef32c800eefcde7f''; - }; - }; - - usocket = buildLispPackage rec { - baseName = "usocket"; - version = "0.6.1"; - description = "Universal socket library for Common Lisp"; - deps = []; - # Source type: http - src = pkgs.fetchurl { - url = ''http://common-lisp.net/project/usocket/releases/usocket-${version}.tar.gz''; - sha256 = "1lnhjli85w20iy5nn6j6gsyxx42mvj8l0dfhwcjpl6dl2lz80r7a"; - }; - }; - - cl-html-parse = buildLispPackage rec { - baseName = "cl-html-parse"; - version = "git-20141113"; - description = "HTML Parser"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/gwkkwg/cl-html-parse''; - sha256 = "0s8jjn3s55m59nihc8qiw2s71gn09sxsaii343rzfwdrkdwk9vzh"; - rev = ''b21e8757210a1eb2a47104a563f58bf82ba9a579''; - }; - }; - - nibbles = buildLispPackage rec { - baseName = "nibbles"; - version = "git-20141116"; - description = "A library for accessing octet-addressed blocks of data"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/froydnj/nibbles''; - sha256 = "0p0swss7xjx74sr95wqak5hfhfw13bwkzncy4l4hbfy130gncv8b"; - rev = ''ace095d85e48b18bf9cf9e21249ba7fb57e3efe2''; - }; - }; - - ironclad = buildLispPackage rec { - baseName = "ironclad"; - version = "0.33.0"; - description = "A cryptographic toolkit written in pure Common Lisp"; - deps = [nibbles]; - # Source type: http - src = pkgs.fetchurl { - url = ''http://method-combination.net/lisp/files/ironclad_0.33.0.tar.gz''; - sha256 = "1ld0xz8gmi566zxl1cva5yi86aw1wb6i6446gxxdw1lisxx3xwz7"; - }; - }; - - cl-smtp = buildLispPackage rec { - baseName = "cl-smtp"; - version = "git-2015-07-01"; - description = "SMTP client library"; - deps = [cl-ssl cl-base64 flexi-streams trivial-gray-streams usocket]; - # Source type: git - src = pkgs.fetchgit { - url = "https://gitlab.common-lisp.net/cl-smtp/cl-smtp.git"; - sha256 = "0kvb34jzb3hgvzqlwwwmnyaqj0ghlgmi1x2zll5qw5089gbhfv10"; - rev = ''2bf946c1d561c0085dba6d6337e3e53d9711a5d2''; - }; - }; - - md5 = buildLispPackage rec { - baseName = "md5"; - version = "git-20150415"; - description = "The MD5 Message-Digest Algorithm RFC 1321"; - deps = []; - # Source type: git - src = pkgs.fetchgit { - url = ''https://github.com/pmai/md5''; - sha256 = "18k6k04cqx9zx0q8x3hk5icvjhihra1za7k2jx82xb19jfnjli1y"; - rev = ''9d6f82f7121c87fb7e3b314987ba93900d300dc6''; + sha256 = "15yiial7cy2nbgszqxd26qqcc6n3pw5qlrppzx0mfr3xbd9pvzby"; + rev = ''5a559b0030ecbf5e14cb070b0dc240535faa3402''; }; }; clx-xkeyboard = buildLispPackage rec { baseName = "clx-xkeyboard"; + testSystems = ["xkeyboard"]; version = "git-20150523"; description = "CLX support for X Keyboard extensions"; - deps = [clx]; + deps = with (pkgs.quicklispPackagesFor clwrapper); [clx]; # Source type: git src = pkgs.fetchgit { url = ''https://github.com/filonenko-mikhail/clx-xkeyboard''; @@ -578,6 +35,9 @@ let lispPackages = rec { quicklisp = buildLispPackage rec { baseName = "quicklisp"; version = "2016-01-21"; + + testSystems = []; + description = "The Common Lisp package manager"; deps = []; src = pkgs.fetchgit { @@ -601,6 +61,5 @@ let lispPackages = rec { ''; }; }; - }; in lispPackages diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-aliases.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-aliases.nix new file mode 100644 index 00000000000..cdcfde8eb33 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-aliases.nix @@ -0,0 +1,13 @@ +{quicklisp-to-nix-packages}: +with quicklisp-to-nix-packages; +rec { + cffi-grovel = cffi; + + cxml-test = null; + cxml-dom = null; + cxml-klacks = null; + cxml-xml = null; + + cl-async-util = cl-async-base; + cl-async = cl-async-base; +} diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd.nix new file mode 100644 index 00000000000..e04b3032091 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''3bmd''; + version = ''20161204-git''; + + description = ''markdown processor in CL using esrap parser.''; + + deps = [ args."split-sequence" args."esrap" args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz''; + sha256 = ''158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/3bmd[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM 3bmd DESCRIPTION markdown processor in CL using esrap parser. SHA256 158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx URL + http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz MD5 b80864c74437e0cfb66663e9bbf08fed NAME 3bmd TESTNAME NIL FILENAME 3bmd DEPS + ((NAME split-sequence) (NAME esrap) (NAME alexandria)) DEPENDENCIES (split-sequence esrap alexandria) VERSION 20161204-git SIBLINGS + (3bmd-ext-code-blocks 3bmd-ext-definition-lists 3bmd-ext-tables 3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd-youtube)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix new file mode 100644 index 00000000000..d72835e88c6 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''alexandria''; + version = ''20170227-git''; + + description = ''Alexandria is a collection of portable public domain utilities.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/alexandria/2017-02-27/alexandria-20170227-git.tgz''; + sha256 = ''0gnn4ysyvqf8wfi94kh6x23iwx3czaicam1lz9pnwsv40ws5fwwh''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/alexandria[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM alexandria DESCRIPTION Alexandria is a collection of portable public domain utilities. SHA256 0gnn4ysyvqf8wfi94kh6x23iwx3czaicam1lz9pnwsv40ws5fwwh + URL http://beta.quicklisp.org/archive/alexandria/2017-02-27/alexandria-20170227-git.tgz MD5 b0cbf86723fa3a1fe5c544e8079a3be3 NAME alexandria TESTNAME NIL + FILENAME alexandria DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS (alexandria-tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix new file mode 100644 index 00000000000..fde774a9b24 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''anaphora''; + version = ''20170227-git''; + + description = ''The Anaphoric Macro Package from Hell''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/anaphora/2017-02-27/anaphora-20170227-git.tgz''; + sha256 = ''1inv6bcly6r7yixj1pp0i4h0y7lxyv68mk9wsi5iwi9gx6000yd9''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/anaphora[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM anaphora DESCRIPTION The Anaphoric Macro Package from Hell SHA256 1inv6bcly6r7yixj1pp0i4h0y7lxyv68mk9wsi5iwi9gx6000yd9 URL + http://beta.quicklisp.org/archive/anaphora/2017-02-27/anaphora-20170227-git.tgz MD5 6121d9bbc92df29d823b60ae0d0c556d NAME anaphora TESTNAME NIL FILENAME + anaphora DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix new file mode 100644 index 00000000000..0f51b69e200 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''array-utils''; + version = ''20160929-git''; + + description = ''A few utilities for working with arrays.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/array-utils/2016-09-29/array-utils-20160929-git.tgz''; + sha256 = ''1nlrf7b81qq7l85kkdh3fxcs6ngnvh5zk7mb5mwf8vjm5kpfbbcx''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/array-utils[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays. SHA256 1nlrf7b81qq7l85kkdh3fxcs6ngnvh5zk7mb5mwf8vjm5kpfbbcx URL + http://beta.quicklisp.org/archive/array-utils/2016-09-29/array-utils-20160929-git.tgz MD5 8b3880c7b73625cf8ed599d91a3836b4 NAME array-utils TESTNAME NIL + FILENAME array-utils DEPS NIL DEPENDENCIES NIL VERSION 20160929-git SIBLINGS (array-utils-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix new file mode 100644 index 00000000000..4ad9f00b150 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''babel-streams''; + version = ''babel-20150608-git''; + + description = ''Some useful streams based on Babel's encoding code''; + + deps = [ args."trivial-gray-streams" args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/babel/2015-06-08/babel-20150608-git.tgz''; + sha256 = ''0nv2w7k33rwc4dwi33ay2rkmvnj4vsz9ar27z8fiar34895vndk5''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/babel-streams[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM babel-streams DESCRIPTION Some useful streams based on Babel's encoding code SHA256 0nv2w7k33rwc4dwi33ay2rkmvnj4vsz9ar27z8fiar34895vndk5 URL + http://beta.quicklisp.org/archive/babel/2015-06-08/babel-20150608-git.tgz MD5 308e6c9132994cf09db7766569ee23fd NAME babel-streams TESTNAME NIL FILENAME + babel-streams DEPS ((NAME trivial-gray-streams) (NAME alexandria)) DEPENDENCIES (trivial-gray-streams alexandria) VERSION babel-20150608-git SIBLINGS + (babel-tests babel)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix new file mode 100644 index 00000000000..a88e60824d1 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''babel''; + version = ''20150608-git''; + + description = ''Babel, a charset conversion library.''; + + deps = [ args."trivial-features" args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/babel/2015-06-08/babel-20150608-git.tgz''; + sha256 = ''0nv2w7k33rwc4dwi33ay2rkmvnj4vsz9ar27z8fiar34895vndk5''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/babel[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM babel DESCRIPTION Babel, a charset conversion library. SHA256 0nv2w7k33rwc4dwi33ay2rkmvnj4vsz9ar27z8fiar34895vndk5 URL + http://beta.quicklisp.org/archive/babel/2015-06-08/babel-20150608-git.tgz MD5 308e6c9132994cf09db7766569ee23fd NAME babel TESTNAME NIL FILENAME babel DEPS + ((NAME trivial-features) (NAME alexandria)) DEPENDENCIES (trivial-features alexandria) VERSION 20150608-git SIBLINGS (babel-streams babel-tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix new file mode 100644 index 00000000000..352538cd353 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''blackbird''; + version = ''20160531-git''; + + description = ''A promise implementation for Common Lisp.''; + + deps = [ args."vom" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz''; + sha256 = ''0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/blackbird[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM blackbird DESCRIPTION A promise implementation for Common Lisp. SHA256 0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9 URL + http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz MD5 5cb13dc06a0eae8dcba14714d2b5365d NAME blackbird TESTNAME NIL FILENAME + blackbird DEPS ((NAME vom)) DEPENDENCIES (vom) VERSION 20160531-git SIBLINGS (blackbird-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix new file mode 100644 index 00000000000..adcf9fa5a72 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''bordeaux-threads''; + version = ''v0.8.5''; + + description = ''Bordeaux Threads makes writing portable multi-threaded apps simple.''; + + deps = [ args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2016-03-18/bordeaux-threads-v0.8.5.tgz''; + sha256 = ''09q1xd3fca6ln6mh45cx24xzkrcnvhgl5nn9g2jv0rwj1m2xvbpd''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/bordeaux-threads[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM bordeaux-threads DESCRIPTION Bordeaux Threads makes writing portable multi-threaded apps simple. SHA256 + 09q1xd3fca6ln6mh45cx24xzkrcnvhgl5nn9g2jv0rwj1m2xvbpd URL http://beta.quicklisp.org/archive/bordeaux-threads/2016-03-18/bordeaux-threads-v0.8.5.tgz MD5 + 67e363a363e164b6f61a047957b8554e NAME bordeaux-threads TESTNAME NIL FILENAME bordeaux-threads DEPS ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION + v0.8.5 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix new file mode 100644 index 00000000000..e5d895adb63 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix @@ -0,0 +1,37 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''caveman''; + version = ''20161031-git''; + + description = ''Web Application Framework for Common Lisp''; + + deps = [ args."myway" args."local-time" args."do-urlencode" args."clack-v1-compat" args."cl-syntax-annot" args."cl-syntax" args."cl-project" args."cl-ppcre" args."cl-emb" args."anaphora" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/caveman/2016-10-31/caveman-20161031-git.tgz''; + sha256 = ''111zxnlsn99sybmwgyxh0x29avq898nxssysvaf8v4mbb6fva2hi''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/caveman[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM caveman DESCRIPTION Web Application Framework for Common Lisp SHA256 111zxnlsn99sybmwgyxh0x29avq898nxssysvaf8v4mbb6fva2hi URL + http://beta.quicklisp.org/archive/caveman/2016-10-31/caveman-20161031-git.tgz MD5 a6700f14fd7c4bf8fdc573473ff5fab6 NAME caveman TESTNAME NIL FILENAME + caveman DEPS + ((NAME myway) (NAME local-time) (NAME do-urlencode) (NAME clack-v1-compat) (NAME cl-syntax-annot) (NAME cl-syntax) (NAME cl-project) (NAME cl-ppcre) + (NAME cl-emb) (NAME anaphora)) + DEPENDENCIES (myway local-time do-urlencode clack-v1-compat cl-syntax-annot cl-syntax cl-project cl-ppcre cl-emb anaphora) VERSION 20161031-git SIBLINGS + (caveman-middleware-dbimanager caveman-test caveman2-db caveman2-test caveman2)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix new file mode 100644 index 00000000000..fdb2ab5b869 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cffi-grovel''; + version = ''cffi_0.18.0''; + + description = ''The CFFI Groveller''; + + deps = [ args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz''; + sha256 = ''0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cffi-grovel[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cffi-grovel DESCRIPTION The CFFI Groveller SHA256 0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz URL + http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz MD5 5be207fca26205c7550d7b6307871f4e NAME cffi-grovel TESTNAME NIL FILENAME cffi-grovel + DEPS ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION cffi_0.18.0 SIBLINGS (cffi-examples cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat cffi)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix new file mode 100644 index 00000000000..81f3dfad8aa --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cffi''; + version = ''cffi_0.18.0''; + + description = ''The Common Foreign Function Interface''; + + deps = [ args."uiop" args."trivial-features" args."babel" args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz''; + sha256 = ''0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cffi[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cffi DESCRIPTION The Common Foreign Function Interface SHA256 0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz URL + http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz MD5 5be207fca26205c7550d7b6307871f4e NAME cffi TESTNAME NIL FILENAME cffi DEPS + ((NAME uiop) (NAME trivial-features) (NAME babel) (NAME alexandria)) DEPENDENCIES (uiop trivial-features babel alexandria) VERSION cffi_0.18.0 SIBLINGS + (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix new file mode 100644 index 00000000000..0a1d054b05e --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''chipz''; + version = ''20160318-git''; + + description = ''A library for decompressing deflate, zlib, and gzip data''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/chipz/2016-03-18/chipz-20160318-git.tgz''; + sha256 = ''1dpsg8kd43k075xihb0szcq1f7iq8ryg5r77x5wi6hy9jhpq8826''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/chipz[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM chipz DESCRIPTION A library for decompressing deflate, zlib, and gzip data SHA256 1dpsg8kd43k075xihb0szcq1f7iq8ryg5r77x5wi6hy9jhpq8826 URL + http://beta.quicklisp.org/archive/chipz/2016-03-18/chipz-20160318-git.tgz MD5 625cb9c551f3692799e2029d4a0dd7e9 NAME chipz TESTNAME NIL FILENAME chipz DEPS + NIL DEPENDENCIES NIL VERSION 20160318-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix new file mode 100644 index 00000000000..6f38719781e --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''chunga''; + version = ''1.1.6''; + + description = ''''; + + deps = [ args."trivial-gray-streams" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/chunga/2014-12-17/chunga-1.1.6.tgz''; + sha256 = ''1ivdfi9hjkzp2anhpjm58gzrjpn6mdsp35km115c1j1c4yhs9lzg''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/chunga[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM chunga DESCRIPTION NIL SHA256 1ivdfi9hjkzp2anhpjm58gzrjpn6mdsp35km115c1j1c4yhs9lzg URL + http://beta.quicklisp.org/archive/chunga/2014-12-17/chunga-1.1.6.tgz MD5 75f5c4f9dec3a8a181ed5ef7e5d700b5 NAME chunga TESTNAME NIL FILENAME chunga DEPS + ((NAME trivial-gray-streams)) DEPENDENCIES (trivial-gray-streams) VERSION 1.1.6 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix new file mode 100644 index 00000000000..ff69c56e8a6 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''circular-streams''; + version = ''20161204-git''; + + description = ''Circularly readable streams for Common Lisp''; + + deps = [ args."trivial-gray-streams" args."fast-io" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz''; + sha256 = ''1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/circular-streams[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM circular-streams DESCRIPTION Circularly readable streams for Common Lisp SHA256 1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128 URL + http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz MD5 2383f3b82fa3335d9106e1354a678db8 NAME circular-streams + TESTNAME NIL FILENAME circular-streams DEPS ((NAME trivial-gray-streams) (NAME fast-io)) DEPENDENCIES (trivial-gray-streams fast-io) VERSION 20161204-git + SIBLINGS (circular-streams-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix new file mode 100644 index 00000000000..9b19aa51678 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl+ssl''; + version = ''cl+ssl-20170403-git''; + + description = ''Common Lisp interface to OpenSSL.''; + + deps = [ args."uiop" args."trivial-gray-streams" args."trivial-garbage" args."flexi-streams" args."cffi" args."bordeaux-threads" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl+ssl/2017-04-03/cl+ssl-20170403-git.tgz''; + sha256 = ''1f1nr1wy6nk0l2n249djcvygl0379ch3x4ndc243jcahcp44x18s''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl+ssl[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 1f1nr1wy6nk0l2n249djcvygl0379ch3x4ndc243jcahcp44x18s URL + http://beta.quicklisp.org/archive/cl+ssl/2017-04-03/cl+ssl-20170403-git.tgz MD5 e6d22f98947384d0e0bb2eb18230f72d NAME cl+ssl TESTNAME NIL FILENAME cl+ssl + DEPS ((NAME uiop) (NAME trivial-gray-streams) (NAME trivial-garbage) (NAME flexi-streams) (NAME cffi) (NAME bordeaux-threads)) DEPENDENCIES + (uiop trivial-gray-streams trivial-garbage flexi-streams cffi bordeaux-threads) VERSION cl+ssl-20170403-git SIBLINGS (cl+ssl.test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix new file mode 100644 index 00000000000..2988906735a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-aa''; + version = ''cl-vectors-20150407-git''; + + description = ''cl-aa: polygon rasterizer''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz''; + sha256 = ''1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-aa[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-aa DESCRIPTION cl-aa: polygon rasterizer SHA256 1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w URL + http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz MD5 9e255503bf4559912ea1511c919c474a NAME cl-aa TESTNAME NIL FILENAME + cl-aa DEPS NIL DEPENDENCIES NIL VERSION cl-vectors-20150407-git SIBLINGS (cl-aa-misc cl-paths-ttf cl-paths cl-vectors)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix new file mode 100644 index 00000000000..bdf0dbdf48a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-annot''; + version = ''20150608-git''; + + description = ''Python-like Annotation Syntax for Common Lisp''; + + deps = [ args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz''; + sha256 = ''0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-annot[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-annot DESCRIPTION Python-like Annotation Syntax for Common Lisp SHA256 0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3 URL + http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz MD5 35d8f79311bda4dd86002d11edcd0a21 NAME cl-annot TESTNAME NIL FILENAME + cl-annot DEPS ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION 20150608-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix new file mode 100644 index 00000000000..dae0666a727 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-anonfun''; + version = ''20111203-git''; + + description = ''Anonymous function helpers for Common Lisp''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz''; + sha256 = ''16r3v3yba41smkqpz0qvzabkxashl39klfb6vxhzbly696x87p1m''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-anonfun[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-anonfun DESCRIPTION Anonymous function helpers for Common Lisp SHA256 16r3v3yba41smkqpz0qvzabkxashl39klfb6vxhzbly696x87p1m URL + http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz MD5 915bda1a7653d42090f8d20a1ad85d0b NAME cl-anonfun TESTNAME NIL + FILENAME cl-anonfun DEPS NIL DEPENDENCIES NIL VERSION 20111203-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix new file mode 100644 index 00000000000..2530203e3b7 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-ansi-text''; + version = ''20150804-git''; + + description = ''ANSI control string characters, focused on color''; + + deps = [ args."cl-colors" args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-ansi-text/2015-08-04/cl-ansi-text-20150804-git.tgz''; + sha256 = ''112w7qg8yp28qyc2b5c7km457krr3xksxyps1icmgdpqf9ccpn2i''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-ansi-text[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-ansi-text DESCRIPTION ANSI control string characters, focused on color SHA256 112w7qg8yp28qyc2b5c7km457krr3xksxyps1icmgdpqf9ccpn2i URL + http://beta.quicklisp.org/archive/cl-ansi-text/2015-08-04/cl-ansi-text-20150804-git.tgz MD5 70aa38b40377a5e89a7f22bb68b3f796 NAME cl-ansi-text TESTNAME NIL + FILENAME cl-ansi-text DEPS ((NAME cl-colors) (NAME alexandria)) DEPENDENCIES (cl-colors alexandria) VERSION 20150804-git SIBLINGS (cl-ansi-text-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix new file mode 100644 index 00000000000..ea9c89dffb7 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-async-base''; + version = ''cl-async-20160825-git''; + + testSystems = ["cl-async"]; + + description = ''Base system for cl-async.''; + + deps = [ args."cl-libuv" args."cffi" args."bordeaux-threads" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz''; + sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-async-base[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-async-base DESCRIPTION Base system for cl-async. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL + http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-base TESTNAME cl-async + FILENAME cl-async-base DEPS ((NAME cl-libuv) (NAME cffi) (NAME bordeaux-threads)) DEPENDENCIES (cl-libuv cffi bordeaux-threads) VERSION + cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test cl-async)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix new file mode 100644 index 00000000000..ccc138a9b5e --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-async-repl''; + version = ''cl-async-20160825-git''; + + description = ''REPL integration for CL-ASYNC.''; + + deps = [ args."bordeaux-threads" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz''; + sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-async-repl[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL + http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-repl TESTNAME NIL + FILENAME cl-async-repl DEPS ((NAME bordeaux-threads)) DEPENDENCIES (bordeaux-threads) VERSION cl-async-20160825-git SIBLINGS + (cl-async-ssl cl-async-test cl-async)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix new file mode 100644 index 00000000000..dbd056059f7 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-async-ssl''; + version = ''cl-async-20160825-git''; + + description = ''SSL Wrapper around cl-async socket implementation.''; + + deps = [ args."vom" args."cffi" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz''; + sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-async-ssl[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-async-ssl DESCRIPTION SSL Wrapper around cl-async socket implementation. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL + http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-ssl TESTNAME NIL + FILENAME cl-async-ssl DEPS ((NAME vom) (NAME cffi)) DEPENDENCIES (vom cffi) VERSION cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-test cl-async)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix new file mode 100644 index 00000000000..b72be6f88bf --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-async-util''; + version = ''cl-async-20160825-git''; + + description = ''Internal utilities for cl-async.''; + + deps = [ args."vom" args."fast-io" args."cl-ppcre" args."cl-libuv" args."cl-async-base" args."cffi" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz''; + sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-async-util[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-async-util DESCRIPTION Internal utilities for cl-async. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL + http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-util TESTNAME NIL + FILENAME cl-async-util DEPS ((NAME vom) (NAME fast-io) (NAME cl-ppcre) (NAME cl-libuv) (NAME cl-async-base) (NAME cffi)) DEPENDENCIES + (vom fast-io cl-ppcre cl-libuv cl-async-base cffi) VERSION cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test cl-async)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix new file mode 100644 index 00000000000..e484e1d991a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix @@ -0,0 +1,37 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-async''; + version = ''20160825-git''; + + description = ''Asynchronous operations for Common Lisp.''; + + deps = [ args."uiop" args."trivial-gray-streams" args."trivial-features" args."static-vectors" args."cl-ppcre" args."cl-libuv" args."cl-async-util" args."cl-async-base" args."cffi" args."babel" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz''; + sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-async[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-async DESCRIPTION Asynchronous operations for Common Lisp. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL + http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async TESTNAME NIL FILENAME + cl-async DEPS + ((NAME uiop) (NAME trivial-gray-streams) (NAME trivial-features) (NAME static-vectors) (NAME cl-ppcre) (NAME cl-libuv) (NAME cl-async-util) + (NAME cl-async-base) (NAME cffi) (NAME babel)) + DEPENDENCIES (uiop trivial-gray-streams trivial-features static-vectors cl-ppcre cl-libuv cl-async-util cl-async-base cffi babel) VERSION 20160825-git + SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix new file mode 100644 index 00000000000..0ca5f7149f2 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-base64''; + version = ''20150923-git''; + + description = ''Base64 encoding and decoding with URI support.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-base64/2015-09-23/cl-base64-20150923-git.tgz''; + sha256 = ''0haip5x0091r9xa8gdzr21s0rk432998nbxxfys35lhnyc1vgyhp''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-base64[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-base64 DESCRIPTION Base64 encoding and decoding with URI support. SHA256 0haip5x0091r9xa8gdzr21s0rk432998nbxxfys35lhnyc1vgyhp URL + http://beta.quicklisp.org/archive/cl-base64/2015-09-23/cl-base64-20150923-git.tgz MD5 560d0601eaa86901611f1484257b9a57 NAME cl-base64 TESTNAME NIL FILENAME + cl-base64 DEPS NIL DEPENDENCIES NIL VERSION 20150923-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix new file mode 100644 index 00000000000..237fbfaea38 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-colors''; + version = ''20151218-git''; + + description = ''Simple color library for Common Lisp''; + + deps = [ args."alexandria" args."let-plus" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-colors/2015-12-18/cl-colors-20151218-git.tgz''; + sha256 = ''032kswn6h2ib7v8v1dg0lmgfks7zk52wrv31q6p2zj2a156ccqp4''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-colors[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-colors DESCRIPTION Simple color library for Common Lisp SHA256 032kswn6h2ib7v8v1dg0lmgfks7zk52wrv31q6p2zj2a156ccqp4 URL + http://beta.quicklisp.org/archive/cl-colors/2015-12-18/cl-colors-20151218-git.tgz MD5 2963c3e7aca2c5db2132394f83716515 NAME cl-colors TESTNAME NIL FILENAME + cl-colors DEPS ((NAME alexandria) (NAME let-plus)) DEPENDENCIES (alexandria let-plus) VERSION 20151218-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix new file mode 100644 index 00000000000..4d2b56ac775 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-cookie''; + version = ''20150804-git''; + + description = ''HTTP cookie manager''; + + deps = [ args."quri" args."proc-parse" args."local-time" args."cl-ppcre" args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-cookie/2015-08-04/cl-cookie-20150804-git.tgz''; + sha256 = ''0llh5d2p7wi5amzpckng1bzmf2bdfdwkfapcdq0znqlzd5bvbby8''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-cookie[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-cookie DESCRIPTION HTTP cookie manager SHA256 0llh5d2p7wi5amzpckng1bzmf2bdfdwkfapcdq0znqlzd5bvbby8 URL + http://beta.quicklisp.org/archive/cl-cookie/2015-08-04/cl-cookie-20150804-git.tgz MD5 d2c08a71afd47b3ad42e1234ec1a3083 NAME cl-cookie TESTNAME NIL FILENAME + cl-cookie DEPS ((NAME quri) (NAME proc-parse) (NAME local-time) (NAME cl-ppcre) (NAME alexandria)) DEPENDENCIES + (quri proc-parse local-time cl-ppcre alexandria) VERSION 20150804-git SIBLINGS (cl-cookie-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix new file mode 100644 index 00000000000..781ae6c1d33 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-dbi''; + version = ''20170124-git''; + + description = ''''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz''; + sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-dbi[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-dbi DESCRIPTION NIL SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL + http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME cl-dbi TESTNAME NIL FILENAME cl-dbi + DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS (dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix new file mode 100644 index 00000000000..7b4c40632a5 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-emb''; + version = ''20170227-git''; + + description = ''A templating system for Common Lisp''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-emb/2017-02-27/cl-emb-20170227-git.tgz''; + sha256 = ''03n97xvh3v8bz1p75v1vhryfkjm74v0cr5jwg4rakq9zkchhfk80''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-emb[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-emb DESCRIPTION A templating system for Common Lisp SHA256 03n97xvh3v8bz1p75v1vhryfkjm74v0cr5jwg4rakq9zkchhfk80 URL + http://beta.quicklisp.org/archive/cl-emb/2017-02-27/cl-emb-20170227-git.tgz MD5 01d850432cc2f8e920e50b4b36e42d42 NAME cl-emb TESTNAME NIL FILENAME cl-emb + DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix new file mode 100644 index 00000000000..2063f2f4be3 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-fad''; + version = ''0.7.4''; + + description = ''Portable pathname library''; + + deps = [ args."alexandria" args."bordeaux-threads" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-fad/2016-08-25/cl-fad-0.7.4.tgz''; + sha256 = ''1avp5j66vrpv5symgw4n4szlc2cyqz4haa0cxzy1pl8p0a8k0v9x''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-fad[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-fad DESCRIPTION Portable pathname library SHA256 1avp5j66vrpv5symgw4n4szlc2cyqz4haa0cxzy1pl8p0a8k0v9x URL + http://beta.quicklisp.org/archive/cl-fad/2016-08-25/cl-fad-0.7.4.tgz MD5 8ee53f2249eca9d7d54e268662b41845 NAME cl-fad TESTNAME NIL FILENAME cl-fad DEPS + ((NAME alexandria) (NAME bordeaux-threads)) DEPENDENCIES (alexandria bordeaux-threads) VERSION 0.7.4 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix new file mode 100644 index 00000000000..9d3d779ab48 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-fuse-meta-fs''; + version = ''20150608-git''; + + description = ''CFFI bindings to FUSE (Filesystem in user space)''; + + deps = [ args."bordeaux-threads" args."cl-fuse" args."iterate" args."pcall" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2015-06-08/cl-fuse-meta-fs-20150608-git.tgz''; + sha256 = ''1i3yw237ygwlkhbcbm9q54ad9g4fi63fw4mg508hr7bz9gzg36q2''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-fuse-meta-fs[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-fuse-meta-fs DESCRIPTION CFFI bindings to FUSE (Filesystem in user space) SHA256 1i3yw237ygwlkhbcbm9q54ad9g4fi63fw4mg508hr7bz9gzg36q2 URL + http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2015-06-08/cl-fuse-meta-fs-20150608-git.tgz MD5 eb80b959dd6494cd787cff4f8c2f214b NAME cl-fuse-meta-fs + TESTNAME NIL FILENAME cl-fuse-meta-fs DEPS ((NAME bordeaux-threads) (NAME cl-fuse) (NAME iterate) (NAME pcall)) DEPENDENCIES + (bordeaux-threads cl-fuse iterate pcall) VERSION 20150608-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix new file mode 100644 index 00000000000..576edbfdbf2 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-fuse''; + version = ''20160318-git''; + + description = ''CFFI bindings to FUSE (Filesystem in user space)''; + + deps = [ args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-utilities" args."iterate" args."trivial-backtrace" args."trivial-utf-8" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-fuse/2016-03-18/cl-fuse-20160318-git.tgz''; + sha256 = ''1yllmnnhqp42s37a2y7h7vph854xgna62l1pidvlyskc90bl5jf6''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-fuse[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-fuse DESCRIPTION CFFI bindings to FUSE (Filesystem in user space) SHA256 1yllmnnhqp42s37a2y7h7vph854xgna62l1pidvlyskc90bl5jf6 URL + http://beta.quicklisp.org/archive/cl-fuse/2016-03-18/cl-fuse-20160318-git.tgz MD5 ce2e907e5ae2cece72fa314be1ced44c NAME cl-fuse TESTNAME NIL FILENAME + cl-fuse DEPS ((NAME bordeaux-threads) (NAME cffi) (NAME cffi-grovel) (NAME cl-utilities) (NAME iterate) (NAME trivial-backtrace) (NAME trivial-utf-8)) + DEPENDENCIES (bordeaux-threads cffi cffi-grovel cl-utilities iterate trivial-backtrace trivial-utf-8) VERSION 20160318-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix new file mode 100644 index 00000000000..7babd1a459f --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-json''; + version = ''20141217-git''; + + description = ''JSON in Lisp. JSON (JavaScript Object Notation) is a lightweight data-interchange format.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-json/2014-12-17/cl-json-20141217-git.tgz''; + sha256 = ''00cfppyi6njsbpv1x03jcv4zwplg0q1138174l3wjkvi3gsql17g''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-json[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-json DESCRIPTION JSON in Lisp. JSON (JavaScript Object Notation) is a lightweight data-interchange format. SHA256 + 00cfppyi6njsbpv1x03jcv4zwplg0q1138174l3wjkvi3gsql17g URL http://beta.quicklisp.org/archive/cl-json/2014-12-17/cl-json-20141217-git.tgz MD5 + 9d873fa462b93c76d90642d8e3fb4881 NAME cl-json TESTNAME NIL FILENAME cl-json DEPS NIL DEPENDENCIES NIL VERSION 20141217-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix new file mode 100644 index 00000000000..f782c99a68a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-l10n-cldr''; + version = ''20120909-darcs''; + + description = ''The necessary CLDR files for cl-l10n packaged in a QuickLisp friendly way.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz''; + sha256 = ''03l81bx8izvzwzw0qah34l4k47l4gmhr917phhhl81qp55x7zbiv''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-l10n-cldr[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-l10n-cldr DESCRIPTION The necessary CLDR files for cl-l10n packaged in a QuickLisp friendly way. SHA256 + 03l81bx8izvzwzw0qah34l4k47l4gmhr917phhhl81qp55x7zbiv URL http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz MD5 + 466e776f2f6b931d9863e1fc4d0b514e NAME cl-l10n-cldr TESTNAME NIL FILENAME cl-l10n-cldr DEPS NIL DEPENDENCIES NIL VERSION 20120909-darcs SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix new file mode 100644 index 00000000000..6c465f14858 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-l10n''; + version = ''20161204-darcs''; + + description = ''Portable CL Locale Support''; + + deps = [ args."alexandria" args."cl-fad" args."cl-l10n-cldr" args."cl-ppcre" args."closer-mop" args."cxml" args."flexi-streams" args."iterate" args."local-time" args."metabang-bind" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz''; + sha256 = ''1r8jgwks21az78c5kdxgw5llk9ml423vjkv1f93qg1vx3zma6vzl''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-l10n[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-l10n DESCRIPTION Portable CL Locale Support SHA256 1r8jgwks21az78c5kdxgw5llk9ml423vjkv1f93qg1vx3zma6vzl URL + http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz MD5 c7cb0bb584b061799abaaaf2bd65c9c5 NAME cl-l10n TESTNAME NIL FILENAME + cl-l10n DEPS + ((NAME alexandria) (NAME cl-fad) (NAME cl-l10n-cldr) (NAME cl-ppcre) (NAME closer-mop) (NAME cxml) (NAME flexi-streams) (NAME iterate) (NAME local-time) + (NAME metabang-bind)) + DEPENDENCIES (alexandria cl-fad cl-l10n-cldr cl-ppcre closer-mop cxml flexi-streams iterate local-time metabang-bind) VERSION 20161204-darcs SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix new file mode 100644 index 00000000000..cca51585e5d --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-libuv''; + version = ''20160825-git''; + + description = ''Low-level libuv bindings for Common Lisp.''; + + deps = [ args."alexandria" args."cffi" args."cffi-grovel" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-libuv/2016-08-25/cl-libuv-20160825-git.tgz''; + sha256 = ''02vi9ph9pxbxgp9jsbgzb9nijsv0vyk3f1jyhhm88i0y1kb3595r''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-libuv[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-libuv DESCRIPTION Low-level libuv bindings for Common Lisp. SHA256 02vi9ph9pxbxgp9jsbgzb9nijsv0vyk3f1jyhhm88i0y1kb3595r URL + http://beta.quicklisp.org/archive/cl-libuv/2016-08-25/cl-libuv-20160825-git.tgz MD5 ba5e3cfaadcf710eaee67cc9e716e45a NAME cl-libuv TESTNAME NIL FILENAME + cl-libuv DEPS ((NAME alexandria) (NAME cffi) (NAME cffi-grovel)) DEPENDENCIES (alexandria cffi cffi-grovel) VERSION 20160825-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix new file mode 100644 index 00000000000..282b05fefd8 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-markup''; + version = ''20131003-git''; + + description = ''''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz''; + sha256 = ''1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-markup[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-markup DESCRIPTION NIL SHA256 1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r URL + http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz MD5 3ec36b8e15435933f614959032987848 NAME cl-markup TESTNAME NIL FILENAME + cl-markup DEPS NIL DEPENDENCIES NIL VERSION 20131003-git SIBLINGS (cl-markup-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix new file mode 100644 index 00000000000..f54fc00950a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-mysql''; + version = ''20160628-git''; + + description = ''Common Lisp MySQL library bindings''; + + deps = [ args."cffi" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-mysql/2016-06-28/cl-mysql-20160628-git.tgz''; + sha256 = ''1zkijanw34nc91dn9jv30590ir6jw7bbcwjsqbvli69fh4b03319''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-mysql[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-mysql DESCRIPTION Common Lisp MySQL library bindings SHA256 1zkijanw34nc91dn9jv30590ir6jw7bbcwjsqbvli69fh4b03319 URL + http://beta.quicklisp.org/archive/cl-mysql/2016-06-28/cl-mysql-20160628-git.tgz MD5 349615d041c2f2177b678088f9c22409 NAME cl-mysql TESTNAME NIL FILENAME + cl-mysql DEPS ((NAME cffi)) DEPENDENCIES (cffi) VERSION 20160628-git SIBLINGS (cl-mysql-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix new file mode 100644 index 00000000000..38f57fc61b1 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-paths-ttf''; + version = ''cl-vectors-20150407-git''; + + description = ''cl-paths-ttf: vectorial paths manipulation''; + + deps = [ args."zpb-ttf" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz''; + sha256 = ''1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-paths-ttf[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-paths-ttf DESCRIPTION cl-paths-ttf: vectorial paths manipulation SHA256 1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w URL + http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz MD5 9e255503bf4559912ea1511c919c474a NAME cl-paths-ttf TESTNAME NIL + FILENAME cl-paths-ttf DEPS ((NAME zpb-ttf)) DEPENDENCIES (zpb-ttf) VERSION cl-vectors-20150407-git SIBLINGS (cl-aa-misc cl-aa cl-paths cl-vectors)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix new file mode 100644 index 00000000000..66b42fec175 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-postgres''; + version = ''postmodern-20170403-git''; + + description = ''Low-level client library for PostgreSQL''; + + deps = [ args."md5" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz''; + sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-postgres[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL SHA256 1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL + http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME cl-postgres TESTNAME NIL + FILENAME cl-postgres DEPS ((NAME md5)) DEPENDENCIES (md5) VERSION postmodern-20170403-git SIBLINGS (postmodern s-sql simple-date)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix new file mode 100644 index 00000000000..8e687ce64a8 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix @@ -0,0 +1,42 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-ppcre-template''; + version = ''cl-unification-20170124-git''; + + description = ''A system used to conditionally load the CL-PPCRE Template. + +This system is not required and it is handled only if CL-PPCRE is +available. If it is, then the library provides the +REGULAR-EXPRESSION-TEMPLATE.''; + + deps = [ args."cl-ppcre" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-unification/2017-01-24/cl-unification-20170124-git.tgz''; + sha256 = ''0gwk40y5byg6q0hhd41rqf8g8i1my0h4lshc63xfnh3mfgcc8bx9''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-ppcre-template[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-ppcre-template DESCRIPTION A system used to conditionally load the CL-PPCRE Template. + +This system is not required and it is handled only if CL-PPCRE is +available. If it is, then the library provides the +REGULAR-EXPRESSION-TEMPLATE. + SHA256 0gwk40y5byg6q0hhd41rqf8g8i1my0h4lshc63xfnh3mfgcc8bx9 URL http://beta.quicklisp.org/archive/cl-unification/2017-01-24/cl-unification-20170124-git.tgz + MD5 dd277adaf3a0ee41fd0731f78519b1b1 NAME cl-ppcre-template TESTNAME NIL FILENAME cl-ppcre-template DEPS ((NAME cl-ppcre)) DEPENDENCIES (cl-ppcre) VERSION + cl-unification-20170124-git SIBLINGS (cl-unification-lib cl-unification-test cl-unification)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix new file mode 100644 index 00000000000..3872bfd5f93 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-ppcre-unicode''; + version = ''cl-ppcre-2.0.11''; + + description = ''Perl-compatible regular expression library (Unicode)''; + + deps = [ args."cl-unicode" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz''; + sha256 = ''1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-ppcre-unicode[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-ppcre-unicode DESCRIPTION Perl-compatible regular expression library (Unicode) SHA256 1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2 URL + http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz MD5 6d5250467c05eb661a76d395186a1da0 NAME cl-ppcre-unicode TESTNAME NIL FILENAME + cl-ppcre-unicode DEPS ((NAME cl-unicode)) DEPENDENCIES (cl-unicode) VERSION cl-ppcre-2.0.11 SIBLINGS (cl-ppcre)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix new file mode 100644 index 00000000000..ecf4a5de399 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-ppcre''; + version = ''2.0.11''; + + description = ''Perl-compatible regular expression library''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz''; + sha256 = ''1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-ppcre[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-ppcre DESCRIPTION Perl-compatible regular expression library SHA256 1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2 URL + http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz MD5 6d5250467c05eb661a76d395186a1da0 NAME cl-ppcre TESTNAME NIL FILENAME cl-ppcre + DEPS NIL DEPENDENCIES NIL VERSION 2.0.11 SIBLINGS (cl-ppcre-unicode)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix new file mode 100644 index 00000000000..3a933d2b11d --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-project''; + version = ''20160531-git''; + + description = ''Generate a skeleton for modern project''; + + deps = [ args."uiop" args."prove" args."local-time" args."cl-ppcre" args."cl-emb" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-project/2016-05-31/cl-project-20160531-git.tgz''; + sha256 = ''1xwjgs5pzkdnd9i5lcic9z41d1c4yf7pvarrvawfxcicg6rrfw81''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-project[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-project DESCRIPTION Generate a skeleton for modern project SHA256 1xwjgs5pzkdnd9i5lcic9z41d1c4yf7pvarrvawfxcicg6rrfw81 URL + http://beta.quicklisp.org/archive/cl-project/2016-05-31/cl-project-20160531-git.tgz MD5 63de5ce6f0f3e5f60094a86d32c2f1a9 NAME cl-project TESTNAME NIL + FILENAME cl-project DEPS ((NAME uiop) (NAME prove) (NAME local-time) (NAME cl-ppcre) (NAME cl-emb)) DEPENDENCIES (uiop prove local-time cl-ppcre cl-emb) + VERSION 20160531-git SIBLINGS (cl-project-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix new file mode 100644 index 00000000000..cad670acab1 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-reexport''; + version = ''20150709-git''; + + description = ''Reexport external symbols in other packages.''; + + deps = [ args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-reexport/2015-07-09/cl-reexport-20150709-git.tgz''; + sha256 = ''1y6qlyps7g0wl4rbmzvw6s1kjdwwmh33layyjclsjp9j5nm8mdmi''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-reexport[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-reexport DESCRIPTION Reexport external symbols in other packages. SHA256 1y6qlyps7g0wl4rbmzvw6s1kjdwwmh33layyjclsjp9j5nm8mdmi URL + http://beta.quicklisp.org/archive/cl-reexport/2015-07-09/cl-reexport-20150709-git.tgz MD5 207d02771cbd906d033ff704ca5c3a3d NAME cl-reexport TESTNAME NIL + FILENAME cl-reexport DEPS ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION 20150709-git SIBLINGS (cl-reexport-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix new file mode 100644 index 00000000000..0098abf59d3 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-smtp''; + version = ''20160825-git''; + + description = ''Common Lisp smtp client.''; + + deps = [ args."cl+ssl" args."cl-base64" args."flexi-streams" args."trivial-gray-streams" args."usocket" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-smtp/2016-08-25/cl-smtp-20160825-git.tgz''; + sha256 = ''0svkvy6x458a7rgvp3wki0lmhdxpaa1j0brwsw2mlpl2jqkx5dxh''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-smtp[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-smtp DESCRIPTION Common Lisp smtp client. SHA256 0svkvy6x458a7rgvp3wki0lmhdxpaa1j0brwsw2mlpl2jqkx5dxh URL + http://beta.quicklisp.org/archive/cl-smtp/2016-08-25/cl-smtp-20160825-git.tgz MD5 e6bb60e66b0f7d9cc5e4f98aba56998a NAME cl-smtp TESTNAME NIL FILENAME + cl-smtp DEPS ((NAME cl+ssl) (NAME cl-base64) (NAME flexi-streams) (NAME trivial-gray-streams) (NAME usocket)) DEPENDENCIES + (cl+ssl cl-base64 flexi-streams trivial-gray-streams usocket) VERSION 20160825-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix new file mode 100644 index 00000000000..ba16a64a9f6 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-store''; + version = ''20160531-git''; + + description = ''Serialization package''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-store/2016-05-31/cl-store-20160531-git.tgz''; + sha256 = ''0j1pfgvzy6l7hb68xsz2dghsa94lip7caq6f6608jsqadmdswljz''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-store[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-store DESCRIPTION Serialization package SHA256 0j1pfgvzy6l7hb68xsz2dghsa94lip7caq6f6608jsqadmdswljz URL + http://beta.quicklisp.org/archive/cl-store/2016-05-31/cl-store-20160531-git.tgz MD5 8b3f33956b05d8e900346663f6abca3c NAME cl-store TESTNAME NIL FILENAME + cl-store DEPS NIL DEPENDENCIES NIL VERSION 20160531-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix new file mode 100644 index 00000000000..abdfc65ec1f --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-syntax-annot''; + version = ''cl-syntax-20150407-git''; + + description = ''CL-Syntax Reader Syntax for cl-annot''; + + deps = [ args."cl-annot" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz''; + sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-syntax-annot[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-syntax-annot DESCRIPTION CL-Syntax Reader Syntax for cl-annot SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL + http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax-annot TESTNAME NIL + FILENAME cl-syntax-annot DEPS ((NAME cl-annot)) DEPENDENCIES (cl-annot) VERSION cl-syntax-20150407-git SIBLINGS + (cl-syntax-anonfun cl-syntax-clsql cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax-markup cl-syntax)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix new file mode 100644 index 00000000000..32c1a0c0ccc --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-syntax-anonfun''; + version = ''cl-syntax-20150407-git''; + + description = ''CL-Syntax Reader Syntax for cl-anonfun''; + + deps = [ args."cl-anonfun" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz''; + sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-syntax-anonfun[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-syntax-anonfun DESCRIPTION CL-Syntax Reader Syntax for cl-anonfun SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL + http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax-anonfun TESTNAME NIL + FILENAME cl-syntax-anonfun DEPS ((NAME cl-anonfun)) DEPENDENCIES (cl-anonfun) VERSION cl-syntax-20150407-git SIBLINGS + (cl-syntax-annot cl-syntax-clsql cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax-markup cl-syntax)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix new file mode 100644 index 00000000000..34c5a2e6628 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-syntax-markup''; + version = ''cl-syntax-20150407-git''; + + description = ''CL-Syntax Reader Syntax for CL-Markup''; + + deps = [ args."cl-markup" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz''; + sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-syntax-markup[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-syntax-markup DESCRIPTION CL-Syntax Reader Syntax for CL-Markup SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL + http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax-markup TESTNAME NIL + FILENAME cl-syntax-markup DEPS ((NAME cl-markup)) DEPENDENCIES (cl-markup) VERSION cl-syntax-20150407-git SIBLINGS + (cl-syntax-annot cl-syntax-anonfun cl-syntax-clsql cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix new file mode 100644 index 00000000000..bccba7ca8ea --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-syntax''; + version = ''20150407-git''; + + description = ''Reader Syntax Coventions for Common Lisp and SLIME''; + + deps = [ args."trivial-types" args."named-readtables" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz''; + sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-syntax[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-syntax DESCRIPTION Reader Syntax Coventions for Common Lisp and SLIME SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL + http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax TESTNAME NIL FILENAME + cl-syntax DEPS ((NAME trivial-types) (NAME named-readtables)) DEPENDENCIES (trivial-types named-readtables) VERSION 20150407-git SIBLINGS + (cl-syntax-annot cl-syntax-anonfun cl-syntax-clsql cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax-markup)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix new file mode 100644 index 00000000000..c0d004c4009 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-test-more''; + version = ''prove-20170403-git''; + + description = ''''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz''; + sha256 = ''091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-test-more[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-test-more DESCRIPTION NIL SHA256 091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl URL + http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz MD5 063b615692c8711d2392204ecf1b37b7 NAME cl-test-more TESTNAME NIL FILENAME + cl-test-more DEPS NIL DEPENDENCIES NIL VERSION prove-20170403-git SIBLINGS (prove-asdf prove-test prove)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix new file mode 100644 index 00000000000..d514c1f26a4 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-unicode''; + version = ''0.1.5''; + + description = ''Portable Unicode Library''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz''; + sha256 = ''1jd5qq5ji6l749c4x415z22y9r0k9z18pdi9p9fqvamzh854i46n''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-unicode[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-unicode DESCRIPTION Portable Unicode Library SHA256 1jd5qq5ji6l749c4x415z22y9r0k9z18pdi9p9fqvamzh854i46n URL + http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz MD5 2fd456537bd670126da84466226bc5c5 NAME cl-unicode TESTNAME NIL FILENAME + cl-unicode DEPS NIL DEPENDENCIES NIL VERSION 0.1.5 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix new file mode 100644 index 00000000000..4c0b0c5c762 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix @@ -0,0 +1,38 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-unification''; + version = ''20170124-git''; + + description = ''The CL-UNIFICATION system. + +The system contains the definitions for the 'unification' machinery.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-unification/2017-01-24/cl-unification-20170124-git.tgz''; + sha256 = ''0gwk40y5byg6q0hhd41rqf8g8i1my0h4lshc63xfnh3mfgcc8bx9''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-unification[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-unification DESCRIPTION The CL-UNIFICATION system. + +The system contains the definitions for the 'unification' machinery. + SHA256 0gwk40y5byg6q0hhd41rqf8g8i1my0h4lshc63xfnh3mfgcc8bx9 URL http://beta.quicklisp.org/archive/cl-unification/2017-01-24/cl-unification-20170124-git.tgz + MD5 dd277adaf3a0ee41fd0731f78519b1b1 NAME cl-unification TESTNAME NIL FILENAME cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS + (cl-unification-lib cl-unification-test cl-ppcre-template)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix new file mode 100644 index 00000000000..099c63daf28 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-utilities''; + version = ''1.2.4''; + + description = ''''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz''; + sha256 = ''1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-utilities[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-utilities DESCRIPTION NIL SHA256 1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87 URL + http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz MD5 c3a4ba38b627448d3ed40ce888048940 NAME cl-utilities TESTNAME NIL + FILENAME cl-utilities DEPS NIL DEPENDENCIES NIL VERSION 1.2.4 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix new file mode 100644 index 00000000000..e2e2c956e7d --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-vectors''; + version = ''20150407-git''; + + description = ''cl-paths: vectorial paths manipulation''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz''; + sha256 = ''1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-vectors[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-vectors DESCRIPTION cl-paths: vectorial paths manipulation SHA256 1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w URL + http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz MD5 9e255503bf4559912ea1511c919c474a NAME cl-vectors TESTNAME NIL + FILENAME cl-vectors DEPS NIL DEPENDENCIES NIL VERSION 20150407-git SIBLINGS (cl-aa-misc cl-aa cl-paths-ttf cl-paths)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix new file mode 100644 index 00000000000..ca1303e9d1d --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-who''; + version = ''1.1.4''; + + description = ''(X)HTML generation macros''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-who/2014-12-17/cl-who-1.1.4.tgz''; + sha256 = ''0r9wc92njz1cc7nghgbhdmd7jy216ylhlabfj0vc45bmfa4w44rq''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-who[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cl-who DESCRIPTION (X)HTML generation macros SHA256 0r9wc92njz1cc7nghgbhdmd7jy216ylhlabfj0vc45bmfa4w44rq URL + http://beta.quicklisp.org/archive/cl-who/2014-12-17/cl-who-1.1.4.tgz MD5 a9e6f0b6a8aaa247dbf751de2cb550bf NAME cl-who TESTNAME NIL FILENAME cl-who DEPS NIL + DEPENDENCIES NIL VERSION 1.1.4 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix new file mode 100644 index 00000000000..b9d894e3f47 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix @@ -0,0 +1,44 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''clack-v1-compat''; + version = ''clack-20170403-git''; + + description = ''''; + + deps = [ args."uiop" args."trivial-types" args."trivial-mimes" args."trivial-backtrace" args."split-sequence" args."quri" args."marshal" args."local-time" args."lack-util" args."lack" args."ironclad" args."http-body" args."flexi-streams" args."cl-syntax-annot" args."cl-ppcre" args."cl-base64" args."circular-streams" args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/clack/2017-04-03/clack-20170403-git.tgz''; + sha256 = ''1n6rbiz5ybwr1fbzynlmqmx2di5kqxrsniqx9mzy7034hqpk54ss''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clack-v1-compat[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256 1n6rbiz5ybwr1fbzynlmqmx2di5kqxrsniqx9mzy7034hqpk54ss URL + http://beta.quicklisp.org/archive/clack/2017-04-03/clack-20170403-git.tgz MD5 98643f671285c11e91d2c81d4c8fc52a NAME clack-v1-compat TESTNAME NIL FILENAME + clack-v1-compat DEPS + ((NAME uiop) (NAME trivial-types) (NAME trivial-mimes) (NAME trivial-backtrace) (NAME split-sequence) (NAME quri) (NAME marshal) (NAME local-time) + (NAME lack-util) (NAME lack) (NAME ironclad) (NAME http-body) (NAME flexi-streams) (NAME cl-syntax-annot) (NAME cl-ppcre) (NAME cl-base64) + (NAME circular-streams) (NAME alexandria)) + DEPENDENCIES + (uiop trivial-types trivial-mimes trivial-backtrace split-sequence quri marshal local-time lack-util lack ironclad http-body flexi-streams cl-syntax-annot + cl-ppcre cl-base64 circular-streams alexandria) + VERSION clack-20170403-git SIBLINGS + (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack t-clack-handler-fcgi + t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql + clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth clack-middleware-postmodern clack-middleware-rucksack clack-session-store-dbi + t-clack-middleware-auth-basic t-clack-middleware-csrf)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix new file mode 100644 index 00000000000..2d0d3b3d0bc --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix @@ -0,0 +1,38 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''clack''; + version = ''20170403-git''; + + description = ''Web application environment for Common Lisp''; + + deps = [ args."uiop" args."lack-util" args."lack-middleware-backtrace" args."lack" args."bordeaux-threads" args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/clack/2017-04-03/clack-20170403-git.tgz''; + sha256 = ''1n6rbiz5ybwr1fbzynlmqmx2di5kqxrsniqx9mzy7034hqpk54ss''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clack[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256 1n6rbiz5ybwr1fbzynlmqmx2di5kqxrsniqx9mzy7034hqpk54ss URL + http://beta.quicklisp.org/archive/clack/2017-04-03/clack-20170403-git.tgz MD5 98643f671285c11e91d2c81d4c8fc52a NAME clack TESTNAME NIL FILENAME clack DEPS + ((NAME uiop) (NAME lack-util) (NAME lack-middleware-backtrace) (NAME lack) (NAME bordeaux-threads) (NAME alexandria)) DEPENDENCIES + (uiop lack-util lack-middleware-backtrace lack bordeaux-threads alexandria) VERSION 20170403-git SIBLINGS + (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack-v1-compat t-clack-handler-fcgi + t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql + clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth clack-middleware-postmodern clack-middleware-rucksack clack-session-store-dbi + t-clack-middleware-auth-basic t-clack-middleware-csrf)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix new file mode 100644 index 00000000000..432da3069d2 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''closer-mop''; + version = ''20170403-git''; + + description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/closer-mop/2017-04-03/closer-mop-20170403-git.tgz''; + sha256 = ''166k9r55zf0lyvdacvih5y63xv2kp0kqmx9z6jmkyb3snrdghijf''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/closer-mop[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM closer-mop DESCRIPTION + Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations. + SHA256 166k9r55zf0lyvdacvih5y63xv2kp0kqmx9z6jmkyb3snrdghijf URL http://beta.quicklisp.org/archive/closer-mop/2017-04-03/closer-mop-20170403-git.tgz MD5 + 806918d9975d0c82fc471f95f40972a1 NAME closer-mop TESTNAME NIL FILENAME closer-mop DEPS NIL DEPENDENCIES NIL VERSION 20170403-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix new file mode 100644 index 00000000000..4e7579dba88 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''closure-common''; + version = ''20101107-git''; + + description = ''''; + + deps = [ args."babel" args."trivial-gray-streams" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/closure-common/2010-11-07/closure-common-20101107-git.tgz''; + sha256 = ''1982dpn2z7rlznn74gxy9biqybh2d4r1n688h9pn1s2bssgv3hk4''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/closure-common[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM closure-common DESCRIPTION NIL SHA256 1982dpn2z7rlznn74gxy9biqybh2d4r1n688h9pn1s2bssgv3hk4 URL + http://beta.quicklisp.org/archive/closure-common/2010-11-07/closure-common-20101107-git.tgz MD5 12c45a2f0420b2e86fa06cb6575b150a NAME closure-common + TESTNAME NIL FILENAME closure-common DEPS ((NAME babel) (NAME trivial-gray-streams)) DEPENDENCIES (babel trivial-gray-streams) VERSION 20101107-git + SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix new file mode 100644 index 00000000000..f5dba03d08e --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''clsql''; + version = ''20160208-git''; + + description = ''Common Lisp SQL Interface library''; + + deps = [ args."uffi" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz''; + sha256 = ''0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clsql[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM clsql DESCRIPTION Common Lisp SQL Interface library SHA256 0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn URL + http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz MD5 d1da7688361337a7de4fe7452c225a06 NAME clsql TESTNAME NIL FILENAME clsql DEPS + ((NAME uffi)) DEPENDENCIES (uffi) VERSION 20160208-git SIBLINGS + (clsql-aodbc clsql-cffi clsql-mysql clsql-odbc clsql-postgresql-socket clsql-postgresql-socket3 clsql-postgresql clsql-sqlite clsql-sqlite3 clsql-tests + clsql-uffi)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix new file mode 100644 index 00000000000..e8af9d041e0 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''clss''; + version = ''20170124-git''; + + description = ''A DOM tree searching engine based on CSS selectors.''; + + deps = [ args."array-utils" args."plump" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/clss/2017-01-24/clss-20170124-git.tgz''; + sha256 = ''0rrg3brzash1b14n686xjx6d5glm2vg32g0i8hyvaffqd82493pb''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clss[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors. SHA256 0rrg3brzash1b14n686xjx6d5glm2vg32g0i8hyvaffqd82493pb URL + http://beta.quicklisp.org/archive/clss/2017-01-24/clss-20170124-git.tgz MD5 f05606cab3a75e01c57fd264d1c71863 NAME clss TESTNAME NIL FILENAME clss DEPS + ((NAME array-utils) (NAME plump)) DEPENDENCIES (array-utils plump) VERSION 20170124-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix new file mode 100644 index 00000000000..bf1b1a5e00c --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''clx-truetype''; + version = ''20160825-git''; + + description = ''clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension.''; + + deps = [ args."cl-aa" args."cl-fad" args."cl-paths-ttf" args."cl-store" args."cl-vectors" args."clx" args."trivial-features" args."zpb-ttf" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz''; + sha256 = ''0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clx-truetype[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM clx-truetype DESCRIPTION clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension. SHA256 + 0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67 URL http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz MD5 + 7c9dedb21d52dedf727de741ac6d9c60 NAME clx-truetype TESTNAME NIL FILENAME clx-truetype DEPS + ((NAME cl-aa) (NAME cl-fad) (NAME cl-paths-ttf) (NAME cl-store) (NAME cl-vectors) (NAME clx) (NAME trivial-features) (NAME zpb-ttf)) DEPENDENCIES + (cl-aa cl-fad cl-paths-ttf cl-store cl-vectors clx trivial-features zpb-ttf) VERSION 20160825-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix new file mode 100644 index 00000000000..e9e1acfcefc --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''clx''; + version = ''20170227-git''; + + description = ''An implementation of the X Window System protocol in Lisp.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/clx/2017-02-27/clx-20170227-git.tgz''; + sha256 = ''0zgp1yqy0lm528bhil93ap7df01qdyfhnbxhckjv87xk8rs0g5nx''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/clx[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM clx DESCRIPTION An implementation of the X Window System protocol in Lisp. SHA256 0zgp1yqy0lm528bhil93ap7df01qdyfhnbxhckjv87xk8rs0g5nx URL + http://beta.quicklisp.org/archive/clx/2017-02-27/clx-20170227-git.tgz MD5 fe5fc4bd65ced7a0164abc0ed34afffd NAME clx TESTNAME NIL FILENAME clx DEPS NIL + DEPENDENCIES NIL VERSION 20170227-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix new file mode 100644 index 00000000000..62010efd047 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''command-line-arguments''; + version = ''20151218-git''; + + description = ''small library to deal with command-line arguments''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/command-line-arguments/2015-12-18/command-line-arguments-20151218-git.tgz''; + sha256 = ''07yv3vj9kjd84q09d6kvgryqxb71bsa7jl22fd1an6inmk0a3yyh''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/command-line-arguments[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM command-line-arguments DESCRIPTION small library to deal with command-line arguments SHA256 07yv3vj9kjd84q09d6kvgryqxb71bsa7jl22fd1an6inmk0a3yyh URL + http://beta.quicklisp.org/archive/command-line-arguments/2015-12-18/command-line-arguments-20151218-git.tgz MD5 8cdb99db40143e34cf6b0b25ca95f826 NAME + command-line-arguments TESTNAME NIL FILENAME command-line-arguments DEPS NIL DEPENDENCIES NIL VERSION 20151218-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix new file mode 100644 index 00000000000..3f8886915a0 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''css-lite''; + version = ''20120407-git''; + + description = ''''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz''; + sha256 = ''1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/css-lite[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM css-lite DESCRIPTION NIL SHA256 1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg URL + http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz MD5 9b25afb0d2c3f0c32d2303ab1d3f570d NAME css-lite TESTNAME NIL FILENAME + css-lite DEPS NIL DEPENDENCIES NIL VERSION 20120407-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix new file mode 100644 index 00000000000..041cc5b8481 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cxml-dom''; + version = ''cxml-20110619-git''; + + testSystems = ["cxml"]; + + description = ''''; + + deps = [ args."cxml-xml" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz''; + sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cxml-dom[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cxml-dom DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL + http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml-dom TESTNAME cxml FILENAME cxml-dom + DEPS ((NAME cxml-xml)) DEPENDENCIES (cxml-xml) VERSION cxml-20110619-git SIBLINGS (cxml)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix new file mode 100644 index 00000000000..15dd75fbfa6 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cxml-klacks''; + version = ''cxml-20110619-git''; + + testSystems = ["cxml"]; + + description = ''''; + + deps = [ args."cxml-xml" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz''; + sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cxml-klacks[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cxml-klacks DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL + http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml-klacks TESTNAME cxml FILENAME + cxml-klacks DEPS ((NAME cxml-xml)) DEPENDENCIES (cxml-xml) VERSION cxml-20110619-git SIBLINGS (cxml)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix new file mode 100644 index 00000000000..4a872802ecb --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cxml-test''; + version = ''cxml-20110619-git''; + + testSystems = ["cxml"]; + + description = ''''; + + deps = [ args."cxml-xml" args."cxml-klacks" args."cxml-dom" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz''; + sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cxml-test[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cxml-test DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL + http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml-test TESTNAME cxml FILENAME + cxml-test DEPS ((NAME cxml-xml) (NAME cxml-klacks) (NAME cxml-dom)) DEPENDENCIES (cxml-xml cxml-klacks cxml-dom) VERSION cxml-20110619-git SIBLINGS (cxml)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix new file mode 100644 index 00000000000..9674eca3d1a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cxml-xml''; + version = ''cxml-20110619-git''; + + testSystems = ["cxml"]; + + description = ''''; + + deps = [ args."trivial-gray-streams" args."puri" args."closure-common" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz''; + sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cxml-xml[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cxml-xml DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL + http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml-xml TESTNAME cxml FILENAME cxml-xml + DEPS ((NAME trivial-gray-streams) (NAME puri) (NAME closure-common)) DEPENDENCIES (trivial-gray-streams puri closure-common) VERSION cxml-20110619-git + SIBLINGS (cxml)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix new file mode 100644 index 00000000000..3c17f72b42a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cxml''; + version = ''20110619-git''; + + description = ''''; + + deps = [ args."cxml-dom" args."cxml-klacks" args."cxml-test" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz''; + sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cxml[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM cxml DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL + http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml TESTNAME NIL FILENAME cxml DEPS + ((NAME cxml-dom) (NAME cxml-klacks) (NAME cxml-test)) DEPENDENCIES (cxml-dom cxml-klacks cxml-test) VERSION 20110619-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix new file mode 100644 index 00000000000..4ba68b6c545 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''dbd-mysql''; + version = ''cl-dbi-20170124-git''; + + description = ''Database driver for MySQL.''; + + deps = [ args."cl-syntax-annot" args."cl-syntax" args."cl-mysql" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz''; + sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/dbd-mysql[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL + http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME dbd-mysql TESTNAME NIL FILENAME + dbd-mysql DEPS ((NAME cl-syntax-annot) (NAME cl-syntax) (NAME cl-mysql)) DEPENDENCIES (cl-syntax-annot cl-syntax cl-mysql) VERSION cl-dbi-20170124-git + SIBLINGS (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix new file mode 100644 index 00000000000..0d0c3f153ef --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''dbd-postgres''; + version = ''cl-dbi-20170124-git''; + + description = ''Database driver for PostgreSQL.''; + + deps = [ args."trivial-garbage" args."cl-syntax-annot" args."cl-syntax" args."cl-postgres" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz''; + sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/dbd-postgres[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL + http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME dbd-postgres TESTNAME NIL FILENAME + dbd-postgres DEPS ((NAME trivial-garbage) (NAME cl-syntax-annot) (NAME cl-syntax) (NAME cl-postgres)) DEPENDENCIES + (trivial-garbage cl-syntax-annot cl-syntax cl-postgres) VERSION cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix new file mode 100644 index 00000000000..f4c38e485f9 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''dbd-sqlite3''; + version = ''cl-dbi-20170124-git''; + + description = ''Database driver for SQLite3.''; + + deps = [ args."uiop" args."sqlite" args."cl-syntax-annot" args."cl-syntax" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz''; + sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/dbd-sqlite3[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL + http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME dbd-sqlite3 TESTNAME NIL FILENAME + dbd-sqlite3 DEPS ((NAME uiop) (NAME sqlite) (NAME cl-syntax-annot) (NAME cl-syntax)) DEPENDENCIES (uiop sqlite cl-syntax-annot cl-syntax) VERSION + cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbi-test dbi)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix new file mode 100644 index 00000000000..95672b7296f --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix @@ -0,0 +1,39 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''dexador''; + version = ''20170403-git''; + + description = ''Yet another HTTP client for Common Lisp''; + + deps = [ args."usocket" args."trivial-mimes" args."trivial-gray-streams" args."quri" args."fast-io" args."fast-http" args."cl-reexport" args."cl-ppcre" args."cl-cookie" args."cl-base64" args."cl+ssl" args."chunga" args."chipz" args."bordeaux-threads" args."babel" args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/dexador/2017-04-03/dexador-20170403-git.tgz''; + sha256 = ''0lnz36215wccpjgvrv9r7fa1i94jcdyw6q3hlgx9h8b7pwdlcfbn''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/dexador[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 0lnz36215wccpjgvrv9r7fa1i94jcdyw6q3hlgx9h8b7pwdlcfbn URL + http://beta.quicklisp.org/archive/dexador/2017-04-03/dexador-20170403-git.tgz MD5 0330a50a117313dbe0ba3f136b0fa416 NAME dexador TESTNAME NIL FILENAME + dexador DEPS + ((NAME usocket) (NAME trivial-mimes) (NAME trivial-gray-streams) (NAME quri) (NAME fast-io) (NAME fast-http) (NAME cl-reexport) (NAME cl-ppcre) + (NAME cl-cookie) (NAME cl-base64) (NAME cl+ssl) (NAME chunga) (NAME chipz) (NAME bordeaux-threads) (NAME babel) (NAME alexandria)) + DEPENDENCIES + (usocket trivial-mimes trivial-gray-streams quri fast-io fast-http cl-reexport cl-ppcre cl-cookie cl-base64 cl+ssl chunga chipz bordeaux-threads babel + alexandria) + VERSION 20170403-git SIBLINGS (dexador-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix new file mode 100644 index 00000000000..608cd6b3896 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''do-urlencode''; + version = ''20130720-git''; + + description = ''Percent Encoding (aka URL Encoding) library''; + + deps = [ args."babel" args."babel-streams" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/do-urlencode/2013-07-20/do-urlencode-20130720-git.tgz''; + sha256 = ''19l4rwqc52w7nrpy994b3n2dcv8pjgc530yn2xmgqlqabpxpz3xa''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/do-urlencode[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM do-urlencode DESCRIPTION Percent Encoding (aka URL Encoding) library SHA256 19l4rwqc52w7nrpy994b3n2dcv8pjgc530yn2xmgqlqabpxpz3xa URL + http://beta.quicklisp.org/archive/do-urlencode/2013-07-20/do-urlencode-20130720-git.tgz MD5 c8085e138711c225042acf83b4bf0507 NAME do-urlencode TESTNAME NIL + FILENAME do-urlencode DEPS ((NAME babel) (NAME babel-streams)) DEPENDENCIES (babel babel-streams) VERSION 20130720-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix new file mode 100644 index 00000000000..43f6343b7eb --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''documentation-utils''; + version = ''20161204-git''; + + description = ''A few simple tools to help you with documenting your library.''; + + deps = [ args."trivial-indent" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/documentation-utils/2016-12-04/documentation-utils-20161204-git.tgz''; + sha256 = ''0vyj5nvy697w2fvp2rb42jxgqah85ivz1hg84amqfi4bvik2npvq''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/documentation-utils[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM documentation-utils DESCRIPTION A few simple tools to help you with documenting your library. SHA256 + 0vyj5nvy697w2fvp2rb42jxgqah85ivz1hg84amqfi4bvik2npvq URL + http://beta.quicklisp.org/archive/documentation-utils/2016-12-04/documentation-utils-20161204-git.tgz MD5 36a233bf438bfc067b074b6a05865c33 NAME + documentation-utils TESTNAME NIL FILENAME documentation-utils DEPS ((NAME trivial-indent)) DEPENDENCIES (trivial-indent) VERSION 20161204-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix new file mode 100644 index 00000000000..82695e74bfe --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''drakma''; + version = ''2.0.2''; + + description = ''Full-featured http/https client based on usocket''; + + deps = [ args."usocket" args."puri" args."flexi-streams" args."cl-ppcre" args."cl-base64" args."cl+ssl" args."chunga" args."chipz" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/drakma/2015-10-31/drakma-2.0.2.tgz''; + sha256 = ''1bpwh19fxd1ncvwai2ab2363bk6qkpwch5sa4csbiawcihyawh2z''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/drakma[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM drakma DESCRIPTION Full-featured http/https client based on usocket SHA256 1bpwh19fxd1ncvwai2ab2363bk6qkpwch5sa4csbiawcihyawh2z URL + http://beta.quicklisp.org/archive/drakma/2015-10-31/drakma-2.0.2.tgz MD5 eb51e1417c02c912c2b43bd9605dfb50 NAME drakma TESTNAME NIL FILENAME drakma DEPS + ((NAME usocket) (NAME puri) (NAME flexi-streams) (NAME cl-ppcre) (NAME cl-base64) (NAME cl+ssl) (NAME chunga) (NAME chipz)) DEPENDENCIES + (usocket puri flexi-streams cl-ppcre cl-base64 cl+ssl chunga chipz) VERSION 2.0.2 SIBLINGS (drakma-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix new file mode 100644 index 00000000000..60db24e57d0 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''esrap''; + version = ''20170124-git''; + + description = ''A Packrat / Parsing Grammar / TDPL parser for Common Lisp.''; + + deps = [ args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/esrap/2017-01-24/esrap-20170124-git.tgz''; + sha256 = ''1182011bbhvkw2qsdqrccl879vf5k7bcda318n0xskk35hzircp8''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/esrap[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM esrap DESCRIPTION A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256 1182011bbhvkw2qsdqrccl879vf5k7bcda318n0xskk35hzircp8 URL + http://beta.quicklisp.org/archive/esrap/2017-01-24/esrap-20170124-git.tgz MD5 72f7a7d8e5808586dfd3ab1698e3d11f NAME esrap TESTNAME NIL FILENAME esrap DEPS + ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION 20170124-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix new file mode 100644 index 00000000000..aa7963f3243 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''external-program''; + version = ''20160825-git''; + + description = ''''; + + deps = [ args."trivial-features" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/external-program/2016-08-25/external-program-20160825-git.tgz''; + sha256 = ''0avnnhxxa1wfri9i3m1339nszyp1w2cilycc948nf5awz4mckq13''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/external-program[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM external-program DESCRIPTION NIL SHA256 0avnnhxxa1wfri9i3m1339nszyp1w2cilycc948nf5awz4mckq13 URL + http://beta.quicklisp.org/archive/external-program/2016-08-25/external-program-20160825-git.tgz MD5 6902724c4f762a17645c46b0a1d8efde NAME external-program + TESTNAME NIL FILENAME external-program DEPS ((NAME trivial-features)) DEPENDENCIES (trivial-features) VERSION 20160825-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix new file mode 100644 index 00000000000..1f83d562967 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''fast-http''; + version = ''20170227-git''; + + description = ''A fast HTTP protocol parser in Common Lisp''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/fast-http/2017-02-27/fast-http-20170227-git.tgz''; + sha256 = ''0kpfn4i5r12hfnb3j00cl9wq5dcl32n3q67lr2qsb6y3giz335hx''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/fast-http[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM fast-http DESCRIPTION A fast HTTP protocol parser in Common Lisp SHA256 0kpfn4i5r12hfnb3j00cl9wq5dcl32n3q67lr2qsb6y3giz335hx URL + http://beta.quicklisp.org/archive/fast-http/2017-02-27/fast-http-20170227-git.tgz MD5 5c5e2073702e7504a30c739e25c47c69 NAME fast-http TESTNAME NIL FILENAME + fast-http DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS (fast-http-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix new file mode 100644 index 00000000000..52cbc8ddcdb --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''fast-io''; + version = ''20170124-git''; + + description = ''Alternative I/O mechanism to a stream or vector''; + + deps = [ args."trivial-gray-streams" args."static-vectors" args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/fast-io/2017-01-24/fast-io-20170124-git.tgz''; + sha256 = ''0w57iddbpdcchnv3zg7agd3ydm36aw2mni4iasi8wd628gq9a6i2''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/fast-io[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM fast-io DESCRIPTION Alternative I/O mechanism to a stream or vector SHA256 0w57iddbpdcchnv3zg7agd3ydm36aw2mni4iasi8wd628gq9a6i2 URL + http://beta.quicklisp.org/archive/fast-io/2017-01-24/fast-io-20170124-git.tgz MD5 e9fa77c0e75a9f32e56c27ef6861bce2 NAME fast-io TESTNAME NIL FILENAME + fast-io DEPS ((NAME trivial-gray-streams) (NAME static-vectors) (NAME alexandria)) DEPENDENCIES (trivial-gray-streams static-vectors alexandria) VERSION + 20170124-git SIBLINGS (fast-io-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix new file mode 100644 index 00000000000..2348167ba65 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''flexi-streams''; + version = ''1.0.15''; + + description = ''Flexible bivalent streams for Common Lisp''; + + deps = [ args."trivial-gray-streams" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/flexi-streams/2015-07-09/flexi-streams-1.0.15.tgz''; + sha256 = ''0zkx335winqs7xigbmxhhkhcsfa9hjhf1q6r4q710y29fbhpc37p''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/flexi-streams[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM flexi-streams DESCRIPTION Flexible bivalent streams for Common Lisp SHA256 0zkx335winqs7xigbmxhhkhcsfa9hjhf1q6r4q710y29fbhpc37p URL + http://beta.quicklisp.org/archive/flexi-streams/2015-07-09/flexi-streams-1.0.15.tgz MD5 02dbb5a0c5f982e0c7a88aad9a25004e NAME flexi-streams TESTNAME NIL + FILENAME flexi-streams DEPS ((NAME trivial-gray-streams)) DEPENDENCIES (trivial-gray-streams) VERSION 1.0.15 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix new file mode 100644 index 00000000000..e12f3efb59a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''form-fiddle''; + version = ''20160929-git''; + + description = ''A collection of utilities to destructure lambda forms.''; + + deps = [ args."documentation-utils" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/form-fiddle/2016-09-29/form-fiddle-20160929-git.tgz''; + sha256 = ''1lmdxvwh0d81jlkc9qq2cw0bizjbmk7f5fjcb8ps65andfyj9bd7''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/form-fiddle[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM form-fiddle DESCRIPTION A collection of utilities to destructure lambda forms. SHA256 1lmdxvwh0d81jlkc9qq2cw0bizjbmk7f5fjcb8ps65andfyj9bd7 URL + http://beta.quicklisp.org/archive/form-fiddle/2016-09-29/form-fiddle-20160929-git.tgz MD5 d7c363b70125a65d909419b78fa7dc24 NAME form-fiddle TESTNAME NIL + FILENAME form-fiddle DEPS ((NAME documentation-utils)) DEPENDENCIES (documentation-utils) VERSION 20160929-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix new file mode 100644 index 00000000000..ed38c44b0c1 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''http-body''; + version = ''20161204-git''; + + description = ''HTTP POST data parser for Common Lisp''; + + deps = [ args."trivial-gray-streams" args."quri" args."jonathan" args."flexi-streams" args."fast-http" args."cl-utilities" args."cl-ppcre" args."babel" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz''; + sha256 = ''1y50yipsbl4j99igmfi83pr7p56hb31dcplpy05fp5alkb5rv0gi''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/http-body[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM http-body DESCRIPTION HTTP POST data parser for Common Lisp SHA256 1y50yipsbl4j99igmfi83pr7p56hb31dcplpy05fp5alkb5rv0gi URL + http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz MD5 6eda50cf89aa3b6a8e9ccaf324734a0e NAME http-body TESTNAME NIL FILENAME + http-body DEPS + ((NAME trivial-gray-streams) (NAME quri) (NAME jonathan) (NAME flexi-streams) (NAME fast-http) (NAME cl-utilities) (NAME cl-ppcre) (NAME babel)) + DEPENDENCIES (trivial-gray-streams quri jonathan flexi-streams fast-http cl-utilities cl-ppcre babel) VERSION 20161204-git SIBLINGS (http-body-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix new file mode 100644 index 00000000000..c37de8f6f8d --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''hu.dwim.asdf''; + version = ''20170403-darcs''; + + description = ''Various ASDF extensions such as attached test and documentation system, explicit development support, etc.''; + + deps = [ args."uiop" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-04-03/hu.dwim.asdf-20170403-darcs.tgz''; + sha256 = ''0avhfdg2ypv0cnwzihq64zwd562c4ls4bx6014mwgdfggp4b00ll''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/hu.dwim.asdf[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM hu.dwim.asdf DESCRIPTION Various ASDF extensions such as attached test and documentation system, explicit development support, etc. SHA256 + 0avhfdg2ypv0cnwzihq64zwd562c4ls4bx6014mwgdfggp4b00ll URL http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-04-03/hu.dwim.asdf-20170403-darcs.tgz MD5 + 53cbeb56a8ee066116069d80c7fc3f65 NAME hu.dwim.asdf TESTNAME NIL FILENAME hu.dwim.asdf DEPS ((NAME uiop)) DEPENDENCIES (uiop) VERSION 20170403-darcs + SIBLINGS (hu.dwim.asdf.documentation)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix new file mode 100644 index 00000000000..0649edb6fd3 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''hu.dwim.def''; + version = ''20161204-darcs''; + + description = ''General purpose, homogenous, extensible definer macro.''; + + deps = [ args."metabang-bind" args."iterate" args."hu.dwim.asdf" args."anaphora" args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/hu.dwim.def/2016-12-04/hu.dwim.def-20161204-darcs.tgz''; + sha256 = ''0znvcm4zi8rivyk0s840v8jaa52hzdiql88pk8hnaj8abxkvl3lj''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/hu.dwim.def[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM hu.dwim.def DESCRIPTION General purpose, homogenous, extensible definer macro. SHA256 0znvcm4zi8rivyk0s840v8jaa52hzdiql88pk8hnaj8abxkvl3lj URL + http://beta.quicklisp.org/archive/hu.dwim.def/2016-12-04/hu.dwim.def-20161204-darcs.tgz MD5 c4a85c220873a9edd1c2c49a6498baca NAME hu.dwim.def TESTNAME NIL + FILENAME hu.dwim.def DEPS ((NAME metabang-bind) (NAME iterate) (NAME hu.dwim.asdf) (NAME anaphora) (NAME alexandria)) DEPENDENCIES + (metabang-bind iterate hu.dwim.asdf anaphora alexandria) VERSION 20161204-darcs SIBLINGS + (hu.dwim.def+cl-l10n hu.dwim.def+contextl hu.dwim.def+hu.dwim.common hu.dwim.def+hu.dwim.delico hu.dwim.def+swank hu.dwim.def.documentation + hu.dwim.def.namespace hu.dwim.def.test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix new file mode 100644 index 00000000000..e77e977ea3f --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix @@ -0,0 +1,42 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''hunchentoot''; + version = ''1.2.35''; + + description = ''Hunchentoot is a HTTP server based on USOCKET and + BORDEAUX-THREADS. It supports HTTP 1.1, serves static files, has a + simple framework for user-defined handlers and can be extended + through subclassing.''; + + deps = [ args."bordeaux-threads" args."chunga" args."cl+ssl" args."cl-base64" args."cl-fad" args."cl-ppcre" args."flexi-streams" args."md5" args."rfc2388" args."trivial-backtrace" args."usocket" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/hunchentoot/2016-03-18/hunchentoot-1.2.35.tgz''; + sha256 = ''0gp2rgndkijjydb1x3p8414ii1z372gzdy945jy0491bcbhygj74''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/hunchentoot[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM hunchentoot DESCRIPTION Hunchentoot is a HTTP server based on USOCKET and + BORDEAUX-THREADS. It supports HTTP 1.1, serves static files, has a + simple framework for user-defined handlers and can be extended + through subclassing. + SHA256 0gp2rgndkijjydb1x3p8414ii1z372gzdy945jy0491bcbhygj74 URL http://beta.quicklisp.org/archive/hunchentoot/2016-03-18/hunchentoot-1.2.35.tgz MD5 + d1ce17dec454cab119c0f263e8a176d1 NAME hunchentoot TESTNAME NIL FILENAME hunchentoot DEPS + ((NAME bordeaux-threads) (NAME chunga) (NAME cl+ssl) (NAME cl-base64) (NAME cl-fad) (NAME cl-ppcre) (NAME flexi-streams) (NAME md5) (NAME rfc2388) + (NAME trivial-backtrace) (NAME usocket)) + DEPENDENCIES (bordeaux-threads chunga cl+ssl cl-base64 cl-fad cl-ppcre flexi-streams md5 rfc2388 trivial-backtrace usocket) VERSION 1.2.35 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix new file mode 100644 index 00000000000..ea7dd30df0b --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''idna''; + version = ''20120107-git''; + + description = ''IDNA (international domain names) string encoding and decoding routines''; + + deps = [ args."split-sequence" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz''; + sha256 = ''0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/idna[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM idna DESCRIPTION IDNA (international domain names) string encoding and decoding routines SHA256 0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c + URL http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz MD5 85b91a66efe4381bf116cdb5d2b756b6 NAME idna TESTNAME NIL FILENAME idna DEPS + ((NAME split-sequence)) DEPENDENCIES (split-sequence) VERSION 20120107-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix new file mode 100644 index 00000000000..55dd6b2a373 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''iolib''; + version = ''v0.8.1''; + + description = ''I/O library.''; + + deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."idna" args."split-sequence" args."swap-bytes" args."trivial-features" args."uiop" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz''; + sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/iolib[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM iolib DESCRIPTION I/O library. SHA256 090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481 URL + http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz MD5 cd34c4f7db4af7391757ebc3f4f61422 NAME iolib TESTNAME NIL FILENAME iolib DEPS + ((NAME alexandria) (NAME babel) (NAME bordeaux-threads) (NAME cffi) (NAME idna) (NAME split-sequence) (NAME swap-bytes) (NAME trivial-features) + (NAME uiop)) + DEPENDENCIES (alexandria babel bordeaux-threads cffi idna split-sequence swap-bytes trivial-features uiop) VERSION v0.8.1 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix new file mode 100644 index 00000000000..de5528bca5e --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''ironclad''; + version = ''ironclad_0.33.0''; + + description = ''A cryptographic toolkit written in pure Common Lisp''; + + deps = [ args."nibbles" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/ironclad/2014-11-06/ironclad_0.33.0.tgz''; + sha256 = ''1ld0xz8gmi566zxl1cva5yi86aw1wb6i6446gxxdw1lisxx3xwz7''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/ironclad[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM ironclad DESCRIPTION A cryptographic toolkit written in pure Common Lisp SHA256 1ld0xz8gmi566zxl1cva5yi86aw1wb6i6446gxxdw1lisxx3xwz7 URL + http://beta.quicklisp.org/archive/ironclad/2014-11-06/ironclad_0.33.0.tgz MD5 2b7befe607e2fedffbdd45b2443db718 NAME ironclad TESTNAME NIL FILENAME ironclad + DEPS ((NAME nibbles)) DEPENDENCIES (nibbles) VERSION ironclad_0.33.0 SIBLINGS (ironclad-text)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix new file mode 100644 index 00000000000..446b54a455a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''iterate''; + version = ''20160825-darcs''; + + description = ''Jonathan Amsterdam's iterator/gatherer/accumulator facility''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/iterate/2016-08-25/iterate-20160825-darcs.tgz''; + sha256 = ''0kvz16gnxnkdz0fy1x8y5yr28nfm7i2qpvix7mgwccdpjmsb4pgm''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/iterate[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM iterate DESCRIPTION Jonathan Amsterdam's iterator/gatherer/accumulator facility SHA256 0kvz16gnxnkdz0fy1x8y5yr28nfm7i2qpvix7mgwccdpjmsb4pgm URL + http://beta.quicklisp.org/archive/iterate/2016-08-25/iterate-20160825-darcs.tgz MD5 e73ff4898ce4831ff2a28817f32de86e NAME iterate TESTNAME NIL FILENAME + iterate DEPS NIL DEPENDENCIES NIL VERSION 20160825-darcs SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix new file mode 100644 index 00000000000..905a14b785c --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''jonathan''; + version = ''20170124-git''; + + description = ''High performance JSON encoder and decoder. Currently support: SBCL, CCL.''; + + deps = [ args."trivial-types" args."proc-parse" args."fast-io" args."cl-syntax-annot" args."cl-syntax" args."cl-ppcre" args."cl-annot" args."babel" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/jonathan/2017-01-24/jonathan-20170124-git.tgz''; + sha256 = ''1r54w7i1fxaqz6q7idamcy3bvsg0pvfjcs2qq4dag519zwcpln5l''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/jonathan[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM jonathan DESCRIPTION High performance JSON encoder and decoder. Currently support: SBCL, CCL. SHA256 + 1r54w7i1fxaqz6q7idamcy3bvsg0pvfjcs2qq4dag519zwcpln5l URL http://beta.quicklisp.org/archive/jonathan/2017-01-24/jonathan-20170124-git.tgz MD5 + f33377a22a3b1d948f294985acec20ad NAME jonathan TESTNAME NIL FILENAME jonathan DEPS + ((NAME trivial-types) (NAME proc-parse) (NAME fast-io) (NAME cl-syntax-annot) (NAME cl-syntax) (NAME cl-ppcre) (NAME cl-annot) (NAME babel)) DEPENDENCIES + (trivial-types proc-parse fast-io cl-syntax-annot cl-syntax cl-ppcre cl-annot babel) VERSION 20170124-git SIBLINGS (jonathan-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix new file mode 100644 index 00000000000..ba24d7dd78c --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix @@ -0,0 +1,37 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''lack-middleware-backtrace''; + version = ''lack-20161204-git''; + + description = ''''; + + deps = [ args."uiop" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz''; + sha256 = ''10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lack-middleware-backtrace[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256 10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv URL + http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz MD5 bef444eeadf759226539318bee9f0ab5 NAME lack-middleware-backtrace TESTNAME NIL + FILENAME lack-middleware-backtrace DEPS ((NAME uiop)) DEPENDENCIES (uiop) VERSION lack-20161204-git SIBLINGS + (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-csrf lack-middleware-mount lack-middleware-session + lack-middleware-static lack-request lack-response lack-session-store-dbi lack-session-store-redis lack-test lack-util-writer-stream lack-util lack + t-lack-component t-lack-middleware-accesslog t-lack-middleware-auth-basic t-lack-middleware-backtrace t-lack-middleware-csrf t-lack-middleware-mount + t-lack-middleware-session t-lack-middleware-static t-lack-request t-lack-session-store-dbi t-lack-session-store-redis t-lack-util t-lack)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix new file mode 100644 index 00000000000..9b60f52c87f --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix @@ -0,0 +1,38 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''lack-util''; + version = ''lack-20161204-git''; + + description = ''''; + + deps = [ args."ironclad" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz''; + sha256 = ''10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lack-util[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM lack-util DESCRIPTION NIL SHA256 10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv URL + http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz MD5 bef444eeadf759226539318bee9f0ab5 NAME lack-util TESTNAME NIL FILENAME lack-util + DEPS ((NAME ironclad)) DEPENDENCIES (ironclad) VERSION lack-20161204-git SIBLINGS + (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount + lack-middleware-session lack-middleware-static lack-request lack-response lack-session-store-dbi lack-session-store-redis lack-test + lack-util-writer-stream lack t-lack-component t-lack-middleware-accesslog t-lack-middleware-auth-basic t-lack-middleware-backtrace t-lack-middleware-csrf + t-lack-middleware-mount t-lack-middleware-session t-lack-middleware-static t-lack-request t-lack-session-store-dbi t-lack-session-store-redis t-lack-util + t-lack)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix new file mode 100644 index 00000000000..ceed4365966 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix @@ -0,0 +1,38 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''lack''; + version = ''20161204-git''; + + description = ''A minimal Clack''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz''; + sha256 = ''10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lack[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM lack DESCRIPTION A minimal Clack SHA256 10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv URL + http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz MD5 bef444eeadf759226539318bee9f0ab5 NAME lack TESTNAME NIL FILENAME lack DEPS NIL + DEPENDENCIES NIL VERSION 20161204-git SIBLINGS + (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount + lack-middleware-session lack-middleware-static lack-request lack-response lack-session-store-dbi lack-session-store-redis lack-test + lack-util-writer-stream lack-util t-lack-component t-lack-middleware-accesslog t-lack-middleware-auth-basic t-lack-middleware-backtrace + t-lack-middleware-csrf t-lack-middleware-mount t-lack-middleware-session t-lack-middleware-static t-lack-request t-lack-session-store-dbi + t-lack-session-store-redis t-lack-util t-lack)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix new file mode 100644 index 00000000000..c01500f0c3d --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''let-plus''; + version = ''20170124-git''; + + description = ''Destructuring extension of LET*.''; + + deps = [ args."alexandria" args."anaphora" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/let-plus/2017-01-24/let-plus-20170124-git.tgz''; + sha256 = ''1hfsw4g36vccz2lx6gk375arjj6y85yh9ch3pq7yiybjlxx68xi8''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/let-plus[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM let-plus DESCRIPTION Destructuring extension of LET*. SHA256 1hfsw4g36vccz2lx6gk375arjj6y85yh9ch3pq7yiybjlxx68xi8 URL + http://beta.quicklisp.org/archive/let-plus/2017-01-24/let-plus-20170124-git.tgz MD5 1180608e4da53f3866a99d4cca72e3b1 NAME let-plus TESTNAME NIL FILENAME + let-plus DEPS ((NAME alexandria) (NAME anaphora)) DEPENDENCIES (alexandria anaphora) VERSION 20170124-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix new file mode 100644 index 00000000000..9d4aa874d4c --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''lev''; + version = ''20150505-git''; + + description = ''libev bindings for Common Lisp''; + + deps = [ args."cffi" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz''; + sha256 = ''0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lev[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM lev DESCRIPTION libev bindings for Common Lisp SHA256 0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl URL + http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz MD5 10f340f7500beb98b5c0d4a9876131fb NAME lev TESTNAME NIL FILENAME lev DEPS + ((NAME cffi)) DEPENDENCIES (cffi) VERSION 20150505-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix new file mode 100644 index 00000000000..e2e7e71aadd --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''local-time''; + version = ''20170124-git''; + + description = ''A library for manipulating dates and times, based on a paper by Erik Naggum''; + + deps = [ args."cl-fad" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/local-time/2017-01-24/local-time-20170124-git.tgz''; + sha256 = ''0nf21bhclr2cwpflf733wn6hr6mcz94dr796jk91f0ck28nf7ab1''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/local-time[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM local-time DESCRIPTION A library for manipulating dates and times, based on a paper by Erik Naggum SHA256 + 0nf21bhclr2cwpflf733wn6hr6mcz94dr796jk91f0ck28nf7ab1 URL http://beta.quicklisp.org/archive/local-time/2017-01-24/local-time-20170124-git.tgz MD5 + b345e5e74186eeddb85233df91d0dfe9 NAME local-time TESTNAME NIL FILENAME local-time DEPS ((NAME cl-fad)) DEPENDENCIES (cl-fad) VERSION 20170124-git SIBLINGS + (cl-postgres+local-time local-time.test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix new file mode 100644 index 00000000000..473581c3184 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''lquery''; + version = ''20160929-git''; + + description = ''A library to allow jQuery-like HTML/DOM manipulation.''; + + deps = [ args."plump" args."form-fiddle" args."clss" args."array-utils" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/lquery/2016-09-29/lquery-20160929-git.tgz''; + sha256 = ''1kqc0n4zh44yay9vbv6wirk3122q7if2999146lrgada5fy17r7x''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lquery[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM lquery DESCRIPTION A library to allow jQuery-like HTML/DOM manipulation. SHA256 1kqc0n4zh44yay9vbv6wirk3122q7if2999146lrgada5fy17r7x URL + http://beta.quicklisp.org/archive/lquery/2016-09-29/lquery-20160929-git.tgz MD5 072a796075862c96dcd6f227d79dc2b7 NAME lquery TESTNAME NIL FILENAME lquery + DEPS ((NAME plump) (NAME form-fiddle) (NAME clss) (NAME array-utils)) DEPENDENCIES (plump form-fiddle clss array-utils) VERSION 20160929-git SIBLINGS + (lquery-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix new file mode 100644 index 00000000000..ad159edc5c9 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''map-set''; + version = ''20160628-hg''; + + description = ''Set-like data structure.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/map-set/2016-06-28/map-set-20160628-hg.tgz''; + sha256 = ''15fbha43a5153ah836djp9dbg41728adjrzwryv68gcqs31rjk9v''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/map-set[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM map-set DESCRIPTION Set-like data structure. SHA256 15fbha43a5153ah836djp9dbg41728adjrzwryv68gcqs31rjk9v URL + http://beta.quicklisp.org/archive/map-set/2016-06-28/map-set-20160628-hg.tgz MD5 49cf6b527841b717b8696efaa7bb6389 NAME map-set TESTNAME NIL FILENAME + map-set DEPS NIL DEPENDENCIES NIL VERSION 20160628-hg SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix new file mode 100644 index 00000000000..cb5041b6029 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''marshal''; + version = ''cl-20170124-git''; + + description = ''marshal: Simple (de)serialization of Lisp datastructures.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-marshal/2017-01-24/cl-marshal-20170124-git.tgz''; + sha256 = ''0z43m3jspl4c4fcbbxm58hxd9k69308pyijgj7grmq6mirkq664d''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/marshal[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM marshal DESCRIPTION marshal: Simple (de)serialization of Lisp datastructures. SHA256 0z43m3jspl4c4fcbbxm58hxd9k69308pyijgj7grmq6mirkq664d URL + http://beta.quicklisp.org/archive/cl-marshal/2017-01-24/cl-marshal-20170124-git.tgz MD5 ebde1b0f1c1abeb409380884cc665351 NAME marshal TESTNAME NIL FILENAME + marshal DEPS NIL DEPENDENCIES NIL VERSION cl-20170124-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix new file mode 100644 index 00000000000..a24e9d99a2c --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''md5''; + version = ''20150804-git''; + + description = ''The MD5 Message-Digest Algorithm RFC 1321''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/md5/2015-08-04/md5-20150804-git.tgz''; + sha256 = ''1sf79pjip19sx7zmznz1wm4563qc208lq49m0jnhxbv09wmm4vc5''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/md5[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM md5 DESCRIPTION The MD5 Message-Digest Algorithm RFC 1321 SHA256 1sf79pjip19sx7zmznz1wm4563qc208lq49m0jnhxbv09wmm4vc5 URL + http://beta.quicklisp.org/archive/md5/2015-08-04/md5-20150804-git.tgz MD5 69331e0d326cbc3286ac447e2868e7fd NAME md5 TESTNAME NIL FILENAME md5 DEPS NIL + DEPENDENCIES NIL VERSION 20150804-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix new file mode 100644 index 00000000000..708fa41ca51 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''metabang-bind''; + version = ''20170124-git''; + + description = ''Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/metabang-bind/2017-01-24/metabang-bind-20170124-git.tgz''; + sha256 = ''1xyiyrc9c02ylg6b749h2ihn6922kb179x7k338dmglf4mpyqxwc''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/metabang-bind[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM metabang-bind DESCRIPTION + Bind is a macro that generalizes multiple-value-bind, let, let*, destructuring-bind, structure and slot accessors, and a whole lot more. SHA256 + 1xyiyrc9c02ylg6b749h2ihn6922kb179x7k338dmglf4mpyqxwc URL http://beta.quicklisp.org/archive/metabang-bind/2017-01-24/metabang-bind-20170124-git.tgz MD5 + 20c6a434308598ad7fa224d99f3bcbf6 NAME metabang-bind TESTNAME NIL FILENAME metabang-bind DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS + (metabang-bind-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix new file mode 100644 index 00000000000..186550a15df --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''myway''; + version = ''20150302-git''; + + description = ''Sinatra-compatible routing library.''; + + deps = [ args."quri" args."map-set" args."cl-utilities" args."cl-ppcre" args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/myway/2015-03-02/myway-20150302-git.tgz''; + sha256 = ''1spab9zzhwjg3r5xncr5ncha7phw72wp49cxxncgphh1lfaiyblh''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/myway[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM myway DESCRIPTION Sinatra-compatible routing library. SHA256 1spab9zzhwjg3r5xncr5ncha7phw72wp49cxxncgphh1lfaiyblh URL + http://beta.quicklisp.org/archive/myway/2015-03-02/myway-20150302-git.tgz MD5 6a16b41eb3216c469bfc8783cce08b01 NAME myway TESTNAME NIL FILENAME myway DEPS + ((NAME quri) (NAME map-set) (NAME cl-utilities) (NAME cl-ppcre) (NAME alexandria)) DEPENDENCIES (quri map-set cl-utilities cl-ppcre alexandria) VERSION + 20150302-git SIBLINGS (myway-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix new file mode 100644 index 00000000000..c952ab5a1f7 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix @@ -0,0 +1,36 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''named-readtables''; + version = ''20170124-git''; + + description = ''Library that creates a namespace for named readtable + akin to the namespace of packages.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/named-readtables/2017-01-24/named-readtables-20170124-git.tgz''; + sha256 = ''1j0drddahdjab40dd9v9qy92xbvzwgbk6y3hv990sdp9f8ac1q45''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/named-readtables[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM named-readtables DESCRIPTION Library that creates a namespace for named readtable + akin to the namespace of packages. + SHA256 1j0drddahdjab40dd9v9qy92xbvzwgbk6y3hv990sdp9f8ac1q45 URL + http://beta.quicklisp.org/archive/named-readtables/2017-01-24/named-readtables-20170124-git.tgz MD5 1237a07f90e29939e48b595eaad2bd82 NAME named-readtables + TESTNAME NIL FILENAME named-readtables DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix new file mode 100644 index 00000000000..c5300698e54 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''nibbles''; + version = ''20170403-git''; + + description = ''A library for accessing octet-addressed blocks of data in big- and little-endian orders''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/nibbles/2017-04-03/nibbles-20170403-git.tgz''; + sha256 = ''0bg7jwhqhm3qmpzk21gjv50sl0grdn68d770cqfs7in62ny35lk4''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/nibbles[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM nibbles DESCRIPTION A library for accessing octet-addressed blocks of data in big- and little-endian orders SHA256 + 0bg7jwhqhm3qmpzk21gjv50sl0grdn68d770cqfs7in62ny35lk4 URL http://beta.quicklisp.org/archive/nibbles/2017-04-03/nibbles-20170403-git.tgz MD5 + 5683a0a5510860a036b2a272036cda87 NAME nibbles TESTNAME NIL FILENAME nibbles DEPS NIL DEPENDENCIES NIL VERSION 20170403-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix new file mode 100644 index 00000000000..48bd3b7e542 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''optima''; + version = ''20150709-git''; + + description = ''Optimized Pattern Matching Library''; + + deps = [ args."closer-mop" args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz''; + sha256 = ''0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/optima[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM optima DESCRIPTION Optimized Pattern Matching Library SHA256 0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc URL + http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz MD5 20523dc3dfc04bb2526008dff0842caa NAME optima TESTNAME NIL FILENAME optima + DEPS ((NAME closer-mop) (NAME alexandria)) DEPENDENCIES (closer-mop alexandria) VERSION 20150709-git SIBLINGS (optima.ppcre optima.test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix new file mode 100644 index 00000000000..56ae3473e2c --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''parenscript''; + version = ''Parenscript-2.6''; + + description = ''Lisp to JavaScript transpiler''; + + deps = [ args."named-readtables" args."cl-ppcre" args."anaphora" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/parenscript/2016-03-18/Parenscript-2.6.tgz''; + sha256 = ''1hvr407fz7gzaxqbnki4k3l44qvl7vk6p5pn7811nrv6lk3kp5li''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/parenscript[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM parenscript DESCRIPTION Lisp to JavaScript transpiler SHA256 1hvr407fz7gzaxqbnki4k3l44qvl7vk6p5pn7811nrv6lk3kp5li URL + http://beta.quicklisp.org/archive/parenscript/2016-03-18/Parenscript-2.6.tgz MD5 dadecc13f2918bc618fb143e893deb99 NAME parenscript TESTNAME NIL FILENAME + parenscript DEPS ((NAME named-readtables) (NAME cl-ppcre) (NAME anaphora)) DEPENDENCIES (named-readtables cl-ppcre anaphora) VERSION Parenscript-2.6 + SIBLINGS (parenscript.test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix new file mode 100644 index 00000000000..dae0d011e75 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''pcall''; + version = ''0.3''; + + description = ''''; + + deps = [ args."bordeaux-threads" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz''; + sha256 = ''02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/pcall[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM pcall DESCRIPTION NIL SHA256 02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y URL + http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz MD5 019d85dfd1d5d0ee8d4ee475411caf6b NAME pcall TESTNAME NIL FILENAME pcall DEPS + ((NAME bordeaux-threads)) DEPENDENCIES (bordeaux-threads) VERSION 0.3 SIBLINGS (pcall-queue)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix new file mode 100644 index 00000000000..17795e3a92a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''plump''; + version = ''20170124-git''; + + description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/plump/2017-01-24/plump-20170124-git.tgz''; + sha256 = ''1swl5kr6hgl7hkybixsx7h4ddc7c0a7pisgmmiz2bs2rv4inz69x''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/plump[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM plump DESCRIPTION An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256 1swl5kr6hgl7hkybixsx7h4ddc7c0a7pisgmmiz2bs2rv4inz69x + URL http://beta.quicklisp.org/archive/plump/2017-01-24/plump-20170124-git.tgz MD5 c49aeb37173aca79ee6ff5c89b0c4b1a NAME plump TESTNAME NIL FILENAME plump + DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS (plump-dom plump-lexer plump-parser)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix new file mode 100644 index 00000000000..9e4e2effbd3 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''proc-parse''; + version = ''20160318-git''; + + description = ''Procedural vector parser''; + + deps = [ args."babel" args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/proc-parse/2016-03-18/proc-parse-20160318-git.tgz''; + sha256 = ''00261w269w9chg6r3sh8hg8994njbsai1g3zni0whm2dzxxq6rnl''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/proc-parse[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM proc-parse DESCRIPTION Procedural vector parser SHA256 00261w269w9chg6r3sh8hg8994njbsai1g3zni0whm2dzxxq6rnl URL + http://beta.quicklisp.org/archive/proc-parse/2016-03-18/proc-parse-20160318-git.tgz MD5 5e43f50284fa70c448a3df12d1eea2ea NAME proc-parse TESTNAME NIL + FILENAME proc-parse DEPS ((NAME babel) (NAME alexandria)) DEPENDENCIES (babel alexandria) VERSION 20160318-git SIBLINGS (proc-parse-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix new file mode 100644 index 00000000000..cf6fd03ba12 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''prove''; + version = ''20170403-git''; + + description = ''''; + + deps = [ args."uiop" args."cl-ppcre" args."cl-colors" args."cl-ansi-text" args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz''; + sha256 = ''091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/prove[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM prove DESCRIPTION NIL SHA256 091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl URL + http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz MD5 063b615692c8711d2392204ecf1b37b7 NAME prove TESTNAME NIL FILENAME prove DEPS + ((NAME uiop) (NAME cl-ppcre) (NAME cl-colors) (NAME cl-ansi-text) (NAME alexandria)) DEPENDENCIES (uiop cl-ppcre cl-colors cl-ansi-text alexandria) VERSION + 20170403-git SIBLINGS (cl-test-more prove-asdf prove-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix new file mode 100644 index 00000000000..fe48a580ee9 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''puri''; + version = ''20150923-git''; + + description = ''Portable Universal Resource Indentifier Library''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/puri/2015-09-23/puri-20150923-git.tgz''; + sha256 = ''099ay2zji5ablj2jj56sb49hk2l9x5s11vpx6893qwwjsp2881qa''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/puri[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM puri DESCRIPTION Portable Universal Resource Indentifier Library SHA256 099ay2zji5ablj2jj56sb49hk2l9x5s11vpx6893qwwjsp2881qa URL + http://beta.quicklisp.org/archive/puri/2015-09-23/puri-20150923-git.tgz MD5 3bd4e30aa6b6baf6f26753b5fc357e0f NAME puri TESTNAME NIL FILENAME puri DEPS NIL + DEPENDENCIES NIL VERSION 20150923-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix new file mode 100644 index 00000000000..2a1219e48e7 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''query-fs''; + version = ''20160531-git''; + + description = ''High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries''; + + deps = [ args."bordeaux-threads" args."cl-fuse" args."cl-fuse-meta-fs" args."cl-ppcre" args."command-line-arguments" args."iterate" args."trivial-backtrace" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/query-fs/2016-05-31/query-fs-20160531-git.tgz''; + sha256 = ''0wknr3rffihg1my8ihmpwssxpxj4bfmqcly0s37q51fllxkr1v5a''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/query-fs[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM query-fs DESCRIPTION High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries SHA256 + 0wknr3rffihg1my8ihmpwssxpxj4bfmqcly0s37q51fllxkr1v5a URL http://beta.quicklisp.org/archive/query-fs/2016-05-31/query-fs-20160531-git.tgz MD5 + dfbb3d0e7b5d990488a17b184771d049 NAME query-fs TESTNAME NIL FILENAME query-fs DEPS + ((NAME bordeaux-threads) (NAME cl-fuse) (NAME cl-fuse-meta-fs) (NAME cl-ppcre) (NAME command-line-arguments) (NAME iterate) (NAME trivial-backtrace)) + DEPENDENCIES (bordeaux-threads cl-fuse cl-fuse-meta-fs cl-ppcre command-line-arguments iterate trivial-backtrace) VERSION 20160531-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix new file mode 100644 index 00000000000..1c351669c9a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''quri''; + version = ''20161204-git''; + + description = ''Yet another URI library for Common Lisp''; + + deps = [ args."split-sequence" args."cl-utilities" args."babel" args."alexandria" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/quri/2016-12-04/quri-20161204-git.tgz''; + sha256 = ''14if83kd2mv68p4g4ch2w796w3micpzv40z7xrcwzwj64wngwabv''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/quri[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM quri DESCRIPTION Yet another URI library for Common Lisp SHA256 14if83kd2mv68p4g4ch2w796w3micpzv40z7xrcwzwj64wngwabv URL + http://beta.quicklisp.org/archive/quri/2016-12-04/quri-20161204-git.tgz MD5 8c87e99d4f7308d83aab361a6e36508a NAME quri TESTNAME NIL FILENAME quri DEPS + ((NAME split-sequence) (NAME cl-utilities) (NAME babel) (NAME alexandria)) DEPENDENCIES (split-sequence cl-utilities babel alexandria) VERSION 20161204-git + SIBLINGS (quri-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix new file mode 100644 index 00000000000..572cd29c75b --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''rfc2388''; + version = ''20130720-git''; + + description = ''Implementation of RFC 2388''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/rfc2388/2013-07-20/rfc2388-20130720-git.tgz''; + sha256 = ''1ky99cr4bgfyh0pfpl5f6fsmq1qdbgi4b8v0cfs4y73f78p1f8b6''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/rfc2388[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM rfc2388 DESCRIPTION Implementation of RFC 2388 SHA256 1ky99cr4bgfyh0pfpl5f6fsmq1qdbgi4b8v0cfs4y73f78p1f8b6 URL + http://beta.quicklisp.org/archive/rfc2388/2013-07-20/rfc2388-20130720-git.tgz MD5 10a8bfea588196b1147d5dc7bf759bb1 NAME rfc2388 TESTNAME NIL FILENAME + rfc2388 DEPS NIL DEPENDENCIES NIL VERSION 20130720-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix new file mode 100644 index 00000000000..38e9e4ecabd --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''salza2''; + version = ''2.0.9''; + + description = ''Create compressed data in the ZLIB, DEFLATE, or GZIP + data formats''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/salza2/2013-07-20/salza2-2.0.9.tgz''; + sha256 = ''1m0hksgvq3njd9xa2nxlm161vgzw77djxmisq08v9pz2bz16v8va''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/salza2[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM salza2 DESCRIPTION Create compressed data in the ZLIB, DEFLATE, or GZIP + data formats + SHA256 1m0hksgvq3njd9xa2nxlm161vgzw77djxmisq08v9pz2bz16v8va URL http://beta.quicklisp.org/archive/salza2/2013-07-20/salza2-2.0.9.tgz MD5 + e62383de435081c0f1f888ec363bb32c NAME salza2 TESTNAME NIL FILENAME salza2 DEPS NIL DEPENDENCIES NIL VERSION 2.0.9 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix new file mode 100644 index 00000000000..597f8fcfe3a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''smart-buffer''; + version = ''20160628-git''; + + description = ''Smart octets buffer''; + + deps = [ args."xsubseq" args."uiop" args."flexi-streams" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz''; + sha256 = ''1wp50snkc8739n91xlnfnq1dzz3kfp0awgp92m7xbpcw3hbaib1s''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/smart-buffer[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM smart-buffer DESCRIPTION Smart octets buffer SHA256 1wp50snkc8739n91xlnfnq1dzz3kfp0awgp92m7xbpcw3hbaib1s URL + http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz MD5 454d8510618da8111c7ca687549b7035 NAME smart-buffer TESTNAME NIL + FILENAME smart-buffer DEPS ((NAME xsubseq) (NAME uiop) (NAME flexi-streams)) DEPENDENCIES (xsubseq uiop flexi-streams) VERSION 20160628-git SIBLINGS + (smart-buffer-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix new file mode 100644 index 00000000000..2712a1b8e1d --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix @@ -0,0 +1,35 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''split-sequence''; + version = ''1.2''; + + description = ''Splits a sequence into a list of subsequences + delimited by objects satisfying a test.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/split-sequence/2015-08-04/split-sequence-1.2.tgz''; + sha256 = ''12x5yfvinqz9jzxwlsg226103a9sdf67zpzn5izggvdlw0v5qp0l''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/split-sequence[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM split-sequence DESCRIPTION Splits a sequence into a list of subsequences + delimited by objects satisfying a test. + SHA256 12x5yfvinqz9jzxwlsg226103a9sdf67zpzn5izggvdlw0v5qp0l URL http://beta.quicklisp.org/archive/split-sequence/2015-08-04/split-sequence-1.2.tgz MD5 + 194e24d60f0fba70a059633960052e21 NAME split-sequence TESTNAME NIL FILENAME split-sequence DEPS NIL DEPENDENCIES NIL VERSION 1.2 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix new file mode 100644 index 00000000000..1d2f8fd0122 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''sqlite''; + version = ''cl-20130615-git''; + + description = ''''; + + deps = [ args."cffi" args."iterate" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-sqlite/2013-06-15/cl-sqlite-20130615-git.tgz''; + sha256 = ''0db1fvvnsrnxmp272ycnl2kwhymjwrimr8z4djvjlg6cvjxk6lqh''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/sqlite[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM sqlite DESCRIPTION NIL SHA256 0db1fvvnsrnxmp272ycnl2kwhymjwrimr8z4djvjlg6cvjxk6lqh URL + http://beta.quicklisp.org/archive/cl-sqlite/2013-06-15/cl-sqlite-20130615-git.tgz MD5 93be7c68f587d830941be55f2c2f1c8b NAME sqlite TESTNAME NIL FILENAME + sqlite DEPS ((NAME cffi) (NAME iterate)) DEPENDENCIES (cffi iterate) VERSION cl-20130615-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix new file mode 100644 index 00000000000..1a7056e3fa2 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''static-vectors''; + version = ''v1.8.2''; + + description = ''Create vectors allocated in static memory.''; + + deps = [ args."alexandria" args."cffi" args."cffi-grovel" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/static-vectors/2017-01-24/static-vectors-v1.8.2.tgz''; + sha256 = ''0p35f0wrnv46bmmxlviwpsbxnlnkmxwd3xp858lhf0dy52cyra1g''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/static-vectors[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM static-vectors DESCRIPTION Create vectors allocated in static memory. SHA256 0p35f0wrnv46bmmxlviwpsbxnlnkmxwd3xp858lhf0dy52cyra1g URL + http://beta.quicklisp.org/archive/static-vectors/2017-01-24/static-vectors-v1.8.2.tgz MD5 fd3ebe4e79a71c49e32ac87d6a1bcaf4 NAME static-vectors TESTNAME NIL + FILENAME static-vectors DEPS ((NAME alexandria) (NAME cffi) (NAME cffi-grovel)) DEPENDENCIES (alexandria cffi cffi-grovel) VERSION v1.8.2 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix new file mode 100644 index 00000000000..aaef5095dbb --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''stumpwm''; + version = ''20170403-git''; + + description = ''A tiling, keyboard driven window manager''; + + deps = [ args."alexandria" args."cl-ppcre" args."clx" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/stumpwm/2017-04-03/stumpwm-20170403-git.tgz''; + sha256 = ''1aca1nvdzp957mvwxz6x0plkg915l24mjf89h8rgkgclkn6xk4rf''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/stumpwm[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 1aca1nvdzp957mvwxz6x0plkg915l24mjf89h8rgkgclkn6xk4rf URL + http://beta.quicklisp.org/archive/stumpwm/2017-04-03/stumpwm-20170403-git.tgz MD5 1081021518c5b6c36d39f12c47305ea1 NAME stumpwm TESTNAME NIL FILENAME + stumpwm DEPS ((NAME alexandria) (NAME cl-ppcre) (NAME clx)) DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20170403-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix new file mode 100644 index 00000000000..8ae38c45686 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''swap-bytes''; + version = ''v1.1''; + + description = ''Optimized byte-swapping primitives.''; + + deps = [ args."trivial-features" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/swap-bytes/2016-09-29/swap-bytes-v1.1.tgz''; + sha256 = ''0snwbfplqhg1y4y4m7lgvksg1hs0sygfikz3rlbkfl4gwg8pq8ky''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/swap-bytes[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM swap-bytes DESCRIPTION Optimized byte-swapping primitives. SHA256 0snwbfplqhg1y4y4m7lgvksg1hs0sygfikz3rlbkfl4gwg8pq8ky URL + http://beta.quicklisp.org/archive/swap-bytes/2016-09-29/swap-bytes-v1.1.tgz MD5 dda8b3b0a4e345879e80a3cc398667bb NAME swap-bytes TESTNAME NIL FILENAME + swap-bytes DEPS ((NAME trivial-features)) DEPENDENCIES (trivial-features) VERSION v1.1 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix new file mode 100644 index 00000000000..e28637849af --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivial-backtrace''; + version = ''20160531-git''; + + description = ''trivial-backtrace''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/trivial-backtrace/2016-05-31/trivial-backtrace-20160531-git.tgz''; + sha256 = ''1vcvalcv2ljiv2gyh8xjcg62cjsripjwmnhc8zji35ja1xyqvxhx''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-backtrace[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM trivial-backtrace DESCRIPTION trivial-backtrace SHA256 1vcvalcv2ljiv2gyh8xjcg62cjsripjwmnhc8zji35ja1xyqvxhx URL + http://beta.quicklisp.org/archive/trivial-backtrace/2016-05-31/trivial-backtrace-20160531-git.tgz MD5 a3b41b4ae24e3fde303a2623201aac4d NAME + trivial-backtrace TESTNAME NIL FILENAME trivial-backtrace DEPS NIL DEPENDENCIES NIL VERSION 20160531-git SIBLINGS (trivial-backtrace-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix new file mode 100644 index 00000000000..7b44cb90337 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivial-features''; + version = ''20161204-git''; + + description = ''Ensures consistent *FEATURES* across multiple CLs.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/trivial-features/2016-12-04/trivial-features-20161204-git.tgz''; + sha256 = ''0i2zyc9c7jigljxll29sh9gv1fawdsf0kq7s86pwba5zi99q2ij2''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-features[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM trivial-features DESCRIPTION Ensures consistent *FEATURES* across multiple CLs. SHA256 0i2zyc9c7jigljxll29sh9gv1fawdsf0kq7s86pwba5zi99q2ij2 URL + http://beta.quicklisp.org/archive/trivial-features/2016-12-04/trivial-features-20161204-git.tgz MD5 07497e3fd92e68027a96f877cfe62bd4 NAME trivial-features + TESTNAME NIL FILENAME trivial-features DEPS NIL DEPENDENCIES NIL VERSION 20161204-git SIBLINGS (trivial-features-tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix new file mode 100644 index 00000000000..3c439aae2e4 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivial-garbage''; + version = ''20150113-git''; + + description = ''Portable finalizers, weak hash-tables and weak pointers.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/trivial-garbage/2015-01-13/trivial-garbage-20150113-git.tgz''; + sha256 = ''1yy1jyx7wz5rr7lr0jyyfxgzfddmrxrmkp46a21pcdc4jlss1h08''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-garbage[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM trivial-garbage DESCRIPTION Portable finalizers, weak hash-tables and weak pointers. SHA256 1yy1jyx7wz5rr7lr0jyyfxgzfddmrxrmkp46a21pcdc4jlss1h08 URL + http://beta.quicklisp.org/archive/trivial-garbage/2015-01-13/trivial-garbage-20150113-git.tgz MD5 59153568703eed631e53092ab67f935e NAME trivial-garbage + TESTNAME NIL FILENAME trivial-garbage DEPS NIL DEPENDENCIES NIL VERSION 20150113-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix new file mode 100644 index 00000000000..120f384a7a5 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivial-gray-streams''; + version = ''20140826-git''; + + description = ''Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2014-08-26/trivial-gray-streams-20140826-git.tgz''; + sha256 = ''1nhbp0qizvqvy2mfl3i99hlwiy27h3gq0jglwzsj2fmnwqvpfx92''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-gray-streams[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM trivial-gray-streams DESCRIPTION Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams). SHA256 + 1nhbp0qizvqvy2mfl3i99hlwiy27h3gq0jglwzsj2fmnwqvpfx92 URL + http://beta.quicklisp.org/archive/trivial-gray-streams/2014-08-26/trivial-gray-streams-20140826-git.tgz MD5 1ca280830c8c438ca2ccfadb3763ae83 NAME + trivial-gray-streams TESTNAME NIL FILENAME trivial-gray-streams DEPS NIL DEPENDENCIES NIL VERSION 20140826-git SIBLINGS (trivial-gray-streams-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix new file mode 100644 index 00000000000..d091ad3250f --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivial-indent''; + version = ''20160929-git''; + + description = ''A very simple library to allow indentation hints for SWANK.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/trivial-indent/2016-09-29/trivial-indent-20160929-git.tgz''; + sha256 = ''0nc7d5xdx4h8jvvqif7f721z8296kl6jk5hqmgr0mj3g7svgfrir''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-indent[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM trivial-indent DESCRIPTION A very simple library to allow indentation hints for SWANK. SHA256 0nc7d5xdx4h8jvvqif7f721z8296kl6jk5hqmgr0mj3g7svgfrir + URL http://beta.quicklisp.org/archive/trivial-indent/2016-09-29/trivial-indent-20160929-git.tgz MD5 d93c0fa8e29d7d37170efd58b84ac188 NAME trivial-indent + TESTNAME NIL FILENAME trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20160929-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix new file mode 100644 index 00000000000..e9d090a84aa --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivial-mimes''; + version = ''20160929-git''; + + description = ''Tiny library to detect mime types in files.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/trivial-mimes/2016-09-29/trivial-mimes-20160929-git.tgz''; + sha256 = ''1sdsplngi3civv9wjd9rxxj3ynqc3260cfykpid5lpy8rhbyiw0w''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-mimes[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM trivial-mimes DESCRIPTION Tiny library to detect mime types in files. SHA256 1sdsplngi3civv9wjd9rxxj3ynqc3260cfykpid5lpy8rhbyiw0w URL + http://beta.quicklisp.org/archive/trivial-mimes/2016-09-29/trivial-mimes-20160929-git.tgz MD5 1075218aae1940bb3413b0edb6b73ac2 NAME trivial-mimes TESTNAME + NIL FILENAME trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20160929-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix new file mode 100644 index 00000000000..064e67fef50 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivial-types''; + version = ''20120407-git''; + + description = ''Trivial type definitions''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz''; + sha256 = ''0y3lfbbvi2qp2cwswzmk1awzqrsrrcfkcm1qn744bgm1fiqhxbxx''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-types[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM trivial-types DESCRIPTION Trivial type definitions SHA256 0y3lfbbvi2qp2cwswzmk1awzqrsrrcfkcm1qn744bgm1fiqhxbxx URL + http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz MD5 b14dbe0564dcea33d8f4e852a612d7db NAME trivial-types TESTNAME + NIL FILENAME trivial-types DEPS NIL DEPENDENCIES NIL VERSION 20120407-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix new file mode 100644 index 00000000000..d7a8721f298 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivial-utf-8''; + version = ''20111001-darcs''; + + description = ''''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/trivial-utf-8/2011-10-01/trivial-utf-8-20111001-darcs.tgz''; + sha256 = ''1lmg185s6w3rzsz3xa41k5w9xw32bi288ifhrxincy8iv92w65wb''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/trivial-utf-8[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM trivial-utf-8 DESCRIPTION NIL SHA256 1lmg185s6w3rzsz3xa41k5w9xw32bi288ifhrxincy8iv92w65wb URL + http://beta.quicklisp.org/archive/trivial-utf-8/2011-10-01/trivial-utf-8-20111001-darcs.tgz MD5 0206c4ba7a6c0b9b23762f244aca6614 NAME trivial-utf-8 + TESTNAME NIL FILENAME trivial-utf-8 DEPS NIL DEPENDENCIES NIL VERSION 20111001-darcs SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix new file mode 100644 index 00000000000..f3528d60524 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''uffi''; + version = ''20150923-git''; + + description = ''Universal Foreign Function Library for Common Lisp''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/uffi/2015-09-23/uffi-20150923-git.tgz''; + sha256 = ''1b3mb1ac5hqpn941pmgwkiy241rnin308haxbs2f4rwp2la7wzyy''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/uffi[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM uffi DESCRIPTION Universal Foreign Function Library for Common Lisp SHA256 1b3mb1ac5hqpn941pmgwkiy241rnin308haxbs2f4rwp2la7wzyy URL + http://beta.quicklisp.org/archive/uffi/2015-09-23/uffi-20150923-git.tgz MD5 84babed7d1633cf01610e81f027024da NAME uffi TESTNAME NIL FILENAME uffi DEPS NIL + DEPENDENCIES NIL VERSION 20150923-git SIBLINGS (uffi-tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix new file mode 100644 index 00000000000..3b340be7c1d --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''uiop''; + version = ''3.2.0''; + + description = ''''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/uiop/2017-01-24/uiop-3.2.0.tgz''; + sha256 = ''1rrn1mdcb4dmb517vrp3nzwpp1w8hfvpzarj36c7kkpjq23czdig''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/uiop[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM uiop DESCRIPTION NIL SHA256 1rrn1mdcb4dmb517vrp3nzwpp1w8hfvpzarj36c7kkpjq23czdig URL + http://beta.quicklisp.org/archive/uiop/2017-01-24/uiop-3.2.0.tgz MD5 3c304efce790959b14a241db2e669fce NAME uiop TESTNAME NIL FILENAME uiop DEPS NIL + DEPENDENCIES NIL VERSION 3.2.0 SIBLINGS (asdf-driver)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix new file mode 100644 index 00000000000..5b6a7fafd01 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''usocket''; + version = ''0.7.0.1''; + + description = ''Universal socket library for Common Lisp''; + + deps = [ args."split-sequence" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/usocket/2016-10-31/usocket-0.7.0.1.tgz''; + sha256 = ''1mpcfawbzd72cd841bb0hmgx4kinnvcnazc7vym83gv5iy6lwif2''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/usocket[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM usocket DESCRIPTION Universal socket library for Common Lisp SHA256 1mpcfawbzd72cd841bb0hmgx4kinnvcnazc7vym83gv5iy6lwif2 URL + http://beta.quicklisp.org/archive/usocket/2016-10-31/usocket-0.7.0.1.tgz MD5 1dcb027187679211f9d277ce99ca2a5a NAME usocket TESTNAME NIL FILENAME usocket + DEPS ((NAME split-sequence)) DEPENDENCIES (split-sequence) VERSION 0.7.0.1 SIBLINGS (usocket-server usocket-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix new file mode 100644 index 00000000000..ca9680ebd00 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''vom''; + version = ''20160825-git''; + + description = ''A tiny logging utility.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz''; + sha256 = ''0mvln0xx8qnrsmaj7c0f2ilgahvf078qvhqag7qs3j26xmamjm93''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/vom[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM vom DESCRIPTION A tiny logging utility. SHA256 0mvln0xx8qnrsmaj7c0f2ilgahvf078qvhqag7qs3j26xmamjm93 URL + http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz MD5 ad16bdc0221b08de371be6ce25ce3d47 NAME vom TESTNAME NIL FILENAME vom DEPS NIL + DEPENDENCIES NIL VERSION 20160825-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix new file mode 100644 index 00000000000..a225b323f36 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''woo''; + version = ''20170227-git''; + + description = ''An asynchronous HTTP server written in Common Lisp''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/woo/2017-02-27/woo-20170227-git.tgz''; + sha256 = ''0myydz817mpkgs97p9y9n4z0kq00xxr2b65klsdkxasvvfyjw0d1''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/woo[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM woo DESCRIPTION An asynchronous HTTP server written in Common Lisp SHA256 0myydz817mpkgs97p9y9n4z0kq00xxr2b65klsdkxasvvfyjw0d1 URL + http://beta.quicklisp.org/archive/woo/2017-02-27/woo-20170227-git.tgz MD5 cc37270ad408e093bd28c025466d8f64 NAME woo TESTNAME NIL FILENAME woo DEPS NIL + DEPENDENCIES NIL VERSION 20170227-git SIBLINGS (clack-handler-woo woo-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix new file mode 100644 index 00000000000..3744526b25a --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''wookie''; + version = ''20170227-git''; + + description = ''An evented webserver for Common Lisp.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/wookie/2017-02-27/wookie-20170227-git.tgz''; + sha256 = ''0i1wrgr5grg387ldv1zfswws1g3xvrkxxvp1m58m9hj0c1vmm6v0''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/wookie[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM wookie DESCRIPTION An evented webserver for Common Lisp. SHA256 0i1wrgr5grg387ldv1zfswws1g3xvrkxxvp1m58m9hj0c1vmm6v0 URL + http://beta.quicklisp.org/archive/wookie/2017-02-27/wookie-20170227-git.tgz MD5 aeb084106facdc9c8dab100c97e05b92 NAME wookie TESTNAME NIL FILENAME wookie + DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix new file mode 100644 index 00000000000..11fa1931f0b --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix @@ -0,0 +1,32 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''xmls''; + version = ''1.7''; + + description = ''''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/xmls/2015-04-07/xmls-1.7.tgz''; + sha256 = ''1pch221g5jv02rb21ly9ik4cmbzv8ca6bnyrs4s0yfrrq0ji406b''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/xmls[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM xmls DESCRIPTION NIL SHA256 1pch221g5jv02rb21ly9ik4cmbzv8ca6bnyrs4s0yfrrq0ji406b URL http://beta.quicklisp.org/archive/xmls/2015-04-07/xmls-1.7.tgz + MD5 697c9f49a60651b759e24ea0c1eb1cfe NAME xmls TESTNAME NIL FILENAME xmls DEPS NIL DEPENDENCIES NIL VERSION 1.7 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix new file mode 100644 index 00000000000..da2611d1f39 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''xsubseq''; + version = ''20150113-git''; + + description = ''Efficient way to manage "subseq"s in Common Lisp''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/xsubseq/2015-01-13/xsubseq-20150113-git.tgz''; + sha256 = ''0ykjhi7pkqcwm00yzhqvngnx07hsvwbj0c72b08rj4dkngg8is5q''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/xsubseq[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM xsubseq DESCRIPTION Efficient way to manage "subseq"s in Common Lisp SHA256 0ykjhi7pkqcwm00yzhqvngnx07hsvwbj0c72b08rj4dkngg8is5q URL + http://beta.quicklisp.org/archive/xsubseq/2015-01-13/xsubseq-20150113-git.tgz MD5 56f7a4ac1f05f10e7226e0e5b7b0bfa7 NAME xsubseq TESTNAME NIL FILENAME + xsubseq DEPS NIL DEPENDENCIES NIL VERSION 20150113-git SIBLINGS (xsubseq-test)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix new file mode 100644 index 00000000000..32c7198b99f --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''yason''; + version = ''v0.7.6''; + + description = ''JSON parser/encoder''; + + deps = [ args."alexandria" args."trivial-gray-streams" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/yason/2016-02-08/yason-v0.7.6.tgz''; + sha256 = ''00gfn14bvnw0in03y5m2ssgvhy3ppf5a3s0rf7mf4rq00c5ifchk''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/yason[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM yason DESCRIPTION JSON parser/encoder SHA256 00gfn14bvnw0in03y5m2ssgvhy3ppf5a3s0rf7mf4rq00c5ifchk URL + http://beta.quicklisp.org/archive/yason/2016-02-08/yason-v0.7.6.tgz MD5 79de5d242c5e9ce49dfda153d5f442ec NAME yason TESTNAME NIL FILENAME yason DEPS + ((NAME alexandria) (NAME trivial-gray-streams)) DEPENDENCIES (alexandria trivial-gray-streams) VERSION v0.7.6 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix new file mode 100644 index 00000000000..06fc8502d6c --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''zpb-ttf''; + version = ''1.0.3''; + + description = ''Access TrueType font metrics and outlines from Common Lisp''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/zpb-ttf/2013-07-20/zpb-ttf-1.0.3.tgz''; + sha256 = ''1irv0d0pcbwi2wx6hhjjyxzw12lnw8pvyg6ljsljh8xmhppbg5j6''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/zpb-ttf[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* (SYSTEM zpb-ttf DESCRIPTION Access TrueType font metrics and outlines from Common Lisp SHA256 1irv0d0pcbwi2wx6hhjjyxzw12lnw8pvyg6ljsljh8xmhppbg5j6 URL + http://beta.quicklisp.org/archive/zpb-ttf/2013-07-20/zpb-ttf-1.0.3.tgz MD5 1e896d8b0b01babab882e43fe4c3c2d4 NAME zpb-ttf TESTNAME NIL FILENAME zpb-ttf DEPS + NIL DEPENDENCIES NIL VERSION 1.0.3 SIBLINGS NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.lisp new file mode 100644 index 00000000000..a710d25ab5c --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.lisp @@ -0,0 +1,7 @@ +(setf + (gethash "cxml-xml" testnames) "cxml" + (gethash "cxml-dom" testnames) "cxml" + (gethash "cxml-test" testnames) "cxml" + (gethash "cxml-klacks" testnames) "cxml" + (gethash "cl-async-base" testnames) "cl-async" + ) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix new file mode 100644 index 00000000000..6228f9c5fec --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -0,0 +1,135 @@ +{pkgs, buildLispPackage, clwrapper, quicklisp-to-nix-packages}: +let + addDeps = newdeps: x: {deps = x.deps ++ newdeps;}; + addNativeLibs = libs: x: { propagatedBuildInputs = libs; }; + skipBuildPhase = x: { + overrides = y: ((x.overrides y) // { buildPhase = "true"; }); + }; + qlnp = quicklisp-to-nix-packages; + multiOverride = l: x: if l == [] then {} else + ((builtins.head l) x) // (multiOverride (builtins.tail l) x); +in +{ + stumpwm = x:{ + overrides = y: (x.overrides y) // { + preConfigure = '' + export configureFlags="$configureFlags --with-$NIX_LISP=common-lisp.sh"; + ''; + }; + }; + iterate = skipBuildPhase; + cl-fuse = x: { + propagatedBuildInputs = [pkgs.fuse]; + overrides = y : (x.overrides y) // { + configurePhase = '' + export SAVED_CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY" + export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$PWD" + export makeFlags="$makeFlags LISP=common-lisp.sh" + ''; + preInstall = '' + export CL_SOURCE_REGISTRY="$SAVED_CL_SOURCE_REGISTRY" + ''; + }; + }; + hunchentoot = addNativeLibs [pkgs.openssl]; + iolib = addNativeLibs [pkgs.libfixposix pkgs.gcc]; + cl-unicode = addDeps (with qlnp; [cl-ppcre flexi-streams]); + clack = addDeps (with qlnp;[lack bordeaux-threads prove]); + clack-v1-compat = addDeps (with qlnp;[ + lack bordeaux-threads prove usocket dexador http-body trivial-backtrace + marshal local-time cl-base64 cl-ppcre quri trivial-mimes trivial-types + flexi-streams circular-streams ironclad cl-syntax-annot alexandria + split-sequence + ]); + lack = addDeps (with qlnp; [ironclad]); + cxml = multiOverride [ skipBuildPhase (addDeps (with qlnp; [ + closure-common puri trivial-gray-streams + ]))]; + wookie = multiOverride [(addDeps (with qlnp; [ + alexandria blackbird cl-async chunga fast-http quri babel cl-ppcre + cl-fad fast-io vom do-urlencode cl-async-ssl + ])) + (addNativeLibs (with pkgs; [libuv openssl]))]; + woo = addDeps (with qlnp; [ + cffi lev clack swap-bytes static-vectors fast-http proc-parse quri fast-io + trivial-utf-8 vom + ]); + lev = addNativeLibs [pkgs.libev]; + dexador = addDeps (with qlnp; [ + usocket fast-http quri fast-io chunga cl-ppcre cl-cookie trivial-mimes + chipz cl-base64 cl-reexport qlnp."cl+ssl" alexandria bordeaux-threads + ]); + fast-http = addDeps (with qlnp; [ + alexandria cl-utilities proc-parse xsubseq smart-buffer + ]); + cl-emb = addDeps (with qlnp; [cl-ppcre]); + "cl+ssl" = addNativeLibs [pkgs.openssl]; + cl-colors = skipBuildPhase; + cl-libuv = addNativeLibs [pkgs.libuv]; + cl-async = addDeps (with qlnp; [cl-async-base]); + cl-async-ssl = multiOverride [(addDeps (with qlnp; [cl-async-base])) + (addNativeLibs [pkgs.openssl])]; + cl-async-repl = addDeps (with qlnp; [cl-async]); + cl-async-base = addDeps (with qlnp; [ + cffi fast-io vom cl-libuv cl-ppcre trivial-features static-vectors + trivial-gray-streams babel + ]); + cl-async-util = addDeps (with qlnp; [ cl-async-base ]); + css-lite = addDeps (with qlnp; [parenscript]); + clsql = x: { + propagatedBuildInputs = with pkgs; [mysql postgresql sqlite zlib]; + overrides = y: (x.overrides y) // { + preConfigure = ((x.overrides y).preConfigure or "") + '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.lib.getDev pkgs.mysql.client}/include/mysql" + export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.lib.getLib pkgs.mysql.client}/lib/mysql" + ''; + }; + }; + clx-truetype = skipBuildPhase; + query-fs = x: { + overrides = y: (x.overrides y) // { + linkedSystems = []; + postInstall = ((x.overrides y).postInstall or "") + '' + export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$out/lib/common-lisp/query-fs" + export HOME=$PWD + build-with-lisp.sh sbcl \ + ":query-fs $(echo "$linkedSystems" | sed -re 's/(^| )([^ :])/ :\2/g')" \ + "$out/bin/query-fs" \ + "(query-fs:run-fs-with-cmdline-args)" + ''; + }; + }; + cffi = multiOverride [(addNativeLibs [pkgs.libffi]) + (addDeps (with qlnp; [uffi uiop trivial-features]))]; + cl-vectors = addDeps (with qlnp; [zpb-ttf]); + "3bmd" = addDeps (with qlnp; [esrap split-sequence]); + cl-dbi = addDeps (with qlnp; [ + cl-syntax cl-syntax-annot split-sequence closer-mop bordeaux-threads + ]); + dbd-sqlite3 = addDeps (with qlnp; [cl-dbi]); + dbd-postgres = addDeps (with qlnp; [cl-dbi]); + dbd-mysql = addDeps (with qlnp; [cl-dbi]); + cl-mysql = addNativeLibs [pkgs.mysql]; + cl-ppcre-template = x: { + overrides = y: (x.overrides y) // { + postPatch = '' + ln -s lib-dependent/*.asd . + ''; + }; + }; + cl-unification = addDeps (with qlnp; [cl-ppcre]); + cl-syntax-annot = addDeps (with qlnp; [cl-syntax]); + cl-syntax-anonfun = addDeps (with qlnp; [cl-syntax]); + cl-syntax-markup = addDeps (with qlnp; [cl-syntax]); + cl-test-more = addDeps (with qlnp; [prove]); + babel-streams = addDeps (with qlnp; [babel]); + plump = addDeps (with qlnp; [array-utils trivial-indent]); + sqlite = addNativeLibs [pkgs.sqlite]; + uiop = x: { + overrides = y: (x.overrides y) // { + postInstall = ((x.overrides y).postInstall or "") + '' + cp -r "${pkgs.asdf}/lib/common-lisp/asdf/uiop/contrib" "$out/lib/common-lisp/uiop" + ''; + }; + }; +} diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt new file mode 100644 index 00000000000..3d15319ad06 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -0,0 +1,92 @@ +3bmd +alexandria +babel +blackbird +bordeaux-threads +caveman +cffi +chipz +circular-streams +clack +clack-v1-compat +cl-async +cl-async-base +cl-async-repl +cl-async-ssl +cl-base64 +cl-colors +cl-cookie +cl-dbi +cl-emb +cl-fuse +cl-fuse-meta-fs +cl-json +cl-l10n +cl-libuv +cl-mysql +closer-mop +cl-ppcre +cl-ppcre-template +cl-ppcre-unicode +cl-reexport +cl-smtp +clsql +cl+ssl +cl-syntax-annot +cl-syntax-anonfun +cl-syntax-markup +cl-test-more +cl-unicode +cl-unification +cl-utilities +cl-vectors +cl-who +clx +clx-truetype +command-line-arguments +css-lite +cxml +dbd-mysql +dbd-postgres +dbd-sqlite3 +dexador +drakma +esrap +external-program +fast-http +fast-io +flexi-streams +http-body +hu.dwim.def +hunchentoot +iolib +ironclad +iterate +lack +lev +local-time +lquery +marshal +optima +parenscript +pcall +plump +proc-parse +prove +query-fs +quri +salza2 +smart-buffer +split-sequence +static-vectors +stumpwm +trivial-backtrace +trivial-mimes +trivial-types +trivial-utf-8 +usocket +woo +wookie +xmls +xsubseq +yason diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix new file mode 100644 index 00000000000..118045015e2 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -0,0 +1,1459 @@ +{stdenv, fetchurl, pkgs, clwrapper}: +let quicklisp-to-nix-packages = rec { + inherit stdenv fetchurl clwrapper pkgs quicklisp-to-nix-packages; + + callPackage = pkgs.lib.callPackageWith quicklisp-to-nix-packages; + buildLispPackage = callPackage ./define-package.nix; + qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {}; + + "trivial-indent" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-indent" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-indent.nix { + inherit fetchurl; + })); + + + "closure-common" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."closure-common" or (x: {})) + (import ./quicklisp-to-nix-output/closure-common.nix { + inherit fetchurl; + "babel" = quicklisp-to-nix-packages."babel"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + + "documentation-utils" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."documentation-utils" or (x: {})) + (import ./quicklisp-to-nix-output/documentation-utils.nix { + inherit fetchurl; + "trivial-indent" = quicklisp-to-nix-packages."trivial-indent"; + })); + + + "cxml-xml" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cxml-xml" or (x: {})) + (import ./quicklisp-to-nix-output/cxml-xml.nix { + inherit fetchurl; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "puri" = quicklisp-to-nix-packages."puri"; + "closure-common" = quicklisp-to-nix-packages."closure-common"; + })); + + + "babel-streams" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."babel-streams" or (x: {})) + (import ./quicklisp-to-nix-output/babel-streams.nix { + inherit fetchurl; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "map-set" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."map-set" or (x: {})) + (import ./quicklisp-to-nix-output/map-set.nix { + inherit fetchurl; + })); + + + "cl-ansi-text" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-ansi-text" or (x: {})) + (import ./quicklisp-to-nix-output/cl-ansi-text.nix { + inherit fetchurl; + "cl-colors" = quicklisp-to-nix-packages."cl-colors"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "named-readtables" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."named-readtables" or (x: {})) + (import ./quicklisp-to-nix-output/named-readtables.nix { + inherit fetchurl; + })); + + + "array-utils" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."array-utils" or (x: {})) + (import ./quicklisp-to-nix-output/array-utils.nix { + inherit fetchurl; + })); + + + "clss" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clss" or (x: {})) + (import ./quicklisp-to-nix-output/clss.nix { + inherit fetchurl; + "array-utils" = quicklisp-to-nix-packages."array-utils"; + "plump" = quicklisp-to-nix-packages."plump"; + })); + + + "form-fiddle" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."form-fiddle" or (x: {})) + (import ./quicklisp-to-nix-output/form-fiddle.nix { + inherit fetchurl; + "documentation-utils" = quicklisp-to-nix-packages."documentation-utils"; + })); + + + "nibbles" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."nibbles" or (x: {})) + (import ./quicklisp-to-nix-output/nibbles.nix { + inherit fetchurl; + })); + + + "swap-bytes" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."swap-bytes" or (x: {})) + (import ./quicklisp-to-nix-output/swap-bytes.nix { + inherit fetchurl; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + })); + + + "idna" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."idna" or (x: {})) + (import ./quicklisp-to-nix-output/idna.nix { + inherit fetchurl; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + })); + + + "rfc2388" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."rfc2388" or (x: {})) + (import ./quicklisp-to-nix-output/rfc2388.nix { + inherit fetchurl; + })); + + + "md5" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."md5" or (x: {})) + (import ./quicklisp-to-nix-output/md5.nix { + inherit fetchurl; + })); + + + "hu.dwim.asdf" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."hu.dwim.asdf" or (x: {})) + (import ./quicklisp-to-nix-output/hu.dwim.asdf.nix { + inherit fetchurl; + "uiop" = quicklisp-to-nix-packages."uiop"; + })); + + + "jonathan" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."jonathan" or (x: {})) + (import ./quicklisp-to-nix-output/jonathan.nix { + inherit fetchurl; + "trivial-types" = quicklisp-to-nix-packages."trivial-types"; + "proc-parse" = quicklisp-to-nix-packages."proc-parse"; + "fast-io" = quicklisp-to-nix-packages."fast-io"; + "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; + "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-annot" = quicklisp-to-nix-packages."cl-annot"; + "babel" = quicklisp-to-nix-packages."babel"; + })); + + + "puri" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."puri" or (x: {})) + (import ./quicklisp-to-nix-output/puri.nix { + inherit fetchurl; + })); + + + "chunga" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."chunga" or (x: {})) + (import ./quicklisp-to-nix-output/chunga.nix { + inherit fetchurl; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + + "sqlite" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."sqlite" or (x: {})) + (import ./quicklisp-to-nix-output/sqlite.nix { + inherit fetchurl; + "cffi" = quicklisp-to-nix-packages."cffi"; + "iterate" = quicklisp-to-nix-packages."iterate"; + })); + + + "cl-postgres" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-postgres" or (x: {})) + (import ./quicklisp-to-nix-output/cl-postgres.nix { + inherit fetchurl; + "md5" = quicklisp-to-nix-packages."md5"; + })); + + + "cxml-test" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cxml-test" or (x: {})) + (import ./quicklisp-to-nix-output/cxml-test.nix { + inherit fetchurl; + "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; + "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; + "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; + })); + + + "cxml-klacks" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cxml-klacks" or (x: {})) + (import ./quicklisp-to-nix-output/cxml-klacks.nix { + inherit fetchurl; + "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; + })); + + + "cxml-dom" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cxml-dom" or (x: {})) + (import ./quicklisp-to-nix-output/cxml-dom.nix { + inherit fetchurl; + "cxml-xml" = quicklisp-to-nix-packages."cxml-xml"; + })); + + + "zpb-ttf" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."zpb-ttf" or (x: {})) + (import ./quicklisp-to-nix-output/zpb-ttf.nix { + inherit fetchurl; + })); + + + "cl-store" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-store" or (x: {})) + (import ./quicklisp-to-nix-output/cl-store.nix { + inherit fetchurl; + })); + + + "cl-paths-ttf" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-paths-ttf" or (x: {})) + (import ./quicklisp-to-nix-output/cl-paths-ttf.nix { + inherit fetchurl; + "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf"; + })); + + + "cl-aa" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-aa" or (x: {})) + (import ./quicklisp-to-nix-output/cl-aa.nix { + inherit fetchurl; + })); + + + "cl-markup" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-markup" or (x: {})) + (import ./quicklisp-to-nix-output/cl-markup.nix { + inherit fetchurl; + })); + + + "cl-anonfun" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-anonfun" or (x: {})) + (import ./quicklisp-to-nix-output/cl-anonfun.nix { + inherit fetchurl; + })); + + + "cl-annot" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-annot" or (x: {})) + (import ./quicklisp-to-nix-output/cl-annot.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "trivial-garbage" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-garbage" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-garbage.nix { + inherit fetchurl; + })); + + + "uffi" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."uffi" or (x: {})) + (import ./quicklisp-to-nix-output/uffi.nix { + inherit fetchurl; + })); + + + "metabang-bind" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."metabang-bind" or (x: {})) + (import ./quicklisp-to-nix-output/metabang-bind.nix { + inherit fetchurl; + })); + + + "cl-l10n-cldr" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-l10n-cldr" or (x: {})) + (import ./quicklisp-to-nix-output/cl-l10n-cldr.nix { + inherit fetchurl; + })); + + + "cl-fad" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-fad" or (x: {})) + (import ./quicklisp-to-nix-output/cl-fad.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + })); + + + "cffi-grovel" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cffi-grovel" or (x: {})) + (import ./quicklisp-to-nix-output/cffi-grovel.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "let-plus" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."let-plus" or (x: {})) + (import ./quicklisp-to-nix-output/let-plus.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "anaphora" = quicklisp-to-nix-packages."anaphora"; + })); + + + "cl-async-util" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-async-util" or (x: {})) + (import ./quicklisp-to-nix-output/cl-async-util.nix { + inherit fetchurl; + "vom" = quicklisp-to-nix-packages."vom"; + "fast-io" = quicklisp-to-nix-packages."fast-io"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-libuv" = quicklisp-to-nix-packages."cl-libuv"; + "cl-async-base" = quicklisp-to-nix-packages."cl-async-base"; + "cffi" = quicklisp-to-nix-packages."cffi"; + })); + + + "lack-middleware-backtrace" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lack-middleware-backtrace" or (x: {})) + (import ./quicklisp-to-nix-output/lack-middleware-backtrace.nix { + inherit fetchurl; + "uiop" = quicklisp-to-nix-packages."uiop"; + })); + + + "lack-util" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lack-util" or (x: {})) + (import ./quicklisp-to-nix-output/lack-util.nix { + inherit fetchurl; + "ironclad" = quicklisp-to-nix-packages."ironclad"; + })); + + + "trivial-gray-streams" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-gray-streams" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-gray-streams.nix { + inherit fetchurl; + })); + + + "uiop" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."uiop" or (x: {})) + (import ./quicklisp-to-nix-output/uiop.nix { + inherit fetchurl; + })); + + + "anaphora" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."anaphora" or (x: {})) + (import ./quicklisp-to-nix-output/anaphora.nix { + inherit fetchurl; + })); + + + "cl-project" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-project" or (x: {})) + (import ./quicklisp-to-nix-output/cl-project.nix { + inherit fetchurl; + "uiop" = quicklisp-to-nix-packages."uiop"; + "prove" = quicklisp-to-nix-packages."prove"; + "local-time" = quicklisp-to-nix-packages."local-time"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-emb" = quicklisp-to-nix-packages."cl-emb"; + })); + + + "cl-syntax" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-syntax" or (x: {})) + (import ./quicklisp-to-nix-output/cl-syntax.nix { + inherit fetchurl; + "trivial-types" = quicklisp-to-nix-packages."trivial-types"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + })); + + + "do-urlencode" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."do-urlencode" or (x: {})) + (import ./quicklisp-to-nix-output/do-urlencode.nix { + inherit fetchurl; + "babel" = quicklisp-to-nix-packages."babel"; + "babel-streams" = quicklisp-to-nix-packages."babel-streams"; + })); + + + "myway" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."myway" or (x: {})) + (import ./quicklisp-to-nix-output/myway.nix { + inherit fetchurl; + "quri" = quicklisp-to-nix-packages."quri"; + "map-set" = quicklisp-to-nix-packages."map-set"; + "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "vom" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."vom" or (x: {})) + (import ./quicklisp-to-nix-output/vom.nix { + inherit fetchurl; + })); + + + "trivial-features" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-features" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-features.nix { + inherit fetchurl; + })); + + + "yason" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."yason" or (x: {})) + (import ./quicklisp-to-nix-output/yason.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + + "xsubseq" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."xsubseq" or (x: {})) + (import ./quicklisp-to-nix-output/xsubseq.nix { + inherit fetchurl; + })); + + + "xmls" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."xmls" or (x: {})) + (import ./quicklisp-to-nix-output/xmls.nix { + inherit fetchurl; + })); + + + "wookie" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."wookie" or (x: {})) + (import ./quicklisp-to-nix-output/wookie.nix { + inherit fetchurl; + })); + + + "woo" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."woo" or (x: {})) + (import ./quicklisp-to-nix-output/woo.nix { + inherit fetchurl; + })); + + + "usocket" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."usocket" or (x: {})) + (import ./quicklisp-to-nix-output/usocket.nix { + inherit fetchurl; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + })); + + + "trivial-utf-8" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-utf-8" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-utf-8.nix { + inherit fetchurl; + })); + + + "trivial-types" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-types" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-types.nix { + inherit fetchurl; + })); + + + "trivial-mimes" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-mimes" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-mimes.nix { + inherit fetchurl; + })); + + + "trivial-backtrace" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-backtrace" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-backtrace.nix { + inherit fetchurl; + })); + + + "stumpwm" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."stumpwm" or (x: {})) + (import ./quicklisp-to-nix-output/stumpwm.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "clx" = quicklisp-to-nix-packages."clx"; + })); + + + "static-vectors" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."static-vectors" or (x: {})) + (import ./quicklisp-to-nix-output/static-vectors.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + })); + + + "split-sequence" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."split-sequence" or (x: {})) + (import ./quicklisp-to-nix-output/split-sequence.nix { + inherit fetchurl; + })); + + + "smart-buffer" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."smart-buffer" or (x: {})) + (import ./quicklisp-to-nix-output/smart-buffer.nix { + inherit fetchurl; + "xsubseq" = quicklisp-to-nix-packages."xsubseq"; + "uiop" = quicklisp-to-nix-packages."uiop"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + })); + + + "salza2" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."salza2" or (x: {})) + (import ./quicklisp-to-nix-output/salza2.nix { + inherit fetchurl; + })); + + + "quri" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."quri" or (x: {})) + (import ./quicklisp-to-nix-output/quri.nix { + inherit fetchurl; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; + "babel" = quicklisp-to-nix-packages."babel"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "query-fs" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."query-fs" or (x: {})) + (import ./quicklisp-to-nix-output/query-fs.nix { + inherit fetchurl; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cl-fuse" = quicklisp-to-nix-packages."cl-fuse"; + "cl-fuse-meta-fs" = quicklisp-to-nix-packages."cl-fuse-meta-fs"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "command-line-arguments" = quicklisp-to-nix-packages."command-line-arguments"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; + })); + + + "prove" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."prove" or (x: {})) + (import ./quicklisp-to-nix-output/prove.nix { + inherit fetchurl; + "uiop" = quicklisp-to-nix-packages."uiop"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-colors" = quicklisp-to-nix-packages."cl-colors"; + "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "proc-parse" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."proc-parse" or (x: {})) + (import ./quicklisp-to-nix-output/proc-parse.nix { + inherit fetchurl; + "babel" = quicklisp-to-nix-packages."babel"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "plump" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."plump" or (x: {})) + (import ./quicklisp-to-nix-output/plump.nix { + inherit fetchurl; + })); + + + "pcall" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."pcall" or (x: {})) + (import ./quicklisp-to-nix-output/pcall.nix { + inherit fetchurl; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + })); + + + "parenscript" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."parenscript" or (x: {})) + (import ./quicklisp-to-nix-output/parenscript.nix { + inherit fetchurl; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "anaphora" = quicklisp-to-nix-packages."anaphora"; + })); + + + "optima" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."optima" or (x: {})) + (import ./quicklisp-to-nix-output/optima.nix { + inherit fetchurl; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "marshal" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."marshal" or (x: {})) + (import ./quicklisp-to-nix-output/marshal.nix { + inherit fetchurl; + })); + + + "lquery" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lquery" or (x: {})) + (import ./quicklisp-to-nix-output/lquery.nix { + inherit fetchurl; + "plump" = quicklisp-to-nix-packages."plump"; + "form-fiddle" = quicklisp-to-nix-packages."form-fiddle"; + "clss" = quicklisp-to-nix-packages."clss"; + "array-utils" = quicklisp-to-nix-packages."array-utils"; + })); + + + "local-time" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."local-time" or (x: {})) + (import ./quicklisp-to-nix-output/local-time.nix { + inherit fetchurl; + "cl-fad" = quicklisp-to-nix-packages."cl-fad"; + })); + + + "lev" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lev" or (x: {})) + (import ./quicklisp-to-nix-output/lev.nix { + inherit fetchurl; + "cffi" = quicklisp-to-nix-packages."cffi"; + })); + + + "lack" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."lack" or (x: {})) + (import ./quicklisp-to-nix-output/lack.nix { + inherit fetchurl; + })); + + + "iterate" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."iterate" or (x: {})) + (import ./quicklisp-to-nix-output/iterate.nix { + inherit fetchurl; + })); + + + "ironclad" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."ironclad" or (x: {})) + (import ./quicklisp-to-nix-output/ironclad.nix { + inherit fetchurl; + "nibbles" = quicklisp-to-nix-packages."nibbles"; + })); + + + "iolib" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."iolib" or (x: {})) + (import ./quicklisp-to-nix-output/iolib.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "babel" = quicklisp-to-nix-packages."babel"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "idna" = quicklisp-to-nix-packages."idna"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "swap-bytes" = quicklisp-to-nix-packages."swap-bytes"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "uiop" = quicklisp-to-nix-packages."uiop"; + })); + + + "hunchentoot" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."hunchentoot" or (x: {})) + (import ./quicklisp-to-nix-output/hunchentoot.nix { + inherit fetchurl; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "chunga" = quicklisp-to-nix-packages."chunga"; + "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "cl-base64" = quicklisp-to-nix-packages."cl-base64"; + "cl-fad" = quicklisp-to-nix-packages."cl-fad"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "md5" = quicklisp-to-nix-packages."md5"; + "rfc2388" = quicklisp-to-nix-packages."rfc2388"; + "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; + "usocket" = quicklisp-to-nix-packages."usocket"; + })); + + + "hu.dwim.def" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."hu.dwim.def" or (x: {})) + (import ./quicklisp-to-nix-output/hu.dwim.def.nix { + inherit fetchurl; + "metabang-bind" = quicklisp-to-nix-packages."metabang-bind"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "hu.dwim.asdf" = quicklisp-to-nix-packages."hu.dwim.asdf"; + "anaphora" = quicklisp-to-nix-packages."anaphora"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "http-body" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."http-body" or (x: {})) + (import ./quicklisp-to-nix-output/http-body.nix { + inherit fetchurl; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "quri" = quicklisp-to-nix-packages."quri"; + "jonathan" = quicklisp-to-nix-packages."jonathan"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "fast-http" = quicklisp-to-nix-packages."fast-http"; + "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "babel" = quicklisp-to-nix-packages."babel"; + })); + + + "flexi-streams" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."flexi-streams" or (x: {})) + (import ./quicklisp-to-nix-output/flexi-streams.nix { + inherit fetchurl; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + })); + + + "fast-io" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."fast-io" or (x: {})) + (import ./quicklisp-to-nix-output/fast-io.nix { + inherit fetchurl; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "static-vectors" = quicklisp-to-nix-packages."static-vectors"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "fast-http" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."fast-http" or (x: {})) + (import ./quicklisp-to-nix-output/fast-http.nix { + inherit fetchurl; + })); + + + "external-program" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."external-program" or (x: {})) + (import ./quicklisp-to-nix-output/external-program.nix { + inherit fetchurl; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + })); + + + "esrap" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."esrap" or (x: {})) + (import ./quicklisp-to-nix-output/esrap.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "drakma" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."drakma" or (x: {})) + (import ./quicklisp-to-nix-output/drakma.nix { + inherit fetchurl; + "usocket" = quicklisp-to-nix-packages."usocket"; + "puri" = quicklisp-to-nix-packages."puri"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-base64" = quicklisp-to-nix-packages."cl-base64"; + "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "chunga" = quicklisp-to-nix-packages."chunga"; + "chipz" = quicklisp-to-nix-packages."chipz"; + })); + + + "dexador" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."dexador" or (x: {})) + (import ./quicklisp-to-nix-output/dexador.nix { + inherit fetchurl; + "usocket" = quicklisp-to-nix-packages."usocket"; + "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "quri" = quicklisp-to-nix-packages."quri"; + "fast-io" = quicklisp-to-nix-packages."fast-io"; + "fast-http" = quicklisp-to-nix-packages."fast-http"; + "cl-reexport" = quicklisp-to-nix-packages."cl-reexport"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-cookie" = quicklisp-to-nix-packages."cl-cookie"; + "cl-base64" = quicklisp-to-nix-packages."cl-base64"; + "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "chunga" = quicklisp-to-nix-packages."chunga"; + "chipz" = quicklisp-to-nix-packages."chipz"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "babel" = quicklisp-to-nix-packages."babel"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "dbd-sqlite3" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."dbd-sqlite3" or (x: {})) + (import ./quicklisp-to-nix-output/dbd-sqlite3.nix { + inherit fetchurl; + "uiop" = quicklisp-to-nix-packages."uiop"; + "sqlite" = quicklisp-to-nix-packages."sqlite"; + "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; + "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; + })); + + + "dbd-postgres" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."dbd-postgres" or (x: {})) + (import ./quicklisp-to-nix-output/dbd-postgres.nix { + inherit fetchurl; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; + "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; + "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; + "cl-postgres" = quicklisp-to-nix-packages."cl-postgres"; + })); + + + "dbd-mysql" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."dbd-mysql" or (x: {})) + (import ./quicklisp-to-nix-output/dbd-mysql.nix { + inherit fetchurl; + "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; + "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; + "cl-mysql" = quicklisp-to-nix-packages."cl-mysql"; + })); + + + "cxml" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cxml" or (x: {})) + (import ./quicklisp-to-nix-output/cxml.nix { + inherit fetchurl; + "cxml-dom" = quicklisp-to-nix-packages."cxml-dom"; + "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks"; + "cxml-test" = quicklisp-to-nix-packages."cxml-test"; + })); + + + "css-lite" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."css-lite" or (x: {})) + (import ./quicklisp-to-nix-output/css-lite.nix { + inherit fetchurl; + })); + + + "command-line-arguments" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."command-line-arguments" or (x: {})) + (import ./quicklisp-to-nix-output/command-line-arguments.nix { + inherit fetchurl; + })); + + + "clx-truetype" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clx-truetype" or (x: {})) + (import ./quicklisp-to-nix-output/clx-truetype.nix { + inherit fetchurl; + "cl-aa" = quicklisp-to-nix-packages."cl-aa"; + "cl-fad" = quicklisp-to-nix-packages."cl-fad"; + "cl-paths-ttf" = quicklisp-to-nix-packages."cl-paths-ttf"; + "cl-store" = quicklisp-to-nix-packages."cl-store"; + "cl-vectors" = quicklisp-to-nix-packages."cl-vectors"; + "clx" = quicklisp-to-nix-packages."clx"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf"; + })); + + + "clx" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clx" or (x: {})) + (import ./quicklisp-to-nix-output/clx.nix { + inherit fetchurl; + })); + + + "cl-who" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-who" or (x: {})) + (import ./quicklisp-to-nix-output/cl-who.nix { + inherit fetchurl; + })); + + + "cl-vectors" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-vectors" or (x: {})) + (import ./quicklisp-to-nix-output/cl-vectors.nix { + inherit fetchurl; + })); + + + "cl-utilities" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-utilities" or (x: {})) + (import ./quicklisp-to-nix-output/cl-utilities.nix { + inherit fetchurl; + })); + + + "cl-unification" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-unification" or (x: {})) + (import ./quicklisp-to-nix-output/cl-unification.nix { + inherit fetchurl; + })); + + + "cl-unicode" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-unicode" or (x: {})) + (import ./quicklisp-to-nix-output/cl-unicode.nix { + inherit fetchurl; + })); + + + "cl-test-more" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-test-more" or (x: {})) + (import ./quicklisp-to-nix-output/cl-test-more.nix { + inherit fetchurl; + })); + + + "cl-syntax-markup" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-syntax-markup" or (x: {})) + (import ./quicklisp-to-nix-output/cl-syntax-markup.nix { + inherit fetchurl; + "cl-markup" = quicklisp-to-nix-packages."cl-markup"; + })); + + + "cl-syntax-anonfun" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-syntax-anonfun" or (x: {})) + (import ./quicklisp-to-nix-output/cl-syntax-anonfun.nix { + inherit fetchurl; + "cl-anonfun" = quicklisp-to-nix-packages."cl-anonfun"; + })); + + + "cl-syntax-annot" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-syntax-annot" or (x: {})) + (import ./quicklisp-to-nix-output/cl-syntax-annot.nix { + inherit fetchurl; + "cl-annot" = quicklisp-to-nix-packages."cl-annot"; + })); + + + "cl+ssl" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl+ssl" or (x: {})) + (import ./quicklisp-to-nix-output/cl+ssl.nix { + inherit fetchurl; + "uiop" = quicklisp-to-nix-packages."uiop"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + })); + + + "clsql" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clsql" or (x: {})) + (import ./quicklisp-to-nix-output/clsql.nix { + inherit fetchurl; + "uffi" = quicklisp-to-nix-packages."uffi"; + })); + + + "cl-smtp" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-smtp" or (x: {})) + (import ./quicklisp-to-nix-output/cl-smtp.nix { + inherit fetchurl; + "cl+ssl" = quicklisp-to-nix-packages."cl+ssl"; + "cl-base64" = quicklisp-to-nix-packages."cl-base64"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "usocket" = quicklisp-to-nix-packages."usocket"; + })); + + + "cl-reexport" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-reexport" or (x: {})) + (import ./quicklisp-to-nix-output/cl-reexport.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "cl-ppcre-unicode" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-ppcre-unicode" or (x: {})) + (import ./quicklisp-to-nix-output/cl-ppcre-unicode.nix { + inherit fetchurl; + "cl-unicode" = quicklisp-to-nix-packages."cl-unicode"; + })); + + + "cl-ppcre-template" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-ppcre-template" or (x: {})) + (import ./quicklisp-to-nix-output/cl-ppcre-template.nix { + inherit fetchurl; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + })); + + + "cl-ppcre" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-ppcre" or (x: {})) + (import ./quicklisp-to-nix-output/cl-ppcre.nix { + inherit fetchurl; + })); + + + "closer-mop" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."closer-mop" or (x: {})) + (import ./quicklisp-to-nix-output/closer-mop.nix { + inherit fetchurl; + })); + + + "cl-mysql" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-mysql" or (x: {})) + (import ./quicklisp-to-nix-output/cl-mysql.nix { + inherit fetchurl; + "cffi" = quicklisp-to-nix-packages."cffi"; + })); + + + "cl-libuv" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-libuv" or (x: {})) + (import ./quicklisp-to-nix-output/cl-libuv.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + })); + + + "cl-l10n" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-l10n" or (x: {})) + (import ./quicklisp-to-nix-output/cl-l10n.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "cl-fad" = quicklisp-to-nix-packages."cl-fad"; + "cl-l10n-cldr" = quicklisp-to-nix-packages."cl-l10n-cldr"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "cxml" = quicklisp-to-nix-packages."cxml"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "local-time" = quicklisp-to-nix-packages."local-time"; + "metabang-bind" = quicklisp-to-nix-packages."metabang-bind"; + })); + + + "cl-json" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-json" or (x: {})) + (import ./quicklisp-to-nix-output/cl-json.nix { + inherit fetchurl; + })); + + + "cl-fuse-meta-fs" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-fuse-meta-fs" or (x: {})) + (import ./quicklisp-to-nix-output/cl-fuse-meta-fs.nix { + inherit fetchurl; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cl-fuse" = quicklisp-to-nix-packages."cl-fuse"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "pcall" = quicklisp-to-nix-packages."pcall"; + })); + + + "cl-fuse" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-fuse" or (x: {})) + (import ./quicklisp-to-nix-output/cl-fuse.nix { + inherit fetchurl; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel"; + "cl-utilities" = quicklisp-to-nix-packages."cl-utilities"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; + "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8"; + })); + + + "cl-emb" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-emb" or (x: {})) + (import ./quicklisp-to-nix-output/cl-emb.nix { + inherit fetchurl; + })); + + + "cl-dbi" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-dbi" or (x: {})) + (import ./quicklisp-to-nix-output/cl-dbi.nix { + inherit fetchurl; + })); + + + "cl-cookie" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-cookie" or (x: {})) + (import ./quicklisp-to-nix-output/cl-cookie.nix { + inherit fetchurl; + "quri" = quicklisp-to-nix-packages."quri"; + "proc-parse" = quicklisp-to-nix-packages."proc-parse"; + "local-time" = quicklisp-to-nix-packages."local-time"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "cl-colors" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-colors" or (x: {})) + (import ./quicklisp-to-nix-output/cl-colors.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "let-plus" = quicklisp-to-nix-packages."let-plus"; + })); + + + "cl-base64" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-base64" or (x: {})) + (import ./quicklisp-to-nix-output/cl-base64.nix { + inherit fetchurl; + })); + + + "cl-async-ssl" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-async-ssl" or (x: {})) + (import ./quicklisp-to-nix-output/cl-async-ssl.nix { + inherit fetchurl; + "vom" = quicklisp-to-nix-packages."vom"; + "cffi" = quicklisp-to-nix-packages."cffi"; + })); + + + "cl-async-repl" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-async-repl" or (x: {})) + (import ./quicklisp-to-nix-output/cl-async-repl.nix { + inherit fetchurl; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + })); + + + "cl-async-base" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-async-base" or (x: {})) + (import ./quicklisp-to-nix-output/cl-async-base.nix { + inherit fetchurl; + "cl-libuv" = quicklisp-to-nix-packages."cl-libuv"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + })); + + + "cl-async" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-async" or (x: {})) + (import ./quicklisp-to-nix-output/cl-async.nix { + inherit fetchurl; + "uiop" = quicklisp-to-nix-packages."uiop"; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "static-vectors" = quicklisp-to-nix-packages."static-vectors"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-libuv" = quicklisp-to-nix-packages."cl-libuv"; + "cl-async-util" = quicklisp-to-nix-packages."cl-async-util"; + "cl-async-base" = quicklisp-to-nix-packages."cl-async-base"; + "cffi" = quicklisp-to-nix-packages."cffi"; + "babel" = quicklisp-to-nix-packages."babel"; + })); + + + "clack-v1-compat" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clack-v1-compat" or (x: {})) + (import ./quicklisp-to-nix-output/clack-v1-compat.nix { + inherit fetchurl; + "uiop" = quicklisp-to-nix-packages."uiop"; + "trivial-types" = quicklisp-to-nix-packages."trivial-types"; + "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes"; + "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "quri" = quicklisp-to-nix-packages."quri"; + "marshal" = quicklisp-to-nix-packages."marshal"; + "local-time" = quicklisp-to-nix-packages."local-time"; + "lack-util" = quicklisp-to-nix-packages."lack-util"; + "lack" = quicklisp-to-nix-packages."lack"; + "ironclad" = quicklisp-to-nix-packages."ironclad"; + "http-body" = quicklisp-to-nix-packages."http-body"; + "flexi-streams" = quicklisp-to-nix-packages."flexi-streams"; + "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-base64" = quicklisp-to-nix-packages."cl-base64"; + "circular-streams" = quicklisp-to-nix-packages."circular-streams"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "clack" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."clack" or (x: {})) + (import ./quicklisp-to-nix-output/clack.nix { + inherit fetchurl; + "uiop" = quicklisp-to-nix-packages."uiop"; + "lack-util" = quicklisp-to-nix-packages."lack-util"; + "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace"; + "lack" = quicklisp-to-nix-packages."lack"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "circular-streams" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."circular-streams" or (x: {})) + (import ./quicklisp-to-nix-output/circular-streams.nix { + inherit fetchurl; + "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams"; + "fast-io" = quicklisp-to-nix-packages."fast-io"; + })); + + + "chipz" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."chipz" or (x: {})) + (import ./quicklisp-to-nix-output/chipz.nix { + inherit fetchurl; + })); + + + "cffi" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cffi" or (x: {})) + (import ./quicklisp-to-nix-output/cffi.nix { + inherit fetchurl; + "uiop" = quicklisp-to-nix-packages."uiop"; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "babel" = quicklisp-to-nix-packages."babel"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "caveman" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."caveman" or (x: {})) + (import ./quicklisp-to-nix-output/caveman.nix { + inherit fetchurl; + "myway" = quicklisp-to-nix-packages."myway"; + "local-time" = quicklisp-to-nix-packages."local-time"; + "do-urlencode" = quicklisp-to-nix-packages."do-urlencode"; + "clack-v1-compat" = quicklisp-to-nix-packages."clack-v1-compat"; + "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot"; + "cl-syntax" = quicklisp-to-nix-packages."cl-syntax"; + "cl-project" = quicklisp-to-nix-packages."cl-project"; + "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre"; + "cl-emb" = quicklisp-to-nix-packages."cl-emb"; + "anaphora" = quicklisp-to-nix-packages."anaphora"; + })); + + + "bordeaux-threads" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."bordeaux-threads" or (x: {})) + (import ./quicklisp-to-nix-output/bordeaux-threads.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "blackbird" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."blackbird" or (x: {})) + (import ./quicklisp-to-nix-output/blackbird.nix { + inherit fetchurl; + "vom" = quicklisp-to-nix-packages."vom"; + })); + + + "babel" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."babel" or (x: {})) + (import ./quicklisp-to-nix-output/babel.nix { + inherit fetchurl; + "trivial-features" = quicklisp-to-nix-packages."trivial-features"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + + "alexandria" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."alexandria" or (x: {})) + (import ./quicklisp-to-nix-output/alexandria.nix { + inherit fetchurl; + })); + + + "3bmd" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."3bmd" or (x: {})) + (import ./quicklisp-to-nix-output/3bmd.nix { + inherit fetchurl; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "esrap" = quicklisp-to-nix-packages."esrap"; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + })); + + +} // qlAliases {inherit quicklisp-to-nix-packages;}; +qlAliases = import ./quicklisp-to-nix-aliases.nix; +in + quicklisp-to-nix-packages diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb new file mode 100644 index 00000000000..a13cedf3dfe --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb @@ -0,0 +1,8 @@ + "<% @var name %>" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."<% @var name %>" or (x: {})) + (import ./quicklisp-to-nix-output/<% @var filename %>.nix { + inherit fetchurl;<% @loop deps %> + "<% @var name %>" = quicklisp-to-nix-packages."<% @var name %>";<% @endloop %> + }));<% @ifequal name filename %><% @else %> + "<% @var filename %>" = quicklisp-to-nix-packages."<% @var name %>";<% @endif %> diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb new file mode 100644 index 00000000000..3b71ade03f7 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''<% @var filename %>''; + version = ''<% @var version %>'';<% @if testname %> + + testSystems = ["<% @var testname %>"];<% @endif %> + + description = ''<% @var description %>''; + + deps = [ <% @loop deps %>args."<% @var name %>" <% @endloop %>]; + + src = fetchurl { + url = ''<% @var url %>''; + sha256 = ''<% @var sha256 %>''; + }; + + overrides = x: { + postInstall = '' + find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/<% @var name %>[.]asd${"$"}' | + while read f; do + env -i \ + NIX_LISP="$NIX_LISP" \ + NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn + (asdf:load-system :$(basename "$f" .asd)) + (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd)) + (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd))) + )'" \ + "$out"/bin/*-lisp-launcher.sh || + mv "$f"{,.sibling}; done || true + ''; + }; +} +/* <%= cl-emb-intern::topenv %> */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp new file mode 100644 index 00000000000..18cf6d097a2 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp @@ -0,0 +1,154 @@ +; QuickLisp-to-Nix export +; Requires QuickLisp to be loaded +; Installs the QuickLisp version of all the packages processed (in the +; QuickLisp instance it uses) + +(ql:quickload :cl-emb) +(ql:quickload :external-program) +(ql:quickload :cl-ppcre) +(ql:quickload :alexandria) +(ql:quickload :md5) + +(defvar testnames (make-hash-table :test 'equal)) + +(defun nix-prefetch-url (url) + (let* + ((stdout nil) + (stderr nil)) + (setf + stdout + (with-output-to-string (so) + (setf + stderr + (with-output-to-string (se) + (external-program:run + "nix-prefetch-url" + (list url) + :search t :output so :error se))))) + (let* + ((path-line (first (last (cl-ppcre:split (format nil "~%") stderr)))) + (path (cl-ppcre:regex-replace-all "path is .(.*)." path-line "\\1"))) + (list + :sha256 (first (cl-ppcre:split (format nil "~%") stdout)) + :path path + :md5 (string-downcase + (format nil "~{~16,2,'0r~}" + (map 'list 'identity (md5:md5sum-file path)))))))) + +(defun escape-filename (s) + (format nil "~{~a~}" + (loop + for x in (map 'list 'identity s) + collect + (case x + (#\/ "_slash_") + (#\\ "_backslash_") + (#\_ "__") + (t x))))) + +(defun system-data (system) + (let* + ((asdf-system (asdf:find-system system)) + (ql-system (ql-dist:find-system system)) + (ql-release (ql-dist:release ql-system)) + (ql-sibling-systems (ql-dist:provided-systems ql-release)) + (url (ql-dist:archive-url ql-release)) + (local-archive (ql-dist:local-archive-file ql-release)) + (local-url (format nil "file://~a" (pathname local-archive))) + (archive-data + (progn + (ql-dist:ensure-local-archive-file ql-release) + (nix-prefetch-url local-url))) + (ideal-md5 (ql-dist:archive-md5 ql-release)) + (file-md5 (getf archive-data :md5)) + (raw-dependencies (ql-dist:required-systems ql-system)) + (name (string-downcase (format nil "~a" system))) + (ql-sibling-names + (remove name (mapcar 'ql-dist:name ql-sibling-systems) + :test 'equal)) + (dependencies + (set-difference + (remove-duplicates + (remove-if-not 'ql-dist:find-system raw-dependencies) + :test 'equal) + ql-sibling-names + :test 'equal)) + (deps (mapcar (lambda (x) (list :name x)) dependencies)) + (description (asdf:system-description asdf-system)) + (release-name (ql-dist:short-description ql-release)) + (version (cl-ppcre:regex-replace-all + (format nil "~a-" name) release-name ""))) + (assert (equal ideal-md5 file-md5)) + (list + :system system + :description description + :sha256 (getf archive-data :sha256) + :url url + :md5 file-md5 + :name name + :testname (gethash name testnames) + :filename (escape-filename name) + :deps deps + :dependencies dependencies + :version version + :siblings ql-sibling-names))) + +(defmacro this-file () + (or *compile-file-truename* + *load-truename*)) + +(defun nix-expression (system) + (cl-emb:execute-emb + (merge-pathnames #p"nix-package.emb" (this-file)) + :env (system-data system))) +(defun nix-invocation (system) + (cl-emb:execute-emb + (merge-pathnames #p"invocation.emb" (this-file)) + :env (system-data system))) + +(defun systems-closure (systems) + (let* + ((seen (make-hash-table :test 'equal))) + (loop + with queue := systems + with res := nil + while queue + for next := (pop queue) + for old := (gethash next seen) + for data := (unless old (system-data next)) + for deps := (getf data :dependencies) + for siblings := (getf data :siblings) + unless old do + (progn + (push next res) + (setf queue (append queue deps))) + do (setf (gethash next seen) t) + finally (return res)))) + +(defun ql-to-nix (target-directory) + (load (format nil "~a/quicklisp-to-nix-overrides.lisp" target-directory)) + (let* + ((systems + (cl-ppcre:split + (format nil "~%") + (alexandria:read-file-into-string + (format nil "~a/quicklisp-to-nix-systems.txt" target-directory)))) + (closure (systems-closure systems)) + (invocations + (loop for s in closure + collect (list :code (nix-invocation s))))) + (loop + for s in closure + do (alexandria:write-string-into-file + (nix-expression s) + (format nil "~a/quicklisp-to-nix-output/~a.nix" + target-directory (escape-filename s)) + :if-exists :supersede)) + (alexandria:write-string-into-file + (cl-emb:execute-emb + (merge-pathnames + #p"top-package.emb" + (this-file)) + :env (list :invocations invocations)) + (format nil "~a/quicklisp-to-nix.nix" target-directory) + :if-exists :supersede))) diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb new file mode 100644 index 00000000000..95b60df0d01 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix/top-package.emb @@ -0,0 +1,14 @@ +{stdenv, fetchurl, pkgs, clwrapper}: +let quicklisp-to-nix-packages = rec { + inherit stdenv fetchurl clwrapper pkgs quicklisp-to-nix-packages; + + callPackage = pkgs.lib.callPackageWith quicklisp-to-nix-packages; + buildLispPackage = callPackage ./define-package.nix; + qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {}; +<% @loop invocations %> +<% @var code %> +<% @endloop %> +} // qlAliases {inherit quicklisp-to-nix-packages;}; +qlAliases = import ./quicklisp-to-nix-aliases.nix; +in + quicklisp-to-nix-packages diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 52a2ab8f36a..7587fb3e0c4 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -7,7 +7,7 @@ }: { platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs ? false, useGooglePlayServices ? false }: -with { inherit (stdenv.lib) makeLibraryPath; }; +let inherit (stdenv.lib) makeLibraryPath; in stdenv.mkDerivation rec { name = "android-sdk-${version}"; diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix index b78bbda5d5e..8c4a5390f55 100644 --- a/pkgs/development/node-packages/composition-v4.nix +++ b/pkgs/development/node-packages/composition-v4.nix @@ -1,8 +1,8 @@ -# This file has been generated by node2nix 1.1.1. Do not edit! +# This file has been generated by node2nix 1.2.0. Do not edit! {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix index 1c21b47b92c..ea30c5b04c4 100644 --- a/pkgs/development/node-packages/composition-v6.nix +++ b/pkgs/development/node-packages/composition-v6.nix @@ -1,8 +1,8 @@ -# This file has been generated by node2nix 1.1.1. Do not edit! +# This file has been generated by node2nix 1.2.0. Do not edit! {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-5_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: let nodeEnv = import ./node-env.nix { diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh index 613293e850b..f5675623c2c 100755 --- a/pkgs/development/node-packages/generate.sh +++ b/pkgs/development/node-packages/generate.sh @@ -2,5 +2,4 @@ rm -f node-env.nix node2nix -i node-packages.json -o node-packages-v4.nix -c composition-v4.nix -# node2nix doesn't explicitely support node v6 so far -node2nix -5 -i node-packages.json -o node-packages-v6.nix -c composition-v6.nix +node2nix -6 -i node-packages.json -o node-packages-v6.nix -c composition-v6.nix diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index e8328252a11..356e78f027b 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -57,60 +57,6 @@ let # Recursively composes the dependencies of a package composePackage = { name, packageName, src, dependencies ? [], ... }@args: - let - fixImpureDependencies = writeTextFile { - name = "fixDependencies.js"; - text = '' - var fs = require('fs'); - var url = require('url'); - - /* - * Replaces an impure version specification by * - */ - function replaceImpureVersionSpec(versionSpec) { - var parsedUrl = url.parse(versionSpec); - - if(versionSpec == "latest" || versionSpec == "unstable" || - versionSpec.substr(0, 2) == ".." || dependency.substr(0, 2) == "./" || dependency.substr(0, 2) == "~/" || dependency.substr(0, 1) == '/') - return '*'; - else if(parsedUrl.protocol == "git:" || parsedUrl.protocol == "git+ssh:" || parsedUrl.protocol == "git+http:" || parsedUrl.protocol == "git+https:" || parsedUrl.protocol == "github:" || - parsedUrl.protocol == "http:" || parsedUrl.protocol == "https:") - return '*'; - else - return versionSpec; - } - - var packageObj = JSON.parse(fs.readFileSync('./package.json')); - - /* Replace dependencies */ - if(packageObj.dependencies !== undefined) { - for(var dependency in packageObj.dependencies) { - var versionSpec = packageObj.dependencies[dependency]; - packageObj.dependencies[dependency] = replaceImpureVersionSpec(versionSpec); - } - } - - /* Replace development dependencies */ - if(packageObj.devDependencies !== undefined) { - for(var dependency in packageObj.devDependencies) { - var versionSpec = packageObj.devDependencies[dependency]; - packageObj.devDependencies[dependency] = replaceImpureVersionSpec(versionSpec); - } - } - - /* Replace optional dependencies */ - if(packageObj.optionalDependencies !== undefined) { - for(var dependency in packageObj.optionalDependencies) { - var versionSpec = packageObj.optionalDependencies[dependency]; - packageObj.optionalDependencies[dependency] = replaceImpureVersionSpec(versionSpec); - } - } - - /* Write the fixed JSON file */ - fs.writeFileSync("package.json", JSON.stringify(packageObj)); - ''; - }; - in '' DIR=$(pwd) cd $TMPDIR @@ -150,17 +96,97 @@ let # Unset the stripped name to not confuse the next unpack step unset strippedName - # Some version specifiers (latest, unstable, URLs, file paths) force NPM to make remote connections or consult paths outside the Nix store. - # The following JavaScript replaces these by * to prevent that - cd "$DIR/${packageName}" - node ${fixImpureDependencies} - # Include the dependencies of the package + cd "$DIR/${packageName}" ${includeDependencies { inherit dependencies; }} cd .. ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ''; + pinpointDependencies = {dependencies, production}: + let + pinpointDependenciesFromPackageJSON = writeTextFile { + name = "pinpointDependencies.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function resolveDependencyVersion(location, name) { + if(location == process.env['NIX_STORE']) { + return null; + } else { + var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); + + if(fs.existsSync(dependencyPackageJSON)) { + var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); + + if(dependencyPackageObj.name == name) { + return dependencyPackageObj.version; + } + } else { + return resolveDependencyVersion(path.resolve(location, ".."), name); + } + } + } + + function replaceDependencies(dependencies) { + if(typeof dependencies == "object" && dependencies !== null) { + for(var dependency in dependencies) { + var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); + + if(resolvedVersion === null) { + process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); + } else { + dependencies[dependency] = resolvedVersion; + } + } + } + } + + /* Read the package.json configuration */ + var packageObj = JSON.parse(fs.readFileSync('./package.json')); + + /* Pinpoint all dependencies */ + replaceDependencies(packageObj.dependencies); + if(process.argv[2] == "development") { + replaceDependencies(packageObj.devDependencies); + } + replaceDependencies(packageObj.optionalDependencies); + + /* Write the fixed package.json file */ + fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); + ''; + }; + in + '' + node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} + + ${stdenv.lib.optionalString (dependencies != []) + '' + if [ -d node_modules ] + then + cd node_modules + ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + cd .. + fi + ''} + ''; + + # Recursively traverses all dependencies of a package and pinpoints all + # dependencies in the package.json file to the versions that are actually + # being used. + + pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: + '' + if [ -d "${packageName}" ] + then + cd "${packageName}" + ${pinpointDependencies { inherit dependencies production; }} + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + fi + ''; + # Extract the Node.js source code which is used to compile packages with # native bindings nodeSources = runCommand "node-sources" {} '' @@ -183,7 +209,9 @@ let buildPhase = args.buildPhase or "true"; compositionScript = composePackage args; - passAsFile = [ "compositionScript" ]; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; installPhase = args.installPhase or '' # Create and enter a root node_modules/ folder @@ -192,6 +220,10 @@ let # Compose the package and all its dependencies source $compositionScriptPath + + # Pinpoint the versions of all dependencies to the ones that are actually being used + echo "pinpointing versions of dependencies..." + source $pinpointDependenciesScriptPath # Patch the shebangs of the bundled modules to prevent them from # calling executables outside the Nix store as much as possible @@ -254,12 +286,18 @@ let buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or []; includeScript = includeDependencies { inherit dependencies; }; - passAsFile = [ "includeScript" ]; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; buildCommand = '' mkdir -p $out/lib cd $out/lib source $includeScriptPath + + # Pinpoint the versions of all dependencies to the ones that are actually being used + echo "pinpointing versions of dependencies..." + source $pinpointDependenciesScriptPath # Create fake package.json to make the npm commands work properly cat > package.json < \"Yarn\"

"; + description = "📦🐈 Fast, reliable, and secure dependency management."; homepage = "https://github.com/yarnpkg/yarn#readme"; license = "BSD-2-Clause"; }; @@ -39792,12 +40632,12 @@ in (sources."lru-cache-4.0.2" // { dependencies = [ sources."pseudomap-1.0.2" - sources."yallist-2.0.0" + sources."yallist-2.1.2" ]; }) - (sources."which-1.2.12" // { + (sources."which-1.2.14" // { dependencies = [ - sources."isexe-1.1.2" + sources."isexe-2.0.0" ]; }) ]; @@ -39868,7 +40708,7 @@ in sources."object-assign-4.1.1" (sources."parse-json-2.2.0" // { dependencies = [ - (sources."error-ex-1.3.0" // { + (sources."error-ex-1.3.1" // { dependencies = [ sources."is-arrayish-0.2.1" ]; @@ -39881,7 +40721,7 @@ in ]; }) sources."read-all-stream-3.1.0" - (sources."readable-stream-2.2.3" // { + (sources."readable-stream-2.2.6" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -40018,11 +40858,11 @@ in }) ]; }) - (sources."request-2.79.0" // { + (sources."request-2.81.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" (sources."combined-stream-1.0.5" // { dependencies = [ sources."delayed-stream-1.0.0" @@ -40035,30 +40875,19 @@ in sources."asynckit-0.4.0" ]; }) - (sources."har-validator-2.0.6" // { + (sources."har-validator-4.2.1" // { dependencies = [ - (sources."commander-2.9.0" // { + (sources."ajv-4.11.5" // { dependencies = [ - sources."graceful-readlink-1.0.1" - ]; - }) - (sources."is-my-json-valid-2.16.0" // { - dependencies = [ - sources."generate-function-2.0.0" - (sources."generate-object-property-1.2.0" // { + sources."co-4.6.0" + (sources."json-stable-stringify-1.0.1" // { dependencies = [ - sources."is-property-1.0.2" + sources."jsonify-0.0.0" ]; }) - sources."jsonpointer-4.0.1" - sources."xtend-4.0.1" - ]; - }) - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" ]; }) + sources."har-schema-1.0.5" ]; }) (sources."hawk-3.1.3" // { @@ -40072,14 +40901,15 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.1" // { + (sources."jsprim-1.4.0" // { dependencies = [ + sources."assert-plus-1.0.0" sources."extsprintf-1.0.2" sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.2" // { + (sources."sshpk-1.11.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" @@ -40097,15 +40927,17 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.14" // { + (sources."mime-types-2.1.15" // { dependencies = [ - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.3.1" + sources."performance-now-0.2.0" + sources."qs-6.4.0" + sources."safe-buffer-5.0.1" sources."stringstream-0.0.5" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."uuid-3.0.1" ]; }) @@ -40137,9 +40969,9 @@ in }) sources."map-obj-1.0.1" sources."minimist-1.2.0" - (sources."normalize-package-data-2.3.5" // { + (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.2.0" + sources."hosted-git-info-2.4.1" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -40182,7 +41014,7 @@ in }) (sources."registry-url-3.1.0" // { dependencies = [ - (sources."rc-1.1.7" // { + (sources."rc-1.2.0" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -40203,7 +41035,7 @@ in dependencies = [ (sources."registry-auth-token-3.1.0" // { dependencies = [ - (sources."rc-1.1.7" // { + (sources."rc-1.2.0" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -40215,7 +41047,7 @@ in }) (sources."registry-url-3.1.0" // { dependencies = [ - (sources."rc-1.1.7" // { + (sources."rc-1.2.0" // { dependencies = [ sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -40261,7 +41093,7 @@ in sources."graceful-fs-4.1.11" (sources."parse-json-2.2.0" // { dependencies = [ - (sources."error-ex-1.3.0" // { + (sources."error-ex-1.3.1" // { dependencies = [ sources."is-arrayish-0.2.1" ]; @@ -40281,9 +41113,9 @@ in }) ]; }) - (sources."normalize-package-data-2.3.5" // { + (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.2.0" + sources."hosted-git-info-2.4.1" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -40363,7 +41195,7 @@ in }) (sources."tabtab-1.3.2" // { dependencies = [ - (sources."debug-2.6.1" // { + (sources."debug-2.6.3" // { dependencies = [ sources."ms-0.7.2" ]; @@ -40391,7 +41223,7 @@ in dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.2.3" // { + (sources."readable-stream-2.2.6" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -40456,7 +41288,7 @@ in (sources."are-we-there-yet-1.1.2" // { dependencies = [ sources."delegates-1.0.0" - (sources."readable-stream-2.2.3" // { + (sources."readable-stream-2.2.6" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -40620,7 +41452,7 @@ in }) (sources."yeoman-environment-1.6.6" // { dependencies = [ - (sources."debug-2.6.1" // { + (sources."debug-2.6.3" // { dependencies = [ sources."ms-0.7.2" ]; @@ -40694,7 +41526,7 @@ in dependencies = [ sources."inherits-2.0.3" sources."typedarray-0.0.6" - (sources."readable-stream-2.2.3" // { + (sources."readable-stream-2.2.6" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -40752,7 +41584,7 @@ in dependencies = [ (sources."through2-2.0.3" // { dependencies = [ - (sources."readable-stream-2.2.3" // { + (sources."readable-stream-2.2.6" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -40791,7 +41623,7 @@ in dependencies = [ (sources."first-chunk-stream-2.0.0" // { dependencies = [ - (sources."readable-stream-2.2.3" // { + (sources."readable-stream-2.2.6" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index dba0e9d82c2..08070fe0e5f 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.1.1. Do not edit! +# This file has been generated by node2nix 1.2.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -337,13 +337,13 @@ let sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; }; }; - "is-buffer-1.1.4" = { + "is-buffer-1.1.5" = { name = "is-buffer"; packageName = "is-buffer"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz"; - sha1 = "cfc86ccd5dc5a52fa80489111c6920c457e2d98b"; + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz"; + sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc"; }; }; "path-parse-1.0.5" = { @@ -418,13 +418,13 @@ let sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e"; }; }; - "which-1.2.12" = { + "which-1.2.14" = { name = "which"; packageName = "which"; - version = "1.2.12"; + version = "1.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.2.12.tgz"; - sha1 = "de67b5e450269f194909ef23ece4ebe416fa1192"; + url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz"; + sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5"; }; }; "parse-passwd-1.0.0" = { @@ -436,13 +436,13 @@ let sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; }; }; - "isexe-1.1.2" = { + "isexe-2.0.0" = { name = "isexe"; packageName = "isexe"; - version = "1.1.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz"; - sha1 = "36f3e22e60750920f5e7241a476a8c6a42275ad0"; + url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; }; }; "amdefine-1.0.1" = { @@ -517,13 +517,13 @@ let sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f"; }; }; - "azure-arm-cdn-1.0.2" = { + "azure-arm-cdn-1.0.3" = { name = "azure-arm-cdn"; packageName = "azure-arm-cdn"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.2.tgz"; - sha1 = "35eed81c93fb1b2fe1236b432c821a61bce6be96"; + url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.3.tgz"; + sha1 = "39db281679dcdd33cb6ce032383b192430476412"; }; }; "azure-arm-commerce-0.2.0" = { @@ -886,6 +886,15 @@ let sha1 = "5edeb1aee23c4fb541a6b70d692abef19669a2d3"; }; }; + "date-utils-1.2.21" = { + name = "date-utils"; + packageName = "date-utils"; + version = "1.2.21"; + src = fetchurl { + url = "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz"; + sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64"; + }; + }; "easy-table-0.0.1" = { name = "easy-table"; packageName = "easy-table"; @@ -967,6 +976,15 @@ let sha1 = "bd0a7040d426d7598d6c742ec8f875d0e88644a9"; }; }; + "jwt-decode-2.2.0" = { + name = "jwt-decode"; + packageName = "jwt-decode"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz"; + sha1 = "7d86bd56679f58ce6a84704a657dd392bba81a79"; + }; + }; "kuduscript-1.0.13" = { name = "kuduscript"; packageName = "kuduscript"; @@ -976,22 +994,31 @@ let sha1 = "c74349b2092608bb0f3dc827c516ef2fddb8238e"; }; }; - "ms-rest-1.15.5" = { - name = "ms-rest"; - packageName = "ms-rest"; - version = "1.15.5"; + "moment-2.18.1" = { + name = "moment"; + packageName = "moment"; + version = "2.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.5.tgz"; - sha1 = "b207a9c447f7fca3adca701feccc2c1907b1431d"; + url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz"; + sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"; }; }; - "ms-rest-azure-1.15.5" = { + "ms-rest-1.15.7" = { + name = "ms-rest"; + packageName = "ms-rest"; + version = "1.15.7"; + src = fetchurl { + url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.7.tgz"; + sha1 = "400515e05b1924889cb61a1ec6054290a68e1207"; + }; + }; + "ms-rest-azure-1.15.7" = { name = "ms-rest-azure"; packageName = "ms-rest-azure"; - version = "1.15.5"; + version = "1.15.7"; src = fetchurl { - url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.5.tgz"; - sha1 = "8fbb1366ecca18ce59010473dc0228b5a32c5611"; + url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.7.tgz"; + sha1 = "8bce09f053b1565dbaa8bd022ca40155c35b0fde"; }; }; "node-forge-0.6.23" = { @@ -1183,15 +1210,6 @@ let sha1 = "b3da19bd052431a97671d44a42634adf710b40c4"; }; }; - "date-utils-1.2.21" = { - name = "date-utils"; - packageName = "date-utils"; - version = "1.2.21"; - src = fetchurl { - url = "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz"; - sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64"; - }; - }; "jws-3.1.4" = { name = "jws"; packageName = "jws"; @@ -1480,13 +1498,13 @@ let sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; }; }; - "from-0.1.3" = { + "from-0.1.7" = { name = "from"; packageName = "from"; - version = "0.1.3"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/from/-/from-0.1.3.tgz"; - sha1 = "ef63ac2062ac32acf7862e0d40b44b896f22f3bc"; + url = "https://registry.npmjs.org/from/-/from-0.1.7.tgz"; + sha1 = "83c60afc58b9c56997007ed1a768b3ab303a44fe"; }; }; "map-stream-0.1.0" = { @@ -1912,13 +1930,13 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "mime-types-2.1.14" = { + "mime-types-2.1.15" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.14"; + version = "2.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz"; - sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz"; + sha1 = "a4ebf5064094569237b8cf70046776d09fc92aed"; }; }; "oauth-sign-0.8.2" = { @@ -1930,13 +1948,13 @@ let sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; }; }; - "qs-6.2.2" = { + "qs-6.2.3" = { name = "qs"; packageName = "qs"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.2.2.tgz"; - sha1 = "d506a5ad5b2cae1fd35c4f54ec182e267e3ef586"; + url = "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz"; + sha1 = "1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"; }; }; "stringstream-0.0.5" = { @@ -1975,13 +1993,13 @@ let sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; - "async-2.1.5" = { + "async-2.2.0" = { name = "async"; packageName = "async"; - version = "2.1.5"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.1.5.tgz"; - sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc"; + url = "https://registry.npmjs.org/async/-/async-2.2.0.tgz"; + sha1 = "c324eba010a237e4fbd55a12dee86367d5c0ef32"; }; }; "lodash-4.17.4" = { @@ -2191,22 +2209,31 @@ let sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; }; }; - "jsprim-1.3.1" = { + "jsprim-1.4.0" = { name = "jsprim"; packageName = "jsprim"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz"; - sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252"; + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz"; + sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918"; }; }; - "sshpk-1.10.2" = { + "sshpk-1.11.0" = { name = "sshpk"; packageName = "sshpk"; - version = "1.10.2"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz"; - sha1 = "d5a804ce22695515638e798dbe23273de070a5fa"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.11.0.tgz"; + sha1 = "2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77"; + }; + }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; }; "extsprintf-1.0.2" = { @@ -2245,15 +2272,6 @@ let sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; }; }; - "assert-plus-1.0.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; - }; - }; "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; @@ -2317,13 +2335,13 @@ let sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; }; }; - "mime-db-1.26.0" = { + "mime-db-1.27.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.26.0"; + version = "1.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz"; - sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz"; + sha1 = "820f572296bbd20ec25ed55e5b5de869e5436eb1"; }; }; "punycode-1.4.1" = { @@ -2416,13 +2434,13 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "readable-stream-2.2.3" = { + "readable-stream-2.2.6" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.2.3"; + version = "2.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.3.tgz"; - sha1 = "9cf49463985df016c8ae8813097a9293a9b33729"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.6.tgz"; + sha1 = "8b43aed76e71483938d12a8d46c6cf1a00b1f816"; }; }; "buffer-shims-1.0.0" = { @@ -2839,13 +2857,13 @@ let sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; - "normalize-package-data-2.3.5" = { + "normalize-package-data-2.3.6" = { name = "normalize-package-data"; packageName = "normalize-package-data"; - version = "2.3.5"; + version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz"; - sha1 = "8d924f142960e1777e7ffe170543631cc7cb02df"; + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.6.tgz"; + sha1 = "498fa420c96401f787402ba21e600def9f981fff"; }; }; "object-assign-4.1.1" = { @@ -2920,13 +2938,13 @@ let sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; - "hosted-git-info-2.2.0" = { + "hosted-git-info-2.4.1" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.2.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.2.0.tgz"; - sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5"; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.1.tgz"; + sha1 = "4b0445e41c004a8bd1337773a4ff790ca40318c8"; }; }; "is-builtin-module-1.0.0" = { @@ -3064,13 +3082,13 @@ let sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; }; }; - "error-ex-1.3.0" = { + "error-ex-1.3.1" = { name = "error-ex"; packageName = "error-ex"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz"; - sha1 = "e67b43f3e82c96ea3a584ffee0b9fc3325d802d9"; + url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz"; + sha1 = "f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"; }; }; "is-arrayish-0.2.1" = { @@ -3190,22 +3208,22 @@ let sha1 = "4088433b46b3b1ba259d78785d8e96f73ba02439"; }; }; - "q-1.4.1" = { + "q-1.5.0" = { name = "q"; packageName = "q"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/q/-/q-1.4.1.tgz"; - sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e"; + url = "https://registry.npmjs.org/q/-/q-1.5.0.tgz"; + sha1 = "dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"; }; }; - "debug-2.6.1" = { + "debug-2.6.3" = { name = "debug"; packageName = "debug"; - version = "2.6.1"; + version = "2.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz"; - sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351"; + url = "https://registry.npmjs.org/debug/-/debug-2.6.3.tgz"; + sha1 = "0f7eb8c30965ec08c72accfa0130c8b79984141d"; }; }; "ms-0.7.2" = { @@ -3532,13 +3550,13 @@ let sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2"; }; }; - "syntax-error-1.1.6" = { + "syntax-error-1.3.0" = { name = "syntax-error"; packageName = "syntax-error"; - version = "1.1.6"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.1.6.tgz"; - sha1 = "b4549706d386cc1c1dc7c2423f18579b6cade710"; + url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.3.0.tgz"; + sha1 = "1ed9266c4d40be75dc55bf9bb1cb77062bb96ca1"; }; }; "through2-2.0.3" = { @@ -3712,13 +3730,13 @@ let sha1 = "9988244874bf5ed4e28da95666dcd66ac8fc363a"; }; }; - "browserify-sign-4.0.0" = { + "browserify-sign-4.0.4" = { name = "browserify-sign"; packageName = "browserify-sign"; - version = "4.0.0"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.0.tgz"; - sha1 = "10773910c3c206d5420a46aad8694f820b85968f"; + url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz"; + sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"; }; }; "create-ecdh-4.0.0" = { @@ -3874,13 +3892,13 @@ let sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df"; }; }; - "parse-asn1-5.0.0" = { + "parse-asn1-5.1.0" = { name = "parse-asn1"; packageName = "parse-asn1"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.0.0.tgz"; - sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23"; + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz"; + sha1 = "37c4f9b7ed3ab65c74817b5f2480937fbf97c712"; }; }; "brorand-1.1.0" = { @@ -3973,22 +3991,22 @@ let sha1 = "fcea5edc704a4b3a8796cdca419c3a0afaf22df4"; }; }; - "astw-2.0.0" = { + "astw-2.2.0" = { name = "astw"; packageName = "astw"; - version = "2.0.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/astw/-/astw-2.0.0.tgz"; - sha1 = "08121ac8288d35611c0ceec663f6cd545604897d"; + url = "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz"; + sha1 = "7bd41784d32493987aeb239b6b4e1c57a873b917"; }; }; - "acorn-1.2.2" = { + "acorn-4.0.11" = { name = "acorn"; packageName = "acorn"; - version = "1.2.2"; + version = "4.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"; - sha1 = "c8ce27de0acc76d896d2b1fad3df588d9e82f014"; + url = "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz"; + sha1 = "edcda3bd937e7556410d42ed5860f67399c794c0"; }; }; "stream-splicer-2.0.0" = { @@ -4000,13 +4018,13 @@ let sha1 = "1b63be438a133e4b671cc1935197600175910d83"; }; }; - "detective-4.3.2" = { + "detective-4.5.0" = { name = "detective"; packageName = "detective"; - version = "4.3.2"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/detective/-/detective-4.3.2.tgz"; - sha1 = "77697e2e7947ac3fe7c8e26a6d6f115235afa91c"; + url = "https://registry.npmjs.org/detective/-/detective-4.5.0.tgz"; + sha1 = "6e5a8c6b26e6c7a254b1c6b6d7490d98ec91edd1"; }; }; "stream-combiner2-1.1.1" = { @@ -4018,15 +4036,6 @@ let sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; }; }; - "acorn-3.3.0" = { - name = "acorn"; - packageName = "acorn"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz"; - sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; - }; - }; "path-platform-0.11.15" = { name = "path-platform"; packageName = "path-platform"; @@ -4099,15 +4108,6 @@ let sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43"; }; }; - "acorn-2.7.0" = { - name = "acorn"; - packageName = "acorn"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz"; - sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7"; - }; - }; "punycode-1.3.2" = { name = "punycode"; packageName = "punycode"; @@ -4612,13 +4612,13 @@ let sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; }; }; - "parse-torrent-5.8.1" = { + "parse-torrent-5.8.2" = { name = "parse-torrent"; packageName = "parse-torrent"; - version = "5.8.1"; + version = "5.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.1.tgz"; - sha1 = "29452b9eae4a1b497f12e580c1cf6fa9682e5c68"; + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.2.tgz"; + sha1 = "09f02ca43ec2d885d1460aacb0fb50c79b3c49f9"; }; }; "pump-0.3.5" = { @@ -5071,13 +5071,13 @@ let sha1 = "a862e018e3fb1ea2ec3fce5d55605cf57f247371"; }; }; - "ip-1.1.4" = { + "ip-1.1.5" = { name = "ip"; packageName = "ip"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/ip/-/ip-1.1.4.tgz"; - sha1 = "de8247ffef940451832550fba284945e6e039bfb"; + url = "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz"; + sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; }; }; "magnet-uri-4.2.3" = { @@ -5314,13 +5314,13 @@ let sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9"; }; }; - "simple-peer-6.4.3" = { + "simple-peer-6.4.4" = { name = "simple-peer"; packageName = "simple-peer"; - version = "6.4.3"; + version = "6.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.4.3.tgz"; - sha1 = "f487b381e0fe0874bff1020026001bbf4579c20a"; + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.4.4.tgz"; + sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3"; }; }; "simple-websocket-4.3.1" = { @@ -5341,22 +5341,22 @@ let sha1 = "420b3a9ee1c46854919b4a2aeac65c43fa50597b"; }; }; - "ws-1.1.2" = { + "ws-1.1.4" = { name = "ws"; packageName = "ws"; - version = "1.1.2"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz"; - sha1 = "8a244fa052401e08c9886cf44a85189e1fd4067f"; + url = "https://registry.npmjs.org/ws/-/ws-1.1.4.tgz"; + sha1 = "57f40d036832e5f5055662a397c4de76ed66bf61"; }; }; - "ipaddr.js-1.2.0" = { + "ipaddr.js-1.3.0" = { name = "ipaddr.js"; packageName = "ipaddr.js"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.2.0.tgz"; - sha1 = "8aba49c9192799585bdd643e0ccb50e8ae777ba4"; + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.3.0.tgz"; + sha1 = "1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec"; }; }; "get-browser-rtc-1.0.2" = { @@ -5368,13 +5368,13 @@ let sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9"; }; }; - "ws-2.1.0" = { + "ws-2.2.2" = { name = "ws"; packageName = "ws"; - version = "2.1.0"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-2.1.0.tgz"; - sha1 = "b24eaed9609f8632dd51e3f7698619a90fddcc92"; + url = "https://registry.npmjs.org/ws/-/ws-2.2.2.tgz"; + sha1 = "aa26daf39c52b20ed716e3447f8641494a726b01"; }; }; "ultron-1.1.0" = { @@ -5530,6 +5530,15 @@ let sha1 = "9b361dee95a931640e6d504e05609a8fc3ac45d2"; }; }; + "node-uuid-1.4.8" = { + name = "node-uuid"; + packageName = "node-uuid"; + version = "1.4.8"; + src = fetchurl { + url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz"; + sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907"; + }; + }; "cookie-jar-0.2.0" = { name = "cookie-jar"; packageName = "cookie-jar"; @@ -5953,13 +5962,13 @@ let sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c"; }; }; - "init-package-json-1.9.4" = { + "init-package-json-1.9.5" = { name = "init-package-json"; packageName = "init-package-json"; - version = "1.9.4"; + version = "1.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.4.tgz"; - sha1 = "b4053d0b40f0cf842a41966937cb3dc0f534e856"; + url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.5.tgz"; + sha1 = "7d4d64a264dc76c1f1f557cbbe824978bf10cd09"; }; }; "nopt-3.0.6" = { @@ -5971,13 +5980,13 @@ let sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; }; }; - "npm-2.15.11" = { + "npm-2.15.12" = { name = "npm"; packageName = "npm"; - version = "2.15.11"; + version = "2.15.12"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-2.15.11.tgz"; - sha1 = "350588fba9cd8d384cf9a6e8dc0fef0f94992b7c"; + url = "https://registry.npmjs.org/npm/-/npm-2.15.12.tgz"; + sha1 = "df7c3ed5a277c3f9d4b5d819b05311d10a200ae6"; }; }; "opener-1.4.1" = { @@ -6079,6 +6088,15 @@ let sha1 = "c18d24ef5091174a497f318cd24b026a25cddab4"; }; }; + "acorn-1.2.2" = { + name = "acorn"; + packageName = "acorn"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"; + sha1 = "c8ce27de0acc76d896d2b1fad3df588d9e82f014"; + }; + }; "foreach-2.0.5" = { name = "foreach"; packageName = "foreach"; @@ -6124,22 +6142,31 @@ let sha1 = "498905a593bf47cc2d9e7f738372bbf7696c7f26"; }; }; - "shelljs-0.7.6" = { + "shelljs-0.7.7" = { name = "shelljs"; packageName = "shelljs"; - version = "0.7.6"; + version = "0.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.6.tgz"; - sha1 = "379cccfb56b91c8601e4793356eb5382924de9ad"; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.7.tgz"; + sha1 = "b2f5c77ef97148f4b4f6e22682e10bba8667cff1"; }; }; - "interpret-1.0.1" = { + "q-1.4.1" = { + name = "q"; + packageName = "q"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/q/-/q-1.4.1.tgz"; + sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e"; + }; + }; + "interpret-1.0.2" = { name = "interpret"; packageName = "interpret"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-1.0.1.tgz"; - sha1 = "d579fb7f693b858004947af39fa0db49f795602c"; + url = "https://registry.npmjs.org/interpret/-/interpret-1.0.2.tgz"; + sha1 = "f4f623f0bb7122f15f5717c8e254b8161b5c5b2d"; }; }; "rechoir-0.6.2" = { @@ -6178,13 +6205,13 @@ let sha1 = "cceb121ecc9d09c52d7ad0c3350ea93ddd402bc3"; }; }; - "express-4.14.1" = { + "express-4.15.2" = { name = "express"; packageName = "express"; - version = "4.14.1"; + version = "4.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.14.1.tgz"; - sha1 = "646c237f766f148c2120aff073817b9e4d7e0d33"; + url = "https://registry.npmjs.org/express/-/express-4.15.2.tgz"; + sha1 = "af107fc148504457f2dca9a6f2571d7129b97b35"; }; }; "accepts-1.3.3" = { @@ -6205,13 +6232,13 @@ let sha1 = "d5b680a165b6201739acb611542aabc2d8ceb070"; }; }; - "compressible-2.0.9" = { + "compressible-2.0.10" = { name = "compressible"; packageName = "compressible"; - version = "2.0.9"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.9.tgz"; - sha1 = "6daab4e2b599c2770dd9e21e7a891b1c5a755425"; + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.10.tgz"; + sha1 = "feda1c7f7617912732b29bf8cf26252a20b9eecd"; }; }; "debug-2.2.0" = { @@ -6232,13 +6259,13 @@ let sha1 = "928f5d0f470d49342651ea6794b0857c100693f7"; }; }; - "vary-1.1.0" = { + "vary-1.1.1" = { name = "vary"; packageName = "vary"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz"; - sha1 = "e1e5affbbd16ae768dd2674394b9ad3022653140"; + url = "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz"; + sha1 = "67535ebb694c1d52257457984665323f587e8d37"; }; }; "negotiator-0.6.1" = { @@ -6304,6 +6331,15 @@ let sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; }; }; + "debug-2.6.1" = { + name = "debug"; + packageName = "debug"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz"; + sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351"; + }; + }; "depd-1.1.0" = { name = "depd"; packageName = "depd"; @@ -6331,31 +6367,31 @@ let sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; }; }; - "etag-1.7.0" = { + "etag-1.8.0" = { name = "etag"; packageName = "etag"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz"; - sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8"; + url = "https://registry.npmjs.org/etag/-/etag-1.8.0.tgz"; + sha1 = "6f631aef336d6c46362b51764044ce216be3c051"; }; }; - "finalhandler-0.5.1" = { + "finalhandler-1.0.1" = { name = "finalhandler"; packageName = "finalhandler"; - version = "0.5.1"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz"; - sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd"; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.1.tgz"; + sha1 = "bcd15d1689c0e5ed729b6f7f541a6df984117db8"; }; }; - "fresh-0.3.0" = { + "fresh-0.5.0" = { name = "fresh"; packageName = "fresh"; - version = "0.3.0"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz"; - sha1 = "651f838e22424e7566de161d8358caa199f83d4f"; + url = "https://registry.npmjs.org/fresh/-/fresh-0.5.0.tgz"; + sha1 = "f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"; }; }; "merge-descriptors-1.0.1" = { @@ -6403,40 +6439,49 @@ let sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; }; }; - "proxy-addr-1.1.3" = { + "proxy-addr-1.1.4" = { name = "proxy-addr"; packageName = "proxy-addr"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.3.tgz"; - sha1 = "dc97502f5722e888467b3fa2297a7b1ff47df074"; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.4.tgz"; + sha1 = "27e545f6960a44a627d9b44467e35c1b6b4ce2f3"; }; }; - "qs-6.2.0" = { + "qs-6.4.0" = { name = "qs"; packageName = "qs"; - version = "6.2.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz"; - sha1 = "3b7848c03c2dece69a9522b0fae8c4126d745f3b"; + url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; + sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; }; }; - "send-0.14.2" = { + "send-0.15.1" = { name = "send"; packageName = "send"; - version = "0.14.2"; + version = "0.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.14.2.tgz"; - sha1 = "39b0438b3f510be5dc6f667a11f71689368cdeef"; + url = "https://registry.npmjs.org/send/-/send-0.15.1.tgz"; + sha1 = "8a02354c26e6f5cca700065f5f0cdeba90ec7b5f"; }; }; - "serve-static-1.11.2" = { + "serve-static-1.12.1" = { name = "serve-static"; packageName = "serve-static"; - version = "1.11.2"; + version = "1.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.11.2.tgz"; - sha1 = "2cf9889bd4435a320cc36895c9aa57bd662e6ac7"; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.12.1.tgz"; + sha1 = "7443a965e3ced647aceb5639fa06bf4d1bbe0039"; + }; + }; + "setprototypeof-1.0.3" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz"; + sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04"; }; }; "type-is-1.6.14" = { @@ -6493,22 +6538,13 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; - "http-errors-1.5.1" = { + "http-errors-1.6.1" = { name = "http-errors"; packageName = "http-errors"; - version = "1.5.1"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz"; - sha1 = "788c0d2c1de2c81b9e6e8c01843b6b97eb920750"; - }; - }; - "setprototypeof-1.0.2" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz"; - sha1 = "81a552141ec104b88e89ce383103ad5c66564d08"; + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz"; + sha1 = "5f8b8ed98aca545656bf572997387f904a722257"; }; }; "media-typer-0.3.0" = { @@ -6538,13 +6574,13 @@ let sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d"; }; }; - "npm-package-arg-4.2.0" = { + "npm-package-arg-4.2.1" = { name = "npm-package-arg"; packageName = "npm-package-arg"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.2.0.tgz"; - sha1 = "809bc61cabf54bd5ff94f6165c89ba8ee88c115c"; + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.2.1.tgz"; + sha1 = "593303fdea85f7c422775f17f9eb7670f680e3ec"; }; }; "promzard-0.3.0" = { @@ -6556,22 +6592,22 @@ let sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"; }; }; - "read-package-json-2.0.4" = { + "read-package-json-2.0.5" = { name = "read-package-json"; packageName = "read-package-json"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.4.tgz"; - sha1 = "61ed1b2256ea438d8008895090be84b8e799c853"; + url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.5.tgz"; + sha1 = "f93a64e641529df68a08c64de46389e8a3f88845"; }; }; - "validate-npm-package-name-2.2.2" = { + "validate-npm-package-name-3.0.0" = { name = "validate-npm-package-name"; packageName = "validate-npm-package-name"; - version = "2.2.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz"; - sha1 = "f65695b22f7324442019a3c7fa39a6e7fd299085"; + url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz"; + sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; }; }; "json-parse-helpfulerror-1.0.3" = { @@ -6592,13 +6628,13 @@ let sha1 = "dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa"; }; }; - "builtins-0.0.7" = { + "builtins-1.0.3" = { name = "builtins"; packageName = "builtins"; - version = "0.0.7"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz"; - sha1 = "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a"; + url = "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz"; + sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88"; }; }; "abbrev-1.1.0" = { @@ -6736,31 +6772,31 @@ let sha1 = "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742"; }; }; - "fs-vacuum-1.2.9" = { + "fs-vacuum-1.2.10" = { name = "fs-vacuum"; packageName = "fs-vacuum"; - version = "1.2.9"; + version = "1.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.9.tgz"; - sha1 = "4f90193ab8ea02890995bcd4e804659a5d366b2d"; + url = "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.10.tgz"; + sha1 = "b7629bec07a4031a2548fdf99f5ecf1cc8b31e36"; }; }; - "fs-write-stream-atomic-1.0.8" = { + "fs-write-stream-atomic-1.0.10" = { name = "fs-write-stream-atomic"; packageName = "fs-write-stream-atomic"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.8.tgz"; - sha1 = "e49aaddf288f87d46ff9e882f216a13abc40778b"; - }; - }; - "fstream-1.0.10" = { - name = "fstream"; - packageName = "fstream"; version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/fstream/-/fstream-1.0.10.tgz"; - sha1 = "604e8a92fe26ffd9f6fae30399d4984e1ab22822"; + url = "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz"; + sha1 = "b47df53493ef911df75731e70a9ded0189db40c9"; + }; + }; + "fstream-1.0.11" = { + name = "fstream"; + packageName = "fstream"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz"; + sha1 = "5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"; }; }; "fstream-npm-1.1.1" = { @@ -6826,13 +6862,13 @@ let sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e"; }; }; - "node-gyp-3.4.0" = { + "node-gyp-3.6.0" = { name = "node-gyp"; packageName = "node-gyp"; - version = "3.4.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.4.0.tgz"; - sha1 = "dda558393b3ecbbe24c9e6b8703c71194c63fa36"; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.0.tgz"; + sha1 = "7474f63a3a0501161dda0b6341f022f14c423fa6"; }; }; "normalize-git-url-3.0.2" = { @@ -7015,6 +7051,15 @@ let sha1 = "f29cebf01df517912bb58ff9c4e50fde8e33320d"; }; }; + "validate-npm-package-name-2.2.2" = { + name = "validate-npm-package-name"; + packageName = "validate-npm-package-name"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz"; + sha1 = "f65695b22f7324442019a3c7fa39a6e7fd299085"; + }; + }; "write-file-atomic-1.1.4" = { name = "write-file-atomic"; packageName = "write-file-atomic"; @@ -7096,76 +7141,31 @@ let sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; }; }; - "yallist-2.0.0" = { + "yallist-2.1.2" = { name = "yallist"; packageName = "yallist"; - version = "2.0.0"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz"; - sha1 = "306c543835f09ee1a4cb23b7bce9ab341c91cdd4"; + url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; + sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; }; }; - "path-array-1.0.1" = { - name = "path-array"; - packageName = "path-array"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-array/-/path-array-1.0.1.tgz"; - sha1 = "7e2f0f35f07a2015122b868b7eac0eb2c4fec271"; - }; - }; - "array-index-1.0.0" = { - name = "array-index"; - packageName = "array-index"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-index/-/array-index-1.0.0.tgz"; - sha1 = "ec56a749ee103e4e08c790b9c353df16055b97f9"; - }; - }; - "es6-symbol-3.1.0" = { - name = "es6-symbol"; - packageName = "es6-symbol"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.0.tgz"; - sha1 = "94481c655e7a7cad82eba832d97d5433496d7ffa"; - }; - }; - "d-0.1.1" = { - name = "d"; - packageName = "d"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/d/-/d-0.1.1.tgz"; - sha1 = "da184c535d18d8ee7ba2aa229b914009fae11309"; - }; - }; - "es5-ext-0.10.12" = { - name = "es5-ext"; - packageName = "es5-ext"; - version = "0.10.12"; - src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.12.tgz"; - sha1 = "aa84641d4db76b62abba5e45fd805ecbab140047"; - }; - }; - "es6-iterator-2.0.0" = { - name = "es6-iterator"; - packageName = "es6-iterator"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.0.tgz"; - sha1 = "bd968567d61635e33c0b80727613c9cb4b096bac"; - }; - }; - "request-2.79.0" = { + "request-2.81.0" = { name = "request"; packageName = "request"; - version = "2.79.0"; + version = "2.81.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz"; - sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de"; + url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; + sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; + }; + }; + "caseless-0.12.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; "form-data-2.1.2" = { @@ -7177,13 +7177,31 @@ let sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4"; }; }; - "qs-6.3.1" = { - name = "qs"; - packageName = "qs"; - version = "6.3.1"; + "har-validator-4.2.1" = { + name = "har-validator"; + packageName = "har-validator"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.3.1.tgz"; - sha1 = "918c0b3bcd36679772baf135b1acb4c1651ed79d"; + url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; + sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; + }; + }; + "performance-now-0.2.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz"; + sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; + }; + }; + "tunnel-agent-0.6.0" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; }; }; "asynckit-0.4.0" = { @@ -7195,6 +7213,42 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; + "ajv-4.11.5" = { + name = "ajv"; + packageName = "ajv"; + version = "4.11.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-4.11.5.tgz"; + sha1 = "b6ee74657b993a01dce44b7944d56f485828d5bd"; + }; + }; + "har-schema-1.0.5" = { + name = "har-schema"; + packageName = "har-schema"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"; + sha1 = "d263135f43307c02c602afc8fe95970c0151369e"; + }; + }; + "co-4.6.0" = { + name = "co"; + packageName = "co"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; + sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; + }; + }; + "json-stable-stringify-1.0.1" = { + name = "json-stable-stringify"; + packageName = "json-stable-stringify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; + sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; + }; + }; "are-we-there-yet-1.1.2" = { name = "are-we-there-yet"; packageName = "are-we-there-yet"; @@ -7285,6 +7339,15 @@ let sha1 = "a7c216d267545169637b3b6edc6ca9119e2ff93f"; }; }; + "builtins-0.0.7" = { + name = "builtins"; + packageName = "builtins"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz"; + sha1 = "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a"; + }; + }; "bl-0.9.5" = { name = "bl"; packageName = "bl"; @@ -7771,13 +7834,13 @@ let sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa"; }; }; - "rc-1.1.7" = { + "rc-1.2.0" = { name = "rc"; packageName = "rc"; - version = "1.1.7"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/rc/-/rc-1.1.7.tgz"; - sha1 = "c5ea564bb07aff9fd3a5b32e906c1d3a65940fea"; + url = "https://registry.npmjs.org/rc/-/rc-1.2.0.tgz"; + sha1 = "c7de973b7b46297c041366b2fd3d2363b1697c66"; }; }; "strip-json-comments-2.0.1" = { @@ -7789,13 +7852,13 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; - "clone-2.1.0" = { + "clone-2.1.1" = { name = "clone"; packageName = "clone"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-2.1.0.tgz"; - sha1 = "9c715bfbd39aa197c8ee0f8e65c3912ba34f8cd6"; + url = "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz"; + sha1 = "d217d1e961118e3ac9a4b8bba3285553bf647cdb"; }; }; "parserlib-1.1.1" = { @@ -8459,13 +8522,13 @@ let sha1 = "45221ee429f7ee1e5035be3f51533f1cdfd29884"; }; }; - "cors-2.8.1" = { + "cors-2.8.3" = { name = "cors"; packageName = "cors"; - version = "2.8.1"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/cors/-/cors-2.8.1.tgz"; - sha1 = "6181aa56abb45a2825be3304703747ae4e9d2383"; + url = "https://registry.npmjs.org/cors/-/cors-2.8.3.tgz"; + sha1 = "4cf78e1d23329a7496b2fc2225b77ca5bb5eb802"; }; }; "docker-parse-image-3.0.1" = { @@ -8477,13 +8540,13 @@ let sha1 = "33dc69291eac3414f84871f2d59d77b6f6948be4"; }; }; - "end-of-stream-1.1.0" = { + "end-of-stream-1.4.0" = { name = "end-of-stream"; packageName = "end-of-stream"; - version = "1.1.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz"; - sha1 = "e9353258baa9108965efc41cb0ef8ade2f3cfb07"; + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz"; + sha1 = "7a90d833efda6cfa6eac0f4949dbb0fad3a63206"; }; }; "from2-1.3.0" = { @@ -9152,13 +9215,13 @@ let sha1 = "027620bee567a88c32561574e7fd0801d33118e4"; }; }; - "doctrine-1.5.0" = { + "doctrine-2.0.0" = { name = "doctrine"; packageName = "doctrine"; - version = "1.5.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz"; - sha1 = "379dce730f6166f76cefa4e6707a159b02c5a6fa"; + url = "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz"; + sha1 = "c73d8d2909d22291e1a007a395804da8b665fe63"; }; }; "escope-3.6.0" = { @@ -9179,6 +9242,15 @@ let sha1 = "41656fa5628e042878025ef467e78f125cb86e1d"; }; }; + "esquery-1.0.0" = { + name = "esquery"; + packageName = "esquery"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz"; + sha1 = "cfba8b57d7fba93f17298a8a006a04cda13d80fa"; + }; + }; "estraverse-4.2.0" = { name = "estraverse"; packageName = "estraverse"; @@ -9206,22 +9278,22 @@ let sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; }; }; - "globals-9.16.0" = { + "globals-9.17.0" = { name = "globals"; packageName = "globals"; - version = "9.16.0"; + version = "9.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-9.16.0.tgz"; - sha1 = "63e903658171ec2d9f51b1d31de5e2b8dc01fb80"; + url = "https://registry.npmjs.org/globals/-/globals-9.17.0.tgz"; + sha1 = "0c0ca696d9b9bb694d2e5470bd37777caad50286"; }; }; - "ignore-3.2.4" = { + "ignore-3.2.6" = { name = "ignore"; packageName = "ignore"; - version = "3.2.4"; + version = "3.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-3.2.4.tgz"; - sha1 = "4055e03596729a8fabe45a43c100ad5ed815c4e8"; + url = "https://registry.npmjs.org/ignore/-/ignore-3.2.6.tgz"; + sha1 = "26e8da0644be0bb4cb39516f6c79f0e0f4ffe48c"; }; }; "inquirer-0.12.0" = { @@ -9242,22 +9314,13 @@ let sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62"; }; }; - "js-yaml-3.8.1" = { + "js-yaml-3.8.2" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.8.1"; + version = "3.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.1.tgz"; - sha1 = "782ba50200be7b9e5a8537001b7804db3ad02628"; - }; - }; - "json-stable-stringify-1.0.1" = { - name = "json-stable-stringify"; - packageName = "json-stable-stringify"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; - sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.2.tgz"; + sha1 = "02d3e2c0f6beab20248d412c352203827d786721"; }; }; "levn-0.3.0" = { @@ -9332,22 +9395,22 @@ let sha1 = "08e9f132484a2c45a30907e9dc4d5567b7f114d7"; }; }; - "es6-map-0.1.4" = { + "es6-map-0.1.5" = { name = "es6-map"; packageName = "es6-map"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.4.tgz"; - sha1 = "a34b147be224773a4d7da8072794cefa3632b897"; + url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz"; + sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0"; }; }; - "es6-weak-map-2.0.1" = { + "es6-weak-map-2.0.2" = { name = "es6-weak-map"; packageName = "es6-weak-map"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.1.tgz"; - sha1 = "0d2bbd8827eb5fb4ba8f97fbfea50d43db21ea81"; + url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz"; + sha1 = "5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"; }; }; "esrecurse-4.1.0" = { @@ -9359,22 +9422,58 @@ let sha1 = "4713b6536adf7f2ac4f327d559e7756bff648220"; }; }; - "es6-set-0.1.4" = { - name = "es6-set"; - packageName = "es6-set"; - version = "0.1.4"; + "d-1.0.0" = { + name = "d"; + packageName = "d"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.4.tgz"; - sha1 = "9516b6761c2964b92ff479456233a247dc707ce8"; + url = "https://registry.npmjs.org/d/-/d-1.0.0.tgz"; + sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f"; }; }; - "event-emitter-0.3.4" = { + "es5-ext-0.10.15" = { + name = "es5-ext"; + packageName = "es5-ext"; + version = "0.10.15"; + src = fetchurl { + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.15.tgz"; + sha1 = "c330a5934c1ee21284a7c081a86e5fd937c91ea6"; + }; + }; + "es6-iterator-2.0.1" = { + name = "es6-iterator"; + packageName = "es6-iterator"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz"; + sha1 = "8e319c9f0453bf575d374940a655920e59ca5512"; + }; + }; + "es6-set-0.1.5" = { + name = "es6-set"; + packageName = "es6-set"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz"; + sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1"; + }; + }; + "es6-symbol-3.1.1" = { + name = "es6-symbol"; + packageName = "es6-symbol"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz"; + sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"; + }; + }; + "event-emitter-0.3.5" = { name = "event-emitter"; packageName = "event-emitter"; - version = "0.3.4"; + version = "0.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.4.tgz"; - sha1 = "8d63ddfb4cfe1fae3b32ca265c4c720222080bb5"; + url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz"; + sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; }; }; "estraverse-4.1.1" = { @@ -9404,6 +9503,15 @@ let sha1 = "afdf9488fb1ecefc8348f6fb22f464e32a58b36b"; }; }; + "acorn-3.3.0" = { + name = "acorn"; + packageName = "acorn"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz"; + sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; + }; + }; "flat-cache-1.2.2" = { name = "flat-cache"; packageName = "flat-cache"; @@ -9620,15 +9728,6 @@ let sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; }; }; - "ajv-4.11.3" = { - name = "ajv"; - packageName = "ajv"; - version = "4.11.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.11.3.tgz"; - sha1 = "ce30bdb90d1254f762c75af915fb3a63e7183d22"; - }; - }; "ajv-keywords-1.5.1" = { name = "ajv-keywords"; packageName = "ajv-keywords"; @@ -9656,15 +9755,6 @@ let sha1 = "635c5436cc72a6e0c387ceca278d4e2eec52687e"; }; }; - "co-4.6.0" = { - name = "co"; - packageName = "co"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; - sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; - }; - }; "is-fullwidth-code-point-2.0.0" = { name = "is-fullwidth-code-point"; packageName = "is-fullwidth-code-point"; @@ -9962,13 +10052,13 @@ let sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0"; }; }; - "normalize-path-2.0.1" = { + "normalize-path-2.1.1" = { name = "normalize-path"; packageName = "normalize-path"; - version = "2.0.1"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz"; - sha1 = "47886ac1662760d4261b7d979d241709d3ce3f7a"; + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"; + sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; }; }; "object.omit-2.0.1" = { @@ -10079,6 +10169,15 @@ let sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"; }; }; + "remove-trailing-separator-1.0.1" = { + name = "remove-trailing-separator"; + packageName = "remove-trailing-separator"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz"; + sha1 = "615ebb96af559552d4bf4057c8436d486ab63cc4"; + }; + }; "for-own-0.1.5" = { name = "for-own"; packageName = "for-own"; @@ -10097,13 +10196,13 @@ let sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; }; }; - "for-in-1.0.1" = { + "for-in-1.0.2" = { name = "for-in"; packageName = "for-in"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/for-in/-/for-in-1.0.1.tgz"; - sha1 = "d6c3e3798ceaaa301047b109dedf1b1ae37a0efa"; + url = "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"; + sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; }; }; "glob-base-0.3.0" = { @@ -10160,13 +10259,22 @@ let sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"; }; }; - "node-pre-gyp-0.6.33" = { + "node-pre-gyp-0.6.34" = { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.6.33"; + version = "0.6.34"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.33.tgz"; - sha1 = "640ac55198f6a925972e0c16c4ac26a034d5ecc9"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.34.tgz"; + sha1 = "94ad1c798a11d7fc67381b50d47f8cc18d9799f7"; + }; + }; + "nopt-4.0.1" = { + name = "nopt"; + packageName = "nopt"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz"; + sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; }; }; "npmlog-4.0.2" = { @@ -10178,13 +10286,13 @@ let sha1 = "d03950e0e78ce1527ba26d2a7592e9348ac3e75f"; }; }; - "tar-pack-3.3.0" = { + "tar-pack-3.4.0" = { name = "tar-pack"; packageName = "tar-pack"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.3.0.tgz"; - sha1 = "30931816418f55afc4d21775afdd6720cee45dae"; + url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz"; + sha1 = "23be2d7f671a8339376cbdb0b8fe3fdebf317984"; }; }; "console-control-strings-1.1.0" = { @@ -10313,6 +10421,15 @@ let sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759"; }; }; + "lodash.groupby-4.6.0" = { + name = "lodash.groupby"; + packageName = "lodash.groupby"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz"; + sha1 = "0b08a1dcf68397c397855c3239783832df7403d1"; + }; + }; "minilog-2.0.8" = { name = "minilog"; packageName = "minilog"; @@ -10322,6 +10439,15 @@ let sha1 = "21ffdc429be2b50cb361df990a40a7731288e935"; }; }; + "simple-git-1.69.0" = { + name = "simple-git"; + packageName = "simple-git"; + version = "1.69.0"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-git/-/simple-git-1.69.0.tgz"; + sha1 = "e86ead16abfc273dca9ae2bd51e5eb3c0122c177"; + }; + }; "tabtab-git+https://github.com/mixu/node-tabtab.git" = { name = "tabtab"; packageName = "tabtab"; @@ -10449,13 +10575,13 @@ let sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7"; }; }; - "uglify-js-2.7.5" = { + "uglify-js-2.8.20" = { name = "uglify-js"; packageName = "uglify-js"; - version = "2.7.5"; + version = "2.8.20"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz"; - sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.20.tgz"; + sha1 = "be87100fbc18de3876ed606e9d24b4568311cecf"; }; }; "void-elements-2.0.1" = { @@ -10494,6 +10620,15 @@ let sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b"; }; }; + "acorn-2.7.0" = { + name = "acorn"; + packageName = "acorn"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz"; + sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7"; + }; + }; "is-promise-2.1.0" = { name = "is-promise"; packageName = "is-promise"; @@ -10665,13 +10800,13 @@ let sha1 = "dcec03f55dca9b7aa3e5b04f21817eb56e63588a"; }; }; - "v8flags-2.0.11" = { + "v8flags-2.0.12" = { name = "v8flags"; packageName = "v8flags"; - version = "2.0.11"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/v8flags/-/v8flags-2.0.11.tgz"; - sha1 = "bca8f30f0d6d60612cc2c00641e6962d42ae6881"; + url = "https://registry.npmjs.org/v8flags/-/v8flags-2.0.12.tgz"; + sha1 = "73235d9f7176f8e8833fb286795445f7938d84e5"; }; }; "vinyl-fs-0.3.14" = { @@ -11358,13 +11493,13 @@ let sha1 = "1fddad938aae1263ce138680be1b3f591c0ab41c"; }; }; - "eventemitter3-2.0.2" = { + "eventemitter3-2.0.3" = { name = "eventemitter3"; packageName = "eventemitter3"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.2.tgz"; - sha1 = "20ce4891909ce9f35b088c94fab40e2c96f473ac"; + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz"; + sha1 = "b5e1079b59fb5e1ba2771c0a993be060a58c99ba"; }; }; "csslint-0.10.0" = { @@ -11592,22 +11727,22 @@ let sha1 = "22817534f24bfa4950c34d532d48ecbc621b8c14"; }; }; - "bluebird-3.4.7" = { + "bluebird-3.5.0" = { name = "bluebird"; packageName = "bluebird"; - version = "3.4.7"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz"; - sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3"; + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz"; + sha1 = "791420d7f551eea2897453a8a77653f96606d67c"; }; }; - "body-parser-1.16.1" = { + "body-parser-1.17.1" = { name = "body-parser"; packageName = "body-parser"; - version = "1.16.1"; + version = "1.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.16.1.tgz"; - sha1 = "51540d045adfa7a0c6995a014bb6b1ed9b802329"; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.17.1.tgz"; + sha1 = "75b3bc98ddd6e7e0d8ffe750dfaca5c66993fa47"; }; }; "combine-lists-1.0.1" = { @@ -11718,13 +11853,13 @@ let sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"; }; }; - "useragent-2.1.12" = { + "useragent-2.1.13" = { name = "useragent"; packageName = "useragent"; - version = "2.1.12"; + version = "2.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/useragent/-/useragent-2.1.12.tgz"; - sha1 = "aa7da6cdc48bdc37ba86790871a7321d64edbaa2"; + url = "https://registry.npmjs.org/useragent/-/useragent-2.1.13.tgz"; + sha1 = "bba43e8aa24d5ceb83c2937473e102e21df74c10"; }; }; "bytes-2.4.0" = { @@ -11745,15 +11880,6 @@ let sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb"; }; }; - "qs-6.2.1" = { - name = "qs"; - packageName = "qs"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz"; - sha1 = "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625"; - }; - }; "raw-body-2.2.0" = { name = "raw-body"; packageName = "raw-body"; @@ -11934,6 +12060,15 @@ let sha1 = "937b079f0007d0893ec56d46cb220b8cb435220a"; }; }; + "ws-1.1.2" = { + name = "ws"; + packageName = "ws"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz"; + sha1 = "8a244fa052401e08c9886cf44a85189e1fd4067f"; + }; + }; "after-0.8.2" = { name = "after"; packageName = "after"; @@ -12204,6 +12339,24 @@ let sha1 = "d77d32fa98e38c2f41ae85e9278e0e0e6ba1022c"; }; }; + "etag-1.7.0" = { + name = "etag"; + packageName = "etag"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz"; + sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8"; + }; + }; + "fresh-0.3.0" = { + name = "fresh"; + packageName = "fresh"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz"; + sha1 = "651f838e22424e7566de161d8358caa199f83d4f"; + }; + }; "merge-descriptors-1.0.0" = { name = "merge-descriptors"; packageName = "merge-descriptors"; @@ -12321,13 +12474,13 @@ let sha1 = "197e22cdebd4198585e8694ef6786197b91ed942"; }; }; - "method-override-2.3.7" = { + "method-override-2.3.8" = { name = "method-override"; packageName = "method-override"; - version = "2.3.7"; + version = "2.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/method-override/-/method-override-2.3.7.tgz"; - sha1 = "8e1d47ac480fb0cd8777083f11c896901166b2e5"; + url = "https://registry.npmjs.org/method-override/-/method-override-2.3.8.tgz"; + sha1 = "178234bf4bab869f89df9444b06fc6147b44828c"; }; }; "morgan-1.6.1" = { @@ -12438,22 +12591,13 @@ let sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2"; }; }; - "csrf-3.0.4" = { + "csrf-3.0.6" = { name = "csrf"; packageName = "csrf"; - version = "3.0.4"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/csrf/-/csrf-3.0.4.tgz"; - sha1 = "ba01423e5b5bea7b655e38b0bdd1323954cbdaa5"; - }; - }; - "base64-url-1.3.3" = { - name = "base64-url"; - packageName = "base64-url"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz"; - sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f"; + url = "https://registry.npmjs.org/csrf/-/csrf-3.0.6.tgz"; + sha1 = "b61120ddceeafc91e76ed5313bb5c0b2667b710a"; }; }; "rndm-1.2.0" = { @@ -12474,13 +12618,13 @@ let sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97"; }; }; - "uid-safe-2.1.3" = { + "uid-safe-2.1.4" = { name = "uid-safe"; packageName = "uid-safe"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.3.tgz"; - sha1 = "077e264a00b3187936b270bb7376a26473631071"; + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.4.tgz"; + sha1 = "3ad6f38368c6d4c8c75ec17623fb79aa1d071d81"; }; }; "random-bytes-1.0.0" = { @@ -12798,13 +12942,13 @@ let sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; }; }; - "convert-source-map-1.4.0" = { + "convert-source-map-1.5.0" = { name = "convert-source-map"; packageName = "convert-source-map"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.4.0.tgz"; - sha1 = "e3dad195bf61bfe13a7a3c73e9876ec14a0268f3"; + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz"; + sha1 = "9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"; }; }; "express-2.5.11" = { @@ -13158,13 +13302,13 @@ let sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; - "serve-favicon-2.4.0" = { + "serve-favicon-2.4.2" = { name = "serve-favicon"; packageName = "serve-favicon"; - version = "2.4.0"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.0.tgz"; - sha1 = "064dcdfdb0f250ae3b148eb18c8bbf3d185e3dd0"; + url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.2.tgz"; + sha1 = "aed1d8de67d5b83192cf31fdf53d2ea29464363e"; }; }; "strong-data-uri-1.0.4" = { @@ -13176,22 +13320,22 @@ let sha1 = "136765ebaf8e0f4ad60c4b146779f062c29d18f0"; }; }; - "v8-debug-0.7.7" = { + "v8-debug-1.0.1" = { name = "v8-debug"; packageName = "v8-debug"; - version = "0.7.7"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/v8-debug/-/v8-debug-0.7.7.tgz"; - sha1 = "c0a14e7d2957209da2508f63a251ce3ffeeb4935"; + url = "https://registry.npmjs.org/v8-debug/-/v8-debug-1.0.1.tgz"; + sha1 = "6ae1c6dae4477bb3ced79b523e4d160c1d8667fe"; }; }; - "v8-profiler-5.6.5" = { + "v8-profiler-5.7.0" = { name = "v8-profiler"; packageName = "v8-profiler"; - version = "5.6.5"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/v8-profiler/-/v8-profiler-5.6.5.tgz"; - sha1 = "8b22e6ff3b76a1c75b1d53fd18d58e3f0a46f5be"; + url = "https://registry.npmjs.org/v8-profiler/-/v8-profiler-5.7.0.tgz"; + sha1 = "e8381cbebb5b5fd0ca8d2b09f6a0181a158db34d"; }; }; "yargs-3.32.0" = { @@ -13275,22 +13419,13 @@ let sha1 = "17eb2807987f76952e9c0485fc311d06a826a2e0"; }; }; - "etag-1.8.0" = { - name = "etag"; - packageName = "etag"; - version = "1.8.0"; + "ms-1.0.0" = { + name = "ms"; + packageName = "ms"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.8.0.tgz"; - sha1 = "6f631aef336d6c46362b51764044ce216be3c051"; - }; - }; - "fresh-0.4.0" = { - name = "fresh"; - packageName = "fresh"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.4.0.tgz"; - sha1 = "475626a934a8d3480b2101a1d6ecef7dafd7c553"; + url = "https://registry.npmjs.org/ms/-/ms-1.0.0.tgz"; + sha1 = "59adcd22edc543f7b5381862d31387b1f4bc9473"; }; }; "truncate-1.0.5" = { @@ -13500,6 +13635,15 @@ let sha1 = "a9baa860a3f9b595a6b81b1a86873121ed3a269e"; }; }; + "clone-2.1.0" = { + name = "clone"; + packageName = "clone"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clone/-/clone-2.1.0.tgz"; + sha1 = "9c715bfbd39aa197c8ee0f8e65c3912ba34f8cd6"; + }; + }; "cookie-parser-1.4.3" = { name = "cookie-parser"; packageName = "cookie-parser"; @@ -13509,6 +13653,15 @@ let sha1 = "0fe31fa19d000b95f4aadf1f53fdc2b8a203baa5"; }; }; + "cors-2.8.1" = { + name = "cors"; + packageName = "cors"; + version = "2.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cors/-/cors-2.8.1.tgz"; + sha1 = "6181aa56abb45a2825be3304703747ae4e9d2383"; + }; + }; "cron-1.2.1" = { name = "cron"; packageName = "cron"; @@ -13635,6 +13788,15 @@ let sha1 = "33279100c35c38519ca5e435245186c512fe0fdc"; }; }; + "uglify-js-2.7.5" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.7.5"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz"; + sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8"; + }; + }; "when-3.7.7" = { name = "when"; packageName = "when"; @@ -13671,13 +13833,13 @@ let sha1 = "63baed16d538e786ddadc169b23552d9eb9abc30"; }; }; - "node-red-node-twitter-0.1.9" = { + "node-red-node-twitter-0.1.10" = { name = "node-red-node-twitter"; packageName = "node-red-node-twitter"; - version = "0.1.9"; + version = "0.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.9.tgz"; - sha1 = "e0ad7f654aab3ff8e7c3d001ec3cee030d33d217"; + url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.10.tgz"; + sha1 = "5883f6a8acebc99829c52400420d5ed52f44d221"; }; }; "node-red-node-rbe-0.1.6" = { @@ -13698,6 +13860,33 @@ let sha1 = "d05fc5d223173e0e28ec381c0f00cc25ffaf2736"; }; }; + "http-errors-1.5.1" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz"; + sha1 = "788c0d2c1de2c81b9e6e8c01843b6b97eb920750"; + }; + }; + "qs-6.2.0" = { + name = "qs"; + packageName = "qs"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz"; + sha1 = "3b7848c03c2dece69a9522b0fae8c4126d745f3b"; + }; + }; + "setprototypeof-1.0.2" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz"; + sha1 = "81a552141ec104b88e89ce383103ad5c66564d08"; + }; + }; "css-select-1.2.0" = { name = "css-select"; packageName = "css-select"; @@ -13878,6 +14067,24 @@ let sha1 = "a954984325392f51532a7760760e459598c89f7a"; }; }; + "serve-static-1.11.2" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.11.2.tgz"; + sha1 = "2cf9889bd4435a320cc36895c9aa57bd662e6ac7"; + }; + }; + "send-0.14.2" = { + name = "send"; + packageName = "send"; + version = "0.14.2"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.14.2.tgz"; + sha1 = "39b0438b3f510be5dc6f667a11f71689368cdeef"; + }; + }; "retry-0.6.1" = { name = "retry"; packageName = "retry"; @@ -13941,13 +14148,13 @@ let sha1 = "b6893c8b0ed9d3c60db83560fa75b4d0097a8d5a"; }; }; - "mqtt-packet-5.2.1" = { + "mqtt-packet-5.2.2" = { name = "mqtt-packet"; packageName = "mqtt-packet"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.2.1.tgz"; - sha1 = "876e35ed616a8e348ac0283b4922039872458b58"; + url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.2.2.tgz"; + sha1 = "190d4358f415c6f964211030c20ca0bf45d5698a"; }; }; "reinterval-1.1.0" = { @@ -14247,6 +14454,24 @@ let sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5"; }; }; + "rc-1.1.7" = { + name = "rc"; + packageName = "rc"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/rc/-/rc-1.1.7.tgz"; + sha1 = "c5ea564bb07aff9fd3a5b32e906c1d3a65940fea"; + }; + }; + "tar-pack-3.3.0" = { + name = "tar-pack"; + packageName = "tar-pack"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.3.0.tgz"; + sha1 = "30931816418f55afc4d21775afdd6720cee45dae"; + }; + }; "mongoose-3.6.7" = { name = "mongoose"; packageName = "mongoose"; @@ -14832,6 +15057,15 @@ let sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; + "call-limit-1.1.0" = { + name = "call-limit"; + packageName = "call-limit"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/call-limit/-/call-limit-1.1.0.tgz"; + sha1 = "6fd61b03f3da42a2cd0ec2b60f02bd0e71991fea"; + }; + }; "fstream-npm-1.2.0" = { name = "fstream-npm"; packageName = "fstream-npm"; @@ -14841,6 +15075,15 @@ let sha1 = "d2c3c89101346982d64e57091c38487bda916fce"; }; }; + "hosted-git-info-2.2.0" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.2.0.tgz"; + sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5"; + }; + }; "lazy-property-1.0.0" = { name = "lazy-property"; packageName = "lazy-property"; @@ -14904,6 +15147,15 @@ let sha1 = "d201583eb12327e3c5c1642a404a9cacf94e34f5"; }; }; + "move-concurrently-1.0.1" = { + name = "move-concurrently"; + packageName = "move-concurrently"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz"; + sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; + }; + }; "node-gyp-3.5.0" = { name = "node-gyp"; packageName = "node-gyp"; @@ -14913,15 +15165,6 @@ let sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a"; }; }; - "nopt-4.0.1" = { - name = "nopt"; - packageName = "nopt"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz"; - sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; - }; - }; "npm-install-checks-3.0.0" = { name = "npm-install-checks"; packageName = "npm-install-checks"; @@ -14931,13 +15174,13 @@ let sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7"; }; }; - "npm-registry-client-7.4.5" = { + "npm-registry-client-7.4.6" = { name = "npm-registry-client"; packageName = "npm-registry-client"; - version = "7.4.5"; + version = "7.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.4.5.tgz"; - sha1 = "1ef61851bb7231db53e397aaf76ddf1cb645c3df"; + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.4.6.tgz"; + sha1 = "0aa7c55f18631b941b7b80a7aa501bfcb8b19717"; }; }; "opener-1.4.3" = { @@ -14985,6 +15228,15 @@ let sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3"; }; }; + "update-notifier-2.1.0" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.1.0.tgz"; + sha1 = "ec0c1e53536b76647a24b77cb83966d9315123d9"; + }; + }; "lodash._baseindexof-3.1.0" = { name = "lodash._baseindexof"; packageName = "lodash._baseindexof"; @@ -15066,6 +15318,24 @@ let sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640"; }; }; + "copy-concurrently-1.0.3" = { + name = "copy-concurrently"; + packageName = "copy-concurrently"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.3.tgz"; + sha1 = "45fb7866249a1ca889aa5708e6cbd273e75bb250"; + }; + }; + "run-queue-1.0.3" = { + name = "run-queue"; + packageName = "run-queue"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz"; + sha1 = "e848396f057d223f24386924618e25694161ec47"; + }; + }; "stream-iterate-1.2.0" = { name = "stream-iterate"; packageName = "stream-iterate"; @@ -15084,6 +15354,186 @@ let sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab"; }; }; + "boxen-1.0.0" = { + name = "boxen"; + packageName = "boxen"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boxen/-/boxen-1.0.0.tgz"; + sha1 = "b2694baf1f605f708ff0177c12193b22f29aaaab"; + }; + }; + "configstore-3.0.0" = { + name = "configstore"; + packageName = "configstore"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/configstore/-/configstore-3.0.0.tgz"; + sha1 = "e1b8669c1803ccc50b545e92f8e6e79aa80e0196"; + }; + }; + "latest-version-3.1.0" = { + name = "latest-version"; + packageName = "latest-version"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz"; + sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15"; + }; + }; + "lazy-req-2.0.0" = { + name = "lazy-req"; + packageName = "lazy-req"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-req/-/lazy-req-2.0.0.tgz"; + sha1 = "c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4"; + }; + }; + "xdg-basedir-3.0.0" = { + name = "xdg-basedir"; + packageName = "xdg-basedir"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz"; + sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4"; + }; + }; + "ansi-align-1.1.0" = { + name = "ansi-align"; + packageName = "ansi-align"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz"; + sha1 = "2f0c1658829739add5ebb15e6b0c6e3423f016ba"; + }; + }; + "camelcase-4.1.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz"; + sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; + }; + }; + "cli-boxes-1.0.0" = { + name = "cli-boxes"; + packageName = "cli-boxes"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz"; + sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143"; + }; + }; + "term-size-0.1.1" = { + name = "term-size"; + packageName = "term-size"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/term-size/-/term-size-0.1.1.tgz"; + sha1 = "87360b96396cab5760963714cda0d0cbeecad9ca"; + }; + }; + "widest-line-1.0.0" = { + name = "widest-line"; + packageName = "widest-line"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz"; + sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"; + }; + }; + "execa-0.4.0" = { + name = "execa"; + packageName = "execa"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.4.0.tgz"; + sha1 = "4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3"; + }; + }; + "cross-spawn-async-2.2.5" = { + name = "cross-spawn-async"; + packageName = "cross-spawn-async"; + version = "2.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz"; + sha1 = "845ff0c0834a3ded9d160daca6d390906bb288cc"; + }; + }; + "npm-run-path-1.0.0" = { + name = "npm-run-path"; + packageName = "npm-run-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz"; + sha1 = "f5c32bf595fe81ae927daec52e82f8b000ac3c8f"; + }; + }; + "path-key-1.0.0" = { + name = "path-key"; + packageName = "path-key"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz"; + sha1 = "5d53d578019646c0d68800db4e146e6bdc2ac7af"; + }; + }; + "dot-prop-4.1.1" = { + name = "dot-prop"; + packageName = "dot-prop"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.1.1.tgz"; + sha1 = "a8493f0b7b5eeec82525b5c7587fa7de7ca859c1"; + }; + }; + "unique-string-1.0.0" = { + name = "unique-string"; + packageName = "unique-string"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz"; + sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a"; + }; + }; + "is-obj-1.0.1" = { + name = "is-obj"; + packageName = "is-obj"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"; + sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; + }; + }; + "crypto-random-string-1.0.0" = { + name = "crypto-random-string"; + packageName = "crypto-random-string"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz"; + sha1 = "a230f64f568310e1498009940790ec99545bca7e"; + }; + }; + "package-json-4.0.0" = { + name = "package-json"; + packageName = "package-json"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json/-/package-json-4.0.0.tgz"; + sha1 = "f3c9dc8738f5b59304d54d2cfb3f91d08fdd7998"; + }; + }; + "registry-auth-token-3.1.0" = { + name = "registry-auth-token"; + packageName = "registry-auth-token"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.1.0.tgz"; + sha1 = "997c08256e0c7999837b90e944db39d8a790276b"; + }; + }; "argparse-0.1.15" = { name = "argparse"; packageName = "argparse"; @@ -15336,6 +15786,15 @@ let sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df"; }; }; + "snyk-1.26.1" = { + name = "snyk"; + packageName = "snyk"; + version = "1.26.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk/-/snyk-1.26.1.tgz"; + sha1 = "12b28e9b43c6453ecb6d4be7670b0c0df7db38a5"; + }; + }; "spawn-please-0.2.0" = { name = "spawn-please"; packageName = "spawn-please"; @@ -15363,6 +15822,15 @@ let sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0"; }; }; + "node-gyp-3.4.0" = { + name = "node-gyp"; + packageName = "node-gyp"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.4.0.tgz"; + sha1 = "dda558393b3ecbbe24c9e6b8703c71194c63fa36"; + }; + }; "request-2.75.0" = { name = "request"; packageName = "request"; @@ -15381,6 +15849,24 @@ let sha1 = "14c66d4e4cb3ca0565c28cf3b7a6f3e4d5938fab"; }; }; + "path-array-1.0.1" = { + name = "path-array"; + packageName = "path-array"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-array/-/path-array-1.0.1.tgz"; + sha1 = "7e2f0f35f07a2015122b868b7eac0eb2c4fec271"; + }; + }; + "array-index-1.0.0" = { + name = "array-index"; + packageName = "array-index"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-index/-/array-index-1.0.0.tgz"; + sha1 = "ec56a749ee103e4e08c790b9c353df16055b97f9"; + }; + }; "form-data-2.0.0" = { name = "form-data"; packageName = "form-data"; @@ -15390,13 +15876,220 @@ let sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25"; }; }; - "boxen-0.6.0" = { + "hasbin-1.2.3" = { + name = "hasbin"; + packageName = "hasbin"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hasbin/-/hasbin-1.2.3.tgz"; + sha1 = "78c5926893c80215c2b568ae1fd3fcab7a2696b0"; + }; + }; + "inquirer-1.0.3" = { + name = "inquirer"; + packageName = "inquirer"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-1.0.3.tgz"; + sha1 = "ebe3a0948571bcc46ccccbe2f9bcec251e984bd0"; + }; + }; + "snyk-config-1.0.1" = { + name = "snyk-config"; + packageName = "snyk-config"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-config/-/snyk-config-1.0.1.tgz"; + sha1 = "f27aec2498b24027ac719214026521591111508f"; + }; + }; + "snyk-module-1.7.0" = { + name = "snyk-module"; + packageName = "snyk-module"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.7.0.tgz"; + sha1 = "07c6ca8556d281de6f9e2368c04ecb6dd1f2631a"; + }; + }; + "snyk-policy-1.7.0" = { + name = "snyk-policy"; + packageName = "snyk-policy"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.7.0.tgz"; + sha1 = "2151c751ab1edc040fc6b94a872aa989db492324"; + }; + }; + "snyk-recursive-readdir-2.0.0" = { + name = "snyk-recursive-readdir"; + packageName = "snyk-recursive-readdir"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-recursive-readdir/-/snyk-recursive-readdir-2.0.0.tgz"; + sha1 = "5cb59e94698169e0205a60e7d6a506d0b4d52ff3"; + }; + }; + "snyk-resolve-1.0.0" = { + name = "snyk-resolve"; + packageName = "snyk-resolve"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.0.0.tgz"; + sha1 = "bbe9196d37f57c39251e6be75ccdd5b2097e99a2"; + }; + }; + "snyk-resolve-deps-1.7.0" = { + name = "snyk-resolve-deps"; + packageName = "snyk-resolve-deps"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-1.7.0.tgz"; + sha1 = "13743a058437dff890baaf437c333c966a743cb6"; + }; + }; + "snyk-tree-1.0.0" = { + name = "snyk-tree"; + packageName = "snyk-tree"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-tree/-/snyk-tree-1.0.0.tgz"; + sha1 = "0fb73176dbf32e782f19100294160448f9111cc8"; + }; + }; + "snyk-try-require-1.2.0" = { + name = "snyk-try-require"; + packageName = "snyk-try-require"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.2.0.tgz"; + sha1 = "30fc2b11c07064591ee35780c826be91312f2144"; + }; + }; + "tempfile-1.1.1" = { + name = "tempfile"; + packageName = "tempfile"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tempfile/-/tempfile-1.1.1.tgz"; + sha1 = "5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"; + }; + }; + "then-fs-2.0.0" = { + name = "then-fs"; + packageName = "then-fs"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/then-fs/-/then-fs-2.0.0.tgz"; + sha1 = "72f792dd9d31705a91ae19ebfcf8b3f968c81da2"; + }; + }; + "mute-stream-0.0.6" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz"; + sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db"; + }; + }; + "run-async-2.3.0" = { + name = "run-async"; + packageName = "run-async"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz"; + sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; + }; + }; + "rx-4.1.0" = { + name = "rx"; + packageName = "rx"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz"; + sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782"; + }; + }; + "nconf-0.7.2" = { + name = "nconf"; + packageName = "nconf"; + version = "0.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nconf/-/nconf-0.7.2.tgz"; + sha1 = "a05fdf22dc01c378dd5c4df27f2dc90b9aa8bb00"; + }; + }; + "yargs-3.15.0" = { + name = "yargs"; + packageName = "yargs"; + version = "3.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-3.15.0.tgz"; + sha1 = "3d9446ef21fb3791b3985690662e4b9683c7f181"; + }; + }; + "minimatch-3.0.2" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz"; + sha1 = "0f398a7300ea441e9c348c83d98ab8c9dbf9c40a"; + }; + }; + "clite-0.3.0" = { + name = "clite"; + packageName = "clite"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clite/-/clite-0.3.0.tgz"; + sha1 = "e7fcbc8cc5bd3e7f8b84ed48db12e9474cc73441"; + }; + }; + "lodash.defaultsdeep-4.6.0" = { + name = "lodash.defaultsdeep"; + packageName = "lodash.defaultsdeep"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.0.tgz"; + sha1 = "bec1024f85b1bd96cbea405b23c14ad6443a6f81"; + }; + }; + "lodash.mergewith-4.6.0" = { + name = "lodash.mergewith"; + packageName = "lodash.mergewith"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz"; + sha1 = "150cf0a16791f5903b8891eab154609274bdea55"; + }; + }; + "update-notifier-0.6.3" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz"; + sha1 = "776dec8daa13e962a341e8a1d98354306b67ae08"; + }; + }; + "yargs-4.8.1" = { + name = "yargs"; + packageName = "yargs"; + version = "4.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz"; + sha1 = "c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0"; + }; + }; + "boxen-0.3.1" = { name = "boxen"; packageName = "boxen"; - version = "0.6.0"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz"; - sha1 = "8364d4248ac34ff0ef1b2f2bf49a6c60ce0d81b6"; + url = "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz"; + sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b"; }; }; "configstore-2.1.0" = { @@ -15417,33 +16110,6 @@ let sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b"; }; }; - "lazy-req-1.1.0" = { - name = "lazy-req"; - packageName = "lazy-req"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz"; - sha1 = "bdaebead30f8d824039ce0ce149d4daa07ba1fac"; - }; - }; - "ansi-align-1.1.0" = { - name = "ansi-align"; - packageName = "ansi-align"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz"; - sha1 = "2f0c1658829739add5ebb15e6b0c6e3423f016ba"; - }; - }; - "cli-boxes-1.0.0" = { - name = "cli-boxes"; - packageName = "cli-boxes"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz"; - sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143"; - }; - }; "filled-array-1.1.0" = { name = "filled-array"; packageName = "filled-array"; @@ -15453,15 +16119,6 @@ let sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84"; }; }; - "widest-line-1.0.0" = { - name = "widest-line"; - packageName = "widest-line"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz"; - sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c"; - }; - }; "dot-prop-3.0.0" = { name = "dot-prop"; packageName = "dot-prop"; @@ -15471,15 +16128,6 @@ let sha1 = "1b708af094a49c9a0e7dbcad790aba539dac1177"; }; }; - "is-obj-1.0.1" = { - name = "is-obj"; - packageName = "is-obj"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"; - sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; - }; - }; "package-json-2.4.0" = { name = "package-json"; packageName = "package-json"; @@ -15498,15 +16146,6 @@ let sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35"; }; }; - "registry-auth-token-3.1.0" = { - name = "registry-auth-token"; - packageName = "registry-auth-token"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.1.0.tgz"; - sha1 = "997c08256e0c7999837b90e944db39d8a790276b"; - }; - }; "node-status-codes-1.0.0" = { name = "node-status-codes"; packageName = "node-status-codes"; @@ -15534,6 +16173,96 @@ let sha1 = "b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"; }; }; + "get-caller-file-1.0.2" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz"; + sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5"; + }; + }; + "lodash.assign-4.2.0" = { + name = "lodash.assign"; + packageName = "lodash.assign"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"; + sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; + }; + }; + "require-directory-2.1.1" = { + name = "require-directory"; + packageName = "require-directory"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + }; + "require-main-filename-1.0.1" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; + sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + }; + }; + "which-module-1.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz"; + sha1 = "bba63ca861948994ff307736089e3b96026c2a4f"; + }; + }; + "window-size-0.2.0" = { + name = "window-size"; + packageName = "window-size"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz"; + sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075"; + }; + }; + "yargs-parser-2.4.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz"; + sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4"; + }; + }; + "camelcase-3.0.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; + sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; + }; + }; + "boxen-0.6.0" = { + name = "boxen"; + packageName = "boxen"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz"; + sha1 = "8364d4248ac34ff0ef1b2f2bf49a6c60ce0d81b6"; + }; + }; + "lazy-req-1.1.0" = { + name = "lazy-req"; + packageName = "lazy-req"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz"; + sha1 = "bdaebead30f8d824039ce0ce149d4daa07ba1fac"; + }; + }; "babybird-0.0.1" = { name = "babybird"; packageName = "babybird"; @@ -15580,6 +16309,15 @@ let sha1 = "80a070bb819b09e4af2ca6d0780f75ce05e75c2f"; }; }; + "finalhandler-0.5.1" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz"; + sha1 = "2c400d8d4530935bc232549c5fa385ec07de6fcd"; + }; + }; "gelf-stream-0.2.4" = { name = "gelf-stream"; packageName = "gelf-stream"; @@ -15627,13 +16365,13 @@ let sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0"; }; }; - "service-runner-2.2.4" = { + "service-runner-2.2.5" = { name = "service-runner"; packageName = "service-runner"; - version = "2.2.4"; + version = "2.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/service-runner/-/service-runner-2.2.4.tgz"; - sha1 = "75cc51113d31d4bb287130880b38f82d7bb4c42c"; + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.2.5.tgz"; + sha1 = "95a55084f939110b3f201549c1afedf900ec4850"; }; }; "simplediff-0.1.1" = { @@ -15645,15 +16383,6 @@ let sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c"; }; }; - "yargs-4.8.1" = { - name = "yargs"; - packageName = "yargs"; - version = "4.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz"; - sha1 = "c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0"; - }; - }; "is-arguments-1.0.2" = { name = "is-arguments"; packageName = "is-arguments"; @@ -15717,13 +16446,13 @@ let sha1 = "23a13c366883adae32ecfd252a566be302b88dc3"; }; }; - "bunyan-1.8.5" = { + "bunyan-1.8.9" = { name = "bunyan"; packageName = "bunyan"; - version = "1.8.5"; + version = "1.8.9"; src = fetchurl { - url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.5.tgz"; - sha1 = "0d619e83005fb89070f5f47982fc1bf00600878a"; + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.9.tgz"; + sha1 = "2c7c9d422ea64ee2465d52b4decd72de0657401a"; }; }; "bunyan-syslog-udp-0.1.0" = { @@ -15744,13 +16473,13 @@ let sha1 = "9cea9b6386ac301c741838ca3cb91e66dbfbf669"; }; }; - "hot-shots-4.3.1" = { + "hot-shots-4.4.0" = { name = "hot-shots"; packageName = "hot-shots"; - version = "4.3.1"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.3.1.tgz"; - sha1 = "58a6c1ff717f25673be4d2f736d1c94d5d79e239"; + url = "https://registry.npmjs.org/hot-shots/-/hot-shots-4.4.0.tgz"; + sha1 = "ab3f3b3df2f4b2ff0d716837569241ede81d9175"; }; }; "limitation-0.2.0" = { @@ -15780,13 +16509,13 @@ let sha1 = "42cb2b9bfb5e8fbdfa395aac74e127fc05074d31"; }; }; - "dtrace-provider-0.8.0" = { + "dtrace-provider-0.8.1" = { name = "dtrace-provider"; packageName = "dtrace-provider"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.0.tgz"; - sha1 = "fa95fbf67ed3ae3e97364f9664af7302e5ff5625"; + url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.1.tgz"; + sha1 = "cd4d174a233bea1bcf4a1fbfa5798f44f48cda9f"; }; }; "mv-2.1.1" = { @@ -15798,13 +16527,13 @@ let sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"; }; }; - "safe-json-stringify-1.0.3" = { + "safe-json-stringify-1.0.4" = { name = "safe-json-stringify"; packageName = "safe-json-stringify"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz"; - sha1 = "3cb6717660a086d07cb5bd9b7a6875bcf67bd05e"; + url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.4.tgz"; + sha1 = "81a098f447e4bbc3ff3312a243521bc060ef5911"; }; }; "ncp-2.0.0" = { @@ -15907,51 +16636,6 @@ let sha1 = "ed17cbf68abd10e0aef8182713e297c5e4b500b0"; }; }; - "camelcase-3.0.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; - sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; - }; - }; - "get-caller-file-1.0.2" = { - name = "get-caller-file"; - packageName = "get-caller-file"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz"; - sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5"; - }; - }; - "require-directory-2.1.1" = { - name = "require-directory"; - packageName = "require-directory"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; - sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; - }; - }; - "require-main-filename-1.0.1" = { - name = "require-main-filename"; - packageName = "require-main-filename"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; - sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; - }; - }; - "which-module-1.0.0" = { - name = "which-module"; - packageName = "which-module"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz"; - sha1 = "bba63ca861948994ff307736089e3b96026c2a4f"; - }; - }; "yargs-parser-4.2.1" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -15979,33 +16663,6 @@ let sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; }; }; - "lodash.assign-4.2.0" = { - name = "lodash.assign"; - packageName = "lodash.assign"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"; - sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; - }; - }; - "window-size-0.2.0" = { - name = "window-size"; - packageName = "window-size"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz"; - sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075"; - }; - }; - "yargs-parser-2.4.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz"; - sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4"; - }; - }; "airplayer-2.0.0" = { name = "airplayer"; packageName = "airplayer"; @@ -16186,13 +16843,13 @@ let sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; }; }; - "multicast-dns-6.1.0" = { + "multicast-dns-6.1.1" = { name = "multicast-dns"; packageName = "multicast-dns"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.1.0.tgz"; - sha1 = "8d91824b538556cd34f0adf6f27c60d94b5fb3bf"; + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.1.1.tgz"; + sha1 = "6e7de86a570872ab17058adea7160bbeca814dde"; }; }; "multicast-dns-service-types-1.1.0" = { @@ -16222,33 +16879,6 @@ let sha1 = "12d7b0db850f7ff7e7081baf4005700060c4600b"; }; }; - "mute-stream-0.0.6" = { - name = "mute-stream"; - packageName = "mute-stream"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz"; - sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db"; - }; - }; - "run-async-2.3.0" = { - name = "run-async"; - packageName = "run-async"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz"; - sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; - }; - }; - "rx-4.1.0" = { - name = "rx"; - packageName = "rx"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz"; - sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782"; - }; - }; "spawn-sync-1.0.15" = { name = "spawn-sync"; packageName = "spawn-sync"; @@ -16942,22 +17572,22 @@ let sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"; }; }; - "recast-0.11.22" = { + "recast-0.11.23" = { name = "recast"; packageName = "recast"; - version = "0.11.22"; + version = "0.11.23"; src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.11.22.tgz"; - sha1 = "dedeb18fb001a2bbc6ac34475fda53dfe3d47dfa"; + url = "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz"; + sha1 = "451fd3004ab1e4df9b4e4b66376b2a21912462d3"; }; }; - "ast-types-0.9.5" = { + "ast-types-0.9.6" = { name = "ast-types"; packageName = "ast-types"; - version = "0.9.5"; + version = "0.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.5.tgz"; - sha1 = "1a660a09945dbceb1f9c9cbb715002617424e04a"; + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz"; + sha1 = "102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"; }; }; "base62-0.1.1" = { @@ -17240,13 +17870,13 @@ let sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4"; }; }; - "express-5.0.0-alpha.3" = { + "express-5.0.0-alpha.5" = { name = "express"; packageName = "express"; - version = "5.0.0-alpha.3"; + version = "5.0.0-alpha.5"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.3.tgz"; - sha1 = "19d63b931bf0f64c42725952ef0602c381fe64db"; + url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.5.tgz"; + sha1 = "e37423a8d82826fb915c7dd166e2900bfa3552e6"; }; }; "express-json5-0.1.0" = { @@ -17312,22 +17942,13 @@ let sha1 = "2af824ae20eccb8f902325b1a2c27dd6619805c9"; }; }; - "http-errors-1.6.1" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.1.tgz"; - sha1 = "5f8b8ed98aca545656bf572997387f904a722257"; - }; - }; - "fs-ext-0.5.0" = { + "fs-ext-0.6.0" = { name = "fs-ext"; packageName = "fs-ext"; - version = "0.5.0"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/fs-ext/-/fs-ext-0.5.0.tgz"; - sha1 = "9c1f9a20b8e7e012e0a914b5e19132724f44f69e"; + url = "https://registry.npmjs.org/fs-ext/-/fs-ext-0.6.0.tgz"; + sha1 = "27d32a72e2e7c3c8001712a0f307f5f8d91dfc66"; }; }; "crypt3-0.2.0" = { @@ -17339,13 +17960,13 @@ let sha1 = "4bd28e0770fad421fc807745c1ef3010905b2332"; }; }; - "router-1.1.5" = { + "router-1.3.0" = { name = "router"; packageName = "router"; - version = "1.1.5"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/router/-/router-1.1.5.tgz"; - sha1 = "c9c6935201b30ac1f227ada6af86e8cea6515387"; + url = "https://registry.npmjs.org/router/-/router-1.3.0.tgz"; + sha1 = "15b24075c1de4a3d3f39808c5d7344a1564417c8"; }; }; "raw-body-1.3.4" = { @@ -17438,13 +18059,13 @@ let sha1 = "1e0f4650c862dcbfed54fd42b148e9bb1721fcf2"; }; }; - "setprototypeof-1.0.3" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.0.3"; + "async-2.1.5" = { + name = "async"; + packageName = "async"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz"; - sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04"; + url = "https://registry.npmjs.org/async/-/async-2.1.5.tgz"; + sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc"; }; }; "lru-cache-2.2.0" = { @@ -17816,31 +18437,22 @@ let sha1 = "f877d5bf648c97e5aa542fadc16d6a259b9c11a1"; }; }; - "csso-2.3.1" = { + "csso-2.3.2" = { name = "csso"; packageName = "csso"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/csso/-/csso-2.3.1.tgz"; - sha1 = "4f8d91a156f2f1c2aebb40b8fb1b5eb83d94d3b9"; + url = "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz"; + sha1 = "ddd52c587033f49e94b71fc55569f252e8ff5f85"; }; }; - "clap-1.1.2" = { + "clap-1.1.3" = { name = "clap"; packageName = "clap"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/clap/-/clap-1.1.2.tgz"; - sha1 = "316545bf22229225a2cecaa6824cd2f56a9709ed"; - }; - }; - "acorn-4.0.11" = { - name = "acorn"; - packageName = "acorn"; - version = "4.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz"; - sha1 = "edcda3bd937e7556410d42ed5860f67399c794c0"; + url = "https://registry.npmjs.org/clap/-/clap-1.1.3.tgz"; + sha1 = "b3bd36e93dd4cbfb395a3c26896352445265c05b"; }; }; "enhanced-resolve-2.3.0" = { @@ -17924,22 +18536,22 @@ let sha1 = "f38f2c97c9889b0ee18fc6cc392e1e443ad2da8e"; }; }; - "node-appc-0.2.39" = { + "node-appc-0.2.41" = { name = "node-appc"; packageName = "node-appc"; - version = "0.2.39"; + version = "0.2.41"; src = fetchurl { - url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.39.tgz"; - sha1 = "c8ffb1e4e1c85b0df3a443889d765de0d963a1f4"; + url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.41.tgz"; + sha1 = "f68cf5acb607c4903e2f63024383ae95ba1fdc52"; }; }; - "request-2.78.0" = { + "request-2.79.0" = { name = "request"; packageName = "request"; - version = "2.78.0"; + version = "2.79.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.78.0.tgz"; - sha1 = "e1c8dec346e1c81923b24acdb337f11decabe9cc"; + url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz"; + sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de"; }; }; "sprintf-0.1.5" = { @@ -17960,13 +18572,13 @@ let sha1 = "68edd769ff79d4f9528cf0e5d80021aade67480c"; }; }; - "wrench-1.5.9" = { - name = "wrench"; - packageName = "wrench"; - version = "1.5.9"; + "fs-extra-2.1.2" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/wrench/-/wrench-1.5.9.tgz"; - sha1 = "411691c63a9b2531b1700267279bdeca23b2142a"; + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz"; + sha1 = "046c70163cef9aad46b0e4a7fa467fb22d71de35"; }; }; "source-map-support-0.3.2" = { @@ -17996,58 +18608,49 @@ let sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1"; }; }; - "diff-2.2.1" = { + "async-2.1.4" = { + name = "async"; + packageName = "async"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.1.4.tgz"; + sha1 = "2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4"; + }; + }; + "diff-3.2.0" = { name = "diff"; packageName = "diff"; - version = "2.2.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-2.2.1.tgz"; - sha1 = "76ec8ea33535344078079fbe8cf03435ffb185ec"; + url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz"; + sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9"; }; }; - "request-2.69.0" = { - name = "request"; - packageName = "request"; - version = "2.69.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.69.0.tgz"; - sha1 = "cf91d2e000752b1217155c005241911991a2346a"; - }; - }; - "semver-5.1.0" = { - name = "semver"; - packageName = "semver"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz"; - sha1 = "85f2cf8550465c4df000cf7d86f6b054106ab9e5"; - }; - }; - "wrench-1.5.8" = { + "wrench-1.5.9" = { name = "wrench"; packageName = "wrench"; - version = "1.5.8"; + version = "1.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz"; - sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5"; + url = "https://registry.npmjs.org/wrench/-/wrench-1.5.9.tgz"; + sha1 = "411691c63a9b2531b1700267279bdeca23b2142a"; }; }; - "xmldom-0.1.22" = { - name = "xmldom"; - packageName = "xmldom"; - version = "0.1.22"; - src = fetchurl { - url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz"; - sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26"; - }; - }; - "qs-6.0.3" = { + "qs-6.3.2" = { name = "qs"; packageName = "qs"; - version = "6.0.3"; + version = "6.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.0.3.tgz"; - sha1 = "95f870b23e70268fba18704e80667515905af06c"; + url = "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz"; + sha1 = "e75bd5f6e268122a2a0e0bda630b2550c166502c"; + }; + }; + "bluebird-3.4.7" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz"; + sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3"; }; }; "blueimp-md5-2.6.0" = { @@ -18077,13 +18680,22 @@ let sha1 = "b1d5f9c1d98af3bdd61f1bda6a86dd1aee4ff8f2"; }; }; - "diff2html-2.0.12" = { + "diff2html-2.3.0" = { name = "diff2html"; packageName = "diff2html"; - version = "2.0.12"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-2.0.12.tgz"; - sha1 = "20eda2f1ffd14027716485c938e3fe21dc379455"; + url = "https://registry.npmjs.org/diff2html/-/diff2html-2.3.0.tgz"; + sha1 = "375fb0783ca8fa90307749399bc9c75eb7cf6580"; + }; + }; + "express-4.14.1" = { + name = "express"; + packageName = "express"; + version = "4.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-4.14.1.tgz"; + sha1 = "646c237f766f148c2120aff073817b9e4d7e0d33"; }; }; "express-session-1.14.2" = { @@ -18131,13 +18743,13 @@ let sha1 = "5056f5c989ab14ccf62fc20ed7598115ae7d09e3"; }; }; - "knockout-3.4.1" = { + "knockout-3.4.2" = { name = "knockout"; packageName = "knockout"; - version = "3.4.1"; + version = "3.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/knockout/-/knockout-3.4.1.tgz"; - sha1 = "8bd057bde8f7d0a02b93dda433c2a8d942d8a9a0"; + url = "https://registry.npmjs.org/knockout/-/knockout-3.4.2.tgz"; + sha1 = "e87958de77ad1e936f7ce645bab8b5d7c456d937"; }; }; "node-cache-4.1.1" = { @@ -18176,13 +18788,13 @@ let sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee"; }; }; - "raven-1.1.2" = { + "raven-1.1.5" = { name = "raven"; packageName = "raven"; - version = "1.1.2"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/raven/-/raven-1.1.2.tgz"; - sha1 = "a5eb3db71f2fc3015a20145bcaf28015e7ae0718"; + url = "https://registry.npmjs.org/raven/-/raven-1.1.5.tgz"; + sha1 = "6af541406c37da1d678781d0af411c27c6f05fbf"; }; }; "signals-1.0.0" = { @@ -18221,22 +18833,22 @@ let sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a"; }; }; - "color-string-1.5.0" = { + "color-string-1.5.2" = { name = "color-string"; packageName = "color-string"; - version = "1.5.0"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/color-string/-/color-string-1.5.0.tgz"; - sha1 = "f9a7a0553e55b34d18a463c06f13e3384dd960ce"; + url = "https://registry.npmjs.org/color-string/-/color-string-1.5.2.tgz"; + sha1 = "26e45814bc3c9a7cbd6751648a41434514a773a9"; }; }; - "color-name-1.1.1" = { + "color-name-1.1.2" = { name = "color-name"; packageName = "color-name"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz"; - sha1 = "4b1415304cf50028ea81643643bd82ea05803689"; + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.2.tgz"; + sha1 = "5c8ab72b64bd2215d617ae9559ebb148475cf98d"; }; }; "simple-swizzle-0.2.2" = { @@ -18257,15 +18869,6 @@ let sha1 = "c2dfc386abaa0c3e33c48db3fe87059e69065efd"; }; }; - "diff-3.2.0" = { - name = "diff"; - packageName = "diff"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz"; - sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9"; - }; - }; "hogan.js-3.0.2" = { name = "hogan.js"; packageName = "hogan.js"; @@ -18275,13 +18878,13 @@ let sha1 = "4cd9e1abd4294146e7679e41d7898732b02c7bfd"; }; }; - "whatwg-fetch-2.0.2" = { + "whatwg-fetch-2.0.3" = { name = "whatwg-fetch"; packageName = "whatwg-fetch"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.2.tgz"; - sha1 = "fe294d1d89e36c5be8b3195057f2e4bc74fc980e"; + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz"; + sha1 = "9c84ec2dcf68187ff00bc64e1274b442176e1c84"; }; }; "crc-3.4.1" = { @@ -18491,13 +19094,13 @@ let sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65"; }; }; - "acorn-dynamic-import-2.0.1" = { + "acorn-dynamic-import-2.0.2" = { name = "acorn-dynamic-import"; packageName = "acorn-dynamic-import"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.1.tgz"; - sha1 = "23f671eb6e650dab277fef477c321b1178a8cca2"; + url = "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz"; + sha1 = "c752bd210bef679501b6c6cb7fc84f8f47158cc4"; }; }; "enhanced-resolve-3.1.0" = { @@ -18563,13 +19166,13 @@ let sha1 = "7d8693907b28ce6013e7f3610aa2a1acf07dad87"; }; }; - "webpack-sources-0.1.4" = { + "webpack-sources-0.2.3" = { name = "webpack-sources"; packageName = "webpack-sources"; - version = "0.1.4"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.4.tgz"; - sha1 = "ccc2c817e08e5fa393239412690bb481821393cd"; + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.2.3.tgz"; + sha1 = "17c62bfaf13c707f9d02c479e0dcdde8380697fb"; }; }; "big.js-3.1.3" = { @@ -18626,13 +19229,13 @@ let sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; }; }; - "source-list-map-0.1.8" = { + "source-list-map-1.1.1" = { name = "source-list-map"; packageName = "source-list-map"; - version = "0.1.8"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz"; - sha1 = "c550b2ab5427f6b3f21f5afead88c4f5587b2106"; + url = "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.1.tgz"; + sha1 = "1a33ac210ca144d1e561f906ebccab5669ff4cb4"; }; }; "babel-runtime-6.23.0" = { @@ -18644,6 +19247,15 @@ let sha1 = "0a9489f144de70efb3ce4300accdb329e2fc543b"; }; }; + "bytes-2.5.0" = { + name = "bytes"; + packageName = "bytes"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-2.5.0.tgz"; + sha1 = "4c9423ea2d252c270c41b2bdefeff9bb6b62c06a"; + }; + }; "death-1.1.0" = { name = "death"; packageName = "death"; @@ -18662,22 +19274,13 @@ let sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"; }; }; - "diff-2.2.3" = { - name = "diff"; - packageName = "diff"; - version = "2.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz"; - sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99"; - }; - }; - "inquirer-3.0.5" = { + "inquirer-3.0.6" = { name = "inquirer"; packageName = "inquirer"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-3.0.5.tgz"; - sha1 = "172cabc8eacbfb91d595f5d7c354b446b8141f65"; + url = "https://registry.npmjs.org/inquirer/-/inquirer-3.0.6.tgz"; + sha1 = "e04aaa9d05b7a3cb9b0f407d04375f0447190347"; }; }; "invariant-2.2.2" = { @@ -18734,13 +19337,13 @@ let sha1 = "b21f5e79bcbb6b4e23eeeced15cfc7f63e8a2e55"; }; }; - "request-capture-har-1.1.4" = { + "request-capture-har-1.2.2" = { name = "request-capture-har"; packageName = "request-capture-har"; - version = "1.1.4"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/request-capture-har/-/request-capture-har-1.1.4.tgz"; - sha1 = "e6ad76eb8e7a1714553fdbeef32cd4518e4e2013"; + url = "https://registry.npmjs.org/request-capture-har/-/request-capture-har-1.2.2.tgz"; + sha1 = "cd692cfb2cc744fd84a3358aac6ee51528cf720d"; }; }; "roadrunner-1.1.0" = { @@ -18797,13 +19400,13 @@ let sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; }; }; - "onetime-2.0.0" = { + "onetime-2.0.1" = { name = "onetime"; packageName = "onetime"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-2.0.0.tgz"; - sha1 = "52aa8110e52fc5126ffc667bd8ec21c2ed209ce6"; + url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; + sha1 = "067428230fd67443b2794b22bba528b6867962d4"; }; }; "loose-envify-1.3.1" = { @@ -18950,15 +19553,6 @@ let sha1 = "7d350722061830ba6617631e0cfd3ea08398d95a"; }; }; - "update-notifier-0.6.3" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "0.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz"; - sha1 = "776dec8daa13e962a341e8a1d98354306b67ae08"; - }; - }; "yeoman-character-1.1.0" = { name = "yeoman-character"; packageName = "yeoman-character"; @@ -19094,15 +19688,6 @@ let sha1 = "848e28f7f1d50740c6747ab3cb07670462b6f89c"; }; }; - "boxen-0.3.1" = { - name = "boxen"; - packageName = "boxen"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz"; - sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b"; - }; - }; "bin-version-check-2.1.0" = { name = "bin-version-check"; packageName = "bin-version-check"; @@ -19184,6 +19769,15 @@ let sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9"; }; }; + "diff-2.2.3" = { + name = "diff"; + packageName = "diff"; + version = "2.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-2.2.3.tgz"; + sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99"; + }; + }; "globby-4.1.0" = { name = "globby"; packageName = "globby"; @@ -19308,7 +19902,7 @@ in sources."kind-of-3.1.0" sources."longest-1.0.1" sources."repeat-string-1.6.1" - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" sources."path-parse-1.0.5" sources."array-unique-0.2.1" (sources."global-modules-0.2.3" // { @@ -19324,9 +19918,9 @@ in }) sources."homedir-polyfill-1.0.1" sources."ini-1.3.4" - sources."which-1.2.12" + sources."which-1.2.14" sources."parse-passwd-1.0.0" - sources."isexe-1.1.2" + sources."isexe-2.0.0" sources."amdefine-1.0.1" sources."xml2js-0.2.8" sources."sax-0.5.8" @@ -19343,10 +19937,10 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.10"; + version = "0.10.11"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.10.tgz"; - sha1 = "f50fe398f935d7e8751b7e84dcf02616553fcfa4"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.11.tgz"; + sha1 = "aa1a379386b5c60f90f86134b4047acb1302d482"; }; dependencies = [ sources."adal-node-0.1.21" @@ -19358,7 +19952,7 @@ in ]; }) sources."azure-arm-authorization-2.0.0" - sources."azure-arm-cdn-1.0.2" + sources."azure-arm-cdn-1.0.3" sources."azure-arm-commerce-0.2.0" sources."azure-arm-compute-0.20.0" sources."azure-arm-datalake-analytics-1.0.1-preview" @@ -19413,6 +20007,7 @@ in sources."caller-id-0.1.0" sources."colors-1.1.2" sources."commander-1.0.4" + sources."date-utils-1.2.21" sources."easy-table-0.0.1" sources."event-stream-3.1.5" sources."eyes-0.1.8" @@ -19422,15 +20017,16 @@ in sources."jsonlint-1.6.2" sources."jsonminify-0.4.1" sources."jsrsasign-4.8.2" + sources."jwt-decode-2.2.0" (sources."kuduscript-1.0.13" // { dependencies = [ sources."commander-1.1.1" sources."streamline-0.4.11" ]; }) - sources."moment-2.17.1" - sources."ms-rest-1.15.5" - (sources."ms-rest-azure-1.15.5" // { + sources."moment-2.18.1" + sources."ms-rest-1.15.7" + (sources."ms-rest-azure-1.15.7" // { dependencies = [ sources."async-0.2.7" ]; @@ -19485,7 +20081,6 @@ in sources."xml2js-0.1.14" sources."xmlbuilder-0.4.3" sources."read-1.0.7" - sources."date-utils-1.2.21" sources."jws-3.1.4" sources."node-uuid-1.4.7" sources."xmldom-0.1.27" @@ -19513,7 +20108,7 @@ in sources."util-deprecate-1.0.2" sources."stack-trace-0.0.9" sources."keypress-0.1.0" - sources."from-0.1.3" + sources."from-0.1.7" sources."map-stream-0.1.0" sources."pause-stream-0.0.11" sources."split-0.2.10" @@ -19567,7 +20162,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - sources."async-2.1.5" + sources."async-2.2.0" ]; }) (sources."har-validator-2.0.6" // { @@ -19582,9 +20177,9 @@ in sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.14" + sources."mime-types-2.1.15" sources."oauth-sign-0.8.2" - sources."qs-6.2.2" + sources."qs-6.2.3" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" @@ -19608,8 +20203,12 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.11.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -19633,7 +20232,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."punycode-1.4.1" sources."ctype-0.5.2" sources."source-map-0.1.43" @@ -19642,7 +20241,7 @@ in sources."amdefine-1.0.1" (sources."concat-stream-1.6.0" // { dependencies = [ - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" ]; }) sources."http-response-object-1.1.0" @@ -19733,7 +20332,7 @@ in sources."timed-out-2.0.0" sources."end-of-stream-1.0.0" sources."inherits-2.0.3" - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."stream-shift-1.0.0" sources."once-1.3.3" sources."wrappy-1.0.2" @@ -19748,7 +20347,7 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."minimist-1.2.0" - sources."normalize-package-data-2.3.5" + sources."normalize-package-data-2.3.6" sources."read-pkg-up-1.0.1" sources."redent-1.0.0" sources."trim-newlines-1.0.0" @@ -19756,7 +20355,7 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.2.0" + sources."hosted-git-info-2.4.1" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -19781,7 +20380,7 @@ in sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" - sources."error-ex-1.3.0" + sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" sources."is-utf8-0.2.1" sources."indent-string-2.1.0" @@ -19815,8 +20414,8 @@ in sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" - sources."q-1.4.1" - sources."debug-2.6.1" + sources."q-1.5.0" + sources."debug-2.6.3" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -19885,7 +20484,7 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."resolve-1.3.2" sources."shasum-1.0.2" sources."shell-quote-1.6.1" @@ -19893,11 +20492,7 @@ in sources."stream-http-2.6.3" sources."string_decoder-0.10.31" sources."subarg-1.0.0" - (sources."syntax-error-1.1.6" // { - dependencies = [ - sources."acorn-2.7.0" - ]; - }) + sources."syntax-error-1.3.0" sources."through2-2.0.3" sources."timers-browserify-1.4.2" sources."tty-browserify-0.0.0" @@ -19931,7 +20526,7 @@ in sources."util-deprecate-1.0.2" sources."date-now-0.1.4" sources."browserify-cipher-1.0.0" - sources."browserify-sign-4.0.0" + sources."browserify-sign-4.0.4" sources."create-ecdh-4.0.0" sources."create-hash-1.1.2" sources."create-hmac-1.1.4" @@ -19949,7 +20544,7 @@ in sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" sources."elliptic-6.4.0" - sources."parse-asn1-5.0.0" + sources."parse-asn1-5.1.0" sources."brorand-1.1.0" sources."hash.js-1.0.3" sources."hmac-drbg-1.0.0" @@ -19968,16 +20563,12 @@ in sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."function-bind-1.1.0" - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" sources."lexical-scope-1.2.0" - sources."astw-2.0.0" - sources."acorn-1.2.2" + sources."astw-2.2.0" + sources."acorn-4.0.11" sources."stream-splicer-2.0.0" - (sources."detective-4.3.2" // { - dependencies = [ - sources."acorn-3.3.0" - ]; - }) + sources."detective-4.5.0" sources."stream-combiner2-1.1.1" sources."path-platform-0.11.15" sources."buffer-shims-1.0.0" @@ -20016,7 +20607,7 @@ in sources."chalk-1.0.0" sources."chromecast-player-0.2.3" sources."debounced-seeker-1.0.0" - sources."debug-2.6.1" + sources."debug-2.6.3" sources."diveSync-0.3.0" sources."got-1.2.2" sources."internal-ip-1.2.0" @@ -20097,7 +20688,7 @@ in sources."decamelize-1.2.0" sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" - sources."normalize-package-data-2.3.5" + sources."normalize-package-data-2.3.6" sources."read-pkg-up-1.0.1" sources."redent-1.0.0" sources."trim-newlines-1.0.0" @@ -20105,7 +20696,7 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.2.0" + sources."hosted-git-info-2.4.1" sources."is-builtin-module-1.0.0" sources."semver-5.3.0" sources."validate-npm-package-license-3.0.1" @@ -20124,7 +20715,7 @@ in sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" - sources."error-ex-1.3.0" + sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" sources."is-utf8-0.2.1" sources."indent-string-2.1.0" @@ -20143,7 +20734,7 @@ in sources."minimist-0.0.10" ]; }) - (sources."parse-torrent-5.8.1" // { + (sources."parse-torrent-5.8.2" // { dependencies = [ sources."get-stdin-5.0.1" ]; @@ -20241,7 +20832,7 @@ in sources."randombytes-2.0.3" sources."run-parallel-1.1.6" sources."inherits-2.0.3" - sources."ip-1.1.4" + sources."ip-1.1.5" sources."flatten-0.0.1" sources."fifo-0.1.4" (sources."peer-wire-protocol-0.7.0" // { @@ -20289,26 +20880,26 @@ in sources."compact2string-1.4.0" sources."random-iterate-1.0.1" sources."run-series-1.1.4" - (sources."simple-peer-6.4.3" // { + (sources."simple-peer-6.4.4" // { dependencies = [ - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."isarray-1.0.0" ]; }) (sources."simple-websocket-4.3.1" // { dependencies = [ - sources."readable-stream-2.2.3" - sources."ws-2.1.0" + sources."readable-stream-2.2.6" + sources."ws-2.2.2" sources."isarray-1.0.0" ]; }) sources."string2compact-1.2.2" - (sources."ws-1.1.2" // { + (sources."ws-1.1.4" // { dependencies = [ sources."ultron-1.0.2" ]; }) - sources."ipaddr.js-1.2.0" + sources."ipaddr.js-1.3.0" sources."get-browser-rtc-1.0.2" sources."buffer-shims-1.0.0" sources."process-nextick-args-1.0.7" @@ -20329,7 +20920,7 @@ in ]; }) sources."hawk-0.10.2" - sources."node-uuid-1.4.7" + sources."node-uuid-1.4.8" sources."cookie-jar-0.2.0" sources."aws-sign-0.2.0" sources."oauth-sign-0.2.0" @@ -20349,7 +20940,7 @@ in sources."voc-0.5.0" (sources."concat-stream-1.6.0" // { dependencies = [ - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."isarray-1.0.0" ]; }) @@ -20395,7 +20986,7 @@ in dependencies = [ (sources."cordova-common-2.0.0" // { dependencies = [ - sources."q-1.4.1" + sources."q-1.5.0" sources."underscore-1.8.3" ]; }) @@ -20412,8 +21003,7 @@ in (sources."insight-0.8.4" // { dependencies = [ sources."async-1.5.2" - sources."request-2.79.0" - sources."qs-6.3.1" + sources."request-2.81.0" ]; }) sources."nopt-3.0.1" @@ -20456,15 +21046,15 @@ in }) (sources."cordova-fetch-1.0.2" // { dependencies = [ - sources."q-1.4.1" - sources."shelljs-0.7.6" + sources."q-1.5.0" + sources."shelljs-0.7.7" sources."glob-7.1.1" ]; }) sources."cordova-js-4.2.1" (sources."cordova-serve-1.0.1" // { dependencies = [ - sources."q-1.4.1" + sources."q-1.5.0" ]; }) (sources."dep-graph-1.1.0" // { @@ -20472,12 +21062,12 @@ in sources."underscore-1.2.1" ]; }) - (sources."init-package-json-1.9.4" // { + (sources."init-package-json-1.9.5" // { dependencies = [ - sources."glob-6.0.4" + sources."glob-7.1.1" ]; }) - (sources."npm-2.15.11" // { + (sources."npm-2.15.12" // { dependencies = [ sources."abbrev-1.0.9" sources."glob-7.0.6" @@ -20488,8 +21078,14 @@ in sources."request-2.74.0" sources."semver-5.1.1" sources."tar-2.2.1" + sources."validate-npm-package-name-2.2.2" sources."isarray-1.0.0" + sources."caseless-0.11.0" sources."form-data-1.0.1" + sources."har-validator-2.0.6" + sources."qs-6.2.3" + sources."tunnel-agent-0.4.3" + sources."builtins-0.0.7" ]; }) sources."opener-1.4.1" @@ -20502,6 +21098,7 @@ in sources."form-data-0.1.4" sources."mime-types-1.0.2" sources."qs-2.3.3" + sources."tunnel-agent-0.4.3" sources."http-signature-0.10.1" sources."oauth-sign-0.4.0" sources."hawk-1.1.1" @@ -20521,7 +21118,11 @@ in }) sources."tar-1.0.2" sources."valid-identifier-0.0.1" - sources."xcode-0.9.1" + (sources."xcode-0.9.1" // { + dependencies = [ + sources."node-uuid-1.4.7" + ]; + }) sources."browserify-transform-tools-1.5.3" sources."falafel-1.2.0" sources."through-2.3.8" @@ -20536,7 +21137,7 @@ in ]; }) sources."is-url-1.2.2" - sources."interpret-1.0.1" + sources."interpret-1.0.2" sources."rechoir-0.6.2" sources."fs.realpath-1.0.0" sources."resolve-1.3.2" @@ -20589,7 +21190,7 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.2.3" // { + (sources."readable-stream-2.2.6" // { dependencies = [ sources."isarray-1.0.0" ]; @@ -20600,9 +21201,9 @@ in sources."stream-http-2.6.3" sources."string_decoder-0.10.31" sources."subarg-1.0.0" - (sources."syntax-error-1.1.6" // { + (sources."syntax-error-1.3.0" // { dependencies = [ - sources."acorn-2.7.0" + sources."acorn-4.0.11" ]; }) sources."through2-2.0.3" @@ -20634,7 +21235,7 @@ in sources."process-nextick-args-1.0.7" sources."date-now-0.1.4" sources."browserify-cipher-1.0.0" - sources."browserify-sign-4.0.0" + sources."browserify-sign-4.0.4" sources."create-ecdh-4.0.0" sources."create-hash-1.1.2" sources."create-hmac-1.1.4" @@ -20652,7 +21253,7 @@ in sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" sources."elliptic-6.4.0" - sources."parse-asn1-5.0.0" + sources."parse-asn1-5.1.0" sources."brorand-1.1.0" sources."hash.js-1.0.3" sources."hmac-drbg-1.0.0" @@ -20662,13 +21263,17 @@ in sources."sha.js-2.4.8" sources."miller-rabin-4.0.0" sources."function-bind-1.1.0" - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" sources."lexical-scope-1.2.0" - sources."astw-2.0.0" - sources."stream-splicer-2.0.0" - (sources."detective-4.3.2" // { + (sources."astw-2.2.0" // { dependencies = [ - sources."acorn-3.3.0" + sources."acorn-4.0.11" + ]; + }) + sources."stream-splicer-2.0.0" + (sources."detective-4.5.0" // { + dependencies = [ + sources."acorn-4.0.11" ]; }) sources."stream-combiner2-1.1.1" @@ -20686,7 +21291,12 @@ in sources."indexof-0.0.1" sources."chalk-1.1.3" sources."compression-1.6.2" - sources."express-4.14.1" + (sources."express-4.15.2" // { + dependencies = [ + sources."debug-2.6.1" + sources."ms-0.7.2" + ]; + }) sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -20695,13 +21305,13 @@ in sources."ansi-regex-2.1.1" sources."accepts-1.3.3" sources."bytes-2.3.0" - sources."compressible-2.0.9" + sources."compressible-2.0.10" sources."debug-2.2.0" sources."on-headers-1.0.1" - sources."vary-1.1.0" - sources."mime-types-2.1.14" + sources."vary-1.1.1" + sources."mime-types-2.1.15" sources."negotiator-0.6.1" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."ms-0.7.1" sources."array-flatten-1.1.1" sources."content-disposition-0.5.2" @@ -20711,49 +21321,55 @@ in sources."depd-1.1.0" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" - sources."etag-1.7.0" - sources."finalhandler-0.5.1" - sources."fresh-0.3.0" + sources."etag-1.8.0" + (sources."finalhandler-1.0.1" // { + dependencies = [ + sources."debug-2.6.3" + sources."ms-0.7.2" + ]; + }) + sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."on-finished-2.3.0" sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.3" - sources."qs-6.2.0" + sources."proxy-addr-1.1.4" + sources."qs-6.4.0" sources."range-parser-1.2.0" - (sources."send-0.14.2" // { + (sources."send-0.15.1" // { dependencies = [ + sources."debug-2.6.1" sources."ms-0.7.2" ]; }) - sources."serve-static-1.11.2" + sources."serve-static-1.12.1" + sources."setprototypeof-1.0.3" + sources."statuses-1.3.1" sources."type-is-1.6.14" sources."utils-merge-1.0.0" - sources."statuses-1.3.1" sources."unpipe-1.0.0" sources."ee-first-1.1.1" sources."forwarded-0.1.0" - sources."ipaddr.js-1.2.0" + sources."ipaddr.js-1.3.0" sources."destroy-1.0.4" - sources."http-errors-1.5.1" + sources."http-errors-1.6.1" sources."mime-1.3.4" - sources."setprototypeof-1.0.2" sources."media-typer-0.3.0" - sources."npm-package-arg-4.2.0" + sources."npm-package-arg-4.2.1" sources."promzard-0.3.0" sources."read-1.0.7" - (sources."read-package-json-2.0.4" // { + (sources."read-package-json-2.0.5" // { dependencies = [ - sources."glob-6.0.4" + sources."glob-7.1.1" ]; }) sources."validate-npm-package-license-3.0.1" - sources."validate-npm-package-name-2.2.2" - sources."hosted-git-info-2.2.0" + sources."validate-npm-package-name-3.0.0" + sources."hosted-git-info-2.4.1" sources."mute-stream-0.0.7" sources."json-parse-helpfulerror-1.0.3" - sources."normalize-package-data-2.3.5" + sources."normalize-package-data-2.3.6" sources."graceful-fs-4.1.11" sources."jju-1.3.0" sources."is-builtin-module-1.0.0" @@ -20761,7 +21377,7 @@ in sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" - sources."builtins-0.0.7" + sources."builtins-1.0.3" sources."abbrev-1.1.0" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" @@ -20776,9 +21392,9 @@ in sources."config-chain-1.1.11" sources."dezalgo-1.0.3" sources."editor-1.0.0" - sources."fs-vacuum-1.2.9" - sources."fs-write-stream-atomic-1.0.8" - sources."fstream-1.0.10" + sources."fs-vacuum-1.2.10" + sources."fs-write-stream-atomic-1.0.10" + sources."fstream-1.0.11" sources."fstream-npm-1.1.1" sources."github-url-from-git-1.4.0" sources."github-url-from-username-repo-1.0.2" @@ -20790,7 +21406,7 @@ in sources."minimist-0.0.8" ]; }) - (sources."node-gyp-3.4.0" // { + (sources."node-gyp-3.6.0" // { dependencies = [ sources."glob-7.1.1" sources."tar-2.2.1" @@ -20801,8 +21417,7 @@ in sources."npm-install-checks-1.0.7" (sources."npm-registry-client-7.2.1" // { dependencies = [ - sources."request-2.79.0" - sources."qs-6.3.1" + sources."request-2.81.0" ]; }) sources."npm-user-validate-0.1.5" @@ -20822,7 +21437,7 @@ in sources."text-table-0.2.0" sources."uid-number-0.0.6" sources."umask-1.1.0" - sources."which-1.2.12" + sources."which-1.2.14" sources."write-file-atomic-1.1.4" sources."imurmurhash-0.1.4" sources."wcwidth-1.0.1" @@ -20833,49 +21448,47 @@ in sources."iferr-0.1.5" sources."fstream-ignore-1.0.5" sources."pseudomap-1.0.2" - sources."yallist-2.0.0" - sources."path-array-1.0.1" - sources."array-index-1.0.0" - sources."es6-symbol-3.1.0" - sources."d-0.1.1" - sources."es5-ext-0.10.12" - sources."es6-iterator-2.0.0" + sources."yallist-2.1.2" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" + sources."performance-now-0.2.0" + sources."safe-buffer-5.0.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."commander-2.9.0" - sources."is-my-json-valid-2.16.0" - sources."pinkie-promise-2.0.1" - sources."graceful-readlink-1.0.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.1" - sources."is-property-1.0.2" - sources."pinkie-2.0.4" + (sources."ajv-4.11.5" // { + dependencies = [ + sources."json-stable-stringify-1.0.1" + ]; + }) + sources."har-schema-1.0.5" + sources."co-4.6.0" sources."hoek-2.16.3" sources."boom-2.10.1" sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.11.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -20915,13 +21528,22 @@ in sources."isarray-1.0.0" ]; }) - sources."node-uuid-1.4.7" - (sources."async-2.1.5" // { + sources."node-uuid-1.4.8" + (sources."async-2.2.0" // { dependencies = [ sources."lodash-4.17.4" ]; }) - sources."isexe-1.1.2" + sources."commander-2.9.0" + sources."is-my-json-valid-2.16.0" + sources."pinkie-promise-2.0.1" + sources."graceful-readlink-1.0.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-4.0.1" + sources."is-property-1.0.2" + sources."pinkie-2.0.4" + sources."isexe-2.0.0" sources."ctype-0.5.3" sources."pegjs-0.9.0" (sources."simple-plist-0.1.4" // { @@ -20988,7 +21610,7 @@ in ]; }) sources."stream-shift-1.0.0" - sources."rc-1.1.7" + sources."rc-1.2.0" sources."deep-extend-0.4.1" sources."strip-json-comments-2.0.1" sources."is-finite-1.0.2" @@ -21009,7 +21631,7 @@ in sha1 = "19cc3eda322160fd3f7232af1cb2a360e898a2e9"; }; dependencies = [ - sources."clone-2.1.0" + sources."clone-2.1.1" sources."parserlib-1.1.1" ]; buildInputs = globalBuildInputs; @@ -21065,7 +21687,7 @@ in }) sources."through-2.3.8" sources."duplexer-0.1.1" - sources."from-0.1.3" + sources."from-0.1.7" sources."map-stream-0.1.0" sources."pause-stream-0.0.11" sources."split-0.3.3" @@ -21099,9 +21721,9 @@ in sources."cookie-0.1.2" sources."merge-descriptors-0.0.2" sources."utils-merge-1.0.0" - sources."mime-types-2.1.14" + sources."mime-types-2.1.15" sources."negotiator-0.5.3" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."ms-0.7.0" sources."crc-3.2.1" sources."ee-first-1.1.0" @@ -21172,9 +21794,9 @@ in sources."JSONStream-0.8.4" sources."basic-auth-1.1.0" sources."cookie-signature-1.0.6" - sources."cors-2.8.1" + sources."cors-2.8.3" sources."docker-parse-image-3.0.1" - sources."end-of-stream-1.1.0" + sources."end-of-stream-1.4.0" sources."from2-1.3.0" sources."fs-blob-store-5.2.1" sources."level-0.18.0" @@ -21213,7 +21835,7 @@ in sources."minimist-1.2.0" sources."split2-2.1.1" sources."through2-2.0.3" - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."isarray-1.0.0" ]; }) @@ -21227,7 +21849,7 @@ in (sources."tar-stream-1.5.2" // { dependencies = [ sources."bl-1.2.0" - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."isarray-1.0.0" ]; }) @@ -21240,8 +21862,9 @@ in sources."xtend-4.0.1" sources."jsonparse-0.0.5" sources."through-2.3.8" - sources."vary-1.1.0" - sources."once-1.3.3" + sources."object-assign-4.1.1" + sources."vary-1.1.1" + sources."once-1.4.0" sources."wrappy-1.0.2" sources."inherits-2.0.3" sources."readable-stream-1.1.14" @@ -21251,7 +21874,8 @@ in (sources."duplexify-3.5.0" // { dependencies = [ sources."end-of-stream-1.0.0" - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" + sources."once-1.3.3" sources."isarray-1.0.0" ]; }) @@ -21319,62 +21943,56 @@ in }; dependencies = [ sources."JSONStream-1.3.1" - sources."async-2.1.5" + sources."async-2.2.0" sources."aws4-1.6.0" sources."awscred-1.2.0" sources."ini-1.3.4" sources."optimist-0.6.1" - sources."request-2.79.0" + sources."request-2.81.0" sources."jsonparse-1.3.0" sources."through-2.3.8" sources."lodash-4.17.4" sources."wordwrap-0.0.3" sources."minimist-0.0.10" sources."aws-sign2-0.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.14" + sources."mime-types-2.1.15" sources."oauth-sign-0.8.2" - sources."qs-6.3.1" + sources."performance-now-0.2.0" + sources."qs-6.4.0" + sources."safe-buffer-5.0.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."chalk-1.1.3" - sources."commander-2.9.0" - sources."is-my-json-valid-2.16.0" - sources."pinkie-promise-2.0.1" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."ansi-regex-2.1.1" - sources."graceful-readlink-1.0.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.1" - sources."xtend-4.0.1" - sources."is-property-1.0.2" - sources."pinkie-2.0.4" + sources."ajv-4.11.5" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" sources."hoek-2.16.3" sources."boom-2.10.1" sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.11.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -21398,7 +22016,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."punycode-1.4.1" ]; buildInputs = globalBuildInputs; @@ -21444,10 +22062,10 @@ in sources."signal-exit-3.0.2" sources."strip-eof-1.0.0" sources."lru-cache-4.0.2" - sources."which-1.2.12" + sources."which-1.2.14" sources."pseudomap-1.0.2" - sources."yallist-2.0.0" - sources."isexe-1.1.2" + sources."yallist-2.1.2" + sources."isexe-2.0.0" sources."object-assign-4.1.1" sources."pinkie-promise-2.0.1" sources."pinkie-2.0.4" @@ -21474,14 +22092,14 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."minimist-1.2.0" - sources."normalize-package-data-2.3.5" + sources."normalize-package-data-2.3.6" sources."read-pkg-up-1.0.1" sources."redent-1.0.0" sources."trim-newlines-1.0.0" sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.2.0" + sources."hosted-git-info-2.4.1" sources."is-builtin-module-1.0.0" sources."semver-5.3.0" sources."validate-npm-package-license-3.0.1" @@ -21498,7 +22116,7 @@ in sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" - sources."error-ex-1.3.0" + sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" sources."is-utf8-0.2.1" sources."indent-string-2.1.0" @@ -21519,30 +22137,31 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.16.1"; + version = "3.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.16.1.tgz"; - sha1 = "9bc31fc7341692cf772e80607508f67d711c5609"; + url = "https://registry.npmjs.org/eslint/-/eslint-3.18.0.tgz"; + sha1 = "647e985c4ae71502d20ac62c109f66d5104c8a4b"; }; dependencies = [ sources."babel-code-frame-6.22.0" sources."chalk-1.1.3" sources."concat-stream-1.6.0" - sources."debug-2.6.1" - sources."doctrine-1.5.0" + sources."debug-2.6.3" + sources."doctrine-2.0.0" sources."escope-3.6.0" sources."espree-3.4.0" + sources."esquery-1.0.0" sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."file-entry-cache-2.0.0" sources."glob-7.1.1" - sources."globals-9.16.0" - sources."ignore-3.2.4" + sources."globals-9.17.0" + sources."ignore-3.2.6" sources."imurmurhash-0.1.4" sources."inquirer-0.12.0" sources."is-my-json-valid-2.16.0" sources."is-resolvable-1.0.0" - sources."js-yaml-3.8.1" + sources."js-yaml-3.8.2" sources."json-stable-stringify-1.0.1" sources."levn-0.3.0" sources."lodash-4.17.4" @@ -21553,7 +22172,7 @@ in sources."pluralize-1.2.1" sources."progress-1.1.8" sources."require-uncached-1.0.3" - sources."shelljs-0.7.6" + sources."shelljs-0.7.7" sources."strip-bom-3.0.0" sources."strip-json-comments-2.0.1" (sources."table-3.8.3" // { @@ -21573,7 +22192,7 @@ in sources."ansi-regex-2.1.1" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" @@ -21581,19 +22200,19 @@ in sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" sources."ms-0.7.2" - sources."es6-map-0.1.4" - sources."es6-weak-map-2.0.1" + sources."es6-map-0.1.5" + sources."es6-weak-map-2.0.2" (sources."esrecurse-4.1.0" // { dependencies = [ sources."estraverse-4.1.1" ]; }) - sources."d-0.1.1" - sources."es5-ext-0.10.12" - sources."es6-iterator-2.0.0" - sources."es6-set-0.1.4" - sources."es6-symbol-3.1.0" - sources."event-emitter-0.3.4" + sources."d-1.0.0" + sources."es5-ext-0.10.15" + sources."es6-iterator-2.0.1" + sources."es6-set-0.1.5" + sources."es6-symbol-3.1.1" + sources."event-emitter-0.3.5" sources."object-assign-4.1.1" sources."acorn-4.0.4" (sources."acorn-jsx-3.0.1" // { @@ -21661,11 +22280,11 @@ in sources."caller-path-0.1.0" sources."resolve-from-1.0.1" sources."callsites-0.2.0" - sources."interpret-1.0.1" + sources."interpret-1.0.2" sources."rechoir-0.6.2" sources."resolve-1.3.2" sources."path-parse-1.0.5" - sources."ajv-4.11.3" + sources."ajv-4.11.5" sources."ajv-keywords-1.5.1" sources."slice-ansi-0.0.4" sources."co-4.6.0" @@ -21805,7 +22424,7 @@ in sources."filename-regex-2.0.0" sources."is-extglob-1.0.0" sources."kind-of-3.1.0" - sources."normalize-path-2.0.1" + sources."normalize-path-2.1.1" sources."object.omit-2.0.1" sources."parse-glob-3.0.4" sources."regex-cache-0.4.3" @@ -21820,17 +22439,18 @@ in sources."repeat-string-1.6.1" sources."isarray-1.0.0" sources."is-posix-bracket-0.1.1" - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" + sources."remove-trailing-separator-1.0.1" sources."for-own-0.1.5" sources."is-extendable-0.1.1" - sources."for-in-1.0.1" + sources."for-in-1.0.2" sources."glob-base-0.3.0" sources."is-dotfile-1.0.2" sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" sources."binary-extensions-1.8.0" sources."graceful-fs-4.1.11" - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."set-immediate-shim-1.0.1" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -21838,30 +22458,28 @@ in sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" sources."nan-2.5.1" - sources."node-pre-gyp-0.6.33" + sources."node-pre-gyp-0.6.34" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) - sources."nopt-3.0.6" + sources."nopt-4.0.1" sources."npmlog-4.0.2" - (sources."rc-1.1.7" // { + (sources."rc-1.2.0" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."request-2.79.0" - sources."rimraf-2.5.4" + sources."request-2.81.0" + sources."rimraf-2.6.1" sources."semver-5.3.0" sources."tar-2.2.1" - (sources."tar-pack-3.3.0" // { - dependencies = [ - sources."once-1.3.3" - sources."readable-stream-2.1.5" - ]; - }) + sources."tar-pack-3.4.0" sources."abbrev-1.1.0" + sources."osenv-0.1.4" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" (sources."gauge-2.7.3" // { @@ -21886,48 +22504,44 @@ in sources."strip-json-comments-2.0.1" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.14" + sources."mime-types-2.1.15" sources."oauth-sign-0.8.2" - sources."qs-6.3.1" + sources."performance-now-0.2.0" + sources."qs-6.4.0" + sources."safe-buffer-5.0.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."chalk-1.1.3" - sources."commander-2.9.0" - sources."is-my-json-valid-2.16.0" - sources."pinkie-promise-2.0.1" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" - sources."graceful-readlink-1.0.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.1" - sources."xtend-4.0.1" - sources."is-property-1.0.2" - sources."pinkie-2.0.4" + sources."ajv-4.11.5" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" sources."hoek-2.16.3" sources."boom-2.10.1" sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.11.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -21951,7 +22565,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."punycode-1.4.1" sources."glob-7.1.1" sources."fs.realpath-1.0.0" @@ -21959,11 +22573,11 @@ in sources."once-1.4.0" sources."wrappy-1.0.2" sources."block-stream-0.0.9" - sources."fstream-1.0.10" - sources."debug-2.2.0" + sources."fstream-1.0.11" + sources."debug-2.6.3" sources."fstream-ignore-1.0.5" sources."uid-number-0.0.6" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -21975,7 +22589,6 @@ in sources."lazy-1.0.11" sources."caller-0.0.1" sources."tape-2.3.3" - sources."jsonify-0.0.0" sources."deep-equal-0.1.2" sources."defined-0.0.0" sources."through-2.3.8" @@ -21994,14 +22607,18 @@ in git-run = nodeEnv.buildNodePackage { name = "git-run"; packageName = "git-run"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/git-run/-/git-run-0.5.3.tgz"; - sha1 = "92005049d5514753d53c4f90fd6f2b2b29a8e08c"; + url = "https://registry.npmjs.org/git-run/-/git-run-0.5.4.tgz"; + sha1 = "466a7253a54f526ca2f57ca78780895b95efaee4"; }; dependencies = [ + sources."async-2.2.0" + sources."lodash.groupby-4.6.0" sources."minilog-2.0.8" + sources."simple-git-1.69.0" sources."tabtab-git+https://github.com/mixu/node-tabtab.git" + sources."lodash-4.17.4" sources."microee-0.0.2" ]; buildInputs = globalBuildInputs; @@ -22082,7 +22699,7 @@ in sources."source-map-0.1.43" ]; }) - (sources."uglify-js-2.7.5" // { + (sources."uglify-js-2.8.20" // { dependencies = [ sources."source-map-0.5.6" ]; @@ -22106,9 +22723,8 @@ in sources."css-stringify-1.0.5" sources."optimist-0.3.7" sources."wordwrap-0.0.3" - sources."async-0.2.10" - sources."uglify-to-browserify-1.0.2" sources."yargs-3.10.0" + sources."uglify-to-browserify-1.0.2" sources."camelcase-1.2.1" (sources."cliui-2.1.0" // { dependencies = [ @@ -22124,7 +22740,7 @@ in sources."kind-of-3.1.0" sources."longest-1.0.1" sources."repeat-string-1.6.1" - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" sources."acorn-globals-1.0.9" sources."pop-iterate-1.0.1" sources."weak-map-1.0.5" @@ -22153,14 +22769,14 @@ in sources."chalk-1.1.3" sources."deprecated-0.0.1" sources."gulp-util-3.0.8" - sources."interpret-1.0.1" + sources."interpret-1.0.2" sources."liftoff-2.3.0" sources."minimist-1.2.0" sources."orchestrator-0.3.8" sources."pretty-hrtime-1.0.3" sources."semver-4.3.6" sources."tildify-1.2.0" - sources."v8flags-2.0.11" + sources."v8flags-2.0.12" (sources."vinyl-fs-0.3.14" // { dependencies = [ sources."through2-0.6.5" @@ -22191,7 +22807,7 @@ in sources."replace-ext-0.0.1" (sources."through2-2.0.3" // { dependencies = [ - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."isarray-1.0.0" ]; }) @@ -22245,7 +22861,7 @@ in sources."extglob-0.3.2" sources."filename-regex-2.0.0" sources."kind-of-3.1.0" - sources."normalize-path-2.0.1" + sources."normalize-path-2.1.1" sources."object.omit-2.0.1" sources."parse-glob-3.0.4" sources."regex-cache-0.4.3" @@ -22263,10 +22879,11 @@ in sources."randomatic-1.1.6" sources."repeat-string-1.6.1" sources."is-posix-bracket-0.1.1" - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" + sources."remove-trailing-separator-1.0.1" sources."for-own-0.1.5" sources."is-extendable-0.1.1" - sources."for-in-1.0.1" + sources."for-in-1.0.2" sources."glob-base-0.3.0" sources."is-dotfile-1.0.2" sources."glob-parent-2.0.0" @@ -22279,9 +22896,9 @@ in sources."is-windows-0.2.0" sources."homedir-polyfill-1.0.1" sources."ini-1.3.4" - sources."which-1.2.12" + sources."which-1.2.14" sources."parse-passwd-1.0.0" - sources."isexe-1.1.2" + sources."isexe-2.0.0" sources."lodash.assignwith-4.2.0" sources."lodash.isempty-4.4.0" sources."lodash.pick-4.4.0" @@ -22362,7 +22979,7 @@ in sources."redis-0.10.3" sources."lru-cache-2.5.2" sources."minimist-0.0.8" - sources."eventemitter3-2.0.2" + sources."eventemitter3-2.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -22481,7 +23098,7 @@ in sources."source-map-0.4.4" ]; }) - (sources."js-yaml-3.8.1" // { + (sources."js-yaml-3.8.2" // { dependencies = [ sources."esprima-3.1.3" ]; @@ -22495,7 +23112,7 @@ in sources."once-1.4.0" sources."resolve-1.1.7" sources."supports-color-3.2.3" - sources."which-1.2.12" + sources."which-1.2.14" sources."wordwrap-1.0.0" sources."estraverse-1.9.3" sources."esutils-2.0.2" @@ -22520,15 +23137,14 @@ in sources."wordwrap-0.0.3" ]; }) - (sources."uglify-js-2.7.5" // { + (sources."uglify-js-2.8.20" // { dependencies = [ - sources."async-0.2.10" sources."source-map-0.5.6" ]; }) sources."minimist-0.0.10" - sources."uglify-to-browserify-1.0.2" sources."yargs-3.10.0" + sources."uglify-to-browserify-1.0.2" sources."camelcase-1.2.1" (sources."cliui-2.1.0" // { dependencies = [ @@ -22544,11 +23160,11 @@ in sources."kind-of-3.1.0" sources."longest-1.0.1" sources."repeat-string-1.6.1" - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" sources."argparse-1.0.9" sources."sprintf-js-1.0.3" sources."has-flag-1.0.0" - sources."isexe-1.1.2" + sources."isexe-2.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -22631,15 +23247,15 @@ in json = nodeEnv.buildNodePackage { name = "json"; packageName = "json"; - version = "9.0.4"; + version = "9.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/json/-/json-9.0.4.tgz"; - sha1 = "d0dbf2404c128572a935ecafadfc782ec81112ce"; + url = "https://registry.npmjs.org/json/-/json-9.0.6.tgz"; + sha1 = "7972c2a5a48a42678db2730c7c2c4ee6e4e24585"; }; buildInputs = globalBuildInputs; meta = { description = "a 'json' command for massaging and processing JSON on the command line"; - homepage = https://github.com/trentm/json; + homepage = "https://github.com/trentm/json#readme"; }; production = true; }; @@ -22661,10 +23277,10 @@ in js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml"; - version = "3.8.1"; + version = "3.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.1.tgz"; - sha1 = "782ba50200be7b9e5a8537001b7804db3ad02628"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.2.tgz"; + sha1 = "02d3e2c0f6beab20248d412c352203827d786721"; }; dependencies = [ sources."argparse-1.0.9" @@ -22688,8 +23304,8 @@ in sha1 = "9c4c14f0400bef2c04c8e8e6bff59371025cc009"; }; dependencies = [ - sources."bluebird-3.4.7" - sources."body-parser-1.16.1" + sources."bluebird-3.5.0" + sources."body-parser-1.17.1" sources."chokidar-1.6.1" sources."colors-1.1.2" (sources."combine-lists-1.0.1" // { @@ -22736,26 +23352,26 @@ in }) sources."source-map-0.5.6" sources."tmp-0.0.31" - sources."useragent-2.1.12" + sources."useragent-2.1.13" sources."bytes-2.4.0" sources."content-type-1.0.2" sources."debug-2.6.1" sources."depd-1.1.0" - sources."http-errors-1.5.1" + sources."http-errors-1.6.1" sources."iconv-lite-0.4.15" sources."on-finished-2.3.0" - sources."qs-6.2.1" + sources."qs-6.4.0" sources."raw-body-2.2.0" sources."type-is-1.6.14" sources."ms-0.7.2" sources."inherits-2.0.3" - sources."setprototypeof-1.0.2" + sources."setprototypeof-1.0.3" sources."statuses-1.3.1" sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" - sources."mime-types-2.1.14" - sources."mime-db-1.26.0" + sources."mime-types-2.1.15" + sources."mime-db-1.27.0" sources."anymatch-1.3.0" sources."async-each-1.0.1" sources."glob-parent-2.0.0" @@ -22774,7 +23390,7 @@ in sources."filename-regex-2.0.0" sources."is-extglob-1.0.0" sources."kind-of-3.1.0" - sources."normalize-path-2.0.1" + sources."normalize-path-2.1.1" sources."object.omit-2.0.1" sources."parse-glob-3.0.4" sources."regex-cache-0.4.3" @@ -22789,16 +23405,17 @@ in sources."repeat-string-1.6.1" sources."isarray-1.0.0" sources."is-posix-bracket-0.1.1" - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" + sources."remove-trailing-separator-1.0.1" sources."for-own-0.1.5" sources."is-extendable-0.1.1" - sources."for-in-1.0.1" + sources."for-in-1.0.2" sources."glob-base-0.3.0" sources."is-dotfile-1.0.2" sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" sources."binary-extensions-1.8.0" - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."set-immediate-shim-1.0.1" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -22806,36 +23423,24 @@ in sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" sources."nan-2.5.1" - (sources."node-pre-gyp-0.6.33" // { - dependencies = [ - sources."rimraf-2.5.4" - ]; - }) + sources."node-pre-gyp-0.6.34" sources."mkdirp-0.5.1" - sources."nopt-3.0.6" + sources."nopt-4.0.1" sources."npmlog-4.0.2" - (sources."rc-1.1.7" // { + (sources."rc-1.2.0" // { dependencies = [ sources."minimist-1.2.0" ]; }) - (sources."request-2.79.0" // { - dependencies = [ - sources."qs-6.3.1" - ]; - }) + sources."request-2.81.0" sources."semver-5.3.0" sources."tar-2.2.1" - (sources."tar-pack-3.3.0" // { - dependencies = [ - sources."debug-2.2.0" - sources."readable-stream-2.1.5" - sources."rimraf-2.5.4" - sources."ms-0.7.1" - ]; - }) + sources."tar-pack-3.4.0" sources."minimist-0.0.8" sources."abbrev-1.1.0" + sources."osenv-0.1.4" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" sources."gauge-2.7.3" @@ -22857,46 +23462,41 @@ in sources."strip-json-comments-2.0.1" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" + sources."performance-now-0.2.0" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."chalk-1.1.3" - sources."commander-2.9.0" - sources."is-my-json-valid-2.16.0" - sources."pinkie-promise-2.0.1" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" - sources."graceful-readlink-1.0.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.1" - sources."xtend-4.0.1" - sources."is-property-1.0.2" - sources."pinkie-2.0.4" + sources."ajv-4.11.5" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" sources."hoek-2.16.3" sources."boom-2.10.1" sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.11.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -22922,9 +23522,9 @@ in sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" sources."block-stream-0.0.9" - sources."fstream-1.0.10" + sources."fstream-1.0.11" sources."fstream-ignore-1.0.5" - sources."once-1.3.3" + sources."once-1.4.0" sources."uid-number-0.0.6" sources."wrappy-1.0.2" sources."finalhandler-1.0.0" @@ -23006,7 +23606,6 @@ in sources."better-assert-1.0.2" sources."callsite-1.0.0" sources."json3-3.3.2" - sources."os-tmpdir-1.0.2" sources."lru-cache-2.2.4" ]; buildInputs = globalBuildInputs; @@ -23079,15 +23678,14 @@ in (sources."express-session-1.11.3" // { dependencies = [ sources."uid-safe-2.0.0" - sources."base64-url-1.2.1" ]; }) sources."finalhandler-0.4.0" sources."http-errors-1.3.1" - (sources."method-override-2.3.7" // { + (sources."method-override-2.3.8" // { dependencies = [ - sources."debug-2.3.3" - sources."vary-1.1.0" + sources."debug-2.6.3" + sources."vary-1.1.1" sources."ms-0.7.2" ]; }) @@ -23132,18 +23730,18 @@ in sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."accepts-1.2.13" - sources."compressible-2.0.9" - sources."mime-types-2.1.14" + sources."compressible-2.0.10" + sources."mime-types-2.1.15" sources."negotiator-0.5.3" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."ms-0.7.1" - sources."csrf-3.0.4" - sources."base64-url-1.3.3" + sources."csrf-3.0.6" sources."rndm-1.2.0" sources."tsscmp-1.0.5" - sources."uid-safe-2.1.3" + sources."uid-safe-2.1.4" sources."random-bytes-1.0.0" sources."crc-3.3.0" + sources."base64-url-1.2.1" sources."inherits-2.0.3" sources."statuses-1.3.1" sources."readable-stream-1.1.14" @@ -23188,7 +23786,7 @@ in sources."through2-2.0.3" sources."vinyl-1.2.0" sources."vinyl-fs-2.4.4" - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."xtend-4.0.1" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -23256,7 +23854,7 @@ in }) sources."filename-regex-2.0.0" sources."kind-of-3.1.0" - sources."normalize-path-2.0.1" + sources."normalize-path-2.1.1" sources."object.omit-2.0.1" (sources."parse-glob-3.0.4" // { dependencies = [ @@ -23275,10 +23873,11 @@ in sources."randomatic-1.1.6" sources."repeat-string-1.6.1" sources."is-posix-bracket-0.1.1" - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" + sources."remove-trailing-separator-1.0.1" sources."for-own-0.1.5" sources."is-extendable-0.1.1" - sources."for-in-1.0.1" + sources."for-in-1.0.2" (sources."glob-base-0.3.0" // { dependencies = [ sources."glob-parent-2.0.0" @@ -23293,7 +23892,7 @@ in sources."extend-shallow-2.0.1" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" - sources."convert-source-map-1.4.0" + sources."convert-source-map-1.5.0" sources."minimist-0.0.8" sources."is-utf8-0.2.1" sources."first-chunk-stream-1.0.0" @@ -23415,10 +24014,10 @@ in node2nix = nodeEnv.buildNodePackage { name = "node2nix"; packageName = "node2nix"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/node2nix/-/node2nix-1.1.1.tgz"; - sha1 = "f58c3157be2ffcb8253f82641b5f0473543d21e8"; + url = "https://registry.npmjs.org/node2nix/-/node2nix-1.2.0.tgz"; + sha1 = "3c0a578ffebc231a14f0c0e9078b8063ff776408"; }; dependencies = [ sources."optparse-1.0.5" @@ -23448,17 +24047,17 @@ in sources."concat-stream-1.6.0" sources."graceful-fs-4.1.11" sources."mkdirp-0.5.1" - sources."normalize-package-data-2.3.5" - sources."npm-package-arg-4.2.0" + sources."normalize-package-data-2.3.6" + sources."npm-package-arg-4.2.1" sources."once-1.4.0" - sources."request-2.79.0" + sources."request-2.81.0" sources."retry-0.8.0" sources."rimraf-2.6.1" sources."slide-1.1.6" sources."npmlog-3.1.2" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" @@ -23466,7 +24065,7 @@ in sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" sources."minimist-0.0.8" - sources."hosted-git-info-2.2.0" + sources."hosted-git-info-2.4.1" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -23476,50 +24075,44 @@ in sources."wrappy-1.0.2" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.14" + sources."mime-types-2.1.15" sources."oauth-sign-0.8.2" - sources."qs-6.3.1" + sources."performance-now-0.2.0" + sources."qs-6.4.0" + sources."safe-buffer-5.0.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."chalk-1.1.3" - sources."commander-2.9.0" - sources."is-my-json-valid-2.16.0" - sources."pinkie-promise-2.0.1" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."ansi-regex-2.1.1" - sources."graceful-readlink-1.0.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.1" - sources."xtend-4.0.1" - sources."is-property-1.0.2" - sources."pinkie-2.0.4" + sources."ajv-4.11.5" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" sources."hoek-2.16.3" sources."boom-2.10.1" sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.11.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -23543,7 +24136,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."punycode-1.4.1" sources."glob-7.1.1" sources."fs.realpath-1.0.0" @@ -23564,10 +24157,12 @@ in sources."object-assign-4.1.1" sources."signal-exit-3.0.2" sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" + sources."ansi-regex-2.1.1" sources."config-chain-1.1.11" sources."ini-1.3.4" sources."nopt-3.0.6" @@ -23578,7 +24173,7 @@ in sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."block-stream-0.0.9" - sources."fstream-1.0.10" + sources."fstream-1.0.11" (sources."fs-extra-0.6.4" // { dependencies = [ sources."mkdirp-0.3.5" @@ -23595,19 +24190,20 @@ in meta = { description = "Generate Nix expressions to build NPM packages"; homepage = https://github.com/svanderburg/node2nix; + license = "MIT"; }; production = true; }; node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.5.0.tgz"; - sha1 = "a8fe5e611d079ec16348a3eb960e78e11c85274a"; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.0.tgz"; + sha1 = "7474f63a3a0501161dda0b6341f022f14c423fa6"; }; dependencies = [ - sources."fstream-1.0.10" + sources."fstream-1.0.11" sources."glob-7.1.1" sources."graceful-fs-4.1.11" sources."minimatch-3.0.3" @@ -23615,11 +24211,11 @@ in sources."nopt-3.0.6" sources."npmlog-4.0.2" sources."osenv-0.1.4" - sources."request-2.79.0" + sources."request-2.81.0" sources."rimraf-2.6.1" sources."semver-5.3.0" sources."tar-2.2.1" - sources."which-1.2.12" + sources."which-1.2.14" sources."inherits-2.0.3" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -23636,7 +24232,7 @@ in sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" @@ -23658,48 +24254,44 @@ in sources."os-tmpdir-1.0.2" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.14" + sources."mime-types-2.1.15" sources."oauth-sign-0.8.2" - sources."qs-6.3.1" + sources."performance-now-0.2.0" + sources."qs-6.4.0" + sources."safe-buffer-5.0.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."chalk-1.1.3" - sources."commander-2.9.0" - sources."is-my-json-valid-2.16.0" - sources."pinkie-promise-2.0.1" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" - sources."graceful-readlink-1.0.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.1" - sources."xtend-4.0.1" - sources."is-property-1.0.2" - sources."pinkie-2.0.4" + sources."ajv-4.11.5" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" sources."hoek-2.16.3" sources."boom-2.10.1" sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.11.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -23723,10 +24315,10 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."punycode-1.4.1" sources."block-stream-0.0.9" - sources."isexe-1.1.2" + sources."isexe-2.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -23739,36 +24331,34 @@ in node-inspector = nodeEnv.buildNodePackage { name = "node-inspector"; packageName = "node-inspector"; - version = "0.12.8"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-inspector/-/node-inspector-0.12.8.tgz"; - sha1 = "a59c3dc47cb08d15a2e526be3a1da7d64e5c227f"; + url = "https://registry.npmjs.org/node-inspector/-/node-inspector-1.0.0.tgz"; + sha1 = "c6221619e3f0bd8f1f24e0e882a65eb793f69d37"; }; dependencies = [ sources."async-0.9.2" sources."biased-opener-0.2.8" - sources."debug-2.6.1" - (sources."express-4.14.1" // { + sources."debug-2.6.3" + (sources."express-4.15.2" // { dependencies = [ - sources."debug-2.2.0" - sources."ms-0.7.1" + sources."debug-2.6.1" ]; }) sources."glob-5.0.15" sources."path-is-absolute-1.0.1" - sources."rc-1.1.7" + sources."rc-1.2.0" sources."semver-4.3.6" - (sources."serve-favicon-2.4.0" // { + (sources."serve-favicon-2.4.2" // { dependencies = [ - sources."etag-1.8.0" - sources."fresh-0.4.0" + sources."ms-1.0.0" ]; }) sources."strong-data-uri-1.0.4" - sources."v8-debug-0.7.7" - sources."v8-profiler-5.6.5" - sources."which-1.2.12" - sources."ws-1.1.2" + sources."v8-debug-1.0.1" + sources."v8-profiler-5.7.0" + sources."which-1.2.14" + sources."ws-1.1.4" sources."yargs-3.32.0" sources."browser-launcher2-0.4.6" sources."minimist-1.2.0" @@ -23810,7 +24400,7 @@ in sources."decamelize-1.2.0" sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" - sources."normalize-package-data-2.3.5" + sources."normalize-package-data-2.3.6" sources."object-assign-4.1.1" sources."read-pkg-up-1.0.1" sources."redent-1.0.0" @@ -23819,7 +24409,7 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.2.0" + sources."hosted-git-info-2.4.1" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -23837,7 +24427,7 @@ in sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" - sources."error-ex-1.3.0" + sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" sources."is-utf8-0.2.1" sources."indent-string-2.1.0" @@ -23856,48 +24446,39 @@ in sources."depd-1.1.0" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" - sources."etag-1.7.0" - (sources."finalhandler-0.5.1" // { - dependencies = [ - sources."debug-2.2.0" - sources."ms-0.7.1" - ]; - }) - sources."fresh-0.3.0" + sources."etag-1.8.0" + sources."finalhandler-1.0.1" + sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."on-finished-2.3.0" sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.3" - sources."qs-6.2.0" + sources."proxy-addr-1.1.4" + sources."qs-6.4.0" sources."range-parser-1.2.0" - (sources."send-0.14.2" // { + (sources."send-0.15.1" // { dependencies = [ - (sources."debug-2.2.0" // { - dependencies = [ - sources."ms-0.7.1" - ]; - }) + sources."debug-2.6.1" ]; }) - sources."serve-static-1.11.2" + sources."serve-static-1.12.1" + sources."setprototypeof-1.0.3" + sources."statuses-1.3.1" sources."type-is-1.6.14" sources."utils-merge-1.0.0" - sources."vary-1.1.0" - sources."mime-types-2.1.14" + sources."vary-1.1.1" + sources."mime-types-2.1.15" sources."negotiator-0.6.1" - sources."mime-db-1.26.0" - sources."statuses-1.3.1" + sources."mime-db-1.27.0" sources."unpipe-1.0.0" sources."ee-first-1.1.1" sources."forwarded-0.1.0" - sources."ipaddr.js-1.2.0" + sources."ipaddr.js-1.3.0" sources."destroy-1.0.4" - sources."http-errors-1.5.1" + sources."http-errors-1.6.1" sources."mime-1.3.4" sources."inherits-2.0.3" - sources."setprototypeof-1.0.2" sources."media-typer-0.3.0" sources."inflight-1.0.6" sources."minimatch-3.0.3" @@ -23911,28 +24492,20 @@ in sources."strip-json-comments-2.0.1" sources."truncate-1.0.5" sources."nan-2.5.1" - (sources."node-pre-gyp-0.6.33" // { + (sources."node-pre-gyp-0.6.34" // { dependencies = [ - sources."rimraf-2.5.4" + sources."rimraf-2.6.1" sources."semver-5.3.0" sources."glob-7.1.1" ]; }) - sources."nopt-3.0.6" + sources."nopt-4.0.1" sources."npmlog-4.0.2" - (sources."request-2.79.0" // { - dependencies = [ - sources."qs-6.3.1" - ]; - }) + sources."request-2.81.0" sources."tar-2.2.1" - (sources."tar-pack-3.3.0" // { + (sources."tar-pack-3.4.0" // { dependencies = [ - sources."debug-2.2.0" - sources."once-1.3.3" - sources."readable-stream-2.1.5" - sources."rimraf-2.5.4" - sources."ms-0.7.1" + sources."rimraf-2.6.1" sources."glob-7.1.1" ]; }) @@ -23942,7 +24515,7 @@ in sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" @@ -23958,43 +24531,42 @@ in sources."ansi-regex-2.1.1" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" + sources."performance-now-0.2.0" + sources."safe-buffer-5.0.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."chalk-1.1.3" - sources."commander-2.9.0" - sources."is-my-json-valid-2.16.0" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" - sources."graceful-readlink-1.0.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.1" - sources."is-property-1.0.2" + sources."ajv-4.11.5" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" sources."hoek-2.16.3" sources."boom-2.10.1" sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.11.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24021,10 +24593,10 @@ in sources."punycode-1.4.1" sources."fs.realpath-1.0.0" sources."block-stream-0.0.9" - sources."fstream-1.0.10" + sources."fstream-1.0.11" sources."fstream-ignore-1.0.5" sources."uid-number-0.0.6" - sources."isexe-1.1.2" + sources."isexe-2.0.0" sources."options-0.0.6" sources."ultron-1.0.2" sources."cliui-3.2.0" @@ -24045,38 +24617,36 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.6.33"; + version = "0.6.34"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.33.tgz"; - sha1 = "640ac55198f6a925972e0c16c4ac26a034d5ecc9"; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.34.tgz"; + sha1 = "94ad1c798a11d7fc67381b50d47f8cc18d9799f7"; }; dependencies = [ sources."mkdirp-0.5.1" - sources."nopt-3.0.6" + sources."nopt-4.0.1" sources."npmlog-4.0.2" - (sources."rc-1.1.7" // { + (sources."rc-1.2.0" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."request-2.79.0" - sources."rimraf-2.5.4" + sources."request-2.81.0" + sources."rimraf-2.6.1" sources."semver-5.3.0" sources."tar-2.2.1" - (sources."tar-pack-3.3.0" // { - dependencies = [ - sources."once-1.3.3" - sources."readable-stream-2.1.5" - ]; - }) + sources."tar-pack-3.4.0" sources."minimist-0.0.8" sources."abbrev-1.1.0" + sources."osenv-0.1.4" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" @@ -24100,48 +24670,44 @@ in sources."strip-json-comments-2.0.1" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.14" + sources."mime-types-2.1.15" sources."oauth-sign-0.8.2" - sources."qs-6.3.1" + sources."performance-now-0.2.0" + sources."qs-6.4.0" + sources."safe-buffer-5.0.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."chalk-1.1.3" - sources."commander-2.9.0" - sources."is-my-json-valid-2.16.0" - sources."pinkie-promise-2.0.1" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" - sources."graceful-readlink-1.0.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.1" - sources."xtend-4.0.1" - sources."is-property-1.0.2" - sources."pinkie-2.0.4" + sources."ajv-4.11.5" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" sources."hoek-2.16.3" sources."boom-2.10.1" sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.11.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24165,7 +24731,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."punycode-1.4.1" sources."glob-7.1.1" sources."fs.realpath-1.0.0" @@ -24178,12 +24744,12 @@ in sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."block-stream-0.0.9" - sources."fstream-1.0.10" + sources."fstream-1.0.11" sources."graceful-fs-4.1.11" - sources."debug-2.2.0" + sources."debug-2.6.3" sources."fstream-ignore-1.0.5" sources."uid-number-0.0.6" - sources."ms-0.7.1" + sources."ms-0.7.2" ]; buildInputs = globalBuildInputs; meta = { @@ -24203,11 +24769,7 @@ in }; dependencies = [ sources."chokidar-1.6.1" - (sources."debug-2.6.1" // { - dependencies = [ - sources."ms-0.7.2" - ]; - }) + sources."debug-2.6.3" sources."es6-promise-3.3.1" sources."ignore-by-default-1.0.1" sources."lodash.defaults-3.1.2" @@ -24239,7 +24801,7 @@ in sources."filename-regex-2.0.0" sources."is-extglob-1.0.0" sources."kind-of-3.1.0" - sources."normalize-path-2.0.1" + sources."normalize-path-2.1.1" sources."object.omit-2.0.1" sources."parse-glob-3.0.4" sources."regex-cache-0.4.3" @@ -24254,17 +24816,18 @@ in sources."repeat-string-1.6.1" sources."isarray-1.0.0" sources."is-posix-bracket-0.1.1" - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" + sources."remove-trailing-separator-1.0.1" sources."for-own-0.1.5" sources."is-extendable-0.1.1" - sources."for-in-1.0.1" + sources."for-in-1.0.2" sources."glob-base-0.3.0" sources."is-dotfile-1.0.2" sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" sources."binary-extensions-1.8.0" sources."graceful-fs-4.1.11" - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."set-immediate-shim-1.0.1" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -24272,28 +24835,25 @@ in sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" sources."nan-2.5.1" - sources."node-pre-gyp-0.6.33" + sources."node-pre-gyp-0.6.34" sources."mkdirp-0.5.1" - sources."nopt-3.0.6" + sources."nopt-4.0.1" sources."npmlog-4.0.2" - (sources."rc-1.1.7" // { + (sources."rc-1.2.0" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."request-2.79.0" - sources."rimraf-2.5.4" + sources."request-2.81.0" + sources."rimraf-2.6.1" sources."semver-5.3.0" sources."tar-2.2.1" - (sources."tar-pack-3.3.0" // { - dependencies = [ - sources."debug-2.2.0" - sources."once-1.3.3" - sources."readable-stream-2.1.5" - ]; - }) + sources."tar-pack-3.4.0" sources."minimist-0.0.8" sources."abbrev-1.1.0" + sources."osenv-0.1.4" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" sources."gauge-2.7.3" @@ -24315,48 +24875,44 @@ in sources."strip-json-comments-2.0.1" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.14" + sources."mime-types-2.1.15" sources."oauth-sign-0.8.2" - sources."qs-6.3.1" + sources."performance-now-0.2.0" + sources."qs-6.4.0" + sources."safe-buffer-5.0.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."chalk-1.1.3" - sources."commander-2.9.0" - sources."is-my-json-valid-2.16.0" - sources."pinkie-promise-2.0.1" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" - sources."graceful-readlink-1.0.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.1" - sources."xtend-4.0.1" - sources."is-property-1.0.2" - sources."pinkie-2.0.4" + sources."ajv-4.11.5" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" sources."hoek-2.16.3" sources."boom-2.10.1" sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.11.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24380,7 +24936,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."punycode-1.4.1" sources."glob-7.1.1" sources."fs.realpath-1.0.0" @@ -24388,10 +24944,10 @@ in sources."once-1.4.0" sources."wrappy-1.0.2" sources."block-stream-0.0.9" - sources."fstream-1.0.10" + sources."fstream-1.0.11" sources."fstream-ignore-1.0.5" sources."uid-number-0.0.6" - sources."ms-0.7.1" + sources."ms-0.7.2" sources."lodash.assign-3.2.0" sources."lodash.restparam-3.6.1" sources."lodash._baseassign-3.2.0" @@ -24409,11 +24965,12 @@ in sources."event-stream-3.3.4" sources."through-2.3.8" sources."duplexer-0.1.1" - sources."from-0.1.3" + sources."from-0.1.7" sources."map-stream-0.1.0" sources."pause-stream-0.0.11" sources."split-0.3.3" sources."stream-combiner-0.0.4" + sources."chalk-1.1.3" (sources."configstore-1.4.0" // { dependencies = [ sources."uuid-2.0.3" @@ -24424,11 +24981,12 @@ in sources."repeating-1.1.3" sources."semver-diff-2.1.0" sources."string-length-1.0.1" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.4" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" sources."write-file-atomic-1.3.1" sources."xdg-basedir-2.0.0" - sources."os-homedir-1.0.2" sources."imurmurhash-0.1.4" sources."slide-1.1.6" sources."package-json-1.2.0" @@ -24453,6 +25011,8 @@ in ]; }) sources."stream-shift-1.0.0" + sources."pinkie-promise-2.0.1" + sources."pinkie-2.0.4" sources."is-finite-1.0.2" ]; buildInputs = globalBuildInputs; @@ -24487,7 +25047,7 @@ in sources."express-4.14.0" (sources."follow-redirects-1.2.1" // { dependencies = [ - sources."debug-2.6.1" + sources."debug-2.6.3" sources."ms-0.7.2" ]; }) @@ -24524,11 +25084,14 @@ in sources."xml2js-0.4.17" sources."node-red-node-feedparser-0.1.7" sources."node-red-node-email-0.1.21" - (sources."node-red-node-twitter-0.1.9" // { + (sources."node-red-node-twitter-0.1.10" // { dependencies = [ - sources."request-2.79.0" + sources."request-2.81.0" + sources."caseless-0.12.0" sources."form-data-2.1.2" - sources."qs-6.3.1" + sources."har-validator-4.2.1" + sources."qs-6.4.0" + sources."tunnel-agent-0.6.0" ]; }) sources."node-red-node-rbe-0.1.6" @@ -24548,8 +25111,8 @@ in sources."statuses-1.3.1" sources."ee-first-1.1.1" sources."unpipe-1.0.0" - sources."mime-types-2.1.14" - sources."mime-db-1.26.0" + sources."mime-types-2.1.15" + sources."mime-db-1.27.0" sources."css-select-1.2.0" (sources."dom-serializer-0.1.0" // { dependencies = [ @@ -24576,7 +25139,7 @@ in sources."nth-check-1.0.1" sources."domelementtype-1.3.0" sources."domhandler-2.3.0" - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" @@ -24585,9 +25148,9 @@ in sources."util-deprecate-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."vary-1.1.0" + sources."vary-1.1.1" sources."moment-timezone-0.5.11" - sources."moment-2.17.1" + sources."moment-2.18.1" sources."accepts-1.3.3" sources."array-flatten-1.1.1" sources."content-disposition-0.5.1" @@ -24600,7 +25163,7 @@ in sources."methods-1.1.2" sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.3" + sources."proxy-addr-1.1.4" sources."range-parser-1.2.0" sources."send-0.14.1" (sources."serve-static-1.11.2" // { @@ -24612,7 +25175,7 @@ in sources."utils-merge-1.0.0" sources."negotiator-0.6.1" sources."forwarded-0.1.0" - sources."ipaddr.js-1.2.0" + sources."ipaddr.js-1.3.0" sources."destroy-1.0.4" sources."mime-1.3.4" sources."graceful-fs-4.1.11" @@ -24629,10 +25192,10 @@ in sources."sprintf-js-1.0.3" sources."commist-1.0.0" sources."concat-stream-1.6.0" - sources."end-of-stream-1.1.0" + sources."end-of-stream-1.4.0" sources."help-me-1.0.1" sources."minimist-1.2.0" - sources."mqtt-packet-5.2.1" + sources."mqtt-packet-5.2.2" sources."pump-1.0.2" sources."reinterval-1.1.0" sources."split2-2.1.1" @@ -24640,7 +25203,7 @@ in sources."xtend-4.0.1" sources."leven-1.0.2" sources."typedarray-0.0.6" - sources."once-1.3.3" + sources."once-1.4.0" sources."wrappy-1.0.2" sources."callback-stream-1.1.0" (sources."glob-stream-5.3.5" // { @@ -24683,7 +25246,7 @@ in }) sources."filename-regex-2.0.0" sources."kind-of-3.1.0" - sources."normalize-path-2.0.1" + sources."normalize-path-2.1.1" sources."object.omit-2.0.1" (sources."parse-glob-3.0.4" // { dependencies = [ @@ -24702,10 +25265,11 @@ in sources."randomatic-1.1.6" sources."repeat-string-1.6.1" sources."is-posix-bracket-0.1.1" - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" + sources."remove-trailing-separator-1.0.1" sources."for-own-0.1.5" sources."is-extendable-0.1.1" - sources."for-in-1.0.1" + sources."for-in-1.0.2" (sources."glob-base-0.3.0" // { dependencies = [ sources."glob-parent-2.0.0" @@ -24725,6 +25289,7 @@ in (sources."duplexify-3.5.0" // { dependencies = [ sources."end-of-stream-1.0.0" + sources."once-1.3.3" ]; }) sources."stream-shift-1.0.0" @@ -24772,7 +25337,7 @@ in sources."forever-agent-0.6.1" (sources."form-data-1.0.1" // { dependencies = [ - sources."async-2.1.5" + sources."async-2.2.0" ]; }) sources."har-validator-2.0.6" @@ -24780,7 +25345,7 @@ in sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" - sources."node-uuid-1.4.7" + sources."node-uuid-1.4.8" sources."oauth-sign-0.8.2" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" @@ -24807,8 +25372,12 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.11.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -24876,15 +25445,23 @@ in sources."utf7-1.0.2" sources."twitter-ng-0.6.2" sources."oauth-0.9.14" + sources."performance-now-0.2.0" + sources."safe-buffer-5.0.1" sources."uuid-3.0.1" sources."asynckit-0.4.0" + sources."ajv-4.11.5" + sources."har-schema-1.0.5" + sources."co-4.6.0" sources."bindings-1.2.1" sources."nan-2.5.0" (sources."node-pre-gyp-0.6.32" // { dependencies = [ - sources."request-2.79.0" + sources."request-2.81.0" + sources."caseless-0.12.0" sources."form-data-2.1.2" - sources."qs-6.3.1" + sources."har-validator-4.2.1" + sources."qs-6.4.0" + sources."tunnel-agent-0.6.0" ]; }) (sources."mkdirp-0.5.1" // { @@ -24902,6 +25479,7 @@ in sources."tar-2.2.1" (sources."tar-pack-3.3.0" // { dependencies = [ + sources."once-1.3.3" sources."readable-stream-2.1.5" ]; }) @@ -24924,7 +25502,7 @@ in sources."strip-json-comments-2.0.1" sources."fs.realpath-1.0.0" sources."block-stream-0.0.9" - sources."fstream-1.0.10" + sources."fstream-1.0.11" sources."fstream-ignore-1.0.5" sources."uid-number-0.0.6" ]; @@ -24990,7 +25568,7 @@ in sources."methods-0.0.1" sources."send-0.1.0" sources."cookie-signature-1.0.1" - (sources."debug-2.6.1" // { + (sources."debug-2.6.3" // { dependencies = [ sources."ms-0.7.2" ]; @@ -25065,29 +25643,31 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "4.3.0"; + version = "4.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-4.3.0.tgz"; - sha1 = "78e97142408c8383bff10a0e4036e9f77f00ce28"; + url = "https://registry.npmjs.org/npm/-/npm-4.4.4.tgz"; + sha1 = "d5ec661923a06bcd6a6eec3d0433a9da3fd67e37"; }; dependencies = [ sources."JSONStream-1.3.1" - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" sources."ansi-regex-2.1.1" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" sources."aproba-1.1.1" sources."archy-1.0.0" sources."asap-2.0.5" + sources."bluebird-3.5.0" + sources."call-limit-1.1.0" sources."chownr-1.0.1" sources."cmd-shim-2.0.2" sources."columnify-1.5.4" sources."config-chain-1.1.11" sources."dezalgo-1.0.3" sources."editor-1.0.0" - sources."fs-vacuum-1.2.9" - sources."fs-write-stream-atomic-1.0.8" - sources."fstream-1.0.10" + sources."fs-vacuum-1.2.10" + sources."fs-write-stream-atomic-1.0.10" + sources."fstream-1.0.11" sources."fstream-npm-1.2.0" sources."glob-7.1.1" sources."graceful-fs-4.1.11" @@ -25097,11 +25677,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.4" - (sources."init-package-json-1.9.4" // { - dependencies = [ - sources."glob-6.0.4" - ]; - }) + sources."init-package-json-1.9.5" sources."lazy-property-1.0.0" sources."lockfile-1.0.3" sources."lodash._baseuniq-4.6.0" @@ -25111,6 +25687,7 @@ in sources."lodash.without-4.4.0" sources."mississippi-1.3.0" sources."mkdirp-0.5.1" + sources."move-concurrently-1.0.1" (sources."node-gyp-3.5.0" // { dependencies = [ sources."nopt-3.0.6" @@ -25118,11 +25695,11 @@ in }) sources."nopt-4.0.1" sources."normalize-git-url-3.0.2" - sources."normalize-package-data-2.3.5" + sources."normalize-package-data-2.3.6" sources."npm-cache-filename-1.0.2" sources."npm-install-checks-3.0.0" - sources."npm-package-arg-4.2.0" - sources."npm-registry-client-7.4.5" + sources."npm-package-arg-4.2.1" + sources."npm-registry-client-7.4.6" sources."npm-user-validate-0.1.5" sources."npmlog-4.0.2" sources."once-1.4.0" @@ -25132,17 +25709,13 @@ in sources."read-1.0.7" sources."read-cmd-shim-1.0.1" sources."read-installed-4.0.3" - (sources."read-package-json-2.0.4" // { - dependencies = [ - sources."glob-6.0.4" - ]; - }) + sources."read-package-json-2.0.5" sources."read-package-tree-5.1.5" - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."realize-package-specifier-3.0.3" - sources."request-2.79.0" + sources."request-2.81.0" sources."retry-0.10.1" - sources."rimraf-2.5.4" + sources."rimraf-2.6.1" sources."semver-5.3.0" sources."sha-2.0.1" sources."slide-1.1.6" @@ -25161,9 +25734,10 @@ in sources."umask-1.1.0" sources."unique-filename-1.1.0" sources."unpipe-1.0.0" + sources."update-notifier-2.1.0" sources."uuid-3.0.1" - sources."validate-npm-package-name-2.2.2" - sources."which-1.2.12" + sources."validate-npm-package-name-3.0.0" + sources."which-1.2.14" sources."wrappy-1.0.2" sources."write-file-atomic-1.3.1" sources."debuglog-1.0.1" @@ -25199,11 +25773,7 @@ in sources."once-1.3.3" ]; }) - (sources."end-of-stream-1.1.0" // { - dependencies = [ - sources."once-1.3.3" - ]; - }) + sources."end-of-stream-1.4.0" sources."flush-write-stream-1.0.2" sources."from2-2.3.0" sources."parallel-transform-1.1.0" @@ -25216,6 +25786,8 @@ in sources."cyclist-0.2.2" sources."xtend-4.0.1" sources."minimist-0.0.8" + sources."copy-concurrently-1.0.3" + sources."run-queue-1.0.3" sources."is-builtin-module-1.0.0" sources."builtin-modules-1.1.1" sources."are-we-there-yet-1.1.2" @@ -25244,46 +25816,43 @@ in sources."util-deprecate-1.0.2" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.14" + sources."mime-types-2.1.15" sources."oauth-sign-0.8.2" - sources."qs-6.3.1" + sources."performance-now-0.2.0" + sources."qs-6.4.0" + sources."safe-buffer-5.0.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."chalk-1.1.3" - sources."commander-2.9.0" - sources."is-my-json-valid-2.16.0" - sources."pinkie-promise-2.0.1" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."supports-color-2.0.0" - sources."graceful-readlink-1.0.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.1" - sources."is-property-1.0.2" - sources."pinkie-2.0.4" + sources."ajv-4.11.5" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" sources."hoek-2.16.3" sources."boom-2.10.1" sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.11.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -25307,13 +25876,70 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."punycode-1.4.1" sources."stream-iterate-1.2.0" sources."block-stream-0.0.9" sources."unique-slug-2.0.0" - sources."builtins-0.0.7" - sources."isexe-1.1.2" + (sources."boxen-1.0.0" // { + dependencies = [ + sources."string-width-2.0.0" + sources."is-fullwidth-code-point-2.0.0" + ]; + }) + sources."chalk-1.1.3" + sources."configstore-3.0.0" + sources."is-npm-1.0.0" + sources."latest-version-3.1.0" + sources."lazy-req-2.0.0" + sources."semver-diff-2.1.0" + sources."xdg-basedir-3.0.0" + sources."ansi-align-1.1.0" + sources."camelcase-4.1.0" + sources."cli-boxes-1.0.0" + sources."term-size-0.1.1" + sources."widest-line-1.0.0" + sources."execa-0.4.0" + sources."cross-spawn-async-2.2.5" + sources."is-stream-1.1.0" + sources."npm-run-path-1.0.0" + sources."path-key-1.0.0" + sources."strip-eof-1.0.0" + sources."lru-cache-4.0.2" + sources."pseudomap-1.0.2" + sources."yallist-2.1.2" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" + sources."dot-prop-4.1.1" + sources."unique-string-1.0.0" + sources."is-obj-1.0.1" + sources."crypto-random-string-1.0.0" + sources."package-json-4.0.0" + sources."got-6.7.1" + sources."registry-auth-token-3.1.0" + sources."registry-url-3.1.0" + sources."create-error-class-3.0.2" + sources."duplexer3-0.1.4" + sources."get-stream-3.0.0" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."lowercase-keys-1.0.0" + sources."timed-out-4.0.1" + sources."unzip-response-2.0.1" + sources."url-parse-lax-1.0.0" + sources."capture-stack-trace-1.0.0" + sources."prepend-http-1.0.4" + (sources."rc-1.2.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."deep-extend-0.4.1" + sources."strip-json-comments-2.0.1" + sources."builtins-1.0.3" + sources."isexe-2.0.0" sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" @@ -25366,7 +25992,7 @@ in sources."coffee-script-1.12.4" sources."underscore-1.4.4" sources."underscore.string-2.3.3" - sources."request-2.79.0" + sources."request-2.81.0" sources."graceful-fs-2.0.3" sources."slide-1.1.6" sources."chownr-0.0.2" @@ -25377,50 +26003,44 @@ in sources."npmlog-4.0.2" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.14" + sources."mime-types-2.1.15" sources."oauth-sign-0.8.2" - sources."qs-6.3.1" + sources."performance-now-0.2.0" + sources."qs-6.4.0" + sources."safe-buffer-5.0.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."chalk-1.1.3" - sources."commander-2.9.0" - sources."is-my-json-valid-2.16.0" - sources."pinkie-promise-2.0.1" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."ansi-regex-2.1.1" - sources."graceful-readlink-1.0.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.1" - sources."xtend-4.0.1" - sources."is-property-1.0.2" - sources."pinkie-2.0.4" + sources."ajv-4.11.5" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" sources."hoek-2.16.3" sources."boom-2.10.1" sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.11.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -25444,7 +26064,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."punycode-1.4.1" sources."glob-7.1.1" sources."fs.realpath-1.0.0" @@ -25462,7 +26082,7 @@ in sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" @@ -25474,10 +26094,12 @@ in sources."object-assign-4.1.1" sources."signal-exit-3.0.2" sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" + sources."ansi-regex-2.1.1" (sources."config-chain-1.1.11" // { dependencies = [ sources."ini-1.3.4" @@ -25517,13 +26139,13 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "2.10.3"; + version = "2.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.3.tgz"; - sha1 = "40540278e81e60e2f28df3bc79bf77e157f95555"; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.4.tgz"; + sha1 = "0833dd707f983a04fdcd615afb860ce82b1e54a2"; }; dependencies = [ - sources."bluebird-3.4.7" + sources."bluebird-3.5.0" sources."chalk-1.1.3" sources."cint-8.2.1" sources."cli-table-0.3.1" @@ -25543,8 +26165,26 @@ in sources."require-dir-0.3.1" sources."semver-5.3.0" sources."semver-utils-1.1.1" + (sources."snyk-1.26.1" // { + dependencies = [ + sources."update-notifier-0.5.0" + sources."latest-version-1.0.1" + sources."repeating-1.1.3" + sources."package-json-1.2.0" + sources."got-3.3.1" + sources."object-assign-3.0.0" + sources."timed-out-2.0.0" + ]; + }) sources."spawn-please-0.2.0" - sources."update-notifier-1.0.3" + (sources."update-notifier-1.0.3" // { + dependencies = [ + sources."boxen-0.6.0" + sources."configstore-2.1.0" + sources."camelcase-2.1.1" + sources."uuid-2.0.3" + ]; + }) sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -25569,9 +26209,9 @@ in sources."config-chain-1.1.11" sources."dezalgo-1.0.3" sources."editor-1.0.0" - sources."fs-vacuum-1.2.9" - sources."fs-write-stream-atomic-1.0.8" - sources."fstream-1.0.10" + sources."fs-vacuum-1.2.10" + sources."fs-write-stream-atomic-1.0.10" + sources."fstream-1.0.11" sources."fstream-npm-1.2.0" sources."glob-7.1.1" sources."graceful-fs-4.1.11" @@ -25581,9 +26221,9 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.4" - (sources."init-package-json-1.9.4" // { + (sources."init-package-json-1.9.5" // { dependencies = [ - sources."glob-6.0.4" + sources."validate-npm-package-name-3.0.0" ]; }) sources."lockfile-1.0.3" @@ -25600,10 +26240,10 @@ in }) sources."nopt-3.0.6" sources."normalize-git-url-3.0.2" - sources."normalize-package-data-2.3.5" + sources."normalize-package-data-2.3.6" sources."npm-cache-filename-1.0.2" sources."npm-install-checks-3.0.0" - sources."npm-package-arg-4.2.0" + sources."npm-package-arg-4.2.1" (sources."npm-registry-client-7.2.1" // { dependencies = [ sources."npmlog-3.1.2" @@ -25622,11 +26262,7 @@ in sources."read-1.0.7" sources."read-cmd-shim-1.0.1" sources."read-installed-4.0.3" - (sources."read-package-json-2.0.4" // { - dependencies = [ - sources."glob-6.0.4" - ]; - }) + sources."read-package-json-2.0.5" sources."read-package-tree-5.1.5" sources."readable-stream-2.1.5" sources."realize-package-specifier-3.0.3" @@ -25642,8 +26278,12 @@ in sources."umask-1.1.0" sources."unique-filename-1.1.0" sources."unpipe-1.0.0" - sources."validate-npm-package-name-2.2.2" - sources."which-1.2.12" + (sources."validate-npm-package-name-2.2.2" // { + dependencies = [ + sources."builtins-0.0.7" + ]; + }) + sources."which-1.2.14" sources."wrappy-1.0.2" sources."write-file-atomic-1.2.0" sources."debuglog-1.0.1" @@ -25668,6 +26308,7 @@ in sources."fs.realpath-1.0.0" sources."path-is-absolute-1.0.1" sources."promzard-0.3.0" + sources."builtins-1.0.3" sources."lodash._createset-4.0.3" sources."lodash._root-3.0.1" sources."minimist-0.0.8" @@ -25686,17 +26327,17 @@ in sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."array-index-1.0.0" - sources."debug-2.6.1" - sources."es6-symbol-3.1.0" + sources."debug-2.6.3" + sources."es6-symbol-3.1.1" sources."ms-0.7.2" - sources."d-0.1.1" - sources."es5-ext-0.10.12" - sources."es6-iterator-2.0.0" + sources."d-1.0.0" + sources."es5-ext-0.10.15" + sources."es6-iterator-2.0.1" sources."is-builtin-module-1.0.0" sources."builtin-modules-1.1.1" (sources."concat-stream-1.6.0" // { dependencies = [ - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" ]; }) sources."typedarray-0.0.6" @@ -25728,10 +26369,10 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.14" - sources."node-uuid-1.4.7" + sources."mime-types-2.1.15" + sources."node-uuid-1.4.8" sources."oauth-sign-0.8.2" - sources."qs-6.2.2" + sources."qs-6.2.3" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" @@ -25748,8 +26389,12 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.11.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -25773,31 +26418,122 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."punycode-1.4.1" sources."block-stream-0.0.9" sources."unique-slug-2.0.0" - sources."builtins-0.0.7" - sources."isexe-1.1.2" + sources."isexe-2.0.0" sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" - sources."boxen-0.6.0" - sources."configstore-2.1.0" + sources."ansi-escapes-1.4.0" + (sources."configstore-1.4.0" // { + dependencies = [ + sources."uuid-2.0.3" + ]; + }) + sources."es6-promise-3.3.1" + sources."hasbin-1.2.3" + (sources."inquirer-1.0.3" // { + dependencies = [ + sources."mute-stream-0.0.6" + ]; + }) + sources."open-0.0.5" + sources."os-name-1.0.3" + sources."snyk-config-1.0.1" + sources."snyk-module-1.7.0" + sources."snyk-policy-1.7.0" + (sources."snyk-recursive-readdir-2.0.0" // { + dependencies = [ + sources."minimatch-3.0.2" + ]; + }) + sources."snyk-resolve-1.0.0" + (sources."snyk-resolve-deps-1.7.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."snyk-tree-1.0.0" + sources."snyk-try-require-1.2.0" + (sources."tempfile-1.1.1" // { + dependencies = [ + sources."uuid-2.0.3" + ]; + }) + sources."then-fs-2.0.0" + sources."undefsafe-0.0.3" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + sources."uuid-3.0.1" + sources."xdg-basedir-2.0.0" + sources."async-1.5.2" + sources."cli-cursor-1.0.2" + sources."cli-width-2.1.0" + sources."figures-1.7.0" + sources."run-async-2.3.0" + sources."rx-4.1.0" + sources."through-2.3.8" + sources."restore-cursor-1.0.1" + sources."exit-hook-1.1.1" + sources."onetime-1.1.0" + sources."is-promise-2.1.0" + (sources."osx-release-1.1.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."win-release-1.1.1" + (sources."nconf-0.7.2" // { + dependencies = [ + sources."async-0.9.2" + ]; + }) + sources."yargs-3.15.0" + sources."camelcase-1.2.1" + sources."cliui-2.1.0" + sources."decamelize-1.2.0" + sources."window-size-0.1.4" + sources."center-align-0.1.3" + sources."right-align-0.1.3" + sources."wordwrap-0.0.2" + sources."align-text-0.1.4" + sources."lazy-cache-1.0.4" + sources."kind-of-3.1.0" + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + sources."is-buffer-1.1.5" + sources."js-yaml-3.8.2" + sources."argparse-1.0.9" + sources."esprima-3.1.3" + sources."sprintf-js-1.0.3" + (sources."clite-0.3.0" // { + dependencies = [ + sources."update-notifier-0.6.3" + sources."yargs-4.8.1" + sources."configstore-2.1.0" + sources."uuid-2.0.3" + sources."cliui-3.2.0" + sources."window-size-0.2.0" + ]; + }) + sources."lru-cache-4.0.2" + sources."lodash.defaults-4.2.0" + sources."lodash.defaultsdeep-4.6.0" + sources."lodash.mergewith-4.6.0" + sources."boxen-0.3.1" sources."is-npm-1.0.0" sources."latest-version-2.0.0" - sources."lazy-req-1.1.0" sources."semver-diff-2.1.0" - sources."xdg-basedir-2.0.0" - sources."ansi-align-1.1.0" - sources."camelcase-2.1.1" - sources."cli-boxes-1.0.0" sources."filled-array-1.1.0" sources."repeating-2.0.1" sources."widest-line-1.0.0" sources."is-finite-1.0.2" sources."dot-prop-3.0.0" - sources."uuid-2.0.3" sources."is-obj-1.0.1" sources."package-json-2.4.0" sources."got-5.7.1" @@ -25816,16 +26552,55 @@ in sources."unzip-response-1.0.2" sources."url-parse-lax-1.0.0" sources."capture-stack-trace-1.0.0" - sources."error-ex-1.3.0" + sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" sources."prepend-http-1.0.4" - (sources."rc-1.1.7" // { + (sources."rc-1.2.0" // { dependencies = [ sources."minimist-1.2.0" ]; }) sources."deep-extend-0.4.1" sources."strip-json-comments-2.0.1" + sources."get-caller-file-1.0.2" + sources."lodash.assign-4.2.0" + sources."os-locale-1.4.0" + sources."read-pkg-up-1.0.1" + sources."require-directory-2.1.1" + sources."require-main-filename-1.0.1" + sources."which-module-1.0.0" + sources."y18n-3.2.1" + (sources."yargs-parser-2.4.1" // { + dependencies = [ + sources."camelcase-3.0.0" + ]; + }) + sources."wrap-ansi-2.1.0" + sources."lcid-1.0.0" + sources."invert-kv-1.0.0" + sources."read-pkg-1.1.0" + sources."load-json-file-1.1.0" + sources."path-type-1.1.0" + sources."pify-2.3.0" + sources."strip-bom-2.0.0" + sources."is-utf8-0.2.1" + sources."pseudomap-1.0.2" + sources."yallist-2.1.2" + sources."promise-7.1.1" + sources."string-length-1.0.1" + sources."duplexify-3.5.0" + sources."infinity-agent-2.0.3" + sources."nested-error-stacks-1.0.2" + (sources."end-of-stream-1.0.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."stream-shift-1.0.0" + sources."querystring-0.2.0" + sources."lazy-req-1.1.0" + sources."ansi-align-1.1.0" + sources."cli-boxes-1.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -25846,7 +26621,7 @@ in dependencies = [ sources."async-0.9.2" sources."babybird-0.0.1" - (sources."body-parser-1.16.1" // { + (sources."body-parser-1.17.1" // { dependencies = [ sources."content-type-1.0.2" ]; @@ -25864,12 +26639,14 @@ in sources."diff-1.4.0" sources."domino-1.0.28" sources."entities-1.1.1" - (sources."express-4.14.1" // { + (sources."express-4.15.2" // { dependencies = [ sources."content-type-1.0.2" - sources."debug-2.2.0" - sources."qs-6.2.0" - sources."ms-0.7.1" + (sources."finalhandler-1.0.1" // { + dependencies = [ + sources."debug-2.6.3" + ]; + }) ]; }) sources."express-handlebars-3.0.0" @@ -25880,25 +26657,20 @@ in ]; }) sources."gelf-stream-0.2.4" - sources."js-yaml-3.8.1" + sources."js-yaml-3.8.2" sources."mediawiki-title-0.5.6" sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" - sources."node-uuid-1.4.7" + sources."node-uuid-1.4.8" sources."pegjs-git+https://github.com/tstarling/pegjs.git#fork" sources."prfun-2.1.4" - (sources."request-2.79.0" // { - dependencies = [ - sources."qs-6.3.1" - ]; - }) + sources."request-2.81.0" sources."semver-5.3.0" - (sources."serve-favicon-2.4.0" // { + (sources."serve-favicon-2.4.2" // { dependencies = [ - sources."etag-1.8.0" - sources."fresh-0.4.0" + sources."ms-1.0.0" ]; }) - (sources."service-runner-2.2.4" // { + (sources."service-runner-2.2.5" // { dependencies = [ sources."gelf-stream-1.1.1" sources."yargs-6.6.0" @@ -25921,25 +26693,25 @@ in sources."bytes-2.4.0" sources."debug-2.6.1" sources."depd-1.1.0" - sources."http-errors-1.5.1" + sources."http-errors-1.6.1" sources."iconv-lite-0.4.15" sources."on-finished-2.3.0" - sources."qs-6.2.1" + sources."qs-6.4.0" sources."raw-body-2.2.0" sources."type-is-1.6.14" sources."ms-0.7.2" sources."inherits-2.0.3" - sources."setprototypeof-1.0.2" + sources."setprototypeof-1.0.3" sources."statuses-1.3.1" sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" - sources."mime-types-2.1.14" - sources."mime-db-1.26.0" + sources."mime-types-2.1.15" + sources."mime-db-1.27.0" sources."accepts-1.3.3" - sources."compressible-2.0.9" + sources."compressible-2.0.10" sources."on-headers-1.0.1" - sources."vary-1.1.0" + sources."vary-1.1.1" sources."busboy-0.2.14" sources."dicer-0.2.5" sources."readable-stream-1.1.14" @@ -25953,27 +26725,19 @@ in sources."cookie-signature-1.0.6" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" - sources."etag-1.7.0" - sources."fresh-0.3.0" + sources."etag-1.8.0" + sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.3" + sources."proxy-addr-1.1.4" sources."range-parser-1.2.0" - (sources."send-0.14.2" // { - dependencies = [ - (sources."debug-2.2.0" // { - dependencies = [ - sources."ms-0.7.1" - ]; - }) - ]; - }) - sources."serve-static-1.11.2" + sources."send-0.15.1" + sources."serve-static-1.12.1" sources."utils-merge-1.0.0" sources."forwarded-0.1.0" - sources."ipaddr.js-1.2.0" + sources."ipaddr.js-1.3.0" sources."destroy-1.0.4" sources."mime-1.3.4" sources."glob-6.0.4" @@ -25995,9 +26759,8 @@ in sources."concat-map-0.0.1" sources."optimist-0.6.1" sources."source-map-0.4.4" - (sources."uglify-js-2.7.5" // { + (sources."uglify-js-2.8.20" // { dependencies = [ - sources."async-0.2.10" sources."source-map-0.5.6" sources."yargs-3.10.0" ]; @@ -26021,7 +26784,7 @@ in sources."kind-of-3.1.0" sources."longest-1.0.1" sources."repeat-string-1.6.1" - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" sources."function-bind-1.1.0" sources."object-keys-1.0.11" sources."define-properties-1.1.2" @@ -26032,48 +26795,42 @@ in sources."sprintf-js-1.0.3" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" + sources."performance-now-0.2.0" + sources."safe-buffer-5.0.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."chalk-1.1.3" - sources."commander-2.9.0" - sources."is-my-json-valid-2.16.0" - sources."pinkie-promise-2.0.1" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."ansi-regex-2.1.1" - sources."graceful-readlink-1.0.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.1" - sources."xtend-4.0.1" - sources."is-property-1.0.2" - sources."pinkie-2.0.4" + sources."ajv-4.11.5" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" sources."hoek-2.16.3" sources."boom-2.10.1" sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.11.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26098,21 +26855,21 @@ in sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" sources."punycode-1.4.1" - sources."bluebird-3.4.7" - sources."bunyan-1.8.5" + sources."bluebird-3.5.0" + sources."bunyan-1.8.9" sources."bunyan-syslog-udp-0.1.0" - sources."hot-shots-4.3.1" + sources."hot-shots-4.4.0" (sources."limitation-0.2.0" // { dependencies = [ - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."isarray-1.0.0" ]; }) sources."dnscache-1.0.1" - sources."dtrace-provider-0.8.0" + sources."dtrace-provider-0.8.1" sources."mv-2.1.1" - sources."safe-json-stringify-1.0.3" - sources."moment-2.17.1" + sources."safe-json-stringify-1.0.4" + sources."moment-2.18.1" sources."nan-2.5.1" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -26127,14 +26884,14 @@ in sources."hat-0.0.3" (sources."kad-fs-0.0.4" // { dependencies = [ - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."isarray-1.0.0" ]; }) sources."kad-localstorage-0.0.7" (sources."kad-memstore-0.0.1" // { dependencies = [ - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."isarray-1.0.0" ]; }) @@ -26142,7 +26899,7 @@ in sources."merge-1.2.0" (sources."msgpack5-3.4.1" // { dependencies = [ - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."isarray-1.0.0" ]; }) @@ -26152,7 +26909,7 @@ in sources."dom-storage-2.0.2" (sources."bl-1.2.0" // { dependencies = [ - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."isarray-1.0.0" ]; }) @@ -26170,22 +26927,26 @@ in sources."camelcase-3.0.0" ]; }) + sources."strip-ansi-3.0.1" sources."wrap-ansi-2.1.0" + sources."ansi-regex-2.1.1" sources."lcid-1.0.0" sources."invert-kv-1.0.0" sources."find-up-1.1.2" sources."read-pkg-1.1.0" sources."path-exists-2.1.0" + sources."pinkie-promise-2.0.1" + sources."pinkie-2.0.4" sources."load-json-file-1.1.0" - sources."normalize-package-data-2.3.5" + sources."normalize-package-data-2.3.6" sources."path-type-1.1.0" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" - sources."error-ex-1.3.0" + sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" sources."is-utf8-0.2.1" - sources."hosted-git-info-2.2.0" + sources."hosted-git-info-2.4.1" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -26210,10 +26971,10 @@ in peerflix = nodeEnv.buildNodePackage { name = "peerflix"; packageName = "peerflix"; - version = "0.36.1"; + version = "0.36.2"; src = fetchurl { - url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.1.tgz"; - sha1 = "7d2009b814b5b3a2ca573cabea1f2873a4be4a14"; + url = "https://registry.npmjs.org/peerflix/-/peerflix-0.36.2.tgz"; + sha1 = "93dd39e10a0a94b4f66ec19a42d8f5598a3eec01"; }; dependencies = [ sources."airplayer-2.0.0" @@ -26233,14 +26994,14 @@ in sources."minimist-0.0.10" ]; }) - (sources."parse-torrent-5.8.1" // { + (sources."parse-torrent-5.8.2" // { dependencies = [ sources."get-stdin-5.0.1" ]; }) sources."pump-1.0.2" sources."range-parser-1.2.0" - sources."rc-1.1.7" + sources."rc-1.2.0" (sources."torrent-stream-1.0.3" // { dependencies = [ sources."end-of-stream-0.1.5" @@ -26269,7 +27030,7 @@ in sources."big-integer-1.6.17" sources."inherits-2.0.3" sources."typedarray-0.0.6" - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" @@ -26303,18 +27064,18 @@ in sources."deep-equal-1.0.1" sources."dns-equal-1.0.0" sources."dns-txt-2.0.2" - sources."multicast-dns-6.1.0" + sources."multicast-dns-6.1.1" sources."multicast-dns-service-types-1.1.0" sources."dns-packet-1.1.1" sources."thunky-0.1.0" - sources."ip-1.1.4" + sources."ip-1.1.5" sources."safe-buffer-5.0.1" sources."meow-3.7.0" sources."camelcase-keys-2.1.0" sources."decamelize-1.2.0" sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" - sources."normalize-package-data-2.3.5" + sources."normalize-package-data-2.3.6" sources."object-assign-4.1.1" sources."read-pkg-up-1.0.1" sources."redent-1.0.0" @@ -26323,7 +27084,7 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.2.0" + sources."hosted-git-info-2.4.1" sources."is-builtin-module-1.0.0" sources."semver-5.3.0" sources."validate-npm-package-license-3.0.1" @@ -26342,7 +27103,7 @@ in sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" - sources."error-ex-1.3.0" + sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" sources."is-utf8-0.2.1" sources."indent-string-2.1.0" @@ -26380,11 +27141,7 @@ in sources."rusha-0.8.5" sources."simple-concat-1.0.0" sources."unzip-response-2.0.1" - (sources."end-of-stream-1.1.0" // { - dependencies = [ - sources."once-1.3.3" - ]; - }) + sources."end-of-stream-1.4.0" sources."deep-extend-0.4.1" sources."ini-1.3.4" sources."strip-json-comments-2.0.1" @@ -26414,7 +27171,7 @@ in }) sources."randombytes-2.0.3" sources."run-parallel-1.1.6" - sources."debug-2.6.1" + sources."debug-2.6.3" sources."ms-0.7.2" sources."flatten-0.0.1" sources."fifo-0.1.4" @@ -26461,19 +27218,19 @@ in sources."compact2string-1.4.0" sources."random-iterate-1.0.1" sources."run-series-1.1.4" - sources."simple-peer-6.4.3" + sources."simple-peer-6.4.4" (sources."simple-websocket-4.3.1" // { dependencies = [ - sources."ws-2.1.0" + sources."ws-2.2.2" ]; }) sources."string2compact-1.2.2" - (sources."ws-1.1.2" // { + (sources."ws-1.1.4" // { dependencies = [ sources."ultron-1.0.2" ]; }) - sources."ipaddr.js-1.2.0" + sources."ipaddr.js-1.3.0" sources."get-browser-rtc-1.0.2" sources."ultron-1.1.0" sources."addr-to-ip-port-1.4.2" @@ -26604,11 +27361,7 @@ in sources."keypress-0.1.0" sources."mime-1.2.11" sources."minimist-0.0.8" - (sources."end-of-stream-1.1.0" // { - dependencies = [ - sources."once-1.3.3" - ]; - }) + sources."end-of-stream-1.4.0" sources."once-1.4.0" sources."wrappy-1.0.2" sources."magnet-uri-2.0.1" @@ -26631,7 +27384,7 @@ in sources."rusha-0.8.5" sources."form-data-0.0.10" sources."hawk-0.10.2" - sources."node-uuid-1.4.7" + sources."node-uuid-1.4.8" sources."cookie-jar-0.2.0" sources."aws-sign-0.2.0" sources."oauth-sign-0.2.0" @@ -26673,9 +27426,9 @@ in sources."ms-0.7.2" (sources."accepts-1.3.3" // { dependencies = [ - sources."mime-types-2.1.14" + sources."mime-types-2.1.15" sources."negotiator-0.6.1" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" ]; }) sources."base64id-1.0.0" @@ -26712,13 +27465,13 @@ in sources."bitfield-0.1.0" (sources."bittorrent-dht-3.2.6" // { dependencies = [ - sources."debug-2.6.1" + sources."debug-2.6.3" ]; }) (sources."bittorrent-tracker-2.12.1" // { dependencies = [ sources."bencode-0.6.0" - sources."debug-2.6.1" + sources."debug-2.6.3" ]; }) sources."bncode-0.5.3" @@ -26727,7 +27480,7 @@ in sources."ip-0.3.3" (sources."ip-set-1.0.1" // { dependencies = [ - sources."ip-1.1.4" + sources."ip-1.1.5" ]; }) sources."peer-wire-swarm-0.9.2" @@ -26744,7 +27497,7 @@ in sources."string2compact-1.2.2" sources."ip-regex-1.0.3" sources."unzip-response-1.0.2" - sources."ipaddr.js-1.2.0" + sources."ipaddr.js-1.3.0" sources."bn.js-1.3.0" sources."extend.js-0.0.2" (sources."portfinder-0.3.0" // { @@ -26768,8 +27521,8 @@ in sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" - sources."which-1.2.12" - sources."isexe-1.1.2" + sources."which-1.2.14" + sources."isexe-2.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -26795,7 +27548,7 @@ in sources."progress-1.1.8" sources."request-2.67.0" sources."request-progress-2.0.1" - sources."which-1.2.12" + sources."which-1.2.14" sources."concat-stream-1.5.0" sources."debug-0.7.4" sources."mkdirp-0.5.0" @@ -26834,8 +27587,8 @@ in sources."forever-agent-0.6.1" sources."form-data-1.0.1" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.14" - sources."node-uuid-1.4.7" + sources."mime-types-2.1.15" + sources."node-uuid-1.4.8" sources."qs-5.2.1" sources."tunnel-agent-0.4.3" sources."tough-cookie-2.2.2" @@ -26848,12 +27601,16 @@ in sources."isstream-0.1.2" sources."is-typedarray-1.0.0" sources."har-validator-2.0.6" - sources."async-2.1.5" + sources."async-2.2.0" sources."lodash-4.17.4" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.11.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -26898,7 +27655,7 @@ in sources."xtend-4.0.1" sources."is-property-1.0.2" sources."throttleit-1.0.0" - sources."isexe-1.1.2" + sources."isexe-2.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -26924,16 +27681,16 @@ in ]; }) sources."commander-2.9.0" - sources."detective-4.3.2" + sources."detective-4.5.0" sources."glob-5.0.15" sources."graceful-fs-4.1.11" sources."iconv-lite-0.4.15" sources."mkdirp-0.5.1" sources."private-0.1.7" - sources."q-1.4.1" - sources."recast-0.11.22" + sources."q-1.5.0" + sources."recast-0.11.23" sources."graceful-readlink-1.0.1" - sources."acorn-3.3.0" + sources."acorn-4.0.11" sources."defined-1.0.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -26945,7 +27702,7 @@ in sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."minimist-0.0.8" - sources."ast-types-0.9.5" + sources."ast-types-0.9.6" sources."esprima-3.1.3" sources."source-map-0.5.6" sources."base62-0.1.1" @@ -27010,7 +27767,7 @@ in sources."methods-0.1.0" sources."send-0.1.4" sources."cookie-signature-1.0.1" - sources."debug-2.6.1" + sources."debug-2.6.3" sources."qs-0.6.5" sources."bytes-0.2.1" sources."pause-0.0.1" @@ -27031,8 +27788,8 @@ in sources."request-2.9.203" (sources."openid-2.0.6" // { dependencies = [ - sources."request-2.79.0" - sources."qs-6.3.1" + sources."request-2.81.0" + sources."qs-6.4.0" ]; }) sources."node-swt-0.1.1" @@ -27041,52 +27798,43 @@ in sources."crc-0.2.0" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" sources."form-data-2.1.2" - (sources."har-validator-2.0.6" // { - dependencies = [ - sources."commander-2.9.0" - ]; - }) + sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.14" + sources."mime-types-2.1.15" sources."oauth-sign-0.8.2" + sources."performance-now-0.2.0" + sources."safe-buffer-5.0.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."chalk-1.1.3" - sources."is-my-json-valid-2.16.0" - sources."pinkie-promise-2.0.1" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."ansi-regex-2.1.1" - sources."graceful-readlink-1.0.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.1" - sources."xtend-4.0.1" - sources."is-property-1.0.2" - sources."pinkie-2.0.4" + sources."ajv-4.11.5" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" sources."hoek-2.16.3" sources."boom-2.10.1" sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.11.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -27110,7 +27858,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."punycode-1.4.1" sources."events.node-0.4.9" ]; @@ -27144,37 +27892,31 @@ in sha1 = "36bf5209356facbf6cef18fa32274d116043ed24"; }; dependencies = [ - sources."express-5.0.0-alpha.3" + sources."express-5.0.0-alpha.5" sources."express-json5-0.1.0" - (sources."body-parser-1.16.1" // { + (sources."body-parser-1.17.1" // { dependencies = [ sources."bytes-2.4.0" - sources."debug-2.6.1" - sources."http-errors-1.5.1" sources."iconv-lite-0.4.15" - sources."qs-6.2.1" sources."raw-body-2.2.0" - sources."ms-0.7.2" ]; }) (sources."compression-1.6.2" // { dependencies = [ sources."bytes-2.3.0" + sources."debug-2.2.0" + sources."ms-0.7.1" ]; }) sources."commander-2.9.0" - sources."js-yaml-3.8.1" + sources."js-yaml-3.8.2" sources."cookies-0.7.0" - (sources."request-2.79.0" // { - dependencies = [ - sources."qs-6.3.1" - ]; - }) + sources."request-2.81.0" sources."async-0.9.2" sources."es6-shim-0.21.1" sources."semver-4.3.6" sources."minimatch-1.0.0" - sources."bunyan-1.8.5" + sources."bunyan-1.8.9" sources."handlebars-2.0.0" sources."highlight.js-8.9.1" sources."lunr-0.7.2" @@ -27183,17 +27925,13 @@ in sources."JSONStream-1.3.1" sources."mkdirp-0.5.1" sources."sinopia-htpasswd-0.4.5" - (sources."http-errors-1.6.1" // { - dependencies = [ - sources."setprototypeof-1.0.3" - ]; - }) + sources."http-errors-1.6.1" (sources."readable-stream-1.1.14" // { dependencies = [ sources."isarray-0.0.1" ]; }) - sources."fs-ext-0.5.0" + sources."fs-ext-0.6.0" sources."crypt3-0.2.0" sources."accepts-1.3.3" sources."array-flatten-2.1.1" @@ -27201,51 +27939,49 @@ in sources."content-type-1.0.2" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - sources."debug-2.2.0" + sources."debug-2.6.1" sources."depd-1.1.0" sources."encodeurl-1.0.1" sources."escape-html-1.0.3" - sources."etag-1.7.0" - sources."finalhandler-0.5.1" - sources."fresh-0.3.0" + sources."etag-1.8.0" + (sources."finalhandler-1.0.1" // { + dependencies = [ + sources."debug-2.6.3" + ]; + }) + sources."fresh-0.5.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."on-finished-2.3.0" sources."parseurl-1.3.1" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.3" - sources."qs-6.2.0" + sources."proxy-addr-1.1.4" + sources."qs-6.4.0" sources."range-parser-1.2.0" - sources."router-1.1.5" - (sources."send-0.14.2" // { - dependencies = [ - sources."http-errors-1.5.1" - sources."ms-0.7.2" - ]; - }) - sources."serve-static-1.11.2" + sources."router-1.3.0" + sources."send-0.15.1" + sources."serve-static-1.12.1" + sources."setprototypeof-1.0.3" + sources."statuses-1.3.1" sources."type-is-1.6.14" sources."utils-merge-1.0.0" - sources."vary-1.1.0" - sources."mime-types-2.1.14" + sources."vary-1.1.1" + sources."mime-types-2.1.15" sources."negotiator-0.6.1" - sources."mime-db-1.26.0" - sources."ms-0.7.1" - sources."statuses-1.3.1" + sources."mime-db-1.27.0" + sources."ms-0.7.2" sources."unpipe-1.0.0" sources."ee-first-1.1.1" sources."forwarded-0.1.0" - sources."ipaddr.js-1.2.0" - sources."setprototypeof-1.0.2" + sources."ipaddr.js-1.3.0" sources."destroy-1.0.4" sources."mime-1.3.4" - sources."inherits-2.0.3" sources."media-typer-0.3.0" sources."raw-body-1.3.4" sources."bytes-1.0.0" sources."iconv-lite-0.4.8" - sources."compressible-2.0.9" + sources."compressible-2.0.10" sources."on-headers-1.0.1" sources."graceful-readlink-1.0.1" sources."argparse-1.0.9" @@ -27254,46 +27990,42 @@ in sources."keygrip-1.0.1" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" + sources."performance-now-0.2.0" + sources."safe-buffer-5.0.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."chalk-1.1.3" - sources."is-my-json-valid-2.16.0" - sources."pinkie-promise-2.0.1" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."ansi-regex-2.1.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.1" - sources."xtend-4.0.1" - sources."is-property-1.0.2" - sources."pinkie-2.0.4" + sources."ajv-4.11.5" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" sources."hoek-2.16.3" sources."boom-2.10.1" sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.11.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -27320,10 +28052,10 @@ in sources."punycode-1.4.1" sources."lru-cache-2.7.3" sources."sigmund-1.0.1" - sources."dtrace-provider-0.8.0" + sources."dtrace-provider-0.8.1" sources."mv-2.1.1" - sources."safe-json-stringify-1.0.3" - sources."moment-2.17.1" + sources."safe-json-stringify-1.0.4" + sources."moment-2.18.1" sources."nan-2.5.1" sources."ncp-2.0.0" sources."rimraf-2.4.5" @@ -27333,6 +28065,7 @@ in ]; }) sources."inflight-1.0.6" + sources."inherits-2.0.3" sources."once-1.4.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" @@ -27355,10 +28088,11 @@ in sources."uc.micro-1.0.3" (sources."htmlparser2-3.9.2" // { dependencies = [ - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" ]; }) sources."regexp-quote-0.0.0" + sources."xtend-4.0.1" sources."domelementtype-1.3.0" sources."domhandler-2.3.0" sources."domutils-1.5.1" @@ -27406,7 +28140,7 @@ in sources."graceful-readlink-1.0.1" sources."graceful-fs-4.1.11" sources."minimatch-3.0.3" - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."set-immediate-shim-1.0.1" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -27493,7 +28227,7 @@ in sources."keep-alive-agent-0.0.1" sources."mime-1.3.4" sources."negotiator-0.5.3" - sources."node-uuid-1.4.7" + sources."node-uuid-1.4.8" sources."once-1.4.0" sources."qs-3.1.0" sources."semver-4.3.6" @@ -27517,7 +28251,7 @@ in sources."core-util-is-1.0.2" sources."nan-2.5.1" sources."mv-2.1.1" - sources."safe-json-stringify-1.0.3" + sources."safe-json-stringify-1.0.4" sources."mkdirp-0.5.1" sources."ncp-2.0.0" sources."rimraf-2.4.5" @@ -27542,14 +28276,15 @@ in }) ]; }) - (sources."jsprim-1.3.1" // { + (sources."jsprim-1.4.0" // { dependencies = [ + sources."assert-plus-1.0.0" sources."extsprintf-1.0.2" sources."verror-1.3.6" ]; }) sources."json-schema-0.2.3" - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."buffer-shims-1.0.0" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" @@ -27578,7 +28313,7 @@ in dependencies = [ sources."css-parse-1.7.0" sources."mkdirp-0.5.1" - sources."debug-2.6.1" + sources."debug-2.6.3" sources."sax-0.5.8" sources."glob-7.0.6" sources."source-map-0.1.43" @@ -27619,13 +28354,13 @@ in sources."colors-1.1.2" sources."whet.extend-0.9.9" sources."mkdirp-0.5.1" - sources."csso-2.3.1" - sources."q-1.4.1" + sources."csso-2.3.2" + sources."q-1.5.0" sources."argparse-1.0.9" sources."esprima-2.7.3" sources."sprintf-js-1.0.3" sources."minimist-0.0.8" - sources."clap-1.1.2" + sources."clap-1.1.3" sources."source-map-0.5.6" sources."chalk-1.1.3" sources."ansi-styles-2.2.1" @@ -27662,7 +28397,7 @@ in sources."graceful-fs-4.1.11" sources."object-assign-4.1.1" sources."errno-0.1.4" - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."prr-0.0.0" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -27691,10 +28426,10 @@ in titanium = nodeEnv.buildNodePackage { name = "titanium"; packageName = "titanium"; - version = "5.0.11"; + version = "5.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/titanium/-/titanium-5.0.11.tgz"; - sha1 = "dd0f7132475a5db6ea188222876d28538b47df27"; + url = "https://registry.npmjs.org/titanium/-/titanium-5.0.12.tgz"; + sha1 = "2bcfab6110ef0a91c9d54825052fd0db3e9dd942"; }; dependencies = [ sources."async-2.1.2" @@ -27707,21 +28442,12 @@ in sources."humanize-0.0.9" sources."longjohn-0.2.11" sources."moment-2.16.0" - (sources."node-appc-0.2.39" // { + (sources."node-appc-0.2.41" // { dependencies = [ - sources."async-1.5.2" - sources."request-2.69.0" - sources."semver-5.1.0" - sources."wrench-1.5.8" - ]; - }) - (sources."request-2.78.0" // { - dependencies = [ - sources."form-data-2.1.2" - sources."qs-6.3.1" - sources."tough-cookie-2.3.2" + sources."async-2.1.4" ]; }) + sources."request-2.79.0" sources."semver-5.3.0" sources."sprintf-0.1.5" sources."temp-0.8.3" @@ -27731,53 +28457,66 @@ in sources."colors-1.0.3" ]; }) - sources."wrench-1.5.9" + sources."fs-extra-2.1.2" sources."lodash-4.17.4" sources."keypress-0.2.1" sources."source-map-support-0.3.2" sources."source-map-0.1.32" sources."amdefine-1.0.1" sources."adm-zip-0.4.7" - sources."diff-2.2.1" + sources."diff-3.2.0" sources."node-uuid-1.4.7" sources."optimist-0.6.1" - (sources."uglify-js-2.6.1" // { + sources."wrench-1.5.9" + (sources."uglify-js-2.7.5" // { dependencies = [ sources."async-0.2.10" sources."source-map-0.5.6" ]; }) - sources."xmldom-0.1.22" + sources."xmldom-0.1.27" sources."wordwrap-0.0.3" sources."minimist-0.0.10" + sources."uglify-to-browserify-1.0.2" + sources."yargs-3.10.0" + sources."camelcase-1.2.1" + (sources."cliui-2.1.0" // { + dependencies = [ + sources."wordwrap-0.0.2" + ]; + }) + sources."decamelize-1.2.0" + sources."window-size-0.1.0" + sources."center-align-0.1.3" + sources."right-align-0.1.3" + sources."align-text-0.1.4" + sources."lazy-cache-1.0.4" + sources."kind-of-3.1.0" + sources."longest-1.0.1" + sources."repeat-string-1.6.1" + sources."is-buffer-1.1.5" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."bl-1.0.3" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-1.0.1" + sources."form-data-2.1.2" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.14" + sources."mime-types-2.1.15" sources."oauth-sign-0.8.2" - sources."qs-6.0.3" + sources."qs-6.3.2" sources."stringstream-0.0.5" - sources."tough-cookie-2.2.2" + sources."tough-cookie-2.3.2" sources."tunnel-agent-0.4.3" - sources."readable-stream-2.0.6" - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" + sources."uuid-3.0.1" sources."delayed-stream-1.0.0" + sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" sources."is-my-json-valid-2.16.0" @@ -27800,8 +28539,12 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.11.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -27825,26 +28568,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" - sources."uglify-to-browserify-1.0.2" - sources."yargs-3.10.0" - sources."camelcase-1.2.1" - (sources."cliui-2.1.0" // { - dependencies = [ - sources."wordwrap-0.0.2" - ]; - }) - sources."decamelize-1.2.0" - sources."window-size-0.1.0" - sources."center-align-0.1.3" - sources."right-align-0.1.3" - sources."align-text-0.1.4" - sources."lazy-cache-1.0.4" - sources."kind-of-3.1.0" - sources."longest-1.0.1" - sources."repeat-string-1.6.1" - sources."is-buffer-1.1.4" - sources."asynckit-0.4.0" + sources."mime-db-1.27.0" sources."punycode-1.4.1" sources."os-tmpdir-1.0.2" sources."rimraf-2.2.8" @@ -27852,6 +28576,8 @@ in sources."eyes-0.1.8" sources."pkginfo-0.3.1" sources."stack-trace-0.0.9" + sources."graceful-fs-4.1.11" + sources."jsonfile-2.4.0" ]; buildInputs = globalBuildInputs; meta = { @@ -27864,10 +28590,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.2.1.tgz"; - sha1 = "4862b662b988a4c8ff691cc7969622d24db76ae9"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.2.2.tgz"; + sha1 = "606022508479b55ffa368b58fee963a03dfd7b0c"; }; buildInputs = globalBuildInputs; meta = { @@ -27880,16 +28606,15 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "2.7.5"; + version = "2.8.20"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz"; - sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.20.tgz"; + sha1 = "be87100fbc18de3876ed606e9d24b4568311cecf"; }; dependencies = [ - sources."async-0.2.10" sources."source-map-0.5.6" - sources."uglify-to-browserify-1.0.2" sources."yargs-3.10.0" + sources."uglify-to-browserify-1.0.2" sources."camelcase-1.2.1" sources."cliui-2.1.0" sources."decamelize-1.2.0" @@ -27902,7 +28627,7 @@ in sources."kind-of-3.1.0" sources."longest-1.0.1" sources."repeat-string-1.6.1" - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" ]; buildInputs = globalBuildInputs; meta = { @@ -27915,10 +28640,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.1.8"; + version = "1.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.1.8.tgz"; - sha1 = "1519b78475ef5162ef3342c2046889b396add651"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.1.11.tgz"; + sha1 = "a6391af1d6d132c2f995dbf9740b17b315b2f90f"; }; dependencies = [ sources."async-2.1.5" @@ -27928,15 +28653,15 @@ in sources."color-1.0.3" sources."cookie-parser-1.4.3" sources."crossroads-0.12.2" - sources."diff2html-2.0.12" + sources."diff2html-2.3.0" sources."express-4.14.1" sources."express-session-1.14.2" sources."forever-monitor-1.1.0" sources."getmac-1.2.1" sources."hasher-1.2.0" - sources."ignore-3.2.4" + sources."ignore-3.2.6" sources."keen.io-0.1.3" - sources."knockout-3.4.1" + sources."knockout-3.4.2" sources."lodash-4.17.4" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -27956,7 +28681,7 @@ in sources."hawk-3.1.3" sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" - sources."qs-6.3.1" + sources."qs-6.3.2" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" sources."hoek-2.16.3" @@ -27965,17 +28690,19 @@ in sources."sntp-1.0.9" ]; }) - (sources."npm-registry-client-7.4.5" // { + (sources."npm-registry-client-7.4.6" // { dependencies = [ - sources."request-2.79.0" + sources."request-2.81.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."forever-agent-0.6.1" sources."form-data-2.1.2" + sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" - sources."qs-6.3.1" - sources."tunnel-agent-0.4.3" + sources."qs-6.4.0" + sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."hoek-2.16.3" sources."boom-2.10.1" @@ -27988,7 +28715,7 @@ in sources."os-homedir-1.0.2" sources."passport-0.3.2" sources."passport-local-1.0.0" - (sources."raven-1.1.2" // { + (sources."raven-1.1.5" // { dependencies = [ sources."json-stringify-safe-5.0.1" sources."uuid-3.0.0" @@ -28053,11 +28780,11 @@ in sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" - sources."mime-types-2.1.14" - sources."mime-db-1.26.0" + sources."mime-types-2.1.15" + sources."mime-db-1.27.0" sources."color-convert-1.9.0" - sources."color-string-1.5.0" - sources."color-name-1.1.1" + sources."color-string-1.5.2" + sources."color-name-1.1.2" sources."simple-swizzle-0.2.2" sources."is-arrayish-0.3.1" sources."cookie-0.3.1" @@ -28068,7 +28795,7 @@ in sources."mkdirp-0.3.0" ]; }) - sources."whatwg-fetch-2.0.2" + sources."whatwg-fetch-2.0.3" sources."nopt-1.0.10" sources."abbrev-1.1.0" sources."accepts-1.3.3" @@ -28083,7 +28810,7 @@ in sources."methods-1.1.2" sources."parseurl-1.3.1" sources."path-to-regexp-0.1.7" - sources."proxy-addr-1.1.3" + sources."proxy-addr-1.1.4" sources."range-parser-1.2.0" (sources."send-0.14.2" // { dependencies = [ @@ -28091,16 +28818,15 @@ in ]; }) sources."utils-merge-1.0.0" - sources."vary-1.1.0" + sources."vary-1.1.1" sources."negotiator-0.6.1" sources."forwarded-0.1.0" - sources."ipaddr.js-1.2.0" + sources."ipaddr.js-1.3.0" sources."destroy-1.0.4" sources."mime-1.3.4" sources."crc-3.4.1" sources."on-headers-1.0.1" - sources."uid-safe-2.1.3" - sources."base64-url-1.3.3" + sources."uid-safe-2.1.4" sources."random-bytes-1.0.0" (sources."broadway-0.2.10" // { dependencies = [ @@ -28153,7 +28879,7 @@ in ]; }) sources."hawk-0.10.2" - sources."node-uuid-1.4.7" + sources."node-uuid-1.4.8" sources."cookie-jar-0.2.0" sources."aws-sign-0.2.0" sources."oauth-sign-0.2.0" @@ -28180,7 +28906,7 @@ in sources."editions-1.3.3" sources."typechecker-4.4.1" sources."underscore-1.5.2" - sources."clone-2.1.0" + sources."clone-2.1.1" sources."JSONStream-1.3.1" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" @@ -28193,9 +28919,9 @@ in sources."config-chain-1.1.11" sources."dezalgo-1.0.3" sources."editor-1.0.0" - sources."fs-vacuum-1.2.9" - sources."fs-write-stream-atomic-1.0.8" - sources."fstream-1.0.10" + sources."fs-vacuum-1.2.10" + sources."fs-write-stream-atomic-1.0.10" + sources."fstream-1.0.11" sources."fstream-npm-1.2.0" (sources."glob-7.1.1" // { dependencies = [ @@ -28207,10 +28933,9 @@ in sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" sources."inflight-1.0.6" - (sources."init-package-json-1.9.4" // { + (sources."init-package-json-1.9.5" // { dependencies = [ - sources."glob-6.0.4" - sources."minimatch-3.0.3" + sources."validate-npm-package-name-3.0.0" ]; }) sources."lockfile-1.0.3" @@ -28227,10 +28952,10 @@ in ]; }) sources."normalize-git-url-3.0.2" - sources."normalize-package-data-2.3.5" + sources."normalize-package-data-2.3.6" sources."npm-cache-filename-1.0.2" sources."npm-install-checks-3.0.0" - sources."npm-package-arg-4.2.0" + sources."npm-package-arg-4.2.1" sources."npm-user-validate-0.1.5" sources."npmlog-4.0.2" sources."once-1.4.0" @@ -28240,14 +28965,9 @@ in sources."read-1.0.7" sources."read-cmd-shim-1.0.1" sources."read-installed-4.0.3" - (sources."read-package-json-2.0.4" // { - dependencies = [ - sources."glob-6.0.4" - sources."minimatch-3.0.3" - ]; - }) + sources."read-package-json-2.0.5" sources."read-package-tree-5.1.5" - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."realize-package-specifier-3.0.3" sources."retry-0.10.1" sources."sha-2.0.1" @@ -28267,8 +28987,12 @@ in sources."umask-1.1.0" sources."unique-filename-1.1.0" sources."uuid-3.0.1" - sources."validate-npm-package-name-2.2.2" - sources."which-1.2.12" + (sources."validate-npm-package-name-2.2.2" // { + dependencies = [ + sources."builtins-0.0.7" + ]; + }) + sources."which-1.2.14" sources."wrappy-1.0.2" sources."write-file-atomic-1.3.1" sources."ansi-regex-2.1.1" @@ -28302,6 +29026,7 @@ in sources."fs.realpath-1.0.0" sources."path-is-absolute-1.0.1" sources."promzard-0.3.0" + sources."builtins-1.0.3" sources."lodash._createset-4.0.3" sources."lodash._root-3.0.1" sources."concat-stream-1.6.0" @@ -28311,11 +29036,7 @@ in sources."once-1.3.3" ]; }) - (sources."end-of-stream-1.1.0" // { - dependencies = [ - sources."once-1.3.3" - ]; - }) + sources."end-of-stream-1.4.0" sources."flush-write-stream-1.0.2" sources."from2-2.3.0" sources."pump-1.0.2" @@ -28376,8 +29097,12 @@ in sources."is-property-1.0.2" sources."pinkie-2.0.4" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.11.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -28405,11 +29130,17 @@ in sources."stream-iterate-1.2.0" sources."block-stream-0.0.9" sources."unique-slug-2.0.0" - sources."builtins-0.0.7" - sources."isexe-1.1.2" + sources."isexe-2.0.0" sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" + sources."performance-now-0.2.0" + sources."safe-buffer-5.0.1" + sources."ajv-4.11.5" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" sources."passport-strategy-1.0.0" sources."pause-0.0.1" sources."lsmod-1.0.0" @@ -28502,7 +29233,7 @@ in sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" - (sources."error-ex-1.3.0" // { + (sources."error-ex-1.3.1" // { dependencies = [ sources."is-arrayish-0.2.1" ]; @@ -28561,7 +29292,7 @@ in sources."progress-1.1.8" sources."request-2.67.0" sources."request-progress-2.0.1" - sources."which-1.2.12" + sources."which-1.2.14" sources."concat-stream-1.5.0" sources."debug-0.7.4" sources."yauzl-2.4.1" @@ -28596,8 +29327,8 @@ in sources."forever-agent-0.6.1" sources."form-data-1.0.1" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.14" - sources."node-uuid-1.4.7" + sources."mime-types-2.1.15" + sources."node-uuid-1.4.8" sources."qs-5.2.1" sources."tunnel-agent-0.4.3" sources."tough-cookie-2.2.2" @@ -28610,12 +29341,16 @@ in sources."isstream-0.1.2" sources."is-typedarray-1.0.0" sources."har-validator-2.0.6" - sources."async-2.1.5" + sources."async-2.2.0" sources."lodash-4.17.4" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.11.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -28660,7 +29395,7 @@ in sources."xtend-4.0.1" sources."is-property-1.0.2" sources."throttleit-1.0.0" - sources."isexe-1.1.2" + sources."isexe-2.0.0" sources."os-tmpdir-1.0.2" sources."underscore-1.8.3" ]; @@ -28675,19 +29410,19 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "2.2.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-2.2.1.tgz"; - sha1 = "7bb1d72ae2087dd1a4af526afec15eed17dda475"; + url = "https://registry.npmjs.org/webpack/-/webpack-2.3.2.tgz"; + sha1 = "7d521e6f0777a3a58985c69425263fdfe977b458"; }; dependencies = [ sources."acorn-4.0.11" - sources."acorn-dynamic-import-2.0.1" - sources."ajv-4.11.3" + sources."acorn-dynamic-import-2.0.2" + sources."ajv-4.11.5" sources."ajv-keywords-1.5.1" - sources."async-2.1.5" + sources."async-2.2.0" sources."enhanced-resolve-3.1.0" - sources."interpret-1.0.1" + sources."interpret-1.0.2" sources."json-loader-0.5.4" sources."loader-runner-2.3.0" sources."loader-utils-0.2.17" @@ -28697,14 +29432,13 @@ in sources."source-map-0.5.6" sources."supports-color-3.2.3" sources."tapable-0.2.6" - (sources."uglify-js-2.7.5" // { + (sources."uglify-js-2.8.20" // { dependencies = [ - sources."async-0.2.10" sources."yargs-3.10.0" ]; }) sources."watchpack-1.3.1" - sources."webpack-sources-0.1.4" + sources."webpack-sources-0.2.3" (sources."yargs-6.6.0" // { dependencies = [ sources."camelcase-3.0.0" @@ -28721,7 +29455,7 @@ in sources."emojis-list-2.1.0" sources."json5-0.5.1" sources."errno-0.1.4" - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."prr-0.0.0" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -28765,7 +29499,7 @@ in sources."ieee754-1.1.8" sources."date-now-0.1.4" sources."browserify-cipher-1.0.0" - sources."browserify-sign-4.0.0" + sources."browserify-sign-4.0.4" sources."create-ecdh-4.0.0" sources."create-hash-1.1.2" sources."create-hmac-1.1.4" @@ -28783,7 +29517,7 @@ in sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" sources."elliptic-6.4.0" - sources."parse-asn1-5.0.0" + sources."parse-asn1-5.1.0" sources."brorand-1.1.0" sources."hash.js-1.0.3" sources."hmac-drbg-1.0.0" @@ -28812,7 +29546,7 @@ in sources."kind-of-3.1.0" sources."longest-1.0.1" sources."repeat-string-1.6.1" - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" sources."chokidar-1.6.1" sources."anymatch-1.3.0" sources."async-each-1.0.1" @@ -28831,7 +29565,7 @@ in sources."extglob-0.3.2" sources."filename-regex-2.0.0" sources."is-extglob-1.0.0" - sources."normalize-path-2.0.1" + sources."normalize-path-2.1.1" sources."object.omit-2.0.1" sources."parse-glob-3.0.4" sources."regex-cache-0.4.3" @@ -28844,9 +29578,10 @@ in sources."isobject-2.1.0" sources."randomatic-1.1.6" sources."is-posix-bracket-0.1.1" + sources."remove-trailing-separator-1.0.1" sources."for-own-0.1.5" sources."is-extendable-0.1.1" - sources."for-in-1.0.1" + sources."for-in-1.0.2" sources."glob-base-0.3.0" sources."is-dotfile-1.0.2" sources."is-equal-shallow-0.1.3" @@ -28858,25 +29593,23 @@ in sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."nan-2.5.1" - sources."node-pre-gyp-0.6.33" - sources."nopt-3.0.6" + sources."node-pre-gyp-0.6.34" + sources."nopt-4.0.1" sources."npmlog-4.0.2" - (sources."rc-1.1.7" // { + (sources."rc-1.2.0" // { dependencies = [ sources."minimist-1.2.0" ]; }) - sources."request-2.79.0" - sources."rimraf-2.5.4" + sources."request-2.81.0" + sources."rimraf-2.6.1" sources."semver-5.3.0" sources."tar-2.2.1" - (sources."tar-pack-3.3.0" // { - dependencies = [ - sources."once-1.3.3" - sources."readable-stream-2.1.5" - ]; - }) + sources."tar-pack-3.4.0" sources."abbrev-1.1.0" + sources."osenv-0.1.4" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" sources."gauge-2.7.3" @@ -28897,50 +29630,40 @@ in sources."strip-json-comments-2.0.1" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.14" + sources."mime-types-2.1.15" sources."oauth-sign-0.8.2" - sources."qs-6.3.1" + sources."performance-now-0.2.0" + sources."qs-6.4.0" + sources."safe-buffer-5.0.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."supports-color-2.0.0" - ]; - }) - sources."commander-2.9.0" - sources."is-my-json-valid-2.16.0" - sources."pinkie-promise-2.0.1" - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - sources."has-ansi-2.0.0" - sources."graceful-readlink-1.0.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.1" - sources."is-property-1.0.2" - sources."pinkie-2.0.4" + sources."har-schema-1.0.5" sources."hoek-2.16.3" sources."boom-2.10.1" sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.11.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -28964,19 +29687,19 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."glob-7.1.1" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" sources."once-1.4.0" sources."wrappy-1.0.2" sources."block-stream-0.0.9" - sources."fstream-1.0.10" - sources."debug-2.2.0" + sources."fstream-1.0.11" + sources."debug-2.6.3" sources."fstream-ignore-1.0.5" sources."uid-number-0.0.6" - sources."ms-0.7.1" - sources."source-list-map-0.1.8" + sources."ms-0.7.2" + sources."source-list-map-1.1.1" sources."get-caller-file-1.0.2" sources."os-locale-1.4.0" sources."read-pkg-up-1.0.1" @@ -28995,16 +29718,18 @@ in sources."find-up-1.1.2" sources."read-pkg-1.1.0" sources."path-exists-2.1.0" + sources."pinkie-promise-2.0.1" + sources."pinkie-2.0.4" sources."load-json-file-1.1.0" - sources."normalize-package-data-2.3.5" + sources."normalize-package-data-2.3.6" sources."path-type-1.1.0" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" - sources."error-ex-1.3.0" + sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" sources."is-utf8-0.2.1" - sources."hosted-git-info-2.2.0" + sources."hosted-git-info-2.4.1" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -29039,25 +29764,24 @@ in yarn = nodeEnv.buildNodePackage { name = "yarn"; packageName = "yarn"; - version = "0.20.4"; + version = "0.21.3"; src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-0.20.4.tgz"; - sha1 = "575190fee60a27a54d4125a0f7579fc702f01229"; + url = "https://registry.npmjs.org/yarn/-/yarn-0.21.3.tgz"; + sha1 = "8dda3a63c798b383cfa577452c2b3cb3e4aa87e0"; }; dependencies = [ sources."babel-runtime-6.23.0" - sources."bytes-2.4.0" + sources."bytes-2.5.0" sources."camelcase-3.0.0" sources."chalk-1.1.3" sources."cmd-shim-2.0.2" sources."commander-2.9.0" sources."death-1.1.0" - sources."debug-2.6.1" + sources."debug-2.6.3" sources."defaults-1.0.3" sources."detect-indent-5.0.0" - sources."diff-2.2.3" sources."ini-1.3.4" - sources."inquirer-3.0.5" + sources."inquirer-3.0.6" sources."invariant-2.2.2" sources."is-builtin-module-1.0.0" sources."is-ci-1.0.10" @@ -29066,19 +29790,18 @@ in sources."minimatch-3.0.3" sources."mkdirp-0.5.1" sources."node-emoji-1.5.1" - sources."node-gyp-3.5.0" + sources."node-gyp-3.6.0" sources."object-path-0.11.4" sources."proper-lockfile-2.0.0" sources."read-1.0.7" - sources."request-2.79.0" - sources."request-capture-har-1.1.4" + sources."request-2.81.0" + sources."request-capture-har-1.2.2" sources."rimraf-2.6.1" sources."roadrunner-1.1.0" sources."semver-5.3.0" sources."strip-bom-3.0.0" sources."tar-2.2.1" sources."tar-stream-1.5.2" - sources."user-home-2.0.0" sources."validate-npm-package-license-3.0.1" sources."core-js-2.4.1" sources."regenerator-runtime-0.10.3" @@ -29104,7 +29827,7 @@ in sources."string-width-2.0.0" sources."through-2.3.8" sources."restore-cursor-2.0.0" - sources."onetime-2.0.0" + sources."onetime-2.0.1" sources."signal-exit-3.0.2" sources."mimic-fn-1.1.0" sources."tmp-0.0.31" @@ -29122,12 +29845,12 @@ in sources."concat-map-0.0.1" sources."minimist-0.0.8" sources."string.prototype.codepointat-0.2.0" - sources."fstream-1.0.10" + sources."fstream-1.0.11" sources."glob-7.1.1" sources."nopt-3.0.6" sources."npmlog-4.0.2" sources."osenv-0.1.4" - sources."which-1.2.12" + sources."which-1.2.14" sources."inherits-2.0.3" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -29145,7 +29868,7 @@ in }) sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" sources."isarray-1.0.0" @@ -29164,45 +29887,48 @@ in sources."code-point-at-1.1.0" sources."number-is-nan-1.0.1" sources."os-homedir-1.0.2" - sources."isexe-1.1.2" + sources."isexe-2.0.0" sources."retry-0.10.1" sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.14" + sources."mime-types-2.1.15" sources."oauth-sign-0.8.2" - sources."qs-6.3.1" + sources."performance-now-0.2.0" + sources."qs-6.4.0" + sources."safe-buffer-5.0.1" sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."is-my-json-valid-2.16.0" - sources."pinkie-promise-2.0.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.1" - sources."xtend-4.0.1" - sources."is-property-1.0.2" - sources."pinkie-2.0.4" + sources."ajv-4.11.5" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" sources."hoek-2.16.3" sources."boom-2.10.1" sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.11.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -29226,22 +29952,19 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."punycode-1.4.1" sources."block-stream-0.0.9" sources."bl-1.2.0" - (sources."end-of-stream-1.1.0" // { - dependencies = [ - sources."once-1.3.3" - ]; - }) + sources."end-of-stream-1.4.0" + sources."xtend-4.0.1" sources."spdx-correct-1.0.2" sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" ]; buildInputs = globalBuildInputs; meta = { - description = "

\"Yarn\"

"; + description = "📦🐈 Fast, reliable, and secure dependency management."; homepage = "https://github.com/yarnpkg/yarn#readme"; license = "BSD-2-Clause"; }; @@ -29347,10 +30070,10 @@ in sources."imurmurhash-0.1.4" sources."slide-1.1.6" sources."lru-cache-4.0.2" - sources."which-1.2.12" + sources."which-1.2.14" sources."pseudomap-1.0.2" - sources."yallist-2.0.0" - sources."isexe-1.1.2" + sources."yallist-2.1.2" + sources."isexe-2.0.0" sources."npmconf-2.1.2" sources."pify-2.3.0" sources."pinkie-promise-2.0.1" @@ -29374,12 +30097,12 @@ in sources."node-status-codes-1.0.0" sources."parse-json-2.2.0" sources."read-all-stream-3.1.0" - sources."readable-stream-2.2.3" + sources."readable-stream-2.2.6" sources."timed-out-3.1.3" sources."unzip-response-1.0.2" sources."url-parse-lax-1.0.0" sources."capture-stack-trace-1.0.0" - sources."error-ex-1.3.0" + sources."error-ex-1.3.1" sources."is-arrayish-0.2.1" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -29406,7 +30129,7 @@ in sources."number-is-nan-1.0.1" sources."lodash.debounce-3.1.1" sources."os-name-1.0.3" - (sources."request-2.79.0" // { + (sources."request-2.81.0" // { dependencies = [ sources."uuid-3.0.1" ]; @@ -29425,39 +30148,42 @@ in }) sources."aws-sign2-0.6.0" sources."aws4-1.6.0" - sources."caseless-0.11.0" + sources."caseless-0.12.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" sources."form-data-2.1.2" - sources."har-validator-2.0.6" + sources."har-validator-4.2.1" sources."hawk-3.1.3" sources."http-signature-1.1.1" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.14" + sources."mime-types-2.1.15" sources."oauth-sign-0.8.2" - sources."qs-6.3.1" + sources."performance-now-0.2.0" + sources."qs-6.4.0" + sources."safe-buffer-5.0.1" sources."stringstream-0.0.5" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."commander-2.9.0" - sources."is-my-json-valid-2.16.0" - sources."graceful-readlink-1.0.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."jsonpointer-4.0.1" - sources."xtend-4.0.1" - sources."is-property-1.0.2" + sources."ajv-4.11.5" + sources."har-schema-1.0.5" + sources."co-4.6.0" + sources."json-stable-stringify-1.0.1" + sources."jsonify-0.0.0" sources."hoek-2.16.3" sources."boom-2.10.1" sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.1" - (sources."sshpk-1.10.2" // { + (sources."jsprim-1.4.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."sshpk-1.11.0" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -29481,19 +30207,19 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" sources."bcrypt-pbkdf-1.0.1" - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" sources."punycode-1.4.1" sources."camelcase-keys-2.1.0" sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" - sources."normalize-package-data-2.3.5" + sources."normalize-package-data-2.3.6" sources."redent-1.0.0" sources."trim-newlines-1.0.0" sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.2.0" + sources."hosted-git-info-2.4.1" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -29504,7 +30230,7 @@ in sources."strip-indent-1.0.1" sources."get-stdin-4.0.1" sources."registry-url-3.1.0" - (sources."rc-1.1.7" // { + (sources."rc-1.2.0" // { dependencies = [ sources."minimist-1.2.0" ]; @@ -29532,7 +30258,7 @@ in sources."arrify-1.0.1" sources."dot-prop-2.4.0" sources."is-obj-1.0.1" - sources."debug-2.6.1" + sources."debug-2.6.3" sources."npmlog-2.0.4" sources."ms-0.7.2" sources."external-editor-1.1.1" @@ -29604,6 +30330,7 @@ in sources."through2-2.0.3" sources."vinyl-1.2.0" sources."vinyl-file-2.0.0" + sources."xtend-4.0.1" sources."clone-1.0.2" sources."clone-stats-0.0.1" sources."replace-ext-0.0.1" diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix index 755724bc8b8..fadb55907bf 100644 --- a/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/pkgs/development/ocaml-modules/angstrom/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, ocaml, ocamlbuild, cstruct, result, findlib, ocaml_oasis }: stdenv.mkDerivation rec { - version = "0.3.0"; + version = "0.4.0"; name = "ocaml-angstrom-${version}"; src = fetchFromGitHub { owner = "inhabitedtype"; repo = "angstrom"; rev = "${version}"; - sha256 = "1x9pvy5vw98ns4pspj7i10pmgqyngn4v4cdlz5pbvwbrpwpn090q"; + sha256 = "019s3jwhnswa914bgj1fa6q67k0bl2ahqdaqfnavcbyii8763kh2"; }; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/async_ssl/default.nix b/pkgs/development/ocaml-modules/async_ssl/default.nix deleted file mode 100644 index 2bace35aa8b..00000000000 --- a/pkgs/development/ocaml-modules/async_ssl/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{stdenv, buildOcaml, fetchurl, async_p4, comparelib, core_p4, ctypes, openssl, - fieldslib_p4, herelib, pa_bench, pa_ounit, pipebang, pa_test, sexplib_p4}: - -buildOcaml rec { - name = "async_ssl"; - version = "112.24.03"; - - minimumSupportedOcamlVersion = "4.02"; - - src = fetchurl { - url = "https://github.com/janestreet/async_ssl/archive/${version}.tar.gz"; - sha256 = "1b0bea92142eef11da6bf649bbe229bd4b8d9cc807303d8142406908c0d28c68"; - }; - - buildInputs = [ pa_bench pa_test ]; - propagatedBuildInputs = [ ctypes async_p4 comparelib core_p4 fieldslib_p4 pa_ounit - herelib pipebang sexplib_p4 openssl ]; - - meta = with stdenv.lib; { - homepage = https://github.com/janestreet/async_ssl; - description = "Async wrappers for ssl"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix new file mode 100644 index 00000000000..25564a0a300 --- /dev/null +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -0,0 +1,62 @@ +{stdenv, buildOcaml, fetchFromGitHub, fetchurl, camlp4, ocaml_oasis, bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, ulex, easy-format, xmlm, frontc, ounit, utop, which, makeWrapper, writeText, ocaml}: + +buildOcaml rec { + name = "bap"; + version = "1.2.0"; + src = fetchFromGitHub { + owner = "BinaryAnalysisPlatform"; + repo = "bap"; + rev = "v${version}"; + sha256 = "0dn1gvj73pma0rsw8r50cmjddibnf42w1kbskb2vpzq0kb79jlkw"; + }; + + sigs = fetchurl { + url = "https://github.com/BinaryAnalysisPlatform/bap/releases/download/v${version}/sigs.zip"; + sha256 = "0mpsq2pinbrynlisnh8j3nrlamlsls7lza0bkqnm9szqjjdmcgfn"; + }; + + createFindlibDestdir = true; + + setupHook = writeText "setupHook.sh" '' + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/" + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}-llvm-plugins/" + ''; + + nativeBuildInputs = [ which makeWrapper ]; + + buildInputs = [ ocaml_oasis + llvm_38 + utop ]; + + propagatedBuildInputs = [ bitstring camlzip cmdliner core_kernel ezjsonm faillib fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi + piqi-ocaml uuidm frontc ounit ]; + + installPhase = '' + export OCAMLPATH=$OCAMLPATH:$OCAMLFIND_DESTDIR; + export PATH=$PATH:$out/bin + export CAML_LD_LIBRARY_PATH=$CAML_LD_LIBRARY_PATH:$OCAMLFIND_DESTDIR/bap-plugin-llvm/:$OCAMLFIND_DESTDIR/bap/ + mkdir -p $out/lib/bap + make install + rm $out/bin/baptop + makeWrapper ${utop}/bin/utop $out/bin/baptop --prefix OCAMLPATH : $OCAMLPATH --prefix PATH : $PATH --add-flags "-ppx ppx-bap -short-paths -require \"bap.top\"" + wrapProgram $out/bin/bapbuild --prefix OCAMLPATH : $OCAMLPATH --prefix PATH : $PATH + ln -s $sigs $out/share/bap/sigs.zip + ''; + + disableIda = "--disable-ida --disable-fsi-benchmark"; + + doCheck = true; + + checkTarget = "check test"; + + configureFlags = "--enable-everything --enable-tests ${disableIda} --with-llvm-config=${llvm_38}/bin/llvm-config"; + + BAPBUILDFLAGS = "-j $(NIX_BUILD_CORES)"; + + meta = with stdenv.lib; { + description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages."; + homepage = https://github.com/BinaryAnalysisPlatform/bap/; + maintainers = [ maintainers.maurer ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/ocaml-modules/base/default.nix b/pkgs/development/ocaml-modules/base/default.nix new file mode 100644 index 00000000000..4c92c7f1ca1 --- /dev/null +++ b/pkgs/development/ocaml-modules/base/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, ocaml, jbuilder, findlib }: + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-base-0.9.0"; + + src = fetchurl { + url = http://ocaml.janestreet.com/ocaml-core/v0.9/files/base-v0.9.0.tar.gz; + sha256 = "0pdpa3hflbqn978ppvv5y08cjya0k8xpf1h0kcak6bdrmnmiwlyx"; + }; + + buildInputs = [ ocaml jbuilder findlib ]; + + inherit (jbuilder) installPhase; + + meta = { + license = stdenv.lib.licenses.asl20; + inherit (ocaml.meta) platforms; + homepage = https://github.com/janestreet/base; + description = "Full standard library replacement for OCaml"; + }; +} diff --git a/pkgs/development/ocaml-modules/bitstring/2.0.4.nix b/pkgs/development/ocaml-modules/bitstring/2.0.4.nix deleted file mode 100644 index 68ce28c40bd..00000000000 --- a/pkgs/development/ocaml-modules/bitstring/2.0.4.nix +++ /dev/null @@ -1,25 +0,0 @@ -{stdenv, fetchurl, buildOcaml, time}: - -buildOcaml rec { - name = "bitstring"; - version = "2.0.4"; - src = fetchurl { - url = "http://bitstring.googlecode.com/files/ocaml-bitstring-${version}.tar.gz"; - sha256 = "0mapzn2ls5qcrzjm1az50lqjj76ldkmz4fbv2phc9w6smab50qy5"; - }; - - patches = [ ./camlp4.patch ./meta.patch ./srcdir.patch ]; - - buildInputs = [time]; - doCheck = true; - - createFindlibDestdir = true; - hasSharedObjects = true; - - meta = with stdenv.lib; { - description = "This library adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml"; - homepage = http://code.google.com/p/bitstring/; - license = licenses.lgpl21Plus; - maintainers = [ maintainers.maurer ]; - }; -} diff --git a/pkgs/development/ocaml-modules/bitstring/camlp4.patch b/pkgs/development/ocaml-modules/bitstring/camlp4.patch deleted file mode 100644 index 920c78007bb..00000000000 --- a/pkgs/development/ocaml-modules/bitstring/camlp4.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -rupN ocaml-bitstring-2.0.4.orig/camlp4.patch ocaml-bitstring-2.0.4/camlp4.patch ---- ocaml-bitstring-2.0.4.orig/camlp4.patch 1970-01-01 00:00:00.000000000 +0000 -+++ ocaml-bitstring-2.0.4/camlp4.patch 2015-06-10 18:06:54.016000000 +0000 -@@ -0,0 +1,31 @@ -+--- Makefile.in 2015-06-10 20:05:26.603000000 +0200 -++++ ../bs-old/Makefile.in 2013-05-14 17:42:32.000000000 +0200 -+@@ -40,10 +40,10 @@ -+ enable_coverage = @enable_coverage@ -+ -+ OCAMLCFLAGS = -g -+-OCAMLCPACKAGES = -package camlp4 -++OCAMLCPACKAGES = -+ OCAMLCLIBS = -linkpkg -+ OCAMLOPTFLAGS = -+-OCAMLOPTPACKAGES = -package camlp4 -++OCAMLOPTPACKAGES = -+ OCAMLOPTLIBS = -linkpkg -+ -+ ifneq ($(enable_coverage),no) -+@@ -110,13 +110,12 @@ -+ -I +camlp4 -pp camlp4of -c $< -+ -+ pa_bitstring.cmo: pa_bitstring.ml bitstring.cma bitstring_persistent.cma -+- $(OCAMLFIND) ocamlc $(OCAMLCPACKAGES) \ -+- bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \ -++ $(OCAMLFIND) ocamlc bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \ -+ -pp camlp4of -c $< -o $@ -+ -+ bitstring-objinfo: bitstring_objinfo.cmo bitstring.cma bitstring_persistent.cma -+ $(OCAMLFIND) ocamlc -I +camlp4 unix.cma dynlink.cma camlp4lib.cma \ -+- $(OCAMLCPACKAGES) $(OCAMLCLIBS) \ -++ $(OCAMLCLIBS) \ -+ bitstring.cma bitstring_persistent.cma \ -+ $< -o $@ -+ -diff -rupN ocaml-bitstring-2.0.4.orig/Makefile.in ocaml-bitstring-2.0.4/Makefile.in ---- ocaml-bitstring-2.0.4.orig/Makefile.in 2013-05-14 15:42:32.000000000 +0000 -+++ ocaml-bitstring-2.0.4/Makefile.in 2015-06-25 20:05:52.759000000 +0000 -@@ -40,10 +40,10 @@ pkg_extlib = @OCAML_PKG_extlib@ - enable_coverage = @enable_coverage@ - - OCAMLCFLAGS = -g --OCAMLCPACKAGES = -+OCAMLCPACKAGES = -package camlp4 - OCAMLCLIBS = -linkpkg - OCAMLOPTFLAGS = --OCAMLOPTPACKAGES = -+OCAMLOPTPACKAGES = -package camlp4 - OCAMLOPTLIBS = -linkpkg - - ifneq ($(enable_coverage),no) -@@ -110,12 +110,13 @@ bitstring_persistent.cmi: bitstring_pers - -I +camlp4 -pp camlp4of -c $< - - pa_bitstring.cmo: pa_bitstring.ml bitstring.cma bitstring_persistent.cma -- $(OCAMLFIND) ocamlc bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \ -+ $(OCAMLFIND) ocamlc $(OCAMLCPACKAGES) \ -+ bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \ - -pp camlp4of -c $< -o $@ - - bitstring-objinfo: bitstring_objinfo.cmo bitstring.cma bitstring_persistent.cma - $(OCAMLFIND) ocamlc -I +camlp4 unix.cma dynlink.cma camlp4lib.cma \ -- $(OCAMLCLIBS) \ -+ $(OCAMLCPACKAGES) $(OCAMLCLIBS) \ - bitstring.cma bitstring_persistent.cma \ - $< -o $@ - -@@ -158,13 +159,13 @@ tests/test.bmpp: create_test_pattern - - create_test_pattern: create_test_pattern.cmo - $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \ -- unix.cma -I +camlp4 dynlink.cma camlp4lib.cma \ -- $(OCAMLCLIBS) \ -+ unix.cma -I `$(OCAMLFIND) query camlp4` dynlink.cma camlp4lib.cma \ -+ $(OCAMLCLIBS) $(OCAMLCPACKAGES) \ - -I . bitstring.cma bitstring_persistent.cma $< -o $@ - - create_test_pattern.cmo: create_test_pattern.ml - $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \ -- unix.cma -I +camlp4 \ -+ unix.cma -I `$(OCAMLFIND) query camlp4` $(OCAMLCPACKAGES) \ - -I . -c $< -o $@ - - # Coverage of tests. diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix index 26b41a75146..d6909efe4a6 100644 --- a/pkgs/development/ocaml-modules/bitstring/default.nix +++ b/pkgs/development/ocaml-modules/bitstring/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchzip, buildOcaml, time, autoconf, automake }: +{ stdenv, fetchurl, buildOcaml, time, autoconf, automake }: buildOcaml rec { name = "bitstring"; - version = "f1673f8"; - src = fetchzip { - url = https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/bitstring/source-archive.zip; - sha256 = "03343yggwp3y483zj5axaalxlnl698xrjiv3hmd4c2s05g53iwas"; + version = "2.1.0"; + src = fetchurl { + url = http://github.com/xguerin/bitstring/archive/v2.1.0.tar.gz; + sha256 = "0miw4banfpmx4kxrckpqr57b1fcmsqdmspyjx6gqjd4kghm4l7xj"; }; - patches = [ ./camlp4-git.patch ./meta.patch ./srcdir.patch ]; + patches = [ ./camlp4-git.patch ./srcdir.patch ]; buildInputs = [time autoconf automake]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/bitstring/meta.patch b/pkgs/development/ocaml-modules/bitstring/meta.patch deleted file mode 100644 index 78f44cbe15f..00000000000 --- a/pkgs/development/ocaml-modules/bitstring/meta.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -rupN ocaml-bitstring-2.0.4/META.in ocaml-bitstring-2.0.4.new/META.in ---- ocaml-bitstring-2.0.4/META.in 2013-05-14 17:42:32.000000000 +0200 -+++ ocaml-bitstring-2.0.4.new/META.in 2015-06-11 17:26:11.674000000 +0200 -@@ -15,8 +15,8 @@ package "persistent" ( - - package "syntax" ( - version = "@PACKAGE_VERSION@" -- requires = "camlp4" -+ requires = "camlp4, bitstring.persistent, bitstring" - description = "Syntax extension: bitstring operators" -- archive(syntax,preprocessor) = "-parser o -parser op -printer p unix.cma bitstring.cma bitstring_persistent.cma pa_bitstring.cmo" -- archive(syntax,toploop) = "unix.cma bitstring.cma bitstring_persistent.cma pa_bitstring.cmo" -+ archive(syntax,preprocessor) = "-parser o -parser op -printer p pa_bitstring.cmo" -+ archive(syntax,toploop) = "pa_bitstring.cmo" - ) diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix index 731d66974c6..c1490c3bf19 100644 --- a/pkgs/development/ocaml-modules/camlzip/default.nix +++ b/pkgs/development/ocaml-modules/camlzip/default.nix @@ -4,16 +4,17 @@ let param = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "1.06"; - url = "1616"; - sha256 = "0m6gyjw46w3qnhxfsyqyag42znl5lwargks7w7rfchr9jzwpff68"; - patch = ./makefile_1_06.patch; + version = "1.07"; + url = "https://github.com/xavierleroy/camlzip/archive/rel107.tar.gz"; + sha256 = "1pdz3zyiczm6c46zfgag2frwq3ljlq044p3a2y4wm2wb4pgz8k9g"; + patches = []; installTargets = "install-findlib"; } else { version = "1.05"; - url = "1037"; + download_id = "1037"; + url = "http://forge.ocamlcore.org/frs/download.php/${param.download_id}/camlzip-${param.version}.tar.gz"; sha256 = "930b70c736ab5a7ed1b05220102310a0a2241564786657abe418e834a538d06b"; - patch = ./makefile_1_05.patch; + patches = [./makefile_1_05.patch]; installTargets = "install"; }; in @@ -22,13 +23,15 @@ stdenv.mkDerivation { name = "camlzip-${param.version}"; src = fetchurl { - url = "http://forge.ocamlcore.org/frs/download.php/${param.url}/camlzip-${param.version}.tar.gz"; + inherit (param) url; inherit (param) sha256; }; - buildInputs = [zlib ocaml findlib]; + buildInputs = [ocaml findlib]; - patches = [ param.patch ]; + propagatedBuildInputs = [zlib]; + + inherit (param) patches; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/camlzip/makefile_1_06.patch b/pkgs/development/ocaml-modules/camlzip/makefile_1_06.patch deleted file mode 100644 index ab0d3528c8c..00000000000 --- a/pkgs/development/ocaml-modules/camlzip/makefile_1_06.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/Makefile 2016-06-10 14:37:48.000000000 +0200 -+++ b/Makefile 2016-06-23 05:10:26.000000000 +0200 -@@ -4,17 +4,13 @@ - ZLIB_LIB=-lz - - # The directory containing the Zlib library (libz.a or libz.so) --ZLIB_LIBDIR=/usr/lib -+ZLIB_LIBDIR=@ZLIB_LIBDIR@ - # ZLIB_LIBDIR=/usr/local/lib - - # The directory containing the Zlib header file (zlib.h) --ZLIB_INCLUDE=/usr/include -+ZLIB_INCLUDE=@ZLIB_INCLUDE@ - # ZLIB_INCLUDE=/usr/local/include - --# Where to install the library. By default: sub-directory 'zip' of --# OCaml's standard library directory. --INSTALLDIR=`$(OCAMLC) -where`/zip -- - ### End of configuration section - - OCAMLC=ocamlc -g -safe-string diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index eb148311be0..0278b0f2655 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -6,7 +6,7 @@ assert stdenv.lib.versionAtLeast ocaml.version "4.01"; let param = if stdenv.lib.versionAtLeast ocaml.version "4.02" - then { version = "2.3.0"; sha256 = "19spsgkry41dhsbm6ij71kws90bqp7wiggc6lsqdl43xxvbgdmys"; } + then { version = "2.3.2"; sha256 = "1fykack86hvvqhwngddyxxqlwm3xjljfaszsjbdrvjlrd1nlg079"; } else { version = "1.9.0"; sha256 = "1c1j21zgmxi9spq23imy7byn50qr7hlds1cfpzxlsx9dp309jngy"; }; in diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index e64310f6db8..aaddc7b08d5 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -2,13 +2,13 @@ buildOcaml rec { name = "ctypes"; - version = "0.4.1"; + version = "0.11.2"; minimumSupportedOcamlVersion = "4"; src = fetchurl { url = "https://github.com/ocamllabs/ocaml-ctypes/archive/${version}.tar.gz"; - sha256 = "74564e049de5d3c0e76ea284c225cb658ac1a2b483345be1efb9be4b3c1702f5"; + sha256 = "1ml80i8j5lpg3qwc074fks2hgxjq5cfdm9r6cznv605s05ajr3kh"; }; buildInputs = [ ncurses pkgconfig ]; diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 57f3477edf6..d21bd5977ee 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec createFindlibDestdir = true; + setupHook = [ ./setup-hook.sh ]; + meta = { homepage = http://ocsigen.org/eliom/; description = "Ocaml Framework for programming Web sites and client/server Web applications"; diff --git a/pkgs/development/ocaml-modules/eliom/setup-hook.sh b/pkgs/development/ocaml-modules/eliom/setup-hook.sh new file mode 100644 index 00000000000..096d8f8bf63 --- /dev/null +++ b/pkgs/development/ocaml-modules/eliom/setup-hook.sh @@ -0,0 +1,5 @@ +addOcsigenDistilleryTemplate() { + addToSearchPathWithCustomDelimiter : ELIOM_DISTILLERY_PATH $1/eliom-distillery-templates +} + +envHooks+=(addOcsigenDistilleryTemplate) diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index 492b10bb09b..6c2cb894b54 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -1,16 +1,16 @@ -{stdenv, fetchurl, ocaml, findlib, camlp4, minimal ? true}: +{ stdenv, fetchurl, ocaml, findlib, cppo, minimal ? true }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; stdenv.mkDerivation { - name = "ocaml-extlib-1.6.1"; + name = "ocaml-extlib-1.7.2"; src = fetchurl { - url = http://ocaml-extlib.googlecode.com/files/extlib-1.6.1.tar.gz; - sha256 = "1jmfj2w0f3ap0swz8k3qqmrl6x2y4gkmg88vv024xnmliiiv7m48"; + url = http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.2.tar.gz; + sha256 = "0r7mhfgh6n5chj9r12s2x1fxrzvh6nm8h80ykl1mr75j86za41bm"; }; - buildInputs = [ocaml findlib camlp4]; + buildInputs = [ ocaml findlib cppo ]; createFindlibDestdir = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation { installPhase = "make ${if minimal then "minimal=1" else ""} install"; meta = { - homepage = http://code.google.com/p/ocaml-extlib/; + homepage = https://github.com/ygrek/ocaml-extlib; description = "Enhancements to the OCaml Standard Library modules"; license = stdenv.lib.licenses.lgpl21; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix index 9dfffbf48c5..6265a4b90ca 100644 --- a/pkgs/development/ocaml-modules/fileutils/default.nix +++ b/pkgs/development/ocaml-modules/fileutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }: stdenv.mkDerivation { - name = "ocaml-fileutils-0.5.0"; + name = "ocaml-fileutils-0.5.1"; src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/1531/ocaml-fileutils-0.5.0.tar.gz; - sha256 = "0xs96nlrrm335mcsgsxnqzspiqyfn26b0jjxm72br7c7ax534n47"; + url = https://forge.ocamlcore.org/frs/download.php/1651/ocaml-fileutils-0.5.1.tar.gz; + sha256 = "0g6zx2rcvacklxyli19ixcf6ich9ipxsps4k3jz98f5zlaab0a7g"; }; buildInputs = [ ocaml findlib ocamlbuild ounit ]; diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix index 9994d156a4c..469f808947a 100644 --- a/pkgs/development/ocaml-modules/fmt/default.nix +++ b/pkgs/development/ocaml-modules/fmt/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, cmdliner }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, cmdliner, result, uchar }: stdenv.mkDerivation { - name = "ocaml${ocaml.version}-fmt-0.8.0"; + name = "ocaml${ocaml.version}-fmt-0.8.2"; src = fetchurl { - url = http://erratique.ch/software/fmt/releases/fmt-0.8.0.tbz; - sha256 = "16y7ibndnairb53j8a6qgipyqwjxncn4pl9jiw5bxjfjm59108px"; + url = http://erratique.ch/software/fmt/releases/fmt-0.8.2.tbz; + sha256 = "020qz74cm65bzrywf6kylm93gr5x1ayl6hfmxaql995f6whb388i"; }; unpackCmd = "tar xjf $src"; buildInputs = [ ocaml findlib ocamlbuild opam topkg cmdliner ]; + propagatedBuildInputs = [ result uchar ]; inherit (topkg) buildPhase installPhase; diff --git a/pkgs/development/ocaml-modules/higlo/default.nix b/pkgs/development/ocaml-modules/higlo/default.nix new file mode 100644 index 00000000000..1e3a9713406 --- /dev/null +++ b/pkgs/development/ocaml-modules/higlo/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, xtmpl, ulex }: + +stdenv.mkDerivation rec { + name = "higlo-${version}"; + version = "0.6"; + src = fetchFromGitHub { + owner = "zoggy"; + repo = "higlo"; + rev = "release-${version}"; + sha256 = "0m0qyk2ydivai54502s45sdw9w4xr0j3jpwyc4vqk62a7iz9ihxh"; + }; + + buildInputs = [ ocaml findlib ]; + propagatedBuildInputs = [ xtmpl ulex ]; + + createFindlibDestdir = true; + + patches = ./install.patch; + + meta = with stdenv.lib; { + description = "OCaml library for syntax highlighting"; + homepage = "https://zoggy.github.io/higlo/"; + license = licenses.lgpl3; + platforms = ocaml.meta.platforms or []; + maintainers = with maintainers; [ regnat ]; + }; +} + + diff --git a/pkgs/development/ocaml-modules/higlo/install.patch b/pkgs/development/ocaml-modules/higlo/install.patch new file mode 100644 index 00000000000..bbdaace293b --- /dev/null +++ b/pkgs/development/ocaml-modules/higlo/install.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile b/Makefile +index b8c2e01..fcd07ed 100644 +--- a/Makefile ++++ b/Makefile +@@ -149,7 +149,8 @@ webdoc: + install: install-lib install-bin + + install-bin: +- $(CP) $(HIGLO) $(HIGLO_BYTE) $(MK_HIGLO) `dirname \`which ocamlfind\``/ ++ mkdir -p $(out)/bin ++ $(CP) $(HIGLO) $(HIGLO_BYTE) $(MK_HIGLO) $(out)/bin + + install-lib: higlo.cmo higlo.cmx higlo.cmxs $(HIGLO) $(HIGLO_BYTE) + ocamlfind install higlo META LICENSE \ diff --git a/pkgs/development/ocaml-modules/inifiles/default.nix b/pkgs/development/ocaml-modules/inifiles/default.nix new file mode 100644 index 00000000000..1860e585b59 --- /dev/null +++ b/pkgs/development/ocaml-modules/inifiles/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocaml_pcre }: + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-inifiles-1.2"; + + src = fetchurl { + url = http://archive.ubuntu.com/ubuntu/pool/universe/o/ocaml-inifiles/ocaml-inifiles_1.2.orig.tar.gz; + sha256 = "0jhzgiypmh6hwsv1zpiq77fi0cvcmwbiy5x0yg7mz6p3dh1dmkns"; + }; + + patches = [ (fetchpatch { + url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocaml-inifiles/ocaml-inifiles.1.2/files/ocaml-inifiles.diff; + sha256 = "037kk3172s187w8vwsykdxlpklxzc7m7np57sapk499d8adzdgwn"; + })]; + + buildInputs = [ ocaml findlib ]; + propagatedBuildInputs = [ ocaml_pcre ]; + + buildFlags = [ "all" "opt" ]; + + createFindlibDestdir = true; + + meta = { + description = "A small OCaml library to read and write .ini files"; + license = stdenv.lib.licenses.lgpl21Plus; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix index ed058d82a0e..24aa2557082 100644 --- a/pkgs/development/ocaml-modules/io-page/default.nix +++ b/pkgs/development/ocaml-modules/io-page/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchzip, ocaml, findlib, ocamlbuild, cstruct }: -let version = "1.5.1"; in +let version = "1.6.1"; in stdenv.mkDerivation { name = "ocaml-io-page-${version}"; src = fetchzip { url = "https://github.com/mirage/io-page/archive/v${version}.tar.gz"; - sha256 = "0y92wbvi129d0i7wr4lpk1ps9l247zaf1ibqqz0i6spgl28dyq79"; + sha256 = "1djwks3ss12m55q6h4jsvfsy848cxfnpaxkilw10h26xj6jchflz"; }; buildInputs = [ ocaml findlib ocamlbuild ]; diff --git a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix new file mode 100644 index 00000000000..5cd4c6064e0 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix @@ -0,0 +1,16 @@ +{stdenv, buildOcamlJane, fetchurl, async, comparelib, core, ctypes, openssl, + fieldslib, herelib, pipebang, sexplib, ocaml_oasis}: + +buildOcamlJane rec { + name = "async_ssl"; + version = "113.33.07"; + hash = "0bhzpnmlx6dy4fli3i7ipjwqbsdi7fq171jrila5dr3ciy3841xs"; + propagatedBuildInputs = [ ctypes async comparelib core fieldslib + herelib pipebang sexplib openssl ocaml_oasis ]; + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/async_ssl; + description = "Async wrappers for ssl"; + license = licenses.asl20; + maintainers = [ maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/core-extended.nix b/pkgs/development/ocaml-modules/janestreet/core-extended.nix index df7f6903cd2..dc84ea34337 100644 --- a/pkgs/development/ocaml-modules/janestreet/core-extended.nix +++ b/pkgs/development/ocaml-modules/janestreet/core-extended.nix @@ -13,6 +13,13 @@ buildOcamlJane rec { ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane re2 textutils ]; + patchPhase = stdenv.lib.optionalString stdenv.isLinux '' + patch src/extended_unix_stubs.c < #define _LINUX_QUOTA_VERSION 2 +EOF + ''; + meta = with stdenv.lib; { homepage = https://github.com/janestreet/core_extended; description = "Jane Street Capital's standard library overlay"; diff --git a/pkgs/development/ocaml-modules/janestreet/ocaml-compiler-libs.nix b/pkgs/development/ocaml-modules/janestreet/ocaml-compiler-libs.nix new file mode 100644 index 00000000000..7d7e44ab9cc --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ocaml-compiler-libs.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, ocaml, jbuilder, findlib }: + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-ocaml-compiler-libs-0.9.0"; + src = fetchurl { + url = http://ocaml.janestreet.com/ocaml-core/v0.9/files/ocaml-compiler-libs-v0.9.0.tar.gz; + sha256 = "0ipi56vg227924ahi9vv926jn16br9zfipm6a3xd4xrl5pxkvzaz"; + }; + + buildInputs = [ ocaml jbuilder findlib ]; + + inherit (jbuilder) installPhase; + + meta = { + description = "OCaml compiler libraries repackaged"; + homepage = https://github.com/janestreet/ocaml-compiler-libs; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_ast.nix b/pkgs/development/ocaml-modules/janestreet/ppx_ast.nix new file mode 100644 index 00000000000..33f1766cb4a --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx_ast.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, ocaml, jbuilder, findlib +, ocaml-compiler-libs, ocaml-migrate-parsetree +}: + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-ppx_ast-0.9.0"; + src = fetchurl { + url = http://ocaml.janestreet.com/ocaml-core/v0.9/files/ppx_ast-v0.9.0.tar.gz; + sha256 = "1hirfmxr8hkf3p39k1pqidabxxhd541d6ddfaqpgxbl51bw9ddmz"; + }; + + buildInputs = [ ocaml jbuilder findlib ]; + propagatedBuildInputs = [ ocaml-compiler-libs ocaml-migrate-parsetree ]; + + inherit (jbuilder) installPhase; + + meta = { + description = "OCaml AST used by Jane Street ppx rewriters"; + homepage = https://github.com/janestreet/ppx_ast; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_traverse_builtins.nix b/pkgs/development/ocaml-modules/janestreet/ppx_traverse_builtins.nix new file mode 100644 index 00000000000..d84983ed634 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx_traverse_builtins.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, ocaml, jbuilder, findlib }: + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-ppx_traverse_builtins-0.9.0"; + src = fetchurl { + url = http://ocaml.janestreet.com/ocaml-core/v0.9/files/ppx_traverse_builtins-v0.9.0.tar.gz; + sha256 = "0zmf9kybll0xn8dsj10v260l0zwjyykimqml9rl7xqyjyl1rmnx6"; + }; + + buildInputs = [ ocaml jbuilder findlib ]; + + inherit (jbuilder) installPhase; + + meta = { + description = "Builtins for Ppx_traverse"; + homepage = https://github.com/janestreet/ppx_traverse_builtins; + license = stdenv.lib.licenses.asl20; + inherit (ocaml.meta) platforms; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index 9eafa055b24..3fa8e9d46b4 100644 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ b/pkgs/development/ocaml-modules/mysql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, mysql, camlp4 }: +{ stdenv, fetchurl, ocaml, findlib, mysql }: # TODO: la versione stabile da' un errore di compilazione dovuto a # qualche cambiamento negli header .h @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "1.1.1"; + version = "1.2.1"; src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/870/${pname}-${version}.tar.gz"; - sha256 = "f896fa101a05d81b85af8122fe1c2809008a5e5fdca00f9ceeb7eec356369e3a"; + url = "http://ygrek.org.ua/p/release/ocaml-mysql/${name}.tar.gz"; + sha256 = "06mb2bq7v37wn0lza61917zqgb4bsg1xxb73myjyn88p6khl6yl2"; }; configureFlags = [ @@ -22,17 +22,12 @@ stdenv.mkDerivation rec { "--libdir=$out/lib/ocaml/${ocaml.version}/site-lib/mysql" ]; - buildInputs = [ocaml findlib camlp4 ]; + buildInputs = [ ocaml findlib ]; createFindlibDestdir = true; propagatedBuildInputs = [ mysql.client ]; - buildPhase = '' - make - make opt - ''; - meta = { homepage = http://ocaml-mysql.forge.ocamlcore.org; description = "Bindings for interacting with MySQL databases from ocaml"; diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index d7f7ae0e365..f9240f7507c 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -1,32 +1,33 @@ -{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib -, cstruct, zarith, ounit, ocaml_oasis, ppx_sexp_conv, sexplib -, lwt ? null}: +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, opam, topkg +, cpuid, ocb-stubblr +, cstruct, zarith, ocaml_oasis, ppx_sexp_conv, sexplib +, lwt ? null +}: with stdenv.lib; let withLwt = lwt != null; in -buildOcaml rec { - name = "nocrypto"; - version = "0.5.3"; - - minimumSupportedOcamlVersion = "4.02"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-nocrypto-${version}"; + version = "0.5.4"; src = fetchFromGitHub { owner = "mirleft"; repo = "ocaml-nocrypto"; rev = "v${version}"; - sha256 = "0m3yvqpgfffqp15mcl08b78cv8zw25rnp6z1pkj5aimz6xg3gqbl"; + sha256 = "0nhnlpbqh3mf9y2cxivlvfb70yfbdpvg6jslzq64xblpgjyg443p"; }; - buildInputs = [ ocaml ocaml_oasis findlib ounit ppx_sexp_conv ]; + buildInputs = [ ocaml ocaml_oasis findlib ocamlbuild topkg opam cpuid ocb-stubblr + ppx_sexp_conv ]; propagatedBuildInputs = [ cstruct zarith sexplib ] ++ optional withLwt lwt; - configureFlags = [ "--enable-tests" ] ++ optional withLwt ["--enable-lwt"]; + buildPhase = '' + LD_LIBRARY_PATH=${cpuid}/lib/ocaml/${ocaml.version}/site-lib/stubslibs/ \ + ${topkg.buildPhase} --with-lwt ${if withLwt then "true" else "false"} + ''; + inherit (topkg) installPhase; - configurePhase = "./configure --prefix $out $configureFlags"; - - doCheck = true; - checkTarget = "test"; createFindlibDestdir = true; meta = { diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix index 4f7c7914201..f6379c8b5a7 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -1,24 +1,22 @@ -{stdenv, fetchurl, ocaml, findlib, ocamlPackages }: +{stdenv, fetchurl, ocaml, findlib, lablgtk}: stdenv.mkDerivation rec { name = "ocamlgraph-${version}"; - version = "1.8.5"; + version = "1.8.7"; src = fetchurl { url = "http://ocamlgraph.lri.fr/download/ocamlgraph-${version}.tar.gz"; - sha256 = "0bxqxzd5sd7siz57vhzb8bmiz1ddhgdv49gcsmwwfmd16mj4cryi"; + sha256 = "1845r537swjil2fcj7lgbibc2zybfwqqasrd2s7bncajs83cl1nz"; }; - buildInputs = [ ocaml findlib ocamlPackages.lablgtk ocamlPackages.camlp4 ]; + buildInputs = [ ocaml findlib lablgtk ]; + + patches = ./destdir.patch; - # some patching is required so that the lablgtk2 library is taken into account. It - # does not reside in a subdirectory of the default library path, hence: - # * configure looked in the wrong path - # * ocaml needs that directory and the stubs directory as -I flag postPatch = '' - sed -i 's@$(DESTDIR)$(OCAMLLIB)/ocamlgraph@$(prefix)/lib/ocaml/${ocaml.version}/site-lib/ocamlgraph@' Makefile.in - sed -i 's@$OCAMLLIB/lablgtk2@${ocamlPackages.lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2@' configure Makefile.in - sed -i 's@+lablgtk2@${ocamlPackages.lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2 -I ${ocamlPackages.lablgtk}/lib/ocaml/${ocaml.version}/site-lib/stublibs@' configure Makefile.in editor/Makefile + sed -i 's@$(DESTDIR)$(OCAMLLIB)/ocamlgraph@$(DESTDIR)/lib/ocaml/${ocaml.version}/site-lib/ocamlgraph@' Makefile.in + sed -i 's@OCAMLFINDDEST := -destdir $(DESTDIR)@@' Makefile.in + sed -i 's@+lablgtk2@${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2 -I ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/stublibs@' configure Makefile.in editor/Makefile ''; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ocf/default.nix b/pkgs/development/ocaml-modules/ocf/default.nix new file mode 100644 index 00000000000..4da9fb45d33 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocf/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ppx_tools, yojson }: + +if stdenv.lib.versionOlder ocaml.version "4.03" +then throw "ocf not supported for ocaml ${ocaml.version}" +else +stdenv.mkDerivation rec { + name = "ocf-${version}"; + version = "0.5.0"; + src = fetchFromGitHub { + owner = "zoggy"; + repo = "ocf"; + rev = "release-${version}"; + sha256 = "1fhq9l2nmr39hxzpavc0jssmba71nnmhsncdn4dsbh2ylv29w56y"; + }; + + buildInputs = [ ocaml findlib ppx_tools ]; + propagatedBuildInputs = [ yojson ]; + + createFindlibDestdir = true; + + dontStrip = true; + + patches = [(fetchpatch { + url = "https://github.com/zoggy/ocf/commit/3a231c7a6c5e535a77c25e207af8952793436444.patch"; + sha256 = "0nc8cggc5gxhch9amaz3s71lxs1xbgi7fs9p90cng04dsgr64xk5"; + }) + ]; + + meta = with stdenv.lib; { + description = "OCaml library to read and write configuration options in JSON syntax"; + homepage = "https://zoggy.github.io/ocf/"; + license = licenses.lgpl3; + platforms = ocaml.meta.platforms or []; + maintainers = with maintainers; [ regnat ]; + }; +} diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix new file mode 100644 index 00000000000..13794602af4 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ojquery, magick, ocsigen_deriving, ocsigen_server }: + +buildOcaml rec +{ + name = "ocsigen-start"; + version = "1.0.0"; + + buildInputs = [ eliom ]; + propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ojquery ocsigen_deriving ocsigen_server magick ]; + + patches = [ ./templates-dir.patch ]; + + postPatch = '' + substituteInPlace "src/os_db.ml" --replace "citext" "text" + ''; + + src = fetchurl { + url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz"; + sha256 = "0npc2iq39ixci6ly0fssklv07zqi5cfa1adad4hm8dbzjawkqqll"; + }; + + createFindlibDestdir = true; + + meta = { + homepage = http://ocsigen.org/ocsigen-start; + description = "Eliom application skeleton"; + longDescription ='' + An Eliom application skeleton, ready to use to build your own application with users, (pre)registration, notifications, etc. + ''; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.gal_bolle ]; + }; + +} diff --git a/pkgs/development/ocaml-modules/ocsigen-start/templates-dir.patch b/pkgs/development/ocaml-modules/ocsigen-start/templates-dir.patch new file mode 100644 index 00000000000..38365a26b99 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocsigen-start/templates-dir.patch @@ -0,0 +1,13 @@ +diff --git a/scripts/install.sh b/scripts/install.sh +index f88ae11..d6aae70 100755 +--- a/scripts/install.sh ++++ b/scripts/install.sh +@@ -11,9 +11,9 @@ fi + + TPL_DIR=$1 + TPL_NAME=$2 +-DEST0=$DESTDIR/$(eliom-distillery -dir) ++DEST0=$out/eliom-distillery-templates + DEST=$DEST0/$TPL_NAME + + mkdir -p $DEST0 diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index 488a13ecf16..165a566b1b7 100644 --- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, piqi, ulex, easy-format, xmlm, base64, camlp4}: +{ stdenv, fetchurl, ocaml, findlib, piqi, ulex, easy-format, xmlm, camlp4 }: stdenv.mkDerivation rec { version = "0.7.5"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ngz6y8i98i5v2ma8nk6mc83pdsmf2z0ks7m3xi6clfg3zqbddrv"; }; - buildInputs = [ocaml findlib piqi base64 camlp4]; + buildInputs = [ ocaml findlib piqi camlp4 ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix index 273cd8f1862..f8126f91d87 100644 --- a/pkgs/development/ocaml-modules/piqi/default.nix +++ b/pkgs/development/ocaml-modules/piqi/default.nix @@ -9,13 +9,18 @@ stdenv.mkDerivation rec { sha256 = "1whqr2bb3gds2zmrzqnv8vqka9928w4lx6mi6g244kmbwb2h8d8l"; }; - buildInputs = [ocaml findlib camlp4 which ocaml_optcomp base64]; - propagatedBuildInputs = [ulex xmlm easy-format]; + buildInputs = [ocaml findlib camlp4 which ocaml_optcomp]; + propagatedBuildInputs = [ulex xmlm easy-format base64]; patches = [ ./no-ocamlpath-override.patch ]; createFindlibDestdir = true; + buildPhase = '' + make + make -C piqilib piqilib.cma + ''; + installPhase = '' make install; make ocaml-install; diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix index 5dbc74ef543..2d1746bde0f 100644 --- a/pkgs/development/ocaml-modules/sedlex/default.nix +++ b/pkgs/development/ocaml-modules/sedlex/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; + dontStrip = true; + meta = { homepage = https://github.com/alainfrisch/sedlex; description = "An OCaml lexer generator for Unicode"; diff --git a/pkgs/development/ocaml-modules/stdio/default.nix b/pkgs/development/ocaml-modules/stdio/default.nix new file mode 100644 index 00000000000..87382330022 --- /dev/null +++ b/pkgs/development/ocaml-modules/stdio/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, ocaml, jbuilder, findlib, base }: + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-stdio-0.9.0"; + + src = fetchurl { + url = http://ocaml.janestreet.com/ocaml-core/v0.9/files/stdio-v0.9.0.tar.gz; + sha256 = "008b5y03223107gfv8qawdfyjvf5g97l472i5p5v8mp512wr7kj5"; + }; + + buildInputs = [ ocaml jbuilder findlib ]; + propagatedBuildInputs = [ base ]; + + inherit (jbuilder) installPhase; + + meta = { + license = stdenv.lib.licenses.asl20; + description = "Standard IO library for OCaml"; + homepage = https://github.com/janestreet/stdio; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/xtmpl/default.nix b/pkgs/development/ocaml-modules/xtmpl/default.nix new file mode 100644 index 00000000000..86c9974c931 --- /dev/null +++ b/pkgs/development/ocaml-modules/xtmpl/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, ocaml, findlib, uutf, sedlex, ppx_tools, js_of_ocaml +, re }: + +if stdenv.lib.versionOlder ocaml.version "4.03" +then throw "xtmpl not supported for ocaml ${ocaml.version}" +else +stdenv.mkDerivation rec { + name = "xtmpl-${version}"; + version = "0.16.0"; + src = fetchFromGitHub { + owner = "zoggy"; + repo = "xtmpl"; + rev = version; + sha256 = "1dj5b4b266y4d8q3v1g0xsivz4vkhj0gi0jis37w84xcnlgiik8k"; + }; + + buildInputs = [ ocaml findlib ppx_tools js_of_ocaml ]; + propagatedBuildInputs = [ sedlex uutf re ]; + + createFindlibDestdir = true; + + dontStrip = true; + + meta = with stdenv.lib; { + description = "Xml template library for OCaml"; + homepage = "https://zoggy.github.io/xtmpl/"; + license = licenses.lgpl3; + platforms = ocaml.meta.platforms or []; + maintainers = with maintainers; [ regnat ]; + }; +} diff --git a/pkgs/development/perl-modules/perl-opengl.patch b/pkgs/development/perl-modules/perl-opengl.patch index 77bba1efa41..a44dc4f2e42 100644 --- a/pkgs/development/perl-modules/perl-opengl.patch +++ b/pkgs/development/perl-modules/perl-opengl.patch @@ -2,12 +2,14 @@ diff --git a/Makefile.PL b/Makefile.PL index 55c485c..8501c02 100644 --- a/Makefile.PL +++ b/Makefile.PL -@@ -116,12 +116,7 @@ if ($^O eq 'MSWin32' || $IS_W32API) +@@ -124,14 +124,7 @@ if ($^O eq 'MSWin32' || $IS_W32API) # Look for available libs our @libdirs = qw { - -L/usr/lib +- -L/usr/lib/i386-linux-gnu - -L/usr/X11R6/lib +- -L/opt/X11/lib - -L/usr/local/lib - -L/usr/openwin/lib - -L/opt/csw/lib diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix index 02004061b83..911680b1eb8 100644 --- a/pkgs/development/pharo/launcher/default.nix +++ b/pkgs/development/pharo/launcher/default.nix @@ -43,6 +43,19 @@ stdenv.mkDerivation rec { chmod +x $prefix/bin/${executable-name} ''; + doCheck = true; + + checkPhase = '' + # Launcher should be able to run for a few seconds without crashing. + (set +e + export HOME=. # Pharo will try to create files here + secs=5 + echo -n "Running headless Pharo for $secs seconds to check for a crash... " + timeout $secs \ + ${pharo-vm}/bin/pharo-vm-nox PharoLauncher.image --no-quit eval 'true' + test "$?" == 124 && echo "ok") + ''; + meta = { description = "Launcher for Pharo distributions"; longDescription = '' @@ -65,7 +78,7 @@ stdenv.mkDerivation rec { ''; homepage = http://pharo.org; license = stdenv.lib.licenses.mit; - maintainers = [ ]; + maintainers = [ stdenv.lib.maintainers.lukego ]; platforms = pharo-vm.meta.platforms; }; } diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 1eeb5dc3151..1f9e82f866e 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { mimeType = "application/x-pharo-image"; }; - hardeningDisable = [ "format" ]; + hardeningDisable = [ "format" "pic" ]; # Building preConfigure = '' diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix new file mode 100644 index 00000000000..9362729af44 --- /dev/null +++ b/pkgs/development/python-modules/bap/default.nix @@ -0,0 +1,23 @@ +{stdenv, buildPythonPackage, fetchFromGitHub, bap, requests}: + +buildPythonPackage rec { + name = "bap"; + version = "1.1.0"; + src = fetchFromGitHub { + owner = "BinaryAnalysisPlatform"; + repo = "bap-python"; + rev = "v${version}"; + sha256 = "0wd46ksxscgb2dci69sbndzxs6drq5cahraqq42cdk114hkrsxs3"; + }; + + propagatedBuildInputs = [bap requests]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages."; + homepage = https://github.com/BinaryAnalysisPlatform/bap/; + maintainers = [ maintainers.maurer ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/btrees-py35.patch b/pkgs/development/python-modules/btrees-py35.patch deleted file mode 100644 index 77e47d670b9..00000000000 --- a/pkgs/development/python-modules/btrees-py35.patch +++ /dev/null @@ -1,79 +0,0 @@ -From eee0beef88d135640871050b40844272a3aee790 Mon Sep 17 00:00:00 2001 -From: Tres Seaver -Date: Tue, 15 Sep 2015 17:20:18 -0400 -Subject: [PATCH 1/2] Ensure that we don't overlook errors in first - PyObject_RichCompareBool call. - -Python 3.5 turns such cases into SystemErrors. - -See: https://bugs.python.org/issue23571 - -Fixes #15. ---- - BTrees/_compat.h | 22 +++++++++++++++++++--- - 1 file changed, 19 insertions(+), 3 deletions(-) - -diff --git a/BTrees/_compat.h b/BTrees/_compat.h -index e004d54..19dd377 100644 ---- a/BTrees/_compat.h -+++ b/BTrees/_compat.h -@@ -27,9 +27,25 @@ - #define TEXT_FROM_STRING PyUnicode_FromString - #define TEXT_FORMAT PyUnicode_Format - --#define COMPARE(lhs, rhs) \ -- PyObject_RichCompareBool((lhs), (rhs), Py_LT) > 0 ? -1 : \ -- (PyObject_RichCompareBool((lhs), (rhs), Py_EQ) > 0 ? 0 : 1) -+/* Emulate Python2's __cmp__, wrapping PyObject_RichCompareBool(), -+ * Return -2/-3 for errors, -1 for lhsrhs. -+ */ -+static inline -+int __compare(PyObject *lhs, PyObject *rhs) { -+ int less, equal; -+ -+ less = PyObject_RichCompareBool(lhs, rhs, Py_LT); -+ if ( less == -1 ) { -+ return -2; -+ } -+ equal = PyObject_RichCompareBool(lhs, rhs, Py_EQ); -+ if ( equal == -1 ) { -+ return -3; -+ } -+ return less ? -1 : (equal ? 0 : 1); -+} -+ -+#define COMPARE(lhs, rhs) __compare((lhs), (rhs)) - - - #else - -From ff4c3309fe471f2b9bdd642b8f7d1c2fe0f5e458 Mon Sep 17 00:00:00 2001 -From: Tres Seaver -Date: Sun, 20 Sep 2015 11:07:10 -0400 -Subject: [PATCH 2/2] Avoid unnecessary comparison for 'Py_EQ' if 'Py_LT' - returned True. - ---- - BTrees/_compat.h | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/BTrees/_compat.h b/BTrees/_compat.h -index 19dd377..ece2bf9 100644 ---- a/BTrees/_compat.h -+++ b/BTrees/_compat.h -@@ -38,11 +38,14 @@ int __compare(PyObject *lhs, PyObject *rhs) { - if ( less == -1 ) { - return -2; - } -+ if (less) { -+ return -1; -+ } - equal = PyObject_RichCompareBool(lhs, rhs, Py_EQ); - if ( equal == -1 ) { - return -3; - } -- return less ? -1 : (equal ? 0 : 1); -+ return equal ? 0 : 1; - } - - #define COMPARE(lhs, rhs) __compare((lhs), (rhs)) diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix new file mode 100644 index 00000000000..8e69a207628 --- /dev/null +++ b/pkgs/development/python-modules/btrees/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchPypi, buildPythonPackage, persistent, zope_interface, transaction }: + +buildPythonPackage rec { + pname = "BTrees"; + version = "4.3.1"; + name = "${pname}-${version}"; + + propagatedBuildInputs = [ persistent zope_interface transaction ]; + + src = fetchPypi { + inherit pname version; + sha256 = "15as34f9sa4nnd62nnjkik2jd4rg1byp0i4kwaqwdpv0ab9vfr95"; + }; + + meta = with stdenv.lib; { + description = "Scalable persistent components"; + homepage = http://packages.python.org/BTrees; + license = licenses.zpt21; + }; +} diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index f3f897ac9e7..d2e1d2dc86f 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -1,8 +1,9 @@ -{ lib, fetchurl, mkPythonDerivation, python, pkgconfig, dbus, dbus_glib, dbus_tools, isPyPy +{ lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus_glib, dbus_tools, isPyPy , ncurses, pygobject3 }: -if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else mkPythonDerivation rec { +if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else buildPythonPackage rec { name = "dbus-python-1.2.4"; + format = "other"; src = fetchurl { url = "http://dbus.freedesktop.org/releases/dbus-python/${name}.tar.gz"; diff --git a/pkgs/development/python-modules/django/1_10.nix b/pkgs/development/python-modules/django/1_10.nix new file mode 100644 index 00000000000..271f8a5467b --- /dev/null +++ b/pkgs/development/python-modules/django/1_10.nix @@ -0,0 +1,35 @@ +{ stdenv, buildPythonPackage, fetchurl, substituteAll, + pythonOlder, + geos, gdal +}: +buildPythonPackage rec { + name = "Django-${version}"; + version = "1.10.6"; + disabled = pythonOlder "2.7"; + + src = fetchurl { + url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz"; + sha256 = "0q9c7hx720vc0jzq4xlxwhnxmmm8kh0qsqj3l46m29mi98jvwvks"; + }; + + patches = [ + (substituteAll { + src = ./1.10-gis-libs.template.patch; + geos = geos; + gdal = gdal; + }) + ]; + + # patch only $out/bin to avoid problems with starter templates (see #3134) + postFixup = '' + wrapPythonProgramsIn $out/bin "$out $pythonPath" + ''; + + # too complicated to setup + doCheck = false; + + meta = { + description = "A high-level Python Web framework"; + homepage = https://www.djangoproject.com/; + }; +} diff --git a/pkgs/development/python-modules/hieroglyph/default.nix b/pkgs/development/python-modules/hieroglyph/default.nix new file mode 100644 index 00000000000..e79cdede092 --- /dev/null +++ b/pkgs/development/python-modules/hieroglyph/default.nix @@ -0,0 +1,26 @@ +{ stdenv , fetchurl , buildPythonPackage , sphinx }: + +buildPythonPackage rec { + version = "0.7.1"; + name = "hieroglyph-${version}"; + + src = fetchurl { + url = "mirror://pypi/h/hieroglyph/${name}.tar.gz"; + sha256 = "0rswfk7x6zlj1z8388f153k3zn2h52k5h9b6p57pn7kqagsjilcb"; + }; + + propagatedBuildInputs = [ sphinx ]; + + # all tests fail; don't know why: + # test_absolute_paths_made_relative (hieroglyph.tests.test_path_fixing.PostProcessImageTests) ... ERROR + doCheck = false; + + meta = with stdenv.lib; { + description = "Generate HTML presentations from plain text sources"; + homepage = https://github.com/nyergler/hieroglyph/; + license = licenses.bsd3; + maintainers = with maintainers; [ juliendehos ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/development/python-modules/koji/default.nix b/pkgs/development/python-modules/koji/default.nix index 262ea74d4a3..28b5e11223f 100644 --- a/pkgs/development/python-modules/koji/default.nix +++ b/pkgs/development/python-modules/koji/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchurl, mkPythonDerivation, pycurl }: +{ stdenv, fetchurl, buildPythonPackage, pycurl }: -mkPythonDerivation rec { +buildPythonPackage rec { name = "koji-1.8"; + format = "other"; src = fetchurl { url = "https://fedorahosted.org/released/koji/koji-1.8.0.tar.bz2"; diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix new file mode 100644 index 00000000000..0aa3ed29f20 --- /dev/null +++ b/pkgs/development/python-modules/libnacl/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildPythonPackage, fetchPypi, pytest, libsodium }: + +buildPythonPackage rec { + pname = "libnacl"; + version = "1.5.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ph042x0cfysj16mmjif40pxn505rg5c9n94s972dgc0mfgvrwhs"; + }; + + buildInputs = [ pytest ]; + propagatedBuildInputs = [ libsodium ]; + + postPatch = '' + substituteInPlace "./libnacl/__init__.py" --replace "ctypes.cdll.LoadLibrary('libsodium.so')" "ctypes.cdll.LoadLibrary('${libsodium}/lib/libsodium.so')" + ''; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ xvapx ]; + description = "Python bindings for libsodium based on ctypes"; + homepage = "https://pypi.python.org/pypi/libnacl"; + license = licenses.asl20; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix index fa79cfa3be5..79eb8ab2f83 100644 --- a/pkgs/development/python-modules/libsexy/default.nix +++ b/pkgs/development/python-modules/libsexy/default.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchurl, mkPythonDerivation, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib }: +{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib }: -mkPythonDerivation rec { +buildPythonPackage rec { name = "libsexy-${version}"; version = "0.1.9"; + format = "other"; src = fetchurl { url = "http://releases.chipx86.com/libsexy/sexy-python/sexy-python-${version}.tar.gz"; diff --git a/pkgs/development/python-modules/podcastparser/default.nix b/pkgs/development/python-modules/podcastparser/default.nix new file mode 100644 index 00000000000..25682099225 --- /dev/null +++ b/pkgs/development/python-modules/podcastparser/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchFromGitHub, nose }: + +buildPythonPackage rec { + pname = "podcastparser"; + version = "0.6.1"; + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "gpodder"; + repo = "podcastparser"; + rev = version; + sha256 = "0q3qc8adykmm692ha0c37xd6wbj830zlq900fyw6vrfan9bgdj5y"; + }; + + propagatedBuildInputs = [ ]; + + buildInputs = [ nose ]; + + checkPhase = "nosetests test_*.py"; + + meta = { + description = "podcastparser is a simple, fast and efficient podcast parser written in Python."; + homepage = http://gpodder.org/podcastparser/; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ mic92 ]; + }; +} diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index e7cf3b4c448..2919506e931 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -1,8 +1,18 @@ -{ lib, fetchurl, fetchpatch, python, mkPythonDerivation, pkgconfig, cairo, xlibsWrapper, isPyPy, isPy35, isPy3k }: +{ lib, fetchurl, fetchpatch, python, buildPythonPackage, pkgconfig, cairo, xlibsWrapper, isPyPy, isPy35, isPy36, isPy3k }: -if (isPyPy) then throw "pycairo not supported for interpreter ${python.executable}" else mkPythonDerivation rec { +if (isPyPy) then throw "pycairo not supported for interpreter ${python.executable}" else let + + patch_waf = fetchpatch { + url = http://www.linuxfromscratch.org/patches/blfs/svn/pycairo-1.10.0-waf_python_3_4-1.patch; + sha256 = "0xfl1i9dips2nykyg91f5h5r3xpk2hp1js1gq5z0hwjr0in55id4"; + }; + patch_waf-py3_5 = ./waf-py3_5.patch; + +in buildPythonPackage rec { version = "1.10.0"; name = "pycairo-${version}"; + format = "other"; + src = if isPy3k then fetchurl { url = "http://cairographics.org/releases/pycairo-${version}.tar.bz2"; @@ -13,26 +23,20 @@ if (isPyPy) then throw "pycairo not supported for interpreter ${python.executabl sha256 = "0cblk919wh6w0pgb45zf48xwxykfif16qk264yga7h9fdkq3j16k"; }; - patches = [(fetchpatch { - url = http://www.linuxfromscratch.org/patches/blfs/svn/pycairo-1.10.0-waf_unpack-1.patch; - sha256 = "1bmrhq2nmhx4l5glvyi59r0hc7w5m56kz41frx7v3dcp8f91p7xd"; - })]; - - patch_waf = fetchpatch { - url = http://www.linuxfromscratch.org/patches/blfs/svn/pycairo-1.10.0-waf_python_3_4-1.patch; - sha256 = "0xfl1i9dips2nykyg91f5h5r3xpk2hp1js1gq5z0hwjr0in55id4"; - }; - - patch_waf-py3_5 = ./waf-py3_5.patch; + patches = [ + (fetchpatch { + url = http://www.linuxfromscratch.org/patches/blfs/svn/pycairo-1.10.0-waf_unpack-1.patch; + sha256 = "1bmrhq2nmhx4l5glvyi59r0hc7w5m56kz41frx7v3dcp8f91p7xd"; + }) + ]; buildInputs = [ python pkgconfig cairo xlibsWrapper ]; configurePhase = '' ( cd $(${python.executable} waf unpack) - pwd patch -p1 < ${patch_waf} - ${lib.optionalString isPy35 "patch -p1 < ${patch_waf-py3_5}"} + ${lib.optionalString (isPy35 || isPy36) "patch -p1 < ${patch_waf-py3_5}"} ) ${python.executable} waf configure --prefix=$out diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 33bb1d5a4ca..984b1184434 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -1,9 +1,10 @@ -{ stdenv, fetchurl, mkPythonDerivation, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}: +{ stdenv, fetchurl, buildPythonPackage, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}: -mkPythonDerivation rec { +buildPythonPackage rec { major = "3.22"; minor = "0"; name = "pygobject-${major}.${minor}"; + format = "other"; src = fetchurl { url = "mirror://gnome/sources/pygobject/${major}/${name}.tar.xz"; diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index 6723ba6b6a5..b72bd8b9b52 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchurl, python, mkPythonDerivation, pkgconfig, glib }: +{ stdenv, fetchurl, python, buildPythonPackage, pkgconfig, glib }: -mkPythonDerivation rec { +buildPythonPackage rec { name = "pygobject-${version}"; version = "2.28.6"; + format = "other"; src = fetchurl { url = "mirror://gnome/sources/pygobject/2.28/${name}.tar.xz"; diff --git a/pkgs/development/python-modules/pygtksourceview/default.nix b/pkgs/development/python-modules/pygtksourceview/default.nix index 133cbdb34fd..499634236ac 100644 --- a/pkgs/development/python-modules/pygtksourceview/default.nix +++ b/pkgs/development/python-modules/pygtksourceview/default.nix @@ -1,9 +1,10 @@ -{ lib, fetchurl, python, mkPythonDerivation, pkgconfig, pygobject2, glib, pygtk, gnome2 }: +{ lib, fetchurl, python, buildPythonPackage, pkgconfig, pygobject2, glib, pygtk, gnome2 }: let version = "2.10.1"; in -mkPythonDerivation { +buildPythonPackage { name = "pygtksourceview-${version}"; + format = "other"; src = fetchurl { url = "http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-${version}.tar.bz2"; diff --git a/pkgs/development/python-modules/pylibmc/default.nix b/pkgs/development/python-modules/pylibmc/default.nix new file mode 100644 index 00000000000..c91930292c2 --- /dev/null +++ b/pkgs/development/python-modules/pylibmc/default.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage, fetchurl, stdenv, libmemcached, zlib }: +buildPythonPackage rec { + name = "pylibmc-${version}"; + version = "1.5.1"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/pylibmc/${name}.tar.gz"; + sha256 = "1mnd8lng9wmcihl7mxd940hy1dzzvzsb971qclrvmqf3b4c2dfpc"; + }; + + buildInputs = [ libmemcached zlib ]; + + # requires an external memcached server running + doCheck = false; + + meta = with stdenv.lib; { + description = "Quick and small memcached client for Python"; + homepage = http://sendapatch.se/projects/pylibmc/; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index dc3dd69ac02..a5ae0aaa137 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -2,9 +2,10 @@ let version = "4.12"; - inherit (pythonPackages) mkPythonDerivation python dbus-python sip; -in mkPythonDerivation { + inherit (pythonPackages) buildPythonPackage python dbus-python sip; +in buildPythonPackage { name = "PyQt-x11-gpl-${version}"; + format = "other"; src = fetchurl { url = "mirror://sourceforge/pyqt/PyQt4_gpl_x11-${version}.tar.gz"; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index ee3419eed0e..880edfbab07 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -3,9 +3,10 @@ let version = "5.8.1"; - inherit (pythonPackages) mkPythonDerivation python dbus-python sip; -in mkPythonDerivation { + inherit (pythonPackages) buildPythonPackage python dbus-python sip; +in buildPythonPackage { name = "PyQt-${version}"; + format = "other"; meta = with lib; { description = "Python bindings for Qt5"; diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index 6473ebf22b1..4aff09b8f8f 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -1,8 +1,9 @@ -{ lib, fetchurl, cmake, python, mkPythonDerivation, pysideGeneratorrunner, pysideShiboken, qt4 }: +{ lib, fetchurl, cmake, python, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4 }: -mkPythonDerivation rec { +buildPythonPackage rec { name = "pyside-${version}"; version = "1.2.4"; + format = "other"; src = fetchurl { url = "https://github.com/PySide/PySide/archive/${version}.tar.gz"; diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 48a5c043841..56fc72ebcce 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { # Unpin setuptools-scm (fetchpatch { url = "https://github.com/pytest-dev/pytest-django/commit/25cbc3b395dcdeb92bdc9414e296680c2b9d602e.patch"; - sha256 = "1mx06y4kz2zs41mb2h9bh5p4jc6s6hfsq6fghhsks5b7qak05xjp"; + sha256 = "0mz3rcsv44pfzlxy3pv8mx87glmv34gy0d5aknvbzgb2a9niryws"; }) ]; diff --git a/pkgs/development/python-modules/pyudev.nix b/pkgs/development/python-modules/pyudev.nix index 98607501e03..e9a3ecaac5b 100644 --- a/pkgs/development/python-modules/pyudev.nix +++ b/pkgs/development/python-modules/pyudev.nix @@ -1,5 +1,5 @@ { lib, fetchurl, buildPythonPackage -, six, systemd +, six, systemd, pytest, mock, hypothesis, docutils }: buildPythonPackage rec { @@ -12,12 +12,21 @@ buildPythonPackage rec { }; postPatch = '' - substituteInPlace src/pyudev/_ctypeslib/libudev.py \ - --replace "find_library('udev')" "'${systemd.lib}/lib/libudev.so'" + substituteInPlace src/pyudev/_ctypeslib/utils.py \ + --replace "find_library(name)" "'${systemd.lib}/lib/libudev.so'" ''; + buildInputs = [ pytest mock hypothesis docutils ]; propagatedBuildInputs = [ systemd six ]; + checkPhase = '' + py.test + ''; + + # Bunch of failing tests + # https://github.com/pyudev/pyudev/issues/187 + doCheck = false; + meta = { homepage = "http://pyudev.readthedocs.org/"; description = "Pure Python libudev binding"; diff --git a/pkgs/development/python-modules/pyxml/default.nix b/pkgs/development/python-modules/pyxml/default.nix index abea143d11d..b85b2042369 100644 --- a/pkgs/development/python-modules/pyxml/default.nix +++ b/pkgs/development/python-modules/pyxml/default.nix @@ -1,7 +1,8 @@ -{lib, fetchurl, python, mkPythonDerivation, makeWrapper}: +{lib, fetchurl, python, buildPythonPackage, makeWrapper}: -mkPythonDerivation rec { +buildPythonPackage rec { name = "PyXML-0.8.4"; + format = "other"; src = fetchurl { url = "mirror://sourceforge/pyxml/${name}.tar.gz"; sha256 = "04wc8i7cdkibhrldy6j65qp5l75zjxf5lx6qxdxfdf2gb3wndawz"; diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 99d3c89e1f9..76652954cf0 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -1,7 +1,8 @@ -{ lib, fetchurl, mkPythonDerivation, python, isPyPy }: +{ lib, fetchurl, buildPythonPackage, python, isPyPy }: -if isPyPy then throw "sip not supported for interpreter ${python.executable}" else mkPythonDerivation rec { +if isPyPy then throw "sip not supported for interpreter ${python.executable}" else buildPythonPackage rec { name = "sip-4.19.1"; + format = "other"; src = fetchurl { url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz"; @@ -18,7 +19,7 @@ if isPyPy then throw "sip not supported for interpreter ${python.executable}" el description = "Creates C++ bindings for Python modules"; homepage = "http://www.riverbankcomputing.co.uk/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ lovek323 sander urkud ]; + maintainers = with maintainers; [ lovek323 sander ]; platforms = platforms.all; }; } diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index 88a39400c77..e5de7c4e2a4 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, python, buildPythonPackage -, cython, bzip2, lzo, numpy, numexpr, hdf5 }: +, cython, bzip2, lzo, numpy, numexpr, hdf5, six }: buildPythonPackage rec { - version = "3.2.2"; + version = "3.3.0"; name = "tables-${version}"; src = fetchurl { url = "mirror://pypi/t/tables/${name}.tar.gz"; - sha256 = "3564b351a71ec1737b503b001eb7ceae1f65d5d6e3ffe1ea75aafba10f37fa84"; + sha256 = "0b4211s0zzdmh74k49ss0m9lc2ql2iazq2aa95ams6h45vqcr0w3"; }; buildInputs = [ hdf5 cython bzip2 lzo ]; - propagatedBuildInputs = [ numpy numexpr ]; + propagatedBuildInputs = [ numpy numexpr six ]; # The setup script complains about missing run-paths, but they are # actually set. diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index ea7e7d0fb8e..f66070be694 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://wiki.qt.io/Category:Tools::QtCreator"; license = "LGPL"; - maintainers = [ maintainers.akaWolf maintainers.bbenoist ]; + maintainers = [ maintainers.akaWolf ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 1b41a10bb9c..71ffb35a9f0 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -3,14 +3,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.41.0"; + version = "0.42.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "0v3dhvvj4k35h7g42rmpwc9hqi2z0ccg7rmk8ad00l0djs13l18z"; + sha256 = "1mzl13z3c512b3jrrkzm5wmd9wjpnr173pan0vvpgf23333yvigq"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 14efe29442b..ee36a9be43b 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -8,17 +8,17 @@ in stdenv.mkDerivation rec { name = "frama-c-${version}"; - version = "20160501"; - slang = "Aluminium"; + version = "20161101"; + slang = "Silicon"; src = fetchurl { url = "http://frama-c.com/download/frama-c-${slang}-${version}.tar.gz"; - sha256 = "02z4d1lg2cs4hgbjx74crfrabv39dyhdrq5lvhv0q3hx5c8w7p90"; + sha256 = "1qq045ymz1mx4m9dsypigrcagqyb2k78wk13nqlbykcs5xbihfdh"; }; why2 = fetchurl { - url = "http://why.lri.fr/download/why-2.34.tar.gz"; - sha256 = "1335bhq9v3h46m8aba2c5myi9ghm87q41in0m15xvdrwq5big1jg"; + url = "http://why.lri.fr/download/why-2.37.tar.gz"; + sha256 = "00xr8aq6zwln0ccfs1ng610j70r6ia6wqdyaqs9iqibqfa1scr3m"; }; nativeBuildInputs = [ makeWrapper ]; @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { ]; - enableParallelBuilding = true; + # Experimentally, the build segfaults with high core counts + enableParallelBuilding = false; unpackPhase = '' tar xf $src @@ -39,7 +40,8 @@ stdenv.mkDerivation rec { buildPhase = '' cd frama* ./configure --prefix=$out - make -j$NIX_BUILD_CORES + # It is not parallel safe + make make install cd ../why* FRAMAC=$out/bin/frama-c ./configure --prefix=$out diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix index 586e9d5cd5d..bf1d1357f5e 100644 --- a/pkgs/development/tools/analysis/jdepend/default.nix +++ b/pkgs/development/tools/analysis/jdepend/default.nix @@ -1,24 +1,34 @@ -{stdenv, fetchurl, unzip}: +{ stdenv, fetchFromGitHub, ant, jdk }: -stdenv.mkDerivation { - name = "jdepend-2.9"; - buildInputs = [unzip] ; +stdenv.mkDerivation rec { + name = "jdepend-${version}"; + version = "2.9.1"; - src = fetchurl { - url = http://www.clarkware.com/software/jdepend-2.9.zip ; - sha256 = "1915fk9w9mjv9i6hlkn2grv2kjqcgn4xa8278v66f1ix5wpfcb90"; + src = fetchFromGitHub { + owner = "clarkware"; + repo = "jdepend"; + rev = version; + sha256 = "1sxkgj4k4dhg8vb772pvisyzb8x0gwvlfqqir30ma4zvz3rfz60p"; }; + nativeBuildInputs = [ ant jdk ]; + buildPhase = "ant jar"; + installPhase = '' - mkdir -p $out - cp -R * $out + mkdir -p $out/bin $out/share + install dist/${name}.jar $out/share + + cat > "$out/bin/jdepend" <>conf/sbtopts - ''; - - installPhase = '' - mkdir -p $out/share/sbt $out/bin - cp -ra . $out/share/sbt - ln -s $out/share/sbt/bin/sbt $out/bin/ - ''; - - meta = with stdenv.lib; { - homepage = http://www.scala-sbt.org/; - license = licenses.bsd3; - description = "A build tool for Scala, Java and more"; - maintainers = with maintainers; [ heel ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index e6006e94881..309a6e13606 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "0.13.13"; + version = "0.13.14"; src = fetchurl { url = "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz"; - sha256 = "0ygrz92qkzasj6fps1bjg7wlgl69867jjjc37yjadib0l8hkvl20"; + sha256 = "1q4jnrva21s0rhcn561ayfp5yhd6rpxidgx6f4i5n3dla3p9zkr9"; }; patchPhase = '' diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix index 1d6ac8493f1..f64ead3e107 100644 --- a/pkgs/development/tools/clog-cli/default.nix +++ b/pkgs/development/tools/clog-cli/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "clog-cli-${version}"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "clog-tool"; repo = "clog-cli"; - rev = "${version}"; - sha256 = "00sfbchyf50z6mb5dq1837hlrki88rrf043idy6qd1r90488jsbv"; + rev = "v${version}"; + sha256 = "1wxglc4n1dar5qphhj5pab7ps34cjr7jy611fwn72lz0f6c7jp3z"; }; - depsSha256 = "0czv190r6xhbw33l0jhlri6rgspxb8f6dakcamh52qr3z9m0xs2x"; + depsSha256 = "0gkg3bxx7nxsvff33n7pif731djfvlzk0msia27h0wq0mazq7kw3"; meta = { description = "Generate changelogs from local git metadata"; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 5e46b079aaa..97e195f592e 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: let - version = "1.11.0"; + version = "9.0.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "082slksd0fs0gpwi7kzmk2i71y52xccsn2r2j6qxmbzxwhpwli83"; + sha256 = "1f170akb7j7imgr18m32fy6v3rk98inrjl5a4xymfpivwwqyv9p8"; }; docker_arm = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "1c0awx4q27bckk4xpnw7357d5422iz971jkrfin17wrya4dshg64"; + sha256 = "15mlix8j7bqjg5y07c439d7s197c16zxffknx42z1i3qxcz2mpa4"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-ci-multi-runner"; rev = "v${version}"; - sha256 = "0fvkdiyfp1bf68j3kq721msfhmv8snf968yxgm7d1y6shidghrqb"; + sha256 = "1csha30lcwm1mk6hqbh0j8bb25apyni23szw79l8xjhmiw2ch619"; }; buildInputs = [ go-bindata ]; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix new file mode 100644 index 00000000000..d49221d6e6a --- /dev/null +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/v1.nix @@ -0,0 +1,66 @@ +{ lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: + +let + version = "1.11.1"; + # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 + docker_x86_64 = fetchurl { + url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; + sha256 = "1fahwvwdli6glxsljrd030x15y18jwk72lg1xmrgms409r9y308m"; + }; + + docker_arm = fetchurl { + url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; + sha256 = "0nqda27qcb6r1p2xc2973g08fwb8cnmyc9rswy6776r8ypagn2zw"; + }; +in +buildGoPackage rec { + inherit version; + name = "gitlab-runner-${version}"; + goPackagePath = "gitlab.com/gitlab-org/gitlab-ci-multi-runner"; + commonPackagePath = "${goPackagePath}/common"; + buildFlagsArray = '' + -ldflags= + -X ${commonPackagePath}.NAME=gitlab-runner + -X ${commonPackagePath}.VERSION=${version} + -X ${commonPackagePath}.REVISION=v${version} + ''; + + src = fetchFromGitLab { + owner = "gitlab-org"; + repo = "gitlab-ci-multi-runner"; + rev = "v${version}"; + sha256 = "0ix00p9f01fg8m6p3b1c20hqrcv7pivh6hq92pb9qyiyzmcfap47"; + }; + + buildInputs = [ go-bindata ]; + + preBuild = '' + ( + # go-bindata names the assets after the filename thus we create a symlink with the name we want + cd go/src/${goPackagePath} + ln -sf ${docker_x86_64} prebuilt-x86_64.tar.xz + ln -sf ${docker_arm} prebuilt-arm.tar.xz + go-bindata \ + -pkg docker \ + -nocompress \ + -nomemcopy \ + -o executors/docker/bindata.go \ + prebuilt-x86_64.tar.xz \ + prebuilt-arm.tar.xz + ) + ''; + + postInstall = '' + install -d $out/bin + # The recommended name is gitlab-runner so we create a symlink with that name + ln -sf gitlab-ci-multi-runner $bin/bin/gitlab-runner + ''; + + meta = with lib; { + description = "GitLab Runner the continuous integration executor of GitLab"; + license = licenses.mit; + homepage = "https://about.gitlab.com/gitlab-ci/"; + platforms = platforms.unix; + maintainers = [ lib.maintainers.bachp ]; + }; +} diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix new file mode 100644 index 00000000000..7a2b3e8e1d9 --- /dev/null +++ b/pkgs/development/tools/coursier/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, makeWrapper, jre }: + +stdenv.mkDerivation rec { + name = "coursier-${version}"; + version = "1.0.0-M15-5"; + + src = fetchurl { + url = "https://github.com/coursier/coursier/raw/v${version}/coursier"; + sha256 = "610c5fc08d0137c5270cefd14623120ab10cd81b9f48e43093893ac8d00484c9"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + phases = "installPhase"; + + installPhase = '' + mkdir -p $out/bin + cp ${src} $out/bin/coursier + chmod +x $out/bin/coursier + wrapProgram $out/bin/coursier --prefix PATH ":" ${jre}/bin ; + ''; + + meta = with stdenv.lib; { + homepage = http://get-coursier.io/; + description = "A Scala library to fetch dependencies from Maven / Ivy repositories"; + license = licenses.asl20; + maintainers = with maintainers; [ adelbertc nequissimus ]; + }; +} diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index 18933426db0..ef339d47ea0 100644 --- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -1,8 +1,9 @@ {stdenv, fetchurl, pkgconfig, libxml2Python, libxslt, intltool , makeWrapper, python2Packages }: -python2Packages.mkPythonDerivation { +python2Packages.buildPythonApplication { name = "gnome-doc-utils-0.20.10"; + format = "other"; src = fetchurl { url = mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.10.tar.xz; diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix index 156def09187..7ca54365be5 100644 --- a/pkgs/development/tools/guile/guile-lint/default.nix +++ b/pkgs/development/tools/guile/guile-lint/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "Guile-Lint checks syntax and semantics in a Guile program or module"; homepage = http://user42.tuxfamily.org/guile-lint/index.html; license = "GPL"; + broken = true; }; } diff --git a/pkgs/development/tools/java/jclasslib/builder.sh b/pkgs/development/tools/java/jclasslib/builder.sh deleted file mode 100755 index 35e94d0fab9..00000000000 --- a/pkgs/development/tools/java/jclasslib/builder.sh +++ /dev/null @@ -1,22 +0,0 @@ -source $stdenv/setup || exit 1 - -tar zxf $src || exit 1 -cd jclasslib || exit 1 - -xpf-rm -f build.xml "//taskdef" - -ant clean || exit 1 -ant jar || exit 1 - -mkdir -p $out/bin -mv build/jclasslib.jar $out/bin/ || exit 1 - -cat >> $out/bin/jclasslib <" - ) - -- if( APPLE ) -+ #if( APPLE ) - # In OS X El Capitan, Apple introduced System Integrity Protection. - # Amongst other things, this introduces features to the dynamic loader - # (dyld) which cause it to "sanitise" (and complain about) embedded -@@ -354,15 +354,15 @@ - # simply strip the rpath entry from the dylib. There's no way any - # @executable_path that python might have could be in any way useful to - # libclang.dylib, so this seems perfectly safe. -- get_filename_component( LIBCLANG_TAIL ${LIBCLANG_TARGET} NAME ) -- add_custom_command( TARGET ${PROJECT_NAME} -- POST_BUILD -- COMMAND install_name_tool -- "-delete_rpath" -- "@executable_path/../lib" -- "$/${LIBCLANG_TAIL}" -- ) -- endif() -+ # get_filename_component( LIBCLANG_TAIL ${LIBCLANG_TARGET} NAME ) -+ #add_custom_command( TARGET ${PROJECT_NAME} -+ # POST_BUILD -+ # COMMAND install_name_tool -+ # "-delete_rpath" -+ # "@executable_path/../lib" -+ # "$/${LIBCLANG_TAIL}" -+ # ) -+ # endif() - endif() - endif() diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 9ac227ac006..eb02d0e79dd 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "ycmd-${version}"; - version = "2017-02-03"; + version = "2017-03-27"; src = fetchgit { url = "git://github.com/Valloric/ycmd.git"; - rev = "ec7a154f8fe50c071ecd0ac6841de8a50ce92f5d"; - sha256 = "0rzxgqqqmmrv9r4k2ji074iprhw6sb0jkvh84wvi45yfyphsh0xi"; + rev = "2ef1ae0d00a06a47fed3aacfd465a310e8bdb0d2"; + sha256 = "0p5knlxgy66zi229ns1lfdhz5lram93vahmmk54w98fr3h8b1yfj"; }; buildInputs = [ cmake boost ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ${python.interpreter} build.py --clang-completer --system-boost ''; - patches = [ ./2-ycm-cmake.patch ]; + patches = [ ./dont-symlink-clang.patch ]; configurePhase = ":"; diff --git a/pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch b/pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch new file mode 100644 index 00000000000..6af691426bb --- /dev/null +++ b/pkgs/development/tools/misc/ycmd/dont-symlink-clang.patch @@ -0,0 +1,16 @@ +diff --git a/cpp/ycm/CMakeLists.txt b/cpp/ycm/CMakeLists.txt +index 00e4882..8f29797 100644 +--- a/cpp/ycm/CMakeLists.txt ++++ b/cpp/ycm/CMakeLists.txt +@@ -310,11 +310,6 @@ if ( EXTERNAL_LIBCLANG_PATH OR USE_SYSTEM_LIBCLANG ) + # our libraries require, in particular the Python one (from pyenv for + # instance). + set( CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE ) +- # When loading our library, the dynamic linker will look for +- # libclang.so.4, not libclang.so.4.x. +- file( RENAME +- ${EXTERNAL_LIBCLANG_PATH}.${CLANG_MAJOR_VERSION}.${CLANG_MINOR_VERSION} +- ${EXTERNAL_LIBCLANG_PATH}.${CLANG_MAJOR_VERSION} ) + endif() + endif() + diff --git a/pkgs/development/tools/ocaml/jbuilder/default.nix b/pkgs/development/tools/ocaml/jbuilder/default.nix index 9d6485841fa..3fa0c2685ee 100644 --- a/pkgs/development/tools/ocaml/jbuilder/default.nix +++ b/pkgs/development/tools/ocaml/jbuilder/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchzip, ocaml, opam }: stdenv.mkDerivation { - name = "jbuilder-1.0+beta2"; + name = "jbuilder-1.0+beta5"; src = fetchzip { - url = http://github.com/janestreet/jbuilder/archive/1.0+beta2.tar.gz; - sha256 = "0xbq6p0n4a740l3jvq4a0a58mwfcal0q37vi8ix053f3jiqki6ng"; + url = http://github.com/janestreet/jbuilder/archive/1.0+beta5.tar.gz; + sha256 = "00kh83n3216g1n7rhh14mcmw9bj5vzq7kiixm1abrc09dhwh4m7a"; }; buildInputs = [ ocaml ]; diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index df6c66cb98f..5062f53cd71 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, ocaml, findlib, buildOcaml, type_conv, camlp4, ocamlmod, ocamlify, ounit, expect}: let - version = "0.9.3"; + version = "0.11.0"; in stdenv.mkDerivation { name = "ocamlbuild-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "ocaml"; repo = "ocamlbuild"; rev = version; - sha256 = "1ikm51lx4jz5vmbvrdwsm5p59bwbz3pi22vqkyz5lmqcciyn69i3"; + sha256 = "0c8lv15ngmrc471jmkv0jp3d573chibwnjlavps047d9hd8gwxak"; }; createFindlibDestdir = true; @@ -22,6 +22,7 @@ stdenv.mkDerivation { make -f configure.make Makefile.config \ "OCAMLBUILD_PREFIX=$out" \ "OCAMLBUILD_BINDIR=$out/bin" \ + "OCAMLBUILD_MANDIR=$out/share/man" \ "OCAMLBUILD_LIBDIR=$OCAMLFIND_DESTDIR" ''; @@ -33,4 +34,3 @@ stdenv.mkDerivation { maintainers = with maintainers; [ vbgl ]; }; } - diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix new file mode 100644 index 00000000000..c212ce324b3 --- /dev/null +++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, ocamlPackages }: + +stdenv.mkDerivation rec +{ + name = "ocsigen-i18n"; + version = "3.1.0"; + + buildInputs = with ocamlPackages; [ ocaml findlib ]; + + installPhase = '' + mkdir -p $out/bin + make bindir=$out/bin install + ''; + + src = fetchurl { + url = "https://github.com/besport/${name}/archive/${version}.tar.gz"; + sha256 = "0cw0mmr67wx03j4279z7ldxwb01smkqz9rbklx5lafrj5sf99178"; + }; + + meta = { + homepage = https://github.com/besport/ocsigen-i18n; + description = "I18n made easy for web sites written with eliom"; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.gal_bolle ]; + }; + +} diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 9b41a06c935..31549729cfe 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -25,14 +25,24 @@ stdenv.mkDerivation rec { make doc ''; + dontStrip = true; + postFixup = - let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; - in + let p = p: "${p}/lib/ocaml/${ocaml.version}/site-lib"; in '' - for prog in "$out"/bin/* + pushd $out/bin + for prog in * do - wrapProgram $prog --set CAML_LD_LIBRARY_PATH "${ocaml_lwt}"/lib/ocaml/${ocamlVersion}/site-lib/lwt/:"${lambdaTerm}"/lib/ocaml/${ocamlVersion}/site-lib/lambda-term/:'$CAML_LD_LIBRARY_PATH' --set OCAMLPATH "${ocaml_lwt}"/lib/ocaml/${ocamlVersion}/site-lib:${ocaml_react}/lib/ocaml/${ocamlVersion}/site-lib:${camomile}/lib/ocaml/${ocamlVersion}/site-lib:${zed}/lib/ocaml/${ocamlVersion}/site-lib:${lambdaTerm}/lib/ocaml/${ocamlVersion}/site-lib:"$out"/lib/ocaml/${ocamlVersion}/site-lib:'$OCAMLPATH' + mv $prog .$prog-wrapped + cat > $prog <= 2.25 deprecation warning that gets fatal via -Werror. postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) '' sed 1i'#include ' \ diff --git a/pkgs/development/tools/xcbuild/return-false.patch b/pkgs/development/tools/xcbuild/return-false.patch new file mode 100644 index 00000000000..8ec81b5e97c --- /dev/null +++ b/pkgs/development/tools/xcbuild/return-false.patch @@ -0,0 +1,13 @@ +diff --git a/Libraries/dependency/Tools/dependency-info-tool.cpp b/Libraries/dependency/Tools/dependency-info-tool.cpp +index 006f53c7..d469f068 100644 +--- a/Libraries/dependency/Tools/dependency-info-tool.cpp ++++ b/Libraries/dependency/Tools/dependency-info-tool.cpp +@@ -271,7 +271,7 @@ main(int argc, char **argv) + */ + std::vector makefileContents = std::vector(contents.begin(), contents.end()); + if (!filesystem.write(makefileContents, *options.output())) { +- return false; ++ return -1; + } + + return 0; diff --git a/pkgs/development/tools/xcbuild/toolchain.nix b/pkgs/development/tools/xcbuild/toolchain.nix index 386f67a9d63..4313f005147 100644 --- a/pkgs/development/tools/xcbuild/toolchain.nix +++ b/pkgs/development/tools/xcbuild/toolchain.nix @@ -1,4 +1,4 @@ -{stdenv, writeText, toolchainName, xcbuild +{stdenv, writeText, toolchainName, xcbuild, fetchurl , llvm, cctools, gcc, bootstrap_cmds, binutils , yacc, flex, m4, unifdef, gperf, indent, ctags, makeWrapper}: @@ -8,15 +8,20 @@ let Identifier = toolchainName; }; + # We could pull this out of developer_cmds but it adds an annoying loop if we want to bootstrap and + # this is just a tiny script so I'm not going to bother + mkdep-darwin-src = fetchurl { + url = "https://opensource.apple.com/source/developer_cmds/developer_cmds-63/mkdep/mkdep.sh"; + sha256 = "0n4wpqfslfjs5zbys5yri8pfi2awyhlmknsf6laa5jzqbzq9x541"; + executable = true; + }; in stdenv.mkDerivation { name = "nixpkgs.xctoolchain"; buildInputs = [ xcbuild makeWrapper ]; - propagatedBuildInputs = [ llvm gcc yacc flex m4 unifdef gperf indent ] - ++ stdenv.lib.optionals stdenv.isDarwin [ cctools bootstrap_cmds binutils ]; - ## cctools should build on Linux but it doesn't currentl + ## cctools should build on Linux but it doesn't currently buildCommand = '' mkdir -p $out @@ -58,8 +63,6 @@ stdenv.mkDerivation { ln -s ${unifdef}/bin/unifdefall ln -s ${gperf}/bin/gperf - ln -s ${gcc}/bin/gcov - ln -s ${gcc}/bin/mkdep ln -s ${indent}/bin/indent ln -s ${ctags}/bin/ctags '' + stdenv.lib.optionalString stdenv.isDarwin '' @@ -86,7 +89,15 @@ stdenv.mkDerivation { ln -s ${cctools}/bin/pagestuff ln -s ${cctools}/bin/ranlib ln -s ${cctools}/bin/redo_prebinding - ''; + '' + + # No point including the entire gcc closure if we don't already have it + (if stdenv.cc.isClang then '' + ln -s ${stdenv.cc.cc.llvm}/bin/llvm-cov gcov + ln -s ${mkdep-darwin-src} mkdep + '' else '' + ln -s ${gcc}/bin/gcov + ln -s ${gcc}/bin/mkdep + ''); } # other commands in /bin/ diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index 0da733b8078..ab6605e91b1 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -50,10 +50,10 @@ stdenv.mkDerivation { ln -s ${xcbuild}/Library/Xcode/Specifications $out/Library/Xcode/Specifications mkdir -p $out/Platforms/ - ln -s ${platform} $out/Platforms/ + ln -s ${platform} $out/Platforms/nixpkgs.platform mkdir -p $out/Toolchains/ - ln -s ${toolchain} $out/Toolchains/ + ln -s ${toolchain} $out/Toolchains/nixpkgs.xctoolchain wrapProgram $out/bin/xcodebuild \ --add-flags "-xcconfig ${xcconfig}" \ diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix index 9a142a89677..edef6f7663c 100644 --- a/pkgs/development/web/nodejs/v4.nix +++ b/pkgs/development/web/nodejs/v4.nix @@ -10,11 +10,11 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "4.6.2"; + version = "4.8.1"; name = "${baseName}-${version}"; src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.xz"; - sha256 = "17ick2r2biyxs5zf83i8q8844fbcphm0d5g1z70mcrb86yrmi545"; + sha256 = "0kcalypjf1036gr4mv1gy682hc1rp18ms3cv7mz0941qnizkzrms"; }; }) diff --git a/pkgs/development/web/nodejs/v7.nix b/pkgs/development/web/nodejs/v7.nix index a93cd16e00e..b0b0869dce2 100644 --- a/pkgs/development/web/nodejs/v7.nix +++ b/pkgs/development/web/nodejs/v7.nix @@ -10,11 +10,11 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "7.7.2"; + version = "7.7.3"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "117mqhvnvipyaq02knq75ikbk1swrw42b0kw6iijqb6k8j78si77"; + sha256 = "1pqfrvz06nz88jdp1vsrxfy5z0v8yas1c6pkvl45afvl3zqxlhal"; }; }) diff --git a/pkgs/development/web/remarkjs/node-packages.nix b/pkgs/development/web/remarkjs/node-packages.nix index 7e8a3160b31..2e17d72ea9e 100644 --- a/pkgs/development/web/remarkjs/node-packages.nix +++ b/pkgs/development/web/remarkjs/node-packages.nix @@ -1,16 +1,16 @@ -# This file has been generated by node2nix 1.1.1. Do not edit! +# This file has been generated by node2nix 1.2.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { - "JSONStream-1.3.0" = { + "JSONStream-1.3.1" = { name = "JSONStream"; packageName = "JSONStream"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.0.tgz"; - sha1 = "680ab9ac6572a8a1a207e0b38721db1c77b215e5"; + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz"; + sha1 = "707f761e01dae9e16f1bcf93703b78c70966579a"; }; }; "assert-1.4.1" = { @@ -49,22 +49,22 @@ let sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; }; }; - "buffer-4.9.1" = { + "buffer-5.0.5" = { name = "buffer"; packageName = "buffer"; - version = "4.9.1"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"; - sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; + url = "https://registry.npmjs.org/buffer/-/buffer-5.0.5.tgz"; + sha1 = "35c9393244a90aff83581063d16f0882cecc9418"; }; }; - "cached-path-relative-1.0.0" = { + "cached-path-relative-1.0.1" = { name = "cached-path-relative"; packageName = "cached-path-relative"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.0.tgz"; - sha1 = "d1094c577fbd9a8b8bd43c96af6188aa205d05f4"; + url = "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz"; + sha1 = "d09c4b52800aa4c078e2dd81a869aac90d2e54e7"; }; }; "concat-stream-1.5.2" = { @@ -211,13 +211,13 @@ let sha1 = "a52e1d138024c00b86b1c0c91f677918b8ae0a59"; }; }; - "module-deps-4.0.8" = { + "module-deps-4.1.1" = { name = "module-deps"; packageName = "module-deps"; - version = "4.0.8"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/module-deps/-/module-deps-4.0.8.tgz"; - sha1 = "55fd70623399706c3288bef7a609ff1e8c0ed2bb"; + url = "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz"; + sha1 = "23215833f1da13fd606ccb8087b44852dcb821fd"; }; }; "os-browserify-0.1.2" = { @@ -283,22 +283,22 @@ let sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0"; }; }; - "readable-stream-2.2.2" = { + "readable-stream-2.2.6" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.2.2"; + version = "2.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz"; - sha1 = "a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.6.tgz"; + sha1 = "8b43aed76e71483938d12a8d46c6cf1a00b1f816"; }; }; - "resolve-1.2.0" = { + "resolve-1.3.2" = { name = "resolve"; packageName = "resolve"; - version = "1.2.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.2.0.tgz"; - sha1 = "9589c3f2f6149d1417a40becc1663db6ec6bc26c"; + url = "https://registry.npmjs.org/resolve/-/resolve-1.3.2.tgz"; + sha1 = "1f0442c9e0cbb8136e87b9305f932f46c7f28235"; }; }; "shasum-1.0.2" = { @@ -355,13 +355,13 @@ let sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2"; }; }; - "syntax-error-1.1.6" = { + "syntax-error-1.3.0" = { name = "syntax-error"; packageName = "syntax-error"; - version = "1.1.6"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.1.6.tgz"; - sha1 = "b4549706d386cc1c1dc7c2423f18579b6cade710"; + url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.3.0.tgz"; + sha1 = "1ed9266c4d40be75dc55bf9bb1cb77062bb96ca1"; }; }; "through2-2.0.3" = { @@ -535,15 +535,6 @@ let sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"; }; }; - "isarray-1.0.0" = { - name = "isarray"; - packageName = "isarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; - }; - }; "typedarray-0.0.6" = { name = "typedarray"; packageName = "typedarray"; @@ -571,6 +562,15 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + }; "process-nextick-args-1.0.7" = { name = "process-nextick-args"; packageName = "process-nextick-args"; @@ -607,13 +607,13 @@ let sha1 = "9988244874bf5ed4e28da95666dcd66ac8fc363a"; }; }; - "browserify-sign-4.0.0" = { + "browserify-sign-4.0.4" = { name = "browserify-sign"; packageName = "browserify-sign"; - version = "4.0.0"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.0.tgz"; - sha1 = "10773910c3c206d5420a46aad8694f820b85968f"; + url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz"; + sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"; }; }; "create-ecdh-4.0.0" = { @@ -760,31 +760,31 @@ let sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; }; }; - "elliptic-6.3.2" = { + "elliptic-6.4.0" = { name = "elliptic"; packageName = "elliptic"; - version = "6.3.2"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.2.tgz"; - sha1 = "e4c81e0829cf0a65ab70e998b8232723b5c1bc48"; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz"; + sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df"; }; }; - "parse-asn1-5.0.0" = { + "parse-asn1-5.1.0" = { name = "parse-asn1"; packageName = "parse-asn1"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.0.0.tgz"; - sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23"; + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz"; + sha1 = "37c4f9b7ed3ab65c74817b5f2480937fbf97c712"; }; }; - "brorand-1.0.6" = { + "brorand-1.1.0" = { name = "brorand"; packageName = "brorand"; - version = "1.0.6"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/brorand/-/brorand-1.0.6.tgz"; - sha1 = "4028706b915f91f7b349a2e0bf3c376039d216e5"; + url = "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz"; + sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; }; }; "hash.js-1.0.3" = { @@ -796,6 +796,24 @@ let sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573"; }; }; + "hmac-drbg-1.0.0" = { + name = "hmac-drbg"; + packageName = "hmac-drbg"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.0.tgz"; + sha1 = "3db471f45aae4a994a0688322171f51b8b91bee5"; + }; + }; + "minimalistic-crypto-utils-1.0.1" = { + name = "minimalistic-crypto-utils"; + packageName = "minimalistic-crypto-utils"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; + sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; + }; + }; "asn1.js-4.9.1" = { name = "asn1.js"; packageName = "asn1.js"; @@ -922,13 +940,13 @@ let sha1 = "16176714c801798e4e8f2cf7f7529467bb4a5771"; }; }; - "is-buffer-1.1.4" = { + "is-buffer-1.1.5" = { name = "is-buffer"; packageName = "is-buffer"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz"; - sha1 = "cfc86ccd5dc5a52fa80489111c6920c457e2d98b"; + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz"; + sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc"; }; }; "lexical-scope-1.2.0" = { @@ -940,22 +958,22 @@ let sha1 = "fcea5edc704a4b3a8796cdca419c3a0afaf22df4"; }; }; - "astw-2.0.0" = { + "astw-2.2.0" = { name = "astw"; packageName = "astw"; - version = "2.0.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/astw/-/astw-2.0.0.tgz"; - sha1 = "08121ac8288d35611c0ceec663f6cd545604897d"; + url = "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz"; + sha1 = "7bd41784d32493987aeb239b6b4e1c57a873b917"; }; }; - "acorn-1.2.2" = { + "acorn-4.0.11" = { name = "acorn"; packageName = "acorn"; - version = "1.2.2"; + version = "4.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"; - sha1 = "c8ce27de0acc76d896d2b1fad3df588d9e82f014"; + url = "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz"; + sha1 = "edcda3bd937e7556410d42ed5860f67399c794c0"; }; }; "isarray-0.0.1" = { @@ -976,13 +994,13 @@ let sha1 = "1b63be438a133e4b671cc1935197600175910d83"; }; }; - "detective-4.3.2" = { + "detective-4.5.0" = { name = "detective"; packageName = "detective"; - version = "4.3.2"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/detective/-/detective-4.3.2.tgz"; - sha1 = "77697e2e7947ac3fe7c8e26a6d6f115235afa91c"; + url = "https://registry.npmjs.org/detective/-/detective-4.5.0.tgz"; + sha1 = "6e5a8c6b26e6c7a254b1c6b6d7490d98ec91edd1"; }; }; "stream-combiner2-1.1.1" = { @@ -994,15 +1012,6 @@ let sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; }; }; - "acorn-3.3.0" = { - name = "acorn"; - packageName = "acorn"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz"; - sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; - }; - }; "path-platform-0.11.15" = { name = "path-platform"; packageName = "path-platform"; @@ -1021,6 +1030,15 @@ let sha1 = "9978ce317388c649ad8793028c3477ef044a8b51"; }; }; + "path-parse-1.0.5" = { + name = "path-parse"; + packageName = "path-parse"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz"; + sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"; + }; + }; "json-stable-stringify-0.0.1" = { name = "json-stable-stringify"; packageName = "json-stable-stringify"; @@ -1093,15 +1111,6 @@ let sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; }; }; - "acorn-2.7.0" = { - name = "acorn"; - packageName = "acorn"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz"; - sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7"; - }; - }; "punycode-1.3.2" = { name = "punycode"; packageName = "punycode"; @@ -1138,13 +1147,13 @@ let sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; }; }; - "async-0.2.10" = { - name = "async"; - packageName = "async"; - version = "0.2.10"; + "yargs-3.10.0" = { + name = "yargs"; + packageName = "yargs"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; + url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; + sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; }; }; "uglify-to-browserify-1.0.2" = { @@ -1156,15 +1165,6 @@ let sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; }; }; - "yargs-3.10.0" = { - name = "yargs"; - packageName = "yargs"; - version = "3.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; - sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; - }; - }; "camelcase-1.2.1" = { name = "camelcase"; packageName = "camelcase"; @@ -1327,13 +1327,13 @@ let sha1 = "489654c692616b8aa55b0724fa809bb7db49c5bf"; }; }; - "request-2.79.0" = { + "request-2.81.0" = { name = "request"; packageName = "request"; - version = "2.79.0"; + version = "2.81.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz"; - sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de"; + url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; + sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; }; }; "prr-0.0.0" = { @@ -1372,22 +1372,22 @@ let sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; }; }; - "aws4-1.5.0" = { + "aws4-1.6.0" = { name = "aws4"; packageName = "aws4"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz"; - sha1 = "0a29ffb79c31c9e712eeb087e8e7a64b4a56d755"; + url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz"; + sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; }; }; - "caseless-0.11.0" = { + "caseless-0.12.0" = { name = "caseless"; packageName = "caseless"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"; - sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7"; + url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; "combined-stream-1.0.5" = { @@ -1426,13 +1426,13 @@ let sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4"; }; }; - "har-validator-2.0.6" = { + "har-validator-4.2.1" = { name = "har-validator"; packageName = "har-validator"; - version = "2.0.6"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"; - sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"; + url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; + sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; }; }; "hawk-3.1.3" = { @@ -1480,13 +1480,13 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "mime-types-2.1.14" = { + "mime-types-2.1.15" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.14"; + version = "2.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz"; - sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz"; + sha1 = "a4ebf5064094569237b8cf70046776d09fc92aed"; }; }; "oauth-sign-0.8.2" = { @@ -1498,13 +1498,31 @@ let sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; }; }; - "qs-6.3.0" = { + "performance-now-0.2.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz"; + sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; + }; + }; + "qs-6.4.0" = { name = "qs"; packageName = "qs"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz"; - sha1 = "f403b264f23bc01228c74131b407f18d5ea5d442"; + url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; + sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; + }; + }; + "safe-buffer-5.0.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"; + sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7"; }; }; "stringstream-0.0.5" = { @@ -1525,13 +1543,13 @@ let sha1 = "f081f76e4c85720e6c37a5faced737150d84072a"; }; }; - "tunnel-agent-0.4.3" = { + "tunnel-agent-0.6.0" = { name = "tunnel-agent"; packageName = "tunnel-agent"; - version = "0.4.3"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"; - sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; }; }; "uuid-3.0.1" = { @@ -1561,148 +1579,40 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "chalk-1.1.3" = { - name = "chalk"; - packageName = "chalk"; - version = "1.1.3"; + "ajv-4.11.5" = { + name = "ajv"; + packageName = "ajv"; + version = "4.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.11.5.tgz"; + sha1 = "b6ee74657b993a01dce44b7944d56f485828d5bd"; }; }; - "commander-2.9.0" = { - name = "commander"; - packageName = "commander"; - version = "2.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; - sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; - }; - }; - "is-my-json-valid-2.15.0" = { - name = "is-my-json-valid"; - packageName = "is-my-json-valid"; - version = "2.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz"; - sha1 = "936edda3ca3c211fd98f3b2d3e08da43f7b2915b"; - }; - }; - "pinkie-promise-2.0.1" = { - name = "pinkie-promise"; - packageName = "pinkie-promise"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; - sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; - }; - }; - "ansi-styles-2.2.1" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; - sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; - }; - }; - "escape-string-regexp-1.0.5" = { - name = "escape-string-regexp"; - packageName = "escape-string-regexp"; + "har-schema-1.0.5" = { + name = "har-schema"; + packageName = "har-schema"; version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"; + sha1 = "d263135f43307c02c602afc8fe95970c0151369e"; }; }; - "has-ansi-2.0.0" = { - name = "has-ansi"; - packageName = "has-ansi"; - version = "2.0.0"; + "co-4.6.0" = { + name = "co"; + packageName = "co"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; + sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; }; }; - "strip-ansi-3.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; - }; - }; - "supports-color-2.0.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; - sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; - }; - }; - "ansi-regex-2.1.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; - }; - }; - "graceful-readlink-1.0.1" = { - name = "graceful-readlink"; - packageName = "graceful-readlink"; + "json-stable-stringify-1.0.1" = { + name = "json-stable-stringify"; + packageName = "json-stable-stringify"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; - }; - }; - "generate-function-2.0.0" = { - name = "generate-function"; - packageName = "generate-function"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"; - sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74"; - }; - }; - "generate-object-property-1.2.0" = { - name = "generate-object-property"; - packageName = "generate-object-property"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"; - sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; - }; - }; - "jsonpointer-4.0.1" = { - name = "jsonpointer"; - packageName = "jsonpointer"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz"; - sha1 = "4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"; - }; - }; - "is-property-1.0.2" = { - name = "is-property"; - packageName = "is-property"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; - sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; - }; - }; - "pinkie-2.0.4" = { - name = "pinkie"; - packageName = "pinkie"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; - sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; + sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; }; }; "hoek-2.16.3" = { @@ -1750,22 +1660,31 @@ let sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; }; }; - "jsprim-1.3.1" = { + "jsprim-1.4.0" = { name = "jsprim"; packageName = "jsprim"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz"; - sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252"; + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz"; + sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918"; }; }; - "sshpk-1.10.2" = { + "sshpk-1.11.0" = { name = "sshpk"; packageName = "sshpk"; - version = "1.10.2"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.2.tgz"; - sha1 = "d5a804ce22695515638e798dbe23273de070a5fa"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.11.0.tgz"; + sha1 = "2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77"; + }; + }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; }; "extsprintf-1.0.2" = { @@ -1804,15 +1723,6 @@ let sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; }; }; - "assert-plus-1.0.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; - }; - }; "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; @@ -1831,13 +1741,13 @@ let sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6"; }; }; - "jsbn-0.1.0" = { + "jsbn-0.1.1" = { name = "jsbn"; packageName = "jsbn"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"; - sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd"; + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; "tweetnacl-0.14.5" = { @@ -1867,22 +1777,22 @@ let sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; }; }; - "bcrypt-pbkdf-1.0.0" = { + "bcrypt-pbkdf-1.0.1" = { name = "bcrypt-pbkdf"; packageName = "bcrypt-pbkdf"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz"; - sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4"; + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; + sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; }; }; - "mime-db-1.26.0" = { + "mime-db-1.27.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.26.0"; + version = "1.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz"; - sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz"; + sha1 = "820f572296bbd20ec25ed55e5b5de869e5436eb1"; }; }; "browser-stdout-1.3.0" = { @@ -1894,6 +1804,15 @@ let sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f"; }; }; + "commander-2.9.0" = { + name = "commander"; + packageName = "commander"; + version = "2.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; + sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + }; + }; "debug-2.2.0" = { name = "debug"; packageName = "debug"; @@ -1912,6 +1831,15 @@ let sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; }; }; + "escape-string-regexp-1.0.5" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + }; "glob-7.0.5" = { name = "glob"; packageName = "glob"; @@ -1957,6 +1885,15 @@ let sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"; }; }; + "graceful-readlink-1.0.1" = { + name = "graceful-readlink"; + packageName = "graceful-readlink"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; + sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + }; + }; "ms-0.7.1" = { name = "ms"; packageName = "ms"; @@ -2236,13 +2173,13 @@ let sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e"; }; }; - "abbrev-1.0.9" = { + "abbrev-1.1.0" = { name = "abbrev"; packageName = "abbrev"; - version = "1.0.9"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz"; - sha1 = "91b4792588a7738c25f35dd6f63752a2f8776135"; + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz"; + sha1 = "d0554c2256636e2f56e7c2e5ad183f859428d81f"; }; }; "qs-0.6.6" = { @@ -2272,13 +2209,13 @@ let sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; }; }; - "node-uuid-1.4.7" = { + "node-uuid-1.4.8" = { name = "node-uuid"; packageName = "node-uuid"; - version = "1.4.7"; + version = "1.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"; - sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"; + url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz"; + sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907"; }; }; "form-data-0.1.4" = { @@ -2290,6 +2227,15 @@ let sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; }; }; + "tunnel-agent-0.4.3" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"; + sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; + }; + }; "http-signature-0.10.1" = { name = "http-signature"; packageName = "http-signature"; @@ -2434,13 +2380,13 @@ let sha1 = "0b6e9516f2601a9fb0bb2dcc369afa1c7e200af7"; }; }; - "should-format-3.0.2" = { + "should-format-3.0.3" = { name = "should-format"; packageName = "should-format"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/should-format/-/should-format-3.0.2.tgz"; - sha1 = "1a543ad3abfea5dc2bea4a0ba875ede60fe22b19"; + url = "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz"; + sha1 = "9bfc8f74fa39205c53d38c34d717303e277124f1"; }; }; "should-type-1.4.0" = { @@ -2470,31 +2416,76 @@ let sha1 = "c98cda374aa6b190df8ba87c9889c2b4db620063"; }; }; - "formatio-1.1.1" = { + "diff-3.2.0" = { + name = "diff"; + packageName = "diff"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz"; + sha1 = "c9ce393a4b7cbd0b058a725c93df299027868ff9"; + }; + }; + "formatio-1.2.0" = { name = "formatio"; packageName = "formatio"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz"; - sha1 = "5ed3ccd636551097383465d996199100e86161e9"; + url = "https://registry.npmjs.org/formatio/-/formatio-1.2.0.tgz"; + sha1 = "f3b2167d9068c4698a8d51f4f760a39a54d818eb"; }; }; - "lolex-1.3.2" = { + "lolex-1.6.0" = { name = "lolex"; packageName = "lolex"; - version = "1.3.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/lolex/-/lolex-1.3.2.tgz"; - sha1 = "7c3da62ffcb30f0f5a80a2566ca24e45d8a01f31"; + url = "https://registry.npmjs.org/lolex/-/lolex-1.6.0.tgz"; + sha1 = "3a9a0283452a47d7439e72731b9e07d7386e49f6"; }; }; - "samsam-1.1.2" = { + "native-promise-only-0.8.1" = { + name = "native-promise-only"; + packageName = "native-promise-only"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz"; + sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11"; + }; + }; + "path-to-regexp-1.7.0" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz"; + sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; + }; + }; + "samsam-1.2.1" = { name = "samsam"; packageName = "samsam"; - version = "1.1.2"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz"; - sha1 = "bec11fdc83a9fda063401210e40176c3024d1567"; + url = "https://registry.npmjs.org/samsam/-/samsam-1.2.1.tgz"; + sha1 = "edd39093a3184370cb859243b2bdf255e7d8ea67"; + }; + }; + "text-encoding-0.6.4" = { + name = "text-encoding"; + packageName = "text-encoding"; + version = "0.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz"; + sha1 = "e399a982257a276dae428bb92845cb71bdc26d19"; + }; + }; + "type-detect-4.0.0" = { + name = "type-detect"; + packageName = "type-detect"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-detect/-/type-detect-4.0.0.tgz"; + sha1 = "62053883542a321f2f7b25746dc696478b18ff6b"; }; }; "cli-1.0.1" = { @@ -2623,13 +2614,13 @@ let sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; }; }; - "interpret-1.0.1" = { + "interpret-1.0.2" = { name = "interpret"; packageName = "interpret"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-1.0.1.tgz"; - sha1 = "d579fb7f693b858004947af39fa0db49f795602c"; + url = "https://registry.npmjs.org/interpret/-/interpret-1.0.2.tgz"; + sha1 = "f4f623f0bb7122f15f5717c8e254b8161b5c5b2d"; }; }; "rechoir-0.6.2" = { @@ -2663,13 +2654,13 @@ in browserify = nodeEnv.buildNodePackage { name = "browserify"; packageName = "browserify"; - version = "13.3.0"; + version = "14.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz"; - sha1 = "b5a9c9020243f0c70e4675bec8223bc627e415ce"; + url = "https://registry.npmjs.org/browserify/-/browserify-14.1.0.tgz"; + sha1 = "0508cc1e7bf4c152312c2fa523e676c0b0b92311"; }; dependencies = [ - (sources."JSONStream-1.3.0" // { + (sources."JSONStream-1.3.1" // { dependencies = [ sources."jsonparse-1.3.0" sources."through-2.3.8" @@ -2699,14 +2690,13 @@ in sources."pako-0.2.9" ]; }) - (sources."buffer-4.9.1" // { + (sources."buffer-5.0.5" // { dependencies = [ sources."base64-js-1.2.0" sources."ieee754-1.1.8" - sources."isarray-1.0.0" ]; }) - sources."cached-path-relative-1.0.0" + sources."cached-path-relative-1.0.1" (sources."concat-stream-1.5.2" // { dependencies = [ sources."typedarray-0.0.6" @@ -2749,17 +2739,20 @@ in sources."evp_bytestokey-1.0.0" ]; }) - (sources."browserify-sign-4.0.0" // { + (sources."browserify-sign-4.0.4" // { dependencies = [ sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - (sources."elliptic-6.3.2" // { + (sources."elliptic-6.4.0" // { dependencies = [ - sources."brorand-1.0.6" + sources."brorand-1.1.0" sources."hash.js-1.0.3" + sources."hmac-drbg-1.0.0" + sources."minimalistic-assert-1.0.0" + sources."minimalistic-crypto-utils-1.0.1" ]; }) - (sources."parse-asn1-5.0.0" // { + (sources."parse-asn1-5.1.0" // { dependencies = [ (sources."asn1.js-4.9.1" // { dependencies = [ @@ -2780,10 +2773,13 @@ in (sources."create-ecdh-4.0.0" // { dependencies = [ sources."bn.js-4.11.6" - (sources."elliptic-6.3.2" // { + (sources."elliptic-6.4.0" // { dependencies = [ - sources."brorand-1.0.6" + sources."brorand-1.1.0" sources."hash.js-1.0.3" + sources."hmac-drbg-1.0.0" + sources."minimalistic-assert-1.0.0" + sources."minimalistic-crypto-utils-1.0.1" ]; }) ]; @@ -2801,7 +2797,7 @@ in sources."bn.js-4.11.6" (sources."miller-rabin-4.0.0" // { dependencies = [ - sources."brorand-1.0.6" + sources."brorand-1.1.0" ]; }) ]; @@ -2811,7 +2807,7 @@ in dependencies = [ sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - (sources."parse-asn1-5.0.0" // { + (sources."parse-asn1-5.1.0" // { dependencies = [ (sources."asn1.js-4.9.1" // { dependencies = [ @@ -2881,12 +2877,12 @@ in sources."source-map-0.5.6" ]; }) - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" (sources."lexical-scope-1.2.0" // { dependencies = [ - (sources."astw-2.0.0" // { + (sources."astw-2.2.0" // { dependencies = [ - sources."acorn-1.2.2" + sources."acorn-4.0.11" ]; }) ]; @@ -2899,11 +2895,11 @@ in sources."stream-splicer-2.0.0" ]; }) - (sources."module-deps-4.0.8" // { + (sources."module-deps-4.1.1" // { dependencies = [ - (sources."detective-4.3.2" // { + (sources."detective-4.5.0" // { dependencies = [ - sources."acorn-3.3.0" + sources."acorn-4.0.11" ]; }) sources."stream-combiner2-1.1.1" @@ -2920,7 +2916,7 @@ in sources."punycode-1.4.1" sources."querystring-es3-0.2.1" sources."read-only-stream-2.0.0" - (sources."readable-stream-2.2.2" // { + (sources."readable-stream-2.2.6" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -2929,7 +2925,11 @@ in sources."util-deprecate-1.0.2" ]; }) - sources."resolve-1.2.0" + (sources."resolve-1.3.2" // { + dependencies = [ + sources."path-parse-1.0.5" + ]; + }) (sources."shasum-1.0.2" // { dependencies = [ (sources."json-stable-stringify-0.0.1" // { @@ -2961,9 +2961,9 @@ in sources."minimist-1.2.0" ]; }) - (sources."syntax-error-1.1.6" // { + (sources."syntax-error-1.3.0" // { dependencies = [ - sources."acorn-2.7.0" + sources."acorn-4.0.11" ]; }) sources."through2-2.0.3" @@ -2998,15 +2998,13 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "2.7.5"; + version = "2.8.20"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz"; - sha1 = "4612c0c7baaee2ba7c487de4904ae122079f2ca8"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.20.tgz"; + sha1 = "be87100fbc18de3876ed606e9d24b4568311cecf"; }; dependencies = [ - sources."async-0.2.10" sources."source-map-0.5.6" - sources."uglify-to-browserify-1.0.2" (sources."yargs-3.10.0" // { dependencies = [ sources."camelcase-1.2.1" @@ -3018,7 +3016,7 @@ in dependencies = [ (sources."kind-of-3.1.0" // { dependencies = [ - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" ]; }) sources."longest-1.0.1" @@ -3034,7 +3032,7 @@ in dependencies = [ (sources."kind-of-3.1.0" // { dependencies = [ - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" ]; }) sources."longest-1.0.1" @@ -3050,6 +3048,7 @@ in sources."window-size-0.1.0" ]; }) + sources."uglify-to-browserify-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -3087,11 +3086,11 @@ in ]; }) sources."source-map-0.5.6" - (sources."request-2.79.0" // { + (sources."request-2.81.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" - sources."caseless-0.11.0" + sources."aws4-1.6.0" + sources."caseless-0.12.0" (sources."combined-stream-1.0.5" // { dependencies = [ sources."delayed-stream-1.0.0" @@ -3104,47 +3103,19 @@ in sources."asynckit-0.4.0" ]; }) - (sources."har-validator-2.0.6" // { + (sources."har-validator-4.2.1" // { dependencies = [ - (sources."chalk-1.1.3" // { + (sources."ajv-4.11.5" // { dependencies = [ - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - (sources."has-ansi-2.0.0" // { + sources."co-4.6.0" + (sources."json-stable-stringify-1.0.1" // { dependencies = [ - sources."ansi-regex-2.1.1" + sources."jsonify-0.0.0" ]; }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."supports-color-2.0.0" - ]; - }) - (sources."commander-2.9.0" // { - dependencies = [ - sources."graceful-readlink-1.0.1" - ]; - }) - (sources."is-my-json-valid-2.15.0" // { - dependencies = [ - sources."generate-function-2.0.0" - (sources."generate-object-property-1.2.0" // { - dependencies = [ - sources."is-property-1.0.2" - ]; - }) - sources."jsonpointer-4.0.1" - sources."xtend-4.0.1" - ]; - }) - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" ]; }) + sources."har-schema-1.0.5" ]; }) (sources."hawk-3.1.3" // { @@ -3158,24 +3129,25 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.1" // { + (sources."jsprim-1.4.0" // { dependencies = [ + sources."assert-plus-1.0.0" sources."extsprintf-1.0.2" sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.2" // { + (sources."sshpk-1.11.0" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.0" + sources."bcrypt-pbkdf-1.0.1" ]; }) ]; @@ -3183,20 +3155,22 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.14" // { + (sources."mime-types-2.1.15" // { dependencies = [ - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" ]; }) sources."oauth-sign-0.8.2" - sources."qs-6.3.0" + sources."performance-now-0.2.0" + sources."qs-6.4.0" + sources."safe-buffer-5.0.1" sources."stringstream-0.0.5" (sources."tough-cookie-2.3.2" // { dependencies = [ sources."punycode-1.4.1" ]; }) - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" sources."uuid-3.0.1" ]; }) @@ -3324,7 +3298,7 @@ in sources."osenv-0.0.3" (sources."nopt-2.2.1" // { dependencies = [ - sources."abbrev-1.0.9" + sources."abbrev-1.1.0" ]; }) sources."semver-1.1.4" @@ -3339,7 +3313,7 @@ in sources."json-stringify-safe-5.0.1" sources."mime-1.2.11" sources."forever-agent-0.5.2" - sources."node-uuid-1.4.7" + sources."node-uuid-1.4.8" (sources."tough-cookie-2.3.2" // { dependencies = [ sources."punycode-1.4.1" @@ -3401,14 +3375,14 @@ in should = nodeEnv.buildNodePackage { name = "should"; packageName = "should"; - version = "11.1.2"; + version = "11.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/should/-/should-11.1.2.tgz"; - sha1 = "3cad9c6fc600ffe2e1547d948be3284e984da946"; + url = "https://registry.npmjs.org/should/-/should-11.2.1.tgz"; + sha1 = "90f55145552d01cfc200666e4e818a1c9670eda2"; }; dependencies = [ sources."should-equal-1.0.1" - sources."should-format-3.0.2" + sources."should-format-3.0.3" sources."should-type-1.4.0" sources."should-type-adaptors-1.0.1" sources."should-util-1.0.0" @@ -3424,20 +3398,24 @@ in sinon = nodeEnv.buildNodePackage { name = "sinon"; packageName = "sinon"; - version = "1.17.7"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/sinon/-/sinon-1.17.7.tgz"; - sha1 = "4542a4f49ba0c45c05eb2e9dd9d203e2b8efe0bf"; + url = "https://registry.npmjs.org/sinon/-/sinon-2.1.0.tgz"; + sha1 = "e057a9d2bf1b32f5d6dd62628ca9ee3961b0cafb"; }; dependencies = [ - sources."formatio-1.1.1" - (sources."util-0.10.3" // { + sources."diff-3.2.0" + sources."formatio-1.2.0" + sources."lolex-1.6.0" + sources."native-promise-only-0.8.1" + (sources."path-to-regexp-1.7.0" // { dependencies = [ - sources."inherits-2.0.1" + sources."isarray-0.0.1" ]; }) - sources."lolex-1.3.2" - sources."samsam-1.1.2" + sources."samsam-1.2.1" + sources."text-encoding-0.6.4" + sources."type-detect-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -3533,10 +3511,10 @@ in shelljs = nodeEnv.buildNodePackage { name = "shelljs"; packageName = "shelljs"; - version = "0.7.6"; + version = "0.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.6.tgz"; - sha1 = "379cccfb56b91c8601e4793356eb5382924de9ad"; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.7.tgz"; + sha1 = "b2f5c77ef97148f4b4f6e22682e10bba8667cff1"; }; dependencies = [ (sources."glob-7.1.1" // { @@ -3566,10 +3544,14 @@ in sources."path-is-absolute-1.0.1" ]; }) - sources."interpret-1.0.1" + sources."interpret-1.0.2" (sources."rechoir-0.6.2" // { dependencies = [ - sources."resolve-1.2.0" + (sources."resolve-1.3.2" // { + dependencies = [ + sources."path-parse-1.0.5" + ]; + }) ]; }) ]; diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix index 54f8fe0c728..751638e02da 100644 --- a/pkgs/development/web/remarkjs/nodepkgs.nix +++ b/pkgs/development/web/remarkjs/nodepkgs.nix @@ -1,8 +1,8 @@ -# This file has been generated by node2nix 1.1.1. Do not edit! +# This file has been generated by node2nix 1.2.0. Do not edit! {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}: let nodeEnv = import ../../node-packages/node-env.nix { diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index f038673f4c0..3a50196456c 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -96,6 +96,6 @@ stdenv.mkDerivation rec { gpl2 lgpl21 mit cc-by-sa-30 licenses.zlib # otherwise masked by pkgs.zlib ]; - platforms = platforms.linux; + platforms = subtractLists platforms.i686 platforms.linux; }; } diff --git a/pkgs/games/atanks/default.nix b/pkgs/games/atanks/default.nix index 4b9b097bbb7..05b645ee326 100644 --- a/pkgs/games/atanks/default.nix +++ b/pkgs/games/atanks/default.nix @@ -2,20 +2,16 @@ stdenv.mkDerivation rec { name = "atanks-${version}"; - version = "6.2"; + version = "6.5"; src = fetchurl { url = "mirror://sourceforge/project/atanks/atanks/${name}/${name}.tar.gz"; - sha256 = "1s1lb87ind0y9d6hmfaf1b9wks8q3hd6w5n9dibq75rxqmcfvlpy"; + sha256 = "0bijsbd51j4wsnmdxj54r92m7h8zqnvh9z3qqdig6zx7a8kjn61j"; }; buildInputs = [ allegro ]; - patchPhase = '' - substituteInPlace Makefile --replace /usr $out - ''; - - makeFlags = [ "PREFIX=$(out)/" "INSTALL=install" ]; + makeFlags = [ "PREFIX=$(out)/" "INSTALL=install" "CXX=g++" ]; meta = with stdenv.lib; { description = "Atomic Tanks ballistics game"; diff --git a/pkgs/games/gargoyle/darwin.patch b/pkgs/games/gargoyle/darwin.patch new file mode 100644 index 00000000000..fa0337fc585 --- /dev/null +++ b/pkgs/games/gargoyle/darwin.patch @@ -0,0 +1,97 @@ +From 06255a8b5a378a2484cd0faa1dd718d5b4e98042 Mon Sep 17 00:00:00 2001 +From: Orivej Desh +Date: Fri, 17 Mar 2017 08:43:57 +0000 +Subject: [PATCH] darwin + +--- + Jamrules | 5 ++--- + Jamshared | 2 +- + support/Jamfile | 4 ++-- + tads/Jamfile | 4 ++-- + terps/Jamfile | 4 ++-- + 5 files changed, 9 insertions(+), 10 deletions(-) + +diff --git a/Jamrules b/Jamrules +index 698220d..2294dfc 100644 +--- a/Jamrules ++++ b/Jamrules +@@ -141,8 +141,7 @@ switch $(OS) + case MACOSX : + Echo "OS is MACOSX (cocoa)" ; + SUFDLL = .dylib ; +- MAINARCH = -arch i386 ; +- CCFLAGS = -Wno-pointer-sign $(MAINARCH) $(ALTARCH) ; ++ CCFLAGS = -Wno-pointer-sign $(ALTARCH) ; + PKGCONFIG = "pkg-config freetype2" ; + GARGLKCCFLAGS = "`$(PKGCONFIG) --cflags`" ; + SHRLINKLIBS += "`$(PKGCONFIG) --libs`" -ljpeg -lpng -lz ; +@@ -155,7 +154,7 @@ switch $(OS) + SHRLINKLIBS += -lSDL_mixer -lSDL -lsmpeg -lvorbisfile ; + } + +- LINK = $(CC) -headerpad_max_install_names $(FRAMEWORKS) $(MAINARCH) $(ALTARCH) ; ++ LINK = $(CC) $(FRAMEWORKS) $(ALTARCH) ; + + + case * : +diff --git a/Jamshared b/Jamshared +index 13db835..fd42928 100644 +--- a/Jamshared ++++ b/Jamshared +@@ -79,7 +79,7 @@ if $(OS) = MACOSX + { + actions together SharedLink bind NEEDLIBS + { +- $(LINK) -headerpad_max_install_names $(FRAMEWORKS) $(MAINARCH) $(ALTARCH) -dynamiclib $(SHRLINKFLAGS) -install_name @executable_path/$(<:D=) -o $(<) $(>) $(NEEDLIBS) $(SHRLINKLIBS) ++ $(LINK) $(FRAMEWORKS) $(MAINARCH) $(ALTARCH) -dynamiclib $(SHRLINKFLAGS) -install_name @executable_path/$(<:D=) -o $(<) $(>) $(NEEDLIBS) $(SHRLINKLIBS) + } + } + else +diff --git a/support/Jamfile b/support/Jamfile +index aedf8fe..70cfefd 100644 +--- a/support/Jamfile ++++ b/support/Jamfile +@@ -41,8 +41,8 @@ if $(USESDL) = yes + ; + + if $(OS) = MINGW { SubDirCcFlags -DSDL_SOUND_DLL_EXPORTS ; } +- if $(OS) = SOLARIS { SubDirCcFlags -I/usr/include/SDL -fPIC ; } +- if $(OS) = MACOSX { SubDirCcFlags -I/opt/local/include/SDL -fPIC ; } ++ if $(OS) = SOLARIS { SubDirCcFlags -ISDL -fPIC ; } ++ if $(OS) = MACOSX { SubDirCcFlags -ISDL -fPIC ; } + + SEARCH_SOURCE = + [ FDirName $(TOP) support sdl_sound ] +diff --git a/tads/Jamfile b/tads/Jamfile +index 1f8829d..d8455eb 100644 +--- a/tads/Jamfile ++++ b/tads/Jamfile +@@ -33,8 +33,8 @@ if $(OS) = LINUX || $(OS) = SOLARIS + + if $(OS) = MACOSX + { +- SubDirCcFlags -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ; +- LINKFLAGS = -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ; ++ SubDirCcFlags $(MAINARCH) $(ALTARCH) ; ++ LINKFLAGS = $(MAINARCH) $(ALTARCH) ; + } + + SEARCH_SOURCE = +diff --git a/terps/Jamfile b/terps/Jamfile +index b5f6d52..2d1ccdb 100644 +--- a/terps/Jamfile ++++ b/terps/Jamfile +@@ -185,8 +185,8 @@ if $(MAKE_GEAS) = yes + + if $(OS) = MACOSX + { +- SubDirCcFlags -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ; +- LINKFLAGS = -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ; ++ SubDirCcFlags $(MAINARCH) $(ALTARCH) ; ++ LINKFLAGS = $(MAINARCH) $(ALTARCH) ; + } + + SUBDIRC++FLAGS = $(SUBDIRCCFLAGS) ; +-- +2.12.0 + diff --git a/pkgs/games/gargoyle/darwin.sh b/pkgs/games/gargoyle/darwin.sh new file mode 100644 index 00000000000..9bd45d0b1d5 --- /dev/null +++ b/pkgs/games/gargoyle/darwin.sh @@ -0,0 +1,54 @@ +#!/bin/sh + +set -e + +GARGDIST=build/macosx.release +BUNDLE=${out}/Applications/Gargoyle.app/Contents +TERPS=" +advsys/advsys +agility/agility +alan2/alan2 +alan3/alan3 +bocfel/bocfel +frotz/frotz +garglk/gargoyle +geas/geas +git/git +glulxe/glulxe +hugo/hugo +jacl/jacl +level9/level9 +magnetic/magnetic +nitfol/nitfol +scare/scare +scott/scott +tads/tadsr +" + +mkdir -p $BUNDLE/MacOS +mkdir -p $BUNDLE/Frameworks +mkdir -p $BUNDLE/Resources +mkdir -p $BUNDLE/PlugIns + +install_name_tool -id @executable_path/../Frameworks/libgarglk.dylib $GARGDIST/garglk/libgarglk.dylib +for file in $TERPS +do +install_name_tool -change @executable_path/libgarglk.dylib @executable_path/../Frameworks/libgarglk.dylib $GARGDIST/$file || true +cp -f $GARGDIST/$file $BUNDLE/PlugIns +done + +cp -f garglk/launcher.plist $BUNDLE/Info.plist +cp -f $GARGDIST/garglk/gargoyle $BUNDLE/MacOS/Gargoyle +cp -f $GARGDIST/garglk/libgarglk.dylib $BUNDLE/Frameworks +cp -f $GARGDIST/garglk/libgarglk.dylib $BUNDLE/PlugIns +cp -f garglk/launchmac.nib $BUNDLE/Resources/MainMenu.nib +cp -f garglk/garglk.ini $BUNDLE/Resources +cp -f garglk/*.icns $BUNDLE/Resources +cp -f licenses/* $BUNDLE/Resources + +mkdir $BUNDLE/Resources/Fonts +cp fonts/LiberationMono*.ttf $BUNDLE/Resources/Fonts +cp fonts/LinLibertine*.otf $BUNDLE/Resources/Fonts + +mkdir -p ${out}/bin +ln -s $BUNDLE/MacOS/Gargoyle ${out}/bin/gargoyle diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix new file mode 100644 index 00000000000..ecee61513b4 --- /dev/null +++ b/pkgs/games/gargoyle/default.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchFromGitHub, jam, pkgconfig, gtk2, SDL, SDL_mixer, SDL_sound, smpeg, libvorbis }: + +let + + jamenv = if stdenv.isDarwin then '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL.dev}/include/SDL" + export GARGLKINI="$out/Applications/Gargoyle.app/Contents/Resources/garglk.ini" + '' else '' + export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/libexec/gargoyle" + export DESTDIR="$out" + export _BINDIR=libexec/gargoyle + export _APPDIR=libexec/gargoyle + export _LIBDIR=libexec/gargoyle + export GARGLKINI="$out/etc/garglk.ini" + ''; + +in + +stdenv.mkDerivation { + name = "gargoyle-2017-03-12"; + + src = fetchFromGitHub { + owner = "garglk"; + repo = "garglk"; + rev = "7d8fe875927c332ea30d75656bc982354b42f602"; + sha256 = "00nac7j84gfql1cr11cs9ad4j1gsxrnkqfx6mis4ijf7d6px3sih"; + }; + + nativeBuildInputs = [ jam pkgconfig ]; + + buildInputs = [ gtk2 SDL SDL_mixer ] ++ ( + if stdenv.isDarwin then [ smpeg libvorbis ] else [ SDL_sound ] + ); + + patches = [ ./darwin.patch ]; + + buildPhase = jamenv + "jam -j$NIX_BUILD_CORES"; + + installPhase = if stdenv.isDarwin then (builtins.readFile ./darwin.sh) else jamenv + '' + jam -j$NIX_BUILD_CORES install + mkdir -p "$out/bin" + ln -s ../libexec/gargoyle/gargoyle "$out/bin" + mkdir -p "$out/etc" + cp garglk/garglk.ini "$out/etc" + mkdir -p "$out/share/applications" + cp garglk/gargoyle.desktop "$out/share/applications" + mkdir -p "$out/share/icons/hicolor/32x32/apps" + cp garglk/gargoyle-house.png "$out/share/icons/hicolor/32x32/apps" + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://ccxvii.net/gargoyle/; + license = licenses.gpl2Plus; + description = "Interactive fiction interpreter GUI"; + platforms = platforms.unix; + maintainers = with maintainers; [ orivej ]; + }; +} diff --git a/pkgs/games/hawkthorne/default.nix b/pkgs/games/hawkthorne/default.nix index 5cb79fa9299..4c3d22571b1 100644 --- a/pkgs/games/hawkthorne/default.nix +++ b/pkgs/games/hawkthorne/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { homepage = "http://www.reddit.com/r/hawkthorne"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ campadrenalin ]; + broken = true; }; } diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index 67f0a87df65..e438008b19c 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -4,31 +4,29 @@ let libnbt = fetchFromGitHub { owner = "MultiMC"; repo = "libnbtplusplus"; - rev = "5d0ffb50a526173ce58ae57136bf5d79a7e1920d"; - sha256 = "05hnwfb77rmm9ba7n96g4g1sgwqqcmplvbcafsl76yxr6ysgw5jg"; + rev = "4b305bb"; + sha256 = "1zj7pxk0g5zl16hrngb4rss00hi019rylin7zgf18kaymc54nbcs"; }; in stdenv.mkDerivation { - name = "multimc-5"; + name = "multimc-0.5.1"; src = fetchFromGitHub { owner = "MultiMC"; repo = "MultiMC5"; - rev = "895d8ab4699f1b50bf03532c967a91f5ecb62a50"; - sha256 = "179vc1iv57fx4g4h1wy8yvyvdm671jnvp6zi8pcr1n6azqhwklds"; + rev = "0.5.1"; + sha256 = "0wmlnwcq3gxrbmc53j96aa64pp1kmnlxiifhzngcb5kfmbbc8a20"; }; buildInputs = [ cmake qtbase jdk zlib file makeWrapper ]; libpath = with xorg; [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; postUnpack = '' - rmdir $sourceRoot/depends/libnbtplusplus - cp -r ${libnbt} $sourceRoot/depends/libnbtplusplus - chmod 755 -R $sourceRoot/depends/libnbtplusplus + rmdir $sourceRoot/libraries/libnbtplusplus + cp -r ${libnbt} $sourceRoot/libraries/libnbtplusplus + chmod 755 -R $sourceRoot/libraries/libnbtplusplus mkdir -pv $sourceRoot/build/ cp -v ${quazip.src} $sourceRoot/build/quazip-0.7.1.tar.gz ''; - patches = [ ./multimc.patch ]; - enableParallelBuilding = true; # the install rule tries to bundle ALL deps into the output for portability @@ -41,7 +39,7 @@ stdenv.mkDerivation { mkdir -pv $out/bin/jars $out/lib cp -v MultiMC $out/bin/ cp -v jars/*.jar $out/bin/jars/ #*/ - cp -v librainbow.so libnbt++.so libMultiMC_logic.so $out/lib + cp -v libMultiMC_rainbow.so libMultiMC_nbt++.so libMultiMC_logic.so libMultiMC_gui.so $out/lib wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH $RESULT --prefix PATH : ${jdk}/bin/ ''; diff --git a/pkgs/games/multimc/multimc.patch b/pkgs/games/multimc/multimc.patch deleted file mode 100644 index 39d0076f16a..00000000000 --- a/pkgs/games/multimc/multimc.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src-orig/application/MultiMC.cpp MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src/application/MultiMC.cpp ---- MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src-orig/application/MultiMC.cpp 2015-10-25 03:29:25.270126028 -0300 -+++ MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src/application/MultiMC.cpp 2015-10-25 04:22:48.568437861 -0300 -@@ -330,7 +330,7 @@ - } - - m_mmc_translator.reset(new QTranslator()); -- if (m_mmc_translator->load("mmc_" + locale.bcp47Name(), staticDataPath + "/translations")) -+ if (m_mmc_translator->load("mmc_" + locale.bcp47Name(), "translations")) - { - qDebug() << "Loading MMC Language File for" - << locale.bcp47Name().toLocal8Bit().constData() << "..."; -diff -ur MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src-orig/logic/Env.cpp MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src/logic/Env.cpp ---- MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src-orig/logic/Env.cpp 2015-10-25 03:29:25.428124792 -0300 -+++ MultiMC5-895d8ab4699f1b50bf03532c967a91f5ecb62a50-src/logic/Env.cpp 2015-10-25 04:29:24.145412196 -0300 -@@ -147,7 +147,7 @@ - m_metacache->addBase("general", QDir("cache").absolutePath()); - m_metacache->addBase("skins", QDir("accounts/skins").absolutePath()); - m_metacache->addBase("root", QDir(rootPath).absolutePath()); -- m_metacache->addBase("translations", QDir(staticDataPath + "/translations").absolutePath()); -+ m_metacache->addBase("translations", QDir("translations").absolutePath()); - m_metacache->addBase("icons", QDir("cache/icons").absolutePath()); - m_metacache->Load(); - } diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index 7a23c4dc966..d637c159595 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -1,7 +1,7 @@ { stdenv, config, fetchurl, libX11, libXext, libXinerama, libXrandr , libXrender, fontconfig, freetype, openal }: -with { inherit (stdenv.lib) makeLibraryPath; }; +let inherit (stdenv.lib) makeLibraryPath; in stdenv.mkDerivation { name = "oilrush"; diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index 1988463d61a..5cf55535db1 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -58,6 +58,7 @@ let SDL SDL2_image glew110 + openssl libidn # Other things from runtime @@ -87,7 +88,7 @@ let alsaLib openalSoft libva - openssl-steam + vulkan-loader ] ++ lib.optional newStdcpp gcc.cc; ourRuntime = if runtimeOnly then [] diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index 5027abedcf4..9810d5186b0 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { homepage = http://ultrastardx.sourceforge.net/; description = "Free and open source karaoke game"; license = stdenv.lib.licenses.gpl2Plus; + broken = true; }; } diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index 50b127fa9dc..bc293a88107 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { name = "urbanterror-${version}"; - version = "4.3.1"; + version = "4.3.2"; srcs = [ (fetchurl { - url = "http://cdn.fs1.urbanterror.info/urt/43/releases/zips/UrbanTerror431_full.zip"; - sha256 = "1dfnyb2grf2fxxphwj7p2ff721j2l0gwrj76jzympr32sim5a6cw"; + url = "http://cdn.fs1.urbanterror.info/urt/43/releases/zips/UrbanTerror432_full.zip"; + sha256 = "192jwdyfy18cg413ysaklqc8yzmdnshljqc6dnr0xkd6dxbf3pkl"; }) (fetchurl { - url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.3.1.zip"; - sha256 = "1rbiqa1ki73649np3af96cilavkgv66a0b6p0a5x26cxvpgg128k"; + url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-${version}.zip"; + sha256 = "0m376hdkk8vjnbdy8zakjazyag6jiw4n8zy4lxhv2ndn9mii8lcx"; }) ]; buildInputs = [ unzip SDL mesa openal curl libXxf86vm ]; - sourceRoot = "ioq3-for-UrbanTerror-4-release-4.3.1"; + sourceRoot = "ioq3-for-UrbanTerror-4-release-${version}"; configurePhase = '' echo "USE_OPENAL = 1" > Makefile.local diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index f47ba022c35..1f8e559b415 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -53,6 +53,11 @@ stdenv.mkDerivation rec { "--disable-launchd" ]; + # XXX: Hackery until https://github.com/NixOS/nixpkgs/issues/24693 + preBuild = if stdenv.isDarwin then '' + export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks + '' else null; + installFlags = [ # Don't try to write in /var at build time. "CACHEDIR=$(TMPDIR)/dummy" @@ -79,7 +84,12 @@ stdenv.mkDerivation rec { # Delete obsolete stuff that conflicts with cups-filters. rm -rf $out/share/cups/banners $out/share/cups/data/testprint + # Some outputs in cups-config were unexpanded and some even wrong. moveToOutput bin/cups-config "$dev" + sed -e "/^cups_serverbin=/s|\$(lib)|$out|" \ + -e "s|\$(out)|$out|" \ + -e "s|\$(lib)|$lib|" \ + -i "$dev/bin/cups-config" # Rename systemd files provided by CUPS for f in "$out"/lib/systemd/system/*; do @@ -103,7 +113,7 @@ stdenv.mkDerivation rec { homepage = https://cups.org/; description = "A standards-based printing system for UNIX"; license = licenses.gpl2; # actually LGPL for the library and GPL for the rest - maintainers = with maintainers; [ urkud jgeerds ]; - platforms = platforms.linux; + maintainers = with maintainers; [ jgeerds ]; + platforms = platforms.unix; }; } diff --git a/pkgs/misc/cups/drivers/dymo/default.nix b/pkgs/misc/cups/drivers/dymo/default.nix index b2801c7ae67..9c187a8f378 100644 --- a/pkgs/misc/cups/drivers/dymo/default.nix +++ b/pkgs/misc/cups/drivers/dymo/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ cups ]; + patches = [ ./fix-includes.patch ]; + makeFlags = [ "cupsfilterdir=$(out)/lib/cups/filter" "cupsmodeldir=$(out)/share/cups/model" ]; meta = { diff --git a/pkgs/misc/cups/drivers/dymo/fix-includes.patch b/pkgs/misc/cups/drivers/dymo/fix-includes.patch new file mode 100644 index 00000000000..fa7df5591dd --- /dev/null +++ b/pkgs/misc/cups/drivers/dymo/fix-includes.patch @@ -0,0 +1,67 @@ +diff -rp dymo-cups-drivers-1.4.0.5/src/common/CupsFilter.h dymo-cups-drivers-1.4.0.5-fix/src/common/CupsFilter.h +*** dymo-cups-drivers-1.4.0.5/src/common/CupsFilter.h 2012-02-07 14:22:37.000000000 +0100 +--- dymo-cups-drivers-1.4.0.5-fix/src/common/CupsFilter.h 2017-03-27 23:10:17.638976126 +0200 +*************** +*** 22,29 **** +--- 22,31 ---- + #define hfc4bbdea_8a1b_427c_9ab5_50b84576b19e + + #include ++ #include + #include + #include ++ #include + #include + #include "CupsPrintEnvironment.h" + #include "ErrorDiffusionHalftoning.h" +diff -rp dymo-cups-drivers-1.4.0.5/src/common/CupsPrintEnvironment.h dymo-cups-drivers-1.4.0.5-fix/src/common/CupsPrintEnvironment.h +*** dymo-cups-drivers-1.4.0.5/src/common/CupsPrintEnvironment.h 2012-02-07 14:22:37.000000000 +0100 +--- dymo-cups-drivers-1.4.0.5-fix/src/common/CupsPrintEnvironment.h 2017-03-27 23:10:17.638976126 +0200 +*************** +*** 22,27 **** +--- 22,28 ---- + #define h952b1c81_8931_433a_8479_7ae6d8e85a86 + + #include "PrinterDriver.h" ++ #include + + namespace DymoPrinterDriver + { +diff -rp dymo-cups-drivers-1.4.0.5/src/lm/CupsFilterLabelManager.h dymo-cups-drivers-1.4.0.5-fix/src/lm/CupsFilterLabelManager.h +*** dymo-cups-drivers-1.4.0.5/src/lm/CupsFilterLabelManager.h 2012-02-07 14:22:38.000000000 +0100 +--- dymo-cups-drivers-1.4.0.5-fix/src/lm/CupsFilterLabelManager.h 2017-03-27 23:10:17.635976126 +0200 +*************** +*** 22,27 **** +--- 22,28 ---- + #define he780684b_6efc_428d_bfdb_c5422b1ed982 + + #include ++ #include + #include + #include "LabelManagerDriver.h" + #include "LabelManagerLanguageMonitor.h" +*************** public: +*** 50,53 **** + + /* + * End of "$Id: CupsFilterLabelManager.h 14880 2011-03-31 16:29:05Z aleksandr $". +! */ +\ No newline at end of file +--- 51,54 ---- + + /* + * End of "$Id: CupsFilterLabelManager.h 14880 2011-03-31 16:29:05Z aleksandr $". +! */ +diff -rp dymo-cups-drivers-1.4.0.5/src/lw/CupsFilterLabelWriter.h dymo-cups-drivers-1.4.0.5-fix/src/lw/CupsFilterLabelWriter.h +*** dymo-cups-drivers-1.4.0.5/src/lw/CupsFilterLabelWriter.h 2012-02-07 14:22:37.000000000 +0100 +--- dymo-cups-drivers-1.4.0.5-fix/src/lw/CupsFilterLabelWriter.h 2017-03-27 23:10:17.632976126 +0200 +*************** +*** 22,27 **** +--- 22,28 ---- + #define hd8574b83_b264_47b2_8d33_a46ae75691d2 + + #include ++ #include + #include + #include "LabelWriterDriver.h" + #include "LabelWriterLanguageMonitor.h" diff --git a/pkgs/misc/cups/drivers/estudio/default.nix b/pkgs/misc/cups/drivers/estudio/default.nix new file mode 100644 index 00000000000..6f9e4579a14 --- /dev/null +++ b/pkgs/misc/cups/drivers/estudio/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation { + name = "cups-toshiba-estudio"; + version = "7.51"; + + src = fetchurl { + url = http://business.toshiba.com/downloads/KB/f1Ulds/14079/TOSHIBA_ColorMFP_CUPS.tar; + sha256 = "3741bb79723495da5cb5a3971ae8c6042b6c71a6264af8f25aecf721f1f0752f"; + }; + + buildInputs = [ perl ]; + + phases = [ "unpackPhase" + "patchPhase" + "installPhase" ]; + + patchPhase = '' + patchShebangs lib/ + gunzip share/cups/model/Toshiba/TOSHIBA_ColorMFP_CUPS.gz + sed -i "s+/usr+$out+" share/cups/model/Toshiba/TOSHIBA_ColorMFP_CUPS + gzip share/cups/model/Toshiba/TOSHIBA_ColorMFP_CUPS + ''; + + installPhase = '' + mkdir -p $out/lib/cups/filter + mkdir -p $out/share/cups/model/Toshiba + cp {.,$out}/lib/cups/filter/est6550_Authentication + chmod 755 $out/lib/cups/filter/est6550_Authentication + cp {.,$out}/share/cups/model/Toshiba/TOSHIBA_ColorMFP_CUPS.gz + chmod 755 $out/share/cups/model/Toshiba/TOSHIBA_ColorMFP_CUPS.gz + ''; + + meta = with stdenv.lib; { + description = "Printer only driver for the Toshiba e-STUDIO class of printers"; + longDescription = '' + This driver supports the following printers: TOSHIBA e-STUDIO2000AC, + TOSHIBA e-STUDIO2005AC, TOSHIBA e-STUDIO2040C, TOSHIBA e-STUDIO2050C, + TOSHIBA e-STUDIO2055C, TOSHIBA e-STUDIO2500AC, TOSHIBA e-STUDIO2505AC, + TOSHIBA e-STUDIO2540C, TOSHIBA e-STUDIO2550C, TOSHIBA e-STUDIO2555C, + TOSHIBA e-STUDIO287CS, TOSHIBA e-STUDIO3005AC, TOSHIBA e-STUDIO3040C, + TOSHIBA e-STUDIO3055C, TOSHIBA e-STUDIO347CS, TOSHIBA e-STUDIO3505AC, + TOSHIBA e-STUDIO3540C, TOSHIBA e-STUDIO3555C, TOSHIBA e-STUDIO407CS, + TOSHIBA e-STUDIO4505AC, TOSHIBA e-STUDIO4540C, TOSHIBA e-STUDIO4555C, + TOSHIBA e-STUDIO5005AC, TOSHIBA e-STUDIO5055C, TOSHIBA e-STUDIO5506AC, + TOSHIBA e-STUDIO5540C, TOSHIBA e-STUDIO5560C, TOSHIBA e-STUDIO6506AC, + TOSHIBA e-STUDIO6540C, TOSHIBA e-STUDIO6550C, TOSHIBA e-STUDIO6560C, + TOSHIBA e-STUDIO6570C and TOSHIBA e-STUDIO7506AC. + ''; + homepage = https://www.toshiba-business.com.au/support/drivers; + license = licenses.unfree; + maintainers = [ maintainers.jpotier ]; + }; +} diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/misc/drivers/foo2zjs/default.nix index 36b580bb16d..14ceb405d68 100644 --- a/pkgs/misc/drivers/foo2zjs/default.nix +++ b/pkgs/misc/drivers/foo2zjs/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { description = "ZjStream printer drivers"; maintainers = with maintainers; [ - raskin urkud + raskin ]; platforms = platforms.linux; license = licenses.gpl2Plus; diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index c0a6c0a9baa..62f94ae6fc9 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -10,16 +10,16 @@ let name = "hplip-${version}"; - version = "3.16.5"; + version = "3.16.11"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "1nay65q1zmx2jxiwn66n7mlr73azacz5097gw98kqqf90dh522f6"; + sha256 = "094vkyr0rjng72m13dgr824cdl7q20x23qjxzih4w7l9njn0rqpn"; }; plugin = fetchurl { url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "15qrcd3ndnxri6pfdfmsjyv2f3zfkig80yghs76jbsm106rp8g3q"; + sha256 = "1y3wdax2wb6kdd8bi40wl7v9s8ffyjz95bz42sjcpzzddmlhcaxg"; }; hplipState = @@ -47,8 +47,9 @@ in assert withPlugin -> builtins.elem hplipArch pluginArches || throw "HPLIP plugin not supported on ${stdenv.system}"; -pythonPackages.mkPythonDerivation { +pythonPackages.buildPythonApplication { inherit name src; + format = "other"; buildInputs = [ libjpeg diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index 3f02304c0d4..611cc84325c 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -5,7 +5,7 @@ assert withGamepads -> (SDL != null); let - version = "1.1.0"; + version = "1.3"; fstat = x: fn: "-D" + fn + "=" + (if x then "ON" else "OFF"); in with stdenv.lib; @@ -14,14 +14,16 @@ stdenv.mkDerivation rec{ src = fetchgit { url = "https://github.com/hrydgard/ppsspp.git"; - rev = "8c8e5de89d52b8bcb968227d96cbf049d04d1241"; + rev = "refs/tags/v${version}"; fetchSubmodules = true; - sha256 = "1q21qskzni0nvz2yi2m17gjh4i9nrs2l4fm4y2dww9m29xpvzw3x"; + sha256 = "0l8vgdlw657r8gv7rz8iqa6zd9zrbzw10pwhcnahzil7w9qrd03g"; }; - buildInputs = [ zlib libpng pkgconfig qt4 qmake4Hook ] + buildInputs = [ zlib libpng qt4 ] ++ (if withGamepads then [ SDL ] else [ ]); + nativeBuildInputs = [ pkgconfig qmake4Hook ]; + qmakeFlags = [ "PPSSPPQt.pro" ]; preConfigure = "cd Qt"; @@ -31,7 +33,7 @@ stdenv.mkDerivation rec{ homepage = "http://www.ppsspp.org/"; description = "A PSP emulator, the Qt4 version"; license = licenses.gpl2Plus; - maintainers = [ maintainers.fuuzetsu maintainers.AndersonTorres ]; + maintainers = with maintainers; [ fuuzetsu AndersonTorres ]; platforms = platforms.linux ++ platforms.darwin ++ platforms.cygwin; }; } diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index e8409a631c3..4419d8025a8 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -31,23 +31,23 @@ in rec { }; unstable = fetchurl rec { - version = "2.1"; + version = "2.4"; url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz"; - sha256 = "0vhykmypv8zqdma7nfwv40klwaywcslam6cmipr3vjci6vvapfdz"; + sha256 = "13klfadvd44zdfrzh38al99s53i02x3mlhcj5z7fq7vqwh3xzdc7"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "1r3mpdyhq3nmbqgj99bgrhx202k5c046bl8fhi5hr1x0adybb9hs"; + sha256 = "052s4y7d8lw2k0hk17zwz9bgbsl013g8953ad001y2kqjxwcnilh"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; }; winetricks = fetchFromGitHub rec { - version = "20170207"; - sha256 = "1zmx041rxxawkv3ifsdjbmshp654bib75n5hll0g1f205arbahzw"; + version = "20170316"; + sha256 = "193g3b6rfbxkxmq1y0rawrkrzb225ly71hprif3lv09gmi2bf95a"; owner = "Winetricks"; repo = "winetricks"; rev = version; diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix index aec498b899e..e13abb6fe2b 100644 --- a/pkgs/misc/emulators/wxmupen64plus/default.nix +++ b/pkgs/misc/emulators/wxmupen64plus/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { url = "https://bitbucket.org/auria/wxmupen64plus/get/0.3.tar.bz2"; sha256 = "1mnxi4k011dd300k35li2p6x4wccwi6im21qz8dkznnz397ps67c"; }; - + buildInputs = [ python wxGTK29 SDL libX11 mesa ]; configurePhase = '' @@ -19,10 +19,11 @@ stdenv.mkDerivation { buildPhase = "python waf"; installPhase = "python waf install"; - + meta = { description = "GUI for the Mupen64Plus 2.0 emulator"; license = stdenv.lib.licenses.gpl2Plus; homepage = https://bitbucket.org/auria/wxmupen64plus/wiki/Home; + broken = true; }; } diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix index 02f93eb931d..ae94c3de41b 100644 --- a/pkgs/misc/emulators/zsnes/default.nix +++ b/pkgs/misc/emulators/zsnes/default.nix @@ -57,6 +57,6 @@ in stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; homepage = http://www.zsnes.com; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/freestyle/default.nix b/pkgs/misc/freestyle/default.nix index 231b8eabb07..6d022220794 100644 --- a/pkgs/misc/freestyle/default.nix +++ b/pkgs/misc/freestyle/default.nix @@ -45,9 +45,10 @@ stdenv.mkDerivation { installPhase = ":"; - meta = { + meta = { description = "Non-Photorealistic Line Drawing rendering from 3D scenes"; homepage = http://freestyle.sourceforge.net; - license = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.gpl2; + broken = true; }; } diff --git a/pkgs/misc/logging/filebeat/default.nix b/pkgs/misc/logging/filebeat/default.nix new file mode 100644 index 00000000000..c33f34c6dc4 --- /dev/null +++ b/pkgs/misc/logging/filebeat/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "filebeat-${version}"; + version = "5.2.2"; + + src = fetchFromGitHub { + owner = "elastic"; + repo = "beats"; + rev = "v${version}"; + sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q"; + }; + + goPackagePath = "github.com/elastic/beats"; + + subPackages = [ "filebeat" ]; + + meta = with stdenv.lib; { + description = "Lightweight shipper for logfiles"; + homepage = https://www.elastic.co/products/beats; + license = licenses.asl20; + maintainers = [ maintainers.fadenb ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/logging/heartbeat/default.nix b/pkgs/misc/logging/heartbeat/default.nix new file mode 100644 index 00000000000..faa558589f2 --- /dev/null +++ b/pkgs/misc/logging/heartbeat/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "heartbeat-${version}"; + version = "5.2.2"; + + src = fetchFromGitHub { + owner = "elastic"; + repo = "beats"; + rev = "v${version}"; + sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q"; + }; + + goPackagePath = "github.com/elastic/beats"; + + subPackages = [ "heartbeat" ]; + + meta = with stdenv.lib; { + description = "Lightweight shipper for uptime monitoring"; + homepage = https://www.elastic.co/products/beats; + license = licenses.asl20; + maintainers = [ maintainers.fadenb ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/logging/metricbeat/default.nix b/pkgs/misc/logging/metricbeat/default.nix new file mode 100644 index 00000000000..fcb2376a93d --- /dev/null +++ b/pkgs/misc/logging/metricbeat/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "metricbeat-${version}"; + version = "5.2.2"; + + src = fetchFromGitHub { + owner = "elastic"; + repo = "beats"; + rev = "v${version}"; + sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q"; + }; + + goPackagePath = "github.com/elastic/beats"; + + subPackages = [ "metricbeat" ]; + + meta = with stdenv.lib; { + description = "Lightweight shipper for metrics"; + homepage = https://www.elastic.co/products/beats; + license = licenses.asl20; + maintainers = [ maintainers.fadenb ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/logging/packetbeat/default.nix b/pkgs/misc/logging/packetbeat/default.nix new file mode 100644 index 00000000000..d4445bec998 --- /dev/null +++ b/pkgs/misc/logging/packetbeat/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, buildGoPackage, libpcap }: + +buildGoPackage rec { + name = "packetbeat-${version}"; + version = "5.2.2"; + + src = fetchFromGitHub { + owner = "elastic"; + repo = "beats"; + rev = "v${version}"; + sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q"; + }; + + goPackagePath = "github.com/elastic/beats"; + + subPackages = [ "packetbeat" ]; + + buildInputs = [ libpcap ]; + + meta = with stdenv.lib; { + description = "Network packet analyzer that ships data to Elasticsearch"; + longDescription = '' + Packetbeat is an open source network packet analyzer that ships the + data to Elasticsearch. + + Think of it like a distributed real-time Wireshark with a lot more + analytics features. The Packetbeat shippers sniff the traffic between + your application processes, parse on the fly protocols like HTTP, MySQL, + PostgreSQL, Redis or Thrift and correlate the messages into transactions. + ''; + homepage = https://www.elastic.co/products/beats; + license = licenses.asl20; + maintainers = [ maintainers.fadenb ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/mxt-app/default.nix b/pkgs/misc/mxt-app/default.nix index 2873225b26f..735e73d5d49 100644 --- a/pkgs/misc/mxt-app/default.nix +++ b/pkgs/misc/mxt-app/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool }: +{ stdenv, fetchFromGitHub, autoreconfHook, libtool }: stdenv.mkDerivation rec{ - version="1.26"; + version="1.27"; name = "mxt-app-${version}"; src = fetchFromGitHub { owner = "atmel-maxtouch"; repo = "mxt-app"; rev = "v${version}"; - sha256 = "07afdgh8pnhgh2372cf5pqy6p7l6w3ing2hwnvz6db8wxw59n48h"; + sha256 = "0m1qxsdkwgajyd0sdw909l4w31csa26nw0xzr9ldddnvzb1va05h"; }; - buildInputs = [ autoconf automake libtool ]; - preConfigure = "./autogen.sh"; - + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libtool ]; + hardeningDisable = [ "fortify" ]; meta = with stdenv.lib; { diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index ceb0d0a6c44..427338db8d7 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { - name = "xlockmore-5.50"; + name = "xlockmore-5.51"; src = fetchurl { url = "http://sillycycle.com/xlock/${name}.tar.xz"; - sha256 = "0a9sargn36b5lxil777p35z8m5jr744h9xmc021057aq8kgp4pv3"; + sha256 = "13b088pp75c071ycas37d51jcnb5zk6g87xjxi92x2awirqqw4a7"; curlOpts = "--user-agent 'Mozilla/5.0'"; }; diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 276c311fa45..cd437bfe452 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.jwz.org/xscreensaver/"; description = "A set of screensavers"; - maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; + maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = with stdenv.lib.platforms; allBut cygwin; inherit version; downloadPage = "http://www.jwz.org/xscreensaver/download.html"; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index f0ec5f483d4..d2fadad8852 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -10,17 +10,21 @@ let stdenv.mkDerivation (rec { name = "uboot-${defconfig}-${version}"; - version = "2017.01"; + version = "2017.03"; src = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"; - sha256 = "1wpc51jm3zyibgcr78jng2yksqvrya76bxgsr4pcyjrsz5sm2hkc"; + sha256 = "0gqihplap05dlpwdb971wsqyv01nz2vabwq5g5649gr5jczsyjzm"; }; nativeBuildInputs = [ bc dtc python2 ]; hardeningDisable = [ "all" ]; + postPatch = '' + patchShebangs tools + ''; + configurePhase = '' make ${defconfig} ''; @@ -83,6 +87,12 @@ in rec { filesToInstall = ["u-boot" "u-boot.dtb" "u-boot-dtb-tegra.bin" "u-boot-nodtb-tegra.bin"]; }; + ubootOdroidXU3 = buildUBoot rec { + defconfig = "odroid-xu3_defconfig"; + targetPlatforms = ["armv7l-linux"]; + filesToInstall = ["u-boot-dtb.bin"]; + }; + ubootPcduino3Nano = buildUBoot rec { defconfig = "Linksprite_pcDuino3_Nano_defconfig"; targetPlatforms = ["armv7l-linux"]; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index a0d04638504..90559742057 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -647,11 +647,11 @@ rec { }; vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-elixir-2017-02-21"; + name = "vim-elixir-2017-03-29"; src = fetchgit { url = "https://github.com/elixir-lang/vim-elixir"; - rev = "9524e66ee03a36ef1d5913c7f42c3dd9b235146e"; - sha256 = "0n7v2kfzqifm527pbh8d08xmdzj8rmbhnnvs22hyxv2ij06lzzn2"; + rev = "9482415ab27fddf8125524f54d9e500bb9541756"; + sha256 = "1layanqayf2arg8cvpsx768p544znwsvwispnk01d0c73d2p5llq"; }; dependencies = []; @@ -702,11 +702,11 @@ rec { }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2017-02-19"; + name = "vim-go-1.12"; src = fetchgit { url = "https://github.com/fatih/vim-go"; - rev = "b9c81562630e9dfc098d25814c16bedcfcf9ffa9"; - sha256 = "0r5r4laqd4jwqc14lkjyccz3ijjzz366r0zgqw5cybspnf622f9a"; + rev = "26362e4bfcd7601da5b8fcf0041744962766ef0c"; + sha256 = "19073xxam34vkwdsrqv170f6f6vc9yy8m4034r1l8m9lf67zqla9"; }; dependencies = []; @@ -1528,11 +1528,11 @@ rec { }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2017-02-27"; + name = "youcompleteme-2017-03-28"; src = fetchgit { url = "https://github.com/valloric/youcompleteme"; - rev = "39659caf34c664c7419cadb41cb813158e0749fa"; - sha256 = "0rl8fxcwcj61bj8b2qcnwfipcnf1nb47bvb52sv68sf9v78qa7sx"; + rev = "03ba8a80cd04e2e051bb85eacaea802ca3c4d025"; + sha256 = "1f44bxl4phk79p4n19p0qx5506hkhms77zi4x0sh0gh389xwxmv5"; }; dependencies = []; buildPhase = '' diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 22098b68a55..87b2f9d3e18 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -412,11 +412,16 @@ rec { } // a); requiredPlugins = { - knownPlugins ? vimPlugins, + givenKnownPlugins ? null, vam ? null, pathogen ? null, ... }: let + # This is probably overcomplicated, but I don't understand this well enough to know what's necessary. + knownPlugins = if givenKnownPlugins != null then givenKnownPlugins else + if vam != null && vam ? knownPlugins then vam.knownPlugins else + if pathogen != null && pathogen ? knownPlugins then pathogen.knownPlugins else + vimPlugins; pathogenNames = map (name: knownPlugins.${name}) (findDependenciesRecursively { inherit knownPlugins; names = pathogen.pluginNames; }); vamNames = findDependenciesRecursively { inherit knownPlugins; names = lib.concatMap toNames vam.pluginDictionaries; }; names = (lib.optionals (pathogen != null) pathogenNames) ++ diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 536e62f777e..73126ce1f5c 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -157,6 +157,7 @@ in rec { mkdir -p $out/include pushd $out/include >/dev/null ln -s "${sdk}/include/xpc" + ln -s "${sdk}/include/launch.h" popd >/dev/null ''; }; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libauto/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libauto/default.nix index 2003bb6e55e..7d6ab403a47 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libauto/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libauto/default.nix @@ -13,7 +13,8 @@ appleDerivation { --replace "#include " ''$'#include \nstatic void msgtracer_log_with_keys(...) { };' substituteInPlace Definitions.h \ - --replace "#include " "" + --replace "#include " "" \ + --replace 'void * const, void * const' 'void * const, void *' # getspecific_direct is more efficient, but this should be equivalent... substituteInPlace Zone.h \ diff --git a/pkgs/os-specific/darwin/command-line-tools/default.nix b/pkgs/os-specific/darwin/command-line-tools/default.nix deleted file mode 100644 index 2d1eb7b6b3c..00000000000 --- a/pkgs/os-specific/darwin/command-line-tools/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, fetchurl, xar, gzip, cpio }: - -let - pkg = { name, sha256 }: stdenv.mkDerivation { - inherit name; - - src = fetchurl { - # Magic url found in: - # https://swscan.apple.com/content/catalogs/others/index-10.9-1.sucatalog - url = "http://swcdn.apple.com/content/downloads/27/02/031-06182/xxog8vxu8i6af781ivf4uhy6yt1lslex34/${name}.pkg"; - inherit sha256; - }; - - buildInputs = [ xar gzip cpio ]; - - phases = [ "unpackPhase" "installPhase" ]; - - unpackPhase = '' - xar -x -f $src - ''; - - installPhase = '' - start="$(pwd)" - mkdir -p $out - cd $out - cat $start/Payload | gzip -d | cpio -idm - ''; - - meta = with stdenv.lib; { - description = "Apple developer tools ${name}"; - maintainers = with maintainers; [ copumpkin ]; - platforms = platforms.darwin; - }; - }; -in rec { - tools = pkg { - name = "CLTools_Executables_OSX109"; - sha256 = "1cjdnnjny6h0dc1cc994pgrkmsa5cvk7pi5dpkxyslyicwf260fx"; - }; - - sdk = pkg { - name = "DevSDK_OSX109"; - sha256 = "16b7aplha5573yl1d44nl2yxzp0w2hafihbyh7930wrcvba69iy4"; - }; -} diff --git a/pkgs/os-specific/darwin/khd/default.nix b/pkgs/os-specific/darwin/khd/default.nix index 0768f5a12e0..8a2f4f46e03 100644 --- a/pkgs/os-specific/darwin/khd/default.nix +++ b/pkgs/os-specific/darwin/khd/default.nix @@ -13,11 +13,6 @@ stdenv.mkDerivation rec { buildInputs = [ Carbon Cocoa ]; - prePatch = '' - substituteInPlace makefile \ - --replace g++ clang++ - ''; - buildPhase = '' make install ''; diff --git a/pkgs/os-specific/darwin/osx-sdk/default.nix b/pkgs/os-specific/darwin/osx-sdk/default.nix deleted file mode 100644 index 235eadfd255..00000000000 --- a/pkgs/os-specific/darwin/osx-sdk/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv }: - -let - version = "10.9"; -in stdenv.mkDerivation rec { - name = "MacOSX10.9.sdk"; - - src = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk"; - - unpackPhase = "true"; - dontBuild = true; - - installPhase = '' - mkdir -p $out/Developer/SDKs/ - echo "Source is: $src" - cp -r $src $out/Developer/SDKs/ - ''; - - meta = with stdenv.lib; { - description = "The Mac OS ${version} SDK"; - maintainers = with maintainers; [ copumpkin ]; - platforms = platforms.darwin; - license = licenses.unfree; - }; -} diff --git a/pkgs/os-specific/linux/915resolution/default.nix b/pkgs/os-specific/linux/915resolution/default.nix index 9bcfcf392f4..d1cb7221615 100644 --- a/pkgs/os-specific/linux/915resolution/default.nix +++ b/pkgs/os-specific/linux/915resolution/default.nix @@ -1,15 +1,19 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "915resolution-0.5.2"; +stdenv.mkDerivation rec { + name = "915resolution-0.5.3"; + src = fetchurl { - url = http://www.geocities.com/stomljen/915resolution-0.5.2.tar.gz; - sha256 = "1m5nfzgwaglqabpm2l2mjqvigz1z0dj87cmj2pjbbzxmmpapv0lq"; + url = "http://915resolution.mango-lang.org/${name}.tar.gz"; + sha256 = "0hmmy4kkz3x6yigz6hk99416ybznd67dpjaxap50nhay9f1snk5n"; }; - buildPhase = "rm *.o 915resolution; make"; + + patchPhase = "rm *.o"; installPhase = "mkdir -p $out/sbin; cp 915resolution $out/sbin/"; - meta = { - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + homepage = http://915resolution.mango-lang.org/; + description = "A tool to modify Intel 800/900 video BIOS"; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index 6185e22fb87..9149f6da033 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -73,6 +73,10 @@ stdenv.mkDerivation rec { mkdir $out/sbin ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd ln -s ../libexec/bluetooth/obexd $out/sbin/obexd + + # Add extra configuration + mkdir $out/etc/bluetooth + ln -s /etc/bluetooth/main.conf $out/etc/bluetooth/main.conf ''; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix index ac6117cd599..5e63524e7dc 100644 --- a/pkgs/os-specific/linux/crda/default.nix +++ b/pkgs/os-specific/linux/crda/default.nix @@ -40,7 +40,13 @@ stdenv.mkDerivation rec { longDescription = '' CRDA acts as the udev helper for communication between the kernel and userspace for regulatory compliance. It relies on nl80211 for communication. + CRDA is intended to be run only through udev communication from the kernel. + To use it under NixOS, add + + services.udev.packages = [ pkgs.crda ]; + + to the system configuration. ''; homepage = http://drvbp1.linux-foundation.org/~mcgrof/rel-html/crda/; license = licenses.free; # "copyleft-next 0.3.0", as yet without a web site diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix index 60615fb1e5b..ead0d41ab8d 100644 --- a/pkgs/os-specific/linux/drbd/default.nix +++ b/pkgs/os-specific/linux/drbd/default.nix @@ -19,17 +19,17 @@ stdenv.mkDerivation rec { preConfigure = '' export PATH=${systemd.udev.bin}/sbin:$PATH - substituteInPlace user/Makefile.in --replace /sbin/ $out/sbin/ + substituteInPlace user/Makefile.in \ + --replace /sbin '$(sbindir)' substituteInPlace user/legacy/Makefile.in \ - --replace /sbin/ $out/sbin/ \ - --replace '$(DESTDIR)/lib/drbd' $out/lib/drbd + --replace '$(DESTDIR)/lib/drbd' '$(DESTDIR)$(LIBDIR)' substituteInPlace user/drbdadm_usage_cnt.c --replace /lib/drbd $out/lib/drbd substituteInPlace scripts/drbd.rules --replace /sbin/drbdadm $out/sbin/drbdadm ''; makeFlags = "SHELL=${stdenv.shell}"; - installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc INITDIR=$(out)/etc/init.d DESTDIR=$(out)"; + installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc INITDIR=$(out)/etc/init.d"; meta = { homepage = http://www.drbd.org/; diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix index ccedc381504..366cc9787f2 100644 --- a/pkgs/os-specific/linux/dstat/default.nix +++ b/pkgs/os-specific/linux/dstat/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, python2Packages }: -python2Packages.mkPythonDerivation rec { +python2Packages.buildPythonApplication rec { name = "dstat-${version}"; + format = "other"; version = "0.7.3"; src = fetchurl { diff --git a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix new file mode 100644 index 00000000000..d8d4c37fd88 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub }: +with stdenv.lib; +stdenv.mkDerivation { + name = "rtl8192su-unstable-2016-10-05"; + + src = fetchFromGitHub { + owner = "chunkeey"; + repo = "rtl8192su"; + rev = "c00112c9a14133290fe30bd3b44e45196994cb1c"; + sha256 = "0j3c35paapq1icmxq0mg7pm2xa2m69q7bkfmwgq99d682yr2cb5l"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + for i in rtl8192sfw.bin \ + rtl8192sufw-ap.bin \ + rtl8192sufw-apple.bin \ + rtl8192sufw-windows.bin \ + rtl8712u-linux-firmware-bad.bin \ + rtl8712u-most-recent-v2.6.6-bad.bin \ + rtl8712u-most-recent-v2.6.6-bad.bin \ + rtl8712u-oldest-but-good.bin; + do + install -D -pm644 firmwares/$i $out/lib/firmware/rtlwifi/$i + done + ''; + + meta = with stdenv.lib; { + description = "Firmware for Realtek RTL8188SU/RTL8191SU/RTL8192SU"; + homepage = https://github.com/chunkeey/rtl8192su; + license = licenses.unfreeRedistributableFirmware; + maintainers = with maintainers; [ mic92 ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix index 538d8d4ab83..ab40099fc2c 100644 --- a/pkgs/os-specific/linux/hdparm/default.nix +++ b/pkgs/os-specific/linux/hdparm/default.nix @@ -1,22 +1,24 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hdparm-9.48"; + name = "hdparm-9.51"; src = fetchurl { url = "mirror://sourceforge/hdparm/${name}.tar.gz"; - sha256 = "1vpvlkrksfwx8lxq1p1nk3ddyzgrwy3rgxpn9kslchdh3jkv95yf"; + sha256 = "14ax5lyzhigx58ing7adbfyzisv0fqajbmzphg149rnb3s4xiyhs"; + }; preBuild = '' makeFlagsArray=(sbindir=$out/sbin manprefix=$out) - ''; + ''; - meta = { + meta = with stdenv.lib; { description = "A tool to get/set ATA/SATA drive parameters under Linux"; homepage = http://sourceforge.net/projects/hdparm/; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.bsd2; - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + platforms = platforms.linux; + license = licenses.bsd2; + maintainers = [ maintainers.fuuzetsu ]; }; + } diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix index 260bf412062..824bc3f9a18 100644 --- a/pkgs/os-specific/linux/jool/default.nix +++ b/pkgs/os-specific/linux/jool/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip, kernel }: -assert stdenv.lib.versionOlder kernel.version "4.10"; +assert stdenv.lib.versionOlder kernel.version "4.11"; let sourceAttrs = (import ./source.nix) { inherit fetchzip; }; diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix index ee47ee11855..2de2aeeff8f 100644 --- a/pkgs/os-specific/linux/jool/source.nix +++ b/pkgs/os-specific/linux/jool/source.nix @@ -1,9 +1,9 @@ { fetchzip }: rec { - version = "3.5.2"; + version = "3.5.3"; src = fetchzip { url = "https://github.com/NICMx/releases/raw/master/Jool/Jool-${version}.zip"; - sha256 = "0gmjdi50c9wfapikniy2i1cfhz124pp7q02a0vbwxw7f21llcv8x"; + sha256 = "1dh8qcb3grjpsk7j5d8p5dncrh4fljkrfd9b8sxd2c3kirczckmp"; }; } diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index c02b8209f2f..09e4d9e1ecd 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -33,7 +33,6 @@ with stdenv.lib; DEBUG_KERNEL y DYNAMIC_DEBUG y BACKTRACE_SELF_TEST n - CPU_NOTIFIER_ERROR_INJECT? n DEBUG_DEVRES n DEBUG_STACK_USAGE n DEBUG_STACKOVERFLOW n @@ -41,6 +40,10 @@ with stdenv.lib; SCHEDSTATS n DETECT_HUNG_TASK y + ${optionalString (versionOlder version "4.10") '' + CPU_NOTIFIER_ERROR_INJECT? n + ''} + ${optionalString (versionOlder version "4.11") '' TIMER_STATS y DEBUG_NX_TEST n @@ -308,7 +311,9 @@ with stdenv.lib; NLS_ISO8859_1 m # VFAT default for the iocharset= mount option # Runtime security tests - DEBUG_SET_MODULE_RONX? y # Detect writes to read-only module pages + ${optionalString (versionOlder version "4.11") '' + DEBUG_SET_MODULE_RONX? y # Detect writes to read-only module pages + ''} # Security related features. RANDOMIZE_BASE? y @@ -456,7 +461,11 @@ with stdenv.lib; FTRACE_SYSCALLS y SCHED_TRACER y STACK_TRACER y - UPROBE_EVENT? y + + ${optionalString (versionOlder version "4.11") '' + UPROBE_EVENT? y + ''} + ${optionalString (versionAtLeast version "4.4") '' BPF_SYSCALL y BPF_EVENTS y diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix deleted file mode 100644 index f82eb073de9..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, perl, buildLinux, ... } @ args: - -import ./generic.nix (args // rec { - version = "3.12.71"; - extraMeta.branch = "3.12"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "11wmrj2zqb3x2az22q7ggdp6ibhqmlngy7v01fm8vrhz7f6lwf87"; - }; - - kernelPatches = args.kernelPatches; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.netfilterRPFilter = true; -}) diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix deleted file mode 100644 index 30c5ce7e569..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-4.1.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, perl, buildLinux, ... } @ args: - -import ./generic.nix (args // rec { - version = "4.1.39"; - extraMeta.branch = "4.1"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0m48slb13ipnjnw4inhyb74xxpla94344wbc2y5lzb402n5jrs58"; - }; - - kernelPatches = args.kernelPatches; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.netfilterRPFilter = true; -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.10.nix b/pkgs/os-specific/linux/kernel/linux-4.10.nix index 13052bf8913..a4fa8f65c39 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.10.3"; + version = "4.10.8"; extraMeta.branch = "4.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1m18hlcimxj42lbg7mc9lh3hmmwpyk6y2c92xf0svmlfpzv6ah8r"; + sha256 = "12wf3nzhs0hbl87ckwc15b492z50lg4c7rxwqw50px3zhh5mvf8a"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 7a606045603..da633753e70 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.54"; + version = "4.4.59"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0h2b0zv7dfa8nica7cxf2ysiqdva0bb2pmhi0kz4gyhvp2cm3rjk"; + sha256 = "1jlnm6msxdhm7l6all91rd1rkqsqpd0rblbdl68z7nkz9hy55sb4"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index f024099b828..e8facc96ebc 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.16"; + version = "4.9.20"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1r5spbinz8g3iclm9039cddaamj8q5vy455nnr3pvrmxbj8l9d23"; + sha256 = "0h8km3z5c3qyhwq24dvh00j2jzfcyqdjjcjrrz5qvyrjvl30hrj8"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index d3874e9f929..b32dfbc4b35 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.16"; + version = "4.9.20"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha512 = "3fhzfdiziad5blzcqfbrxjphcygmhd7jzrricpkn7mvg069csrq0yvlbsxksqii0ahk77wzs1nmkfx138y21v4745dk6rf0438jv7md"; + sha512 = "3israf7zhq92wi0py8y299f7cz6z6xr0y4i5b1xvb46ljyx39jwrrdjrf5nxngz6c1641l9qalwzg5r15pp4gqyr09ilmwn8i7kbqwi"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index b9f5d152bf6..f56b1df6184 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.11-rc2"; - modDirVersion = "4.11.0-rc2"; + version = "4.11-rc5"; + modDirVersion = "4.11.0-rc5"; extraMeta.branch = "4.11"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "1rfdnx7klrb8z9372ydmrsw6bk3i6xqa0am3vjqy75mjp54063vx"; + sha256 = "0qmb8sssh4f4zhvasy20k30r8cwc03qm5ql3b25cj16cn3frp0q7"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index e07a89fc1e6..55162e54f4d 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -146,17 +146,12 @@ let unlink $out/lib/modules/${modDirVersion}/build unlink $out/lib/modules/${modDirVersion}/source - mkdir -p $dev/lib/modules/${modDirVersion} - cd .. - mv $sourceRoot $dev/lib/modules/${modDirVersion}/source + mkdir -p $dev/lib/modules/${modDirVersion}/build + cp -dpR ../$sourceRoot $dev/lib/modules/${modDirVersion}/source cd $dev/lib/modules/${modDirVersion}/source - mv $buildRoot/.config $buildRoot/Module.symvers $TMPDIR - rm -fR $buildRoot - mkdir $buildRoot - mv $TMPDIR/.config $TMPDIR/Module.symvers $buildRoot - make modules_prepare $makeFlags "''${makeFlagsArray[@]}" - mv $buildRoot $dev/lib/modules/${modDirVersion}/build + cp $buildRoot/{.config,Module.symvers} $dev/lib/modules/${modDirVersion}/build + make modules_prepare $makeFlags "''${makeFlagsArray[@]}" O=$dev/lib/modules/${modDirVersion}/build # !!! No documentation on how much of the source tree must be kept # If/when kernel builds fail due to missing files, you can add @@ -164,7 +159,7 @@ let # from drivers/ in the future; it adds 50M to keep all of its # headers on 3.10 though. - chmod +w -R ../source + chmod u+w -R ../source arch=`cd $dev/lib/modules/${modDirVersion}/build/arch; ls` # Remove unusued arches @@ -177,14 +172,14 @@ let rm -fR drivers # Keep all headers - find . -type f -name '*.h' -print0 | xargs -0 chmod -w + find . -type f -name '*.h' -print0 | xargs -0 chmod u-w # Keep root and arch-specific Makefiles - chmod -w Makefile - chmod -w arch/$arch/Makefile* + chmod u-w Makefile + chmod u-w arch/$arch/Makefile* # Keep whole scripts dir - chmod -w -R scripts + chmod u-w -R scripts # Delete everything not kept find . -type f -perm -u=w -print0 | xargs -0 rm diff --git a/pkgs/os-specific/linux/kernel/p9-fixes.patch b/pkgs/os-specific/linux/kernel/p9-fixes.patch new file mode 100644 index 00000000000..f6061b60667 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/p9-fixes.patch @@ -0,0 +1,85 @@ +diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c +--- a/fs/9p/vfs_inode.c ++++ b/fs/9p/vfs_inode.c +@@ -483,6 +483,9 @@ static int v9fs_test_inode(struct inode *inode, void *data) + + if (v9inode->qid.type != st->qid.type) + return 0; ++ ++ if (v9inode->qid.path != st->qid.path) ++ return 0; + return 1; + } + +diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c +--- a/fs/9p/vfs_inode_dotl.c ++++ b/fs/9p/vfs_inode_dotl.c +@@ -87,6 +87,9 @@ static int v9fs_test_inode_dotl(struct inode *inode, void *data) + + if (v9inode->qid.type != st->qid.type) + return 0; ++ ++ if (v9inode->qid.path != st->qid.path) ++ return 0; + return 1; + } + +diff --git a/net/9p/client.c b/net/9p/client.c +index 3ce672af1596..f1c8ad373f90 100644 +--- a/net/9p/client.c ++++ b/net/9p/client.c +@@ -749,8 +749,7 @@ p9_client_rpc(struct p9_client *c, int8_t type, const char *fmt, ...) + } + again: + /* Wait for the response */ +- err = wait_event_interruptible(*req->wq, +- req->status >= REQ_STATUS_RCVD); ++ err = wait_event_killable(*req->wq, req->status >= REQ_STATUS_RCVD); + + /* + * Make sure our req is coherent with regard to updates in other +diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c +index f24b25c25106..f3a4efcf1456 100644 +--- a/net/9p/trans_virtio.c ++++ b/net/9p/trans_virtio.c +@@ -286,8 +286,8 @@ p9_virtio_request(struct p9_client *client, struct p9_req_t *req) + if (err == -ENOSPC) { + chan->ring_bufs_avail = 0; + spin_unlock_irqrestore(&chan->lock, flags); +- err = wait_event_interruptible(*chan->vc_wq, +- chan->ring_bufs_avail); ++ err = wait_event_killable(*chan->vc_wq, ++ chan->ring_bufs_avail); + if (err == -ERESTARTSYS) + return err; + +@@ -327,7 +327,7 @@ static int p9_get_mapped_pages(struct virtio_chan *chan, + * Other zc request to finish here + */ + if (atomic_read(&vp_pinned) >= chan->p9_max_pages) { +- err = wait_event_interruptible(vp_wq, ++ err = wait_event_killable(vp_wq, + (atomic_read(&vp_pinned) < chan->p9_max_pages)); + if (err == -ERESTARTSYS) + return err; +@@ -471,8 +471,8 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req, + if (err == -ENOSPC) { + chan->ring_bufs_avail = 0; + spin_unlock_irqrestore(&chan->lock, flags); +- err = wait_event_interruptible(*chan->vc_wq, +- chan->ring_bufs_avail); ++ err = wait_event_killable(*chan->vc_wq, ++ chan->ring_bufs_avail); + if (err == -ERESTARTSYS) + goto err_out; + +@@ -489,8 +489,7 @@ p9_virtio_zc_request(struct p9_client *client, struct p9_req_t *req, + virtqueue_kick(chan->vq); + spin_unlock_irqrestore(&chan->lock, flags); + p9_debug(P9_DEBUG_TRANS, "virtio request kicked\n"); +- err = wait_event_interruptible(*req->wq, +- req->status >= REQ_STATUS_RCVD); ++ err = wait_event_killable(*req->wq, req->status >= REQ_STATUS_RCVD); + /* + * Non kernel buffers are pinned, unpin them + */ diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index aba4f54b526..d8676413e82 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -52,6 +52,11 @@ rec { patch = ./bridge-stp-helper.patch; }; + p9_fixes = + { name = "p9-fixes"; + patch = ./p9-fixes.patch; + }; + no_xsave = { name = "no-xsave"; patch = ./no-xsave.patch; @@ -95,9 +100,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.9.16"; - grrev = "201703180820"; - sha512 = "114yqjffxnf412ypaq91r732mi4im2qakj07g0nbqx1qyg319qag5ckc5438kcny3qhzb9wyrwr6mhza51cq7js40ps2aw7alwjfgql"; + { kver = "4.9.20"; + grrev = "201703310823"; + sha512 = "0pm3wmcip73imjjx13yar5l5bhpii45mjac5vb1snypmbwqmywmikiixqslq84i1yqw0c8pi822znkz7650dhxrmdmagy0yirwfdrhf"; }; # This patch relaxes grsec constraints on the location of usermode helpers, diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index c96d17b7a62..7137390ecab 100644 --- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -21,6 +21,7 @@ in stdenv.mkDerivation { done substituteInPlace "$out"/modprobe.conf \ + --replace "blacklist bochs-drm" "" \ --replace /sbin/lsmod /run/booted-system/sw/bin/lsmod \ --replace /sbin/rmmod /run/booted-system/sw/bin/rmmod \ --replace /sbin/modprobe /run/booted-system/sw/bin/modprobe \ diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix index 0b707ef7239..079bfb7c5be 100644 --- a/pkgs/os-specific/linux/kmscube/default.nix +++ b/pkgs/os-specific/linux/kmscube/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, libdrm, libX11, mesa_noglu, pkgconfig }: +{ stdenv, fetchgit, autoreconfHook, libdrm, libX11, mesa_noglu, pkgconfig }: stdenv.mkDerivation rec { - name = "kmscube-2016-09-19"; + name = "kmscube-2017-03-19"; - src = fetchFromGitHub { - owner = "robclark"; - repo = "kmscube"; - rev = "8c6a20901f95e1b465bbca127f9d47fcfb8762e6"; - sha256 = "045pf4q3g5b54cdbxppn1dxpcn81h630vmhrixz1d5bcl822nhwj"; + src = fetchgit { + url = git://anongit.freedesktop.org/mesa/kmscube; + rev = "b88a44d95eceaeebc5b9c6972ffcbfe9eca00aea"; + sha256 = "029ccslfavz6jllqv980sr6mj9bdbr0kx7bi21ra0q9yl2vh0yca"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index 4bf243c4f03..dc0dadf92e0 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit version; homepage = "http://www.infradead.org/~tgr/libnl/"; description = "Linux NetLink interface library"; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/msr-tools/default.nix b/pkgs/os-specific/linux/msr-tools/default.nix new file mode 100644 index 00000000000..128f3eac263 --- /dev/null +++ b/pkgs/os-specific/linux/msr-tools/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "msr-tools-${version}"; + version = "1.3"; + + src = fetchurl { + url = "https://01.org/sites/default/files/downloads/msr-tools/${name}.zip"; + sha256 = "07hxmddg0l31kjfmaq84ni142lbbvgq6391r8bd79wpm819pnigr"; + }; + + buildInputs = [ unzip ]; + + preInstall = '' + mkdir -p $out/bin + substituteInPlace Makefile \ + --replace /usr/sbin $out/bin + ''; + + meta = with stdenv.lib; { + description = "Tool to read/write from/to MSR CPU registers on Linux"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 24a2e2cf06f..99813d38236 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -78,7 +78,7 @@ installPhase() { fi # All libs except GUI-only are installed now, so fixup them. - for libname in `find "$out/lib/" -name '*.so.*'` `find "$bin/lib/" -name '*.so.*'` + for libname in `find "$out/lib/" -name '*.so.*'` `test -z "$bin" || find "$bin/lib/" -name '*.so.*'` do # I'm lazy to differentiate needed libs per-library, as the closure is the same. # Unfortunately --shrink-rpath would strip too much. diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index eb4d3ae224a..4573766b78b 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -43,7 +43,7 @@ let else throw "nvidia-x11 does not support platform ${stdenv.system}"; # patch to get the nvidia and nvidiaBeta driver to compile on kernel 4.10 - patches = if versionOlder version "375" + patches = if libsOnly || versionOlder version "375" then null else [ (fetchurl { url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel_4.10.patch?h=packages/nvidia; sha256 = "0zhpx3baq2pca2pmz1af5cp2nzjxjx0j9w5xrdy204mnv3v2708z"; diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index b1e24884557..9abb20a1c6a 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -7,12 +7,12 @@ with stdenv.lib; let _kernel = kernel; in stdenv.mkDerivation rec { - version = "2.5.0"; + version = "2.5.2"; name = "openvswitch-${version}"; src = fetchurl { url = "http://openvswitch.org/releases/${name}.tar.gz"; - sha256 = "08bgsqjjn2q5hvxsjqs7n3jir7k7291wlj3blsqhacjhmpxm9nil"; + sha256 = "0ifx758zl97dpad9vpd5i5dqj6i03k632mvgxs82hqkcsb3r6y7q"; }; kernel = optional (_kernel != null) _kernel.dev; diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index 956492ba747..5de0081a411 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "pax-utils-${version}"; @@ -9,15 +9,19 @@ stdenv.mkDerivation rec { sha512 = "26f7lqr1s2iywj8qfbf24sm18bl6f7cwsf77nxwwvgij1z88gvh6yx3gp65zap92l0xjdp8kwq9y96xld39p86zd9dmkm447czykbvb"; }; - makeFlags = [ - "PREFIX=$(out)" - ]; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - description = "A suite of tools for PaX/grsecurity"; - homepage = "https://dev.gentoo.org/~vapier/dist/"; - license = licenses.gpl2; - platforms = platforms.linux; + description = "ELF utils that can check files for security relevant properties"; + longDescription = '' + A suite of ELF tools to aid auditing systems. Contains + various ELF related utils for ELF32, ELF64 binaries useful + for displaying PaX and security info on a large groups of + binary files. + ''; + homepage = https://wiki.gentoo.org/wiki/Hardened/PaX_Utilities; + license = licenses.gpl2; + platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice joachifm ]; }; } diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix index c6065dbfca2..52d7446e48c 100644 --- a/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -2,7 +2,7 @@ let - version = "2.0.2.3"; + version = "2.2.0.0"; in stdenv.mkDerivation rec { @@ -10,12 +10,13 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://www.skarnet.org/software/s6-linux-utils/${name}.tar.gz"; - sha256 = "1hwc3dmqh4cyhx9b4gd48yvjrwmfkz968rncpqc511krpfwzyngr"; + sha256 = "1y9mva7wk1ca2djq3qjh7hz756zk57yv7ljdnldn7k7jzfmlaxsq"; }; dontDisableStatic = true; configureFlags = [ + "--enable-absolute-paths" "--includedir=\${prefix}/include" "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" "--with-include=${skalibs}/include" diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index db474f688e5..d1042723a71 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "nixos"; repo = "systemd"; - rev = "c110fc3504d7a2fa944575b347814f7e97d3c5a0"; - sha256 = "19carch1adad70nifbqdx649kj5m8pgpiq27hh05ig38yrbmb2vz"; + rev = "66e778e851440fde7f20cff0c24d23538144be8d"; + sha256 = "1valz8v2q4cj0ipz2b6mh5p0rjxpy3m88gg9xa2rcc4gcmscndzk"; }; outputs = [ "out" "lib" "man" "dev" ]; diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 11a9808392a..c0e065b3b55 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -1,54 +1,50 @@ -{ stdenv, fetchurl, pkgconfig -, libjpeg -, alsaLib ? null -, libX11 ? null -, qt4 ? null # The default is set to qt4 in all-packages.nix -, qt5 ? null +{ stdenv, lib, fetchurl, pkgconfig, perl, makeQtWrapper +, libjpeg, udev +, withUtils ? true +, withGUI ? true, alsaLib, libX11, qtbase, mesa_glu }: # See libv4l in all-packages.nix for the libs only (overrides alsa, libX11 & QT) -assert qt4 != null -> qt5 == null; -assert qt5 != null -> qt4 == null; - -let - inherit (stdenv.lib) optional; -in - stdenv.mkDerivation rec { - name = "v4l-utils-1.10.1"; + name = "v4l-utils-${version}"; + version = "1.12.3"; src = fetchurl { url = "http://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2"; - sha256 = "1h1nhg5cmmzlbipak526nk4bm6d0yb217mll75f3rpg7kz1cqiv1"; + sha256 = "0vpl3jl0x441y7b5cn7zhdsyi954hp9h2p30jhnr1zkx1rpxsiss"; }; outputs = [ "out" "dev" ]; - configureFlags = [ - "--enable-libv4l" - ] ++ (if (alsaLib != null && libX11 != null && (qt4 != null || qt5 != null)) then [ - "--with-udevdir=\${out}/lib/udev" - "--enable-v4l-utils" - "--enable-qv4l2" - ] else [ - "--without-libudev" - "--without-udevdir" - "--disable-v4l-utils" - "--disable-qv4l2" - ]); + configureFlags = + if withUtils then [ + "--with-udevdir=\${out}/lib/udev" + ] else [ + "--disable-v4l-utils" + ]; postFixup = '' # Create symlink for V4l1 compatibility ln -s "$dev/include/libv4l1-videodev.h" "$dev/include/videodev.h" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig perl ] ++ lib.optional (withUtils && withGUI) makeQtWrapper; - buildInputs = [ alsaLib libX11 qt4 qt5 ]; + buildInputs = [ udev ] ++ lib.optionals (withUtils && withGUI) [ alsaLib libX11 qtbase mesa_glu ]; propagatedBuildInputs = [ libjpeg ]; + NIX_CFLAGS_COMPILE = lib.optional (withUtils && withGUI) "-std=c++11"; + + postPatch = '' + patchShebangs . + ''; + + postInstall = lib.optionalString (withUtils && withGUI) '' + wrapQtProgram $out/bin/qv4l2 + ''; + meta = with stdenv.lib; { description = "V4L utils and libv4l, provide common image formats regardless of the v4l device"; homepage = http://linuxtv.org/projects.php; diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 59b9475160e..68966dd0399 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.18"; let name = "wireguard-${version}"; - version = "0.0.20170223"; + version = "0.0.20170324"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "6d2c8cd29c4f9fb404546a4749ec050739a26b4a49b5864f1dec531377c3c50d"; + sha256 = "2ec08a5d74cb3a63576f06d3cae695b6b8995acd9665e2fa4da91927b467ca51"; }; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index fe0d2ca28f9..1cac0911b24 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { homepage = http://hostap.epitest.fi/wpa_supplicant/; description = "A tool for connecting to WPA and WPA2-protected wireless networks"; license = licenses.bsd3; - maintainers = with maintainers; [ marcweber urkud wkennington ]; + maintainers = with maintainers; [ marcweber wkennington ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index b308a5ec3c3..e231e3a5989 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { CFLAGS = "-I${pixman}/include/pixman-1"; meta = with stdenv.lib; { - maintainers = [ maintainers.goibhniu maintainers.urkud ]; + maintainers = [ maintainers.goibhniu ]; description = "Wacom digitizer driver for X11"; homepage = http://linuxwacom.sourceforge.net; license = licenses.gpl2; diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 41a0bea1cdd..cc566e712c2 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -17,6 +17,10 @@ buildGoPackage rec { # Keep consul.ui for backward compatability passthru.ui = consul-ui; + preBuild = '' + buildFlagsArray+=("-ldflags" "-X github.com/hashicorp/consul/version.GitDescribe=v${version} -X github.com/hashicorp/consul/version.Version=${version} -X github.com/hashicorp/consul/version.VersionPrerelease=") + ''; + meta = with stdenv.lib; { description = "Tool for service discovery, monitoring and configuration"; homepage = "https://www.consul.io/"; diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index 8dc062b7504..ab14ee92a24 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, openssl, libevent }: -with { inherit (stdenv.lib) optional; }; +let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { name = "coturn-${version}"; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 94d5ee9f5c7..97c0da86ec9 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -2,16 +2,16 @@ , systemd, nettle, libedit, zlib, libiconv, fetchpatch }: -with { inherit (stdenv.lib) optional optionals; }; +let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { name = "knot-dns-${version}"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "c064ddf99bf5fc24dd3c6a3a523394760357e204c8b69f0e691e49bc0d9b704c"; + sha256 = "37da7fcf1f194bd6376c63d8c4fa28a21899b56a3f3b63dba7095740a5752c52"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index bc9e35f88c4..c58b66d42f2 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "630b2ad0bfdcf59164957a377adef8b1fddc37a58a7e1d10e76a1b497a30f036"; + sha256 = "30e24f9681e40c79a0aadbbfd78aaa72534dd3bca3347de89dfeae055b2c99e4"; }; outputs = [ "out" "dev" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ knot-dns luajit libuv gnutls ] ++ optional stdenv.isLinux lmdb # system lmdb causes some problems on Darwin - ## optional dependencies + ## optional dependencies; TODO: libedit, dnstap? ++ optional doInstallCheck cmocka ++ optional stdenv.isLinux systemd # socket activation ++ [ diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index a9b1333fb0f..9e0de290143 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.2.5"; + version = "3.2.10"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip"; - sha256 = "1vgn3k57pgj4prndhjshzkwchj9igpagmmlrbkvqdj4axw762i9g"; + sha256 = "0qqqaxlmcy3nfygbfy1bjc188x8k461nckj1sxfvy6wiv6jjfc25"; }; buildInputs = with pkgs; [ diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index e9c1ec8b724..f70d6266e8d 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { preConfigure = '' configureFlags="$configureFlags --includedir=$dev/include" ''; + configureFlags = '' --with-apr=${apr.dev} --with-apr-util=${aprutil.dev} @@ -67,6 +68,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + stripDebugList = "lib modules bin"; + postInstall = '' mkdir -p $doc/share/doc/httpd mv $out/manual $doc/share/doc/httpd diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 5d5a98ad8a8..dfde2045272 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation { homepage = http://nginx.org; license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ thoughtpolice raskin ]; + maintainers = with maintainers; [ thoughtpolice raskin fpletz ]; }; } diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix new file mode 100644 index 00000000000..3b3f2e0cc0f --- /dev/null +++ b/pkgs/servers/jackett/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, mono, curl, makeWrapper }: + +stdenv.mkDerivation rec { + name = "jackett-${version}"; + version = "0.7.1197"; + + src = fetchurl { + url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; + sha256 = "0p9xdfbb8pda5a3knnw6145jky3bf10y1dj2clgsbbygi2xnam2v"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/{bin,share/${name}} + cp -r * $out/share/${name} + + makeWrapper "${mono}/bin/mono" $out/bin/Jackett \ + --add-flags "$out/share/${name}/JackettConsole.exe" \ + --prefix LD_LIBRARY_PATH ':' "${curl.out}/lib" + ''; + + meta = with stdenv.lib; { + description = "API Support for your favorite torrent trackers."; + homepage = https://github.com/Jackett/Jackett/; + license = licenses.gpl2; + maintainers = with maintainers; [ edwtjo ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/kwakd/default.nix b/pkgs/servers/kwakd/default.nix new file mode 100644 index 00000000000..7c7755dee48 --- /dev/null +++ b/pkgs/servers/kwakd/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchFromGitHub, stdenv }: + +stdenv.mkDerivation rec { + name = "kwakd-${version}"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "fetchinson"; + repo = "kwakd"; + rev = "acdf0e1491204ae30622a60fde0bcae4769f78be"; + sha256 = "1inf9ngrbxmkkdhqf1xday12nf0hxjxlx1810phkmivyyp6fl3nj"; + }; + + postInstall = '' + serviceDir=$out/share/dbus-1/system-services + mkdir -p $serviceDir + cp kwakd.service $serviceDir/ + substituteInPlace $serviceDir/kwakd.service \ + --replace "kwakd -p 80" "$out/bin/kwakd -p 80" + ''; + + meta = with lib; { + description = "A super small webserver that serves blank pages"; + license = licenses.gpl2; + maintainers = [ maintainers.nicknovitski ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 863f7afd159..2d5ad9e2742 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -24,13 +24,13 @@ let }; in pythonPackages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.19.2"; + version = "0.19.3"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "03gnz7rb7yncykqy0irl1y5lhk1cs0b4snpas8s1c9r0vsw1bmhr"; + sha256 = "0dnlv2rgda94zlgwkpryjsypcf995l7zdp19d2xiq7zpd13x6yag"; }; patches = [ ./matrix-synapse.patch ]; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index bc2bbb13c44..28b6136d90e 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "minio-${shortVersion}"; - shortVersion = "20170125"; - longVersion = "2017-01-25T03-14-52Z"; + shortVersion = "20170316"; + longVersion = "2017-03-16T21-50-32Z"; src = fetchurl { url = "https://github.com/minio/minio/archive/RELEASE.${lib.replaceStrings [":"] ["-"] longVersion}.tar.gz"; - sha256 = "0yh8fdgl50sza182kl4jly0apf0dw0ya954ky6j8a8hmdcmk6wzk"; + sha256 = "1331lxsfr22x1sh7cyh9xz3aa70715wm1bk1f1r053kyz03q903c"; }; buildInputs = [ go ]; diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 5d7d2e78773..7882572b6c8 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2.0.30"; + version = "2.0.33"; name = "munin-${version}"; src = fetchFromGitHub { owner = "munin-monitoring"; repo = "munin"; rev = version; - sha256 = "1sxsdfq9a5d8b13jigr06gs7n4m3c95645sfyyl49bkfy0n5cxrg"; + sha256 = "0rs05b7926mjd58sdry33i91m1h3v3svl0wg2gmhljl8wqidac5w"; }; buildInputs = [ diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index e3938ec71a8..1883764e24f 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, systemd, boost, darwin +{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, systemd, boost, darwin , alsaSupport ? true, alsaLib , avahiSupport ? true, avahi, dbus , flacSupport ? true, flac @@ -42,6 +42,8 @@ in stdenv.mkDerivation rec { sha256 = "0isbpa79m7zf09w3s1ry638cw96rxasy1ch66zl01k75i48mw1gl"; }; + patches = [ ./x86.patch ]; + buildInputs = [ pkgconfig glib boost ] ++ opt stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudioKit ++ opt stdenv.isLinux systemd diff --git a/pkgs/servers/mpd/x86.patch b/pkgs/servers/mpd/x86.patch new file mode 100644 index 00000000000..3e4c036418d --- /dev/null +++ b/pkgs/servers/mpd/x86.patch @@ -0,0 +1,12 @@ +--- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx ++++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx +@@ -20,8 +20,8 @@ + /* necessary because libavutil/common.h uses UINT64_C */ + #define __STDC_CONSTANT_MACROS + +-#include "lib/ffmpeg/Time.hxx" + #include "config.h" ++#include "lib/ffmpeg/Time.hxx" + #include "FfmpegDecoderPlugin.hxx" + #include "lib/ffmpeg/Domain.hxx" + #include "lib/ffmpeg/Error.hxx" diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index d37b53398b6..4bbff8b86ad 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name= "nextcloud-${version}"; - version = "11.0.1"; + version = "11.0.2"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "0aa6gzcbpjkk7ss3c1sg0scinhczvg4lgb59wv5jljliaks2n5h0"; + sha256 = "0047kfl73720w7y2r7ivzj2gqg84rcfp98svq130nd0ziyfz27jx"; }; installPhase = '' diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index f6fcca16081..a2158c9b541 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.1.1"; + version = "3.1.2"; src = fetchurl { url = "http://dist.neo4j.org/neo4j-community-${version}-unix.tar.gz"; - sha256 = "1jz257brrrblxq0jdh79mmqand6lwi632y8sy5j6dxl3ssd3hrkx"; + sha256 = "0kvbsm9mjwqyl3q2myif28a0f11i4rfq3hik07w9cdnrwyd75s40"; }; buildInputs = [ makeWrapper jre8 which gawk ]; diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix index b18650fbbca..9998d34a2da 100644 --- a/pkgs/servers/nosql/riak/2.2.0.nix +++ b/pkgs/servers/nosql/riak/2.2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip, erlangR16, which, pam, coreutils }: +{ stdenv, lib, fetchurl, unzip, erlang, which, pam, coreutils }: let solrName = "solr-4.10.4-yz-2.tgz"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { name = "riak-2.2.0"; buildInputs = [ - which unzip erlangR16 pam + which unzip erlang pam ]; src = srcs.riak; @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ cstrahan mdaiter ]; description = "Dynamo inspired NoSQL DB by Basho"; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix new file mode 100644 index 00000000000..446927745a9 --- /dev/null +++ b/pkgs/servers/radarr/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, mono, libmediainfo, sqlite, makeWrapper }: + +stdenv.mkDerivation rec { + name = "radarr-${version}"; + version = "0.2.0.535"; + + src = fetchurl { + url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz"; + sha256 = "1ccvblklqn5iki7gc16bzzbwms28mv4kxzv1nwhlm9vf0cw4qxbr"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/{bin,share/${name}} + cp -r * $out/share/${name}/. + + makeWrapper "${mono}/bin/mono" $out/bin/Radarr \ + --add-flags "$out/share/${name}/Radarr.exe" \ + --prefix LD_LIBRARY_PATH ':' "${sqlite.out}/lib" \ + --prefix LD_LIBRARY_PATH ':' "${libmediainfo}/lib" + ''; + + meta = with stdenv.lib; { + description = "A Usenet/BitTorrent movie downloader."; + homepage = https://radarr.video/; + license = licenses.gpl3; + maintainers = with maintainers; [ edwtjo ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 51bee4f0b4c..31867bee105 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -66,7 +66,8 @@ stdenv.mkDerivation rec { ++ optional (!enableDomainController) "--without-ad-dc" ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ]; - enableParallelBuilding = true; + # To build in parallel. + buildPhase = "python buildtools/bin/waf build -j $NIX_BUILD_CORES"; # Some libraries don't have /lib/samba in RPATH but need it. # Use find -type f -executable -exec echo {} \; -exec sh -c 'ldd {} | grep "not found"' \; diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index 1e7ddb53e23..af0b17bfb3a 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sonarr-${version}"; - version = "2.0.0.4613"; + version = "2.0.0.4645"; src = fetchurl { url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "1a8wm50aw7yyigvywx7hgy58w60mi4s60dqvwwlgrbavl4z5jphl"; + sha256 = "13a1ly2rm0ha355h4q2x8v699d43arcq3iyn7nm921rkswajvvb8"; }; buildInputs = [ diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix index 5f6b3904155..b0b8f926d9e 100644 --- a/pkgs/servers/sql/virtuoso/6.x.nix +++ b/pkgs/servers/sql/virtuoso/6.x.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { description = "SQL/RDF database used by, e.g., KDE-nepomuk"; homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/; platforms = platforms.linux; - maintainers = [ maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/servers/sql/virtuoso/7.x.nix b/pkgs/servers/sql/virtuoso/7.x.nix index 2087829084f..a24daa70812 100644 --- a/pkgs/servers/sql/virtuoso/7.x.nix +++ b/pkgs/servers/sql/virtuoso/7.x.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/; #configure: The current version [...] can only be built on 64bit platforms platforms = [ "x86_64-linux" ]; - maintainers = [ maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/servers/web-apps/pump.io/composition.nix b/pkgs/servers/web-apps/pump.io/composition.nix index d413475389f..ee4dab5ad64 100644 --- a/pkgs/servers/web-apps/pump.io/composition.nix +++ b/pkgs/servers/web-apps/pump.io/composition.nix @@ -1,8 +1,8 @@ -# This file has been generated by node2nix 1.1.1. Do not edit! +# This file has been generated by node2nix 1.2.0. Do not edit! {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/servers/web-apps/pump.io/node-packages.nix b/pkgs/servers/web-apps/pump.io/node-packages.nix index a275ef4ca40..ca27c79fab9 100644 --- a/pkgs/servers/web-apps/pump.io/node-packages.nix +++ b/pkgs/servers/web-apps/pump.io/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.1.1. Do not edit! +# This file has been generated by node2nix 1.2.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: @@ -13,13 +13,13 @@ let sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093"; }; }; - "bunyan-1.8.8" = { + "bunyan-1.8.9" = { name = "bunyan"; packageName = "bunyan"; - version = "1.8.8"; + version = "1.8.9"; src = fetchurl { - url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.8.tgz"; - sha1 = "6549ed6db088e4d82b7be3bcc6d0697159f6e209"; + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.9.tgz"; + sha1 = "2c7c9d422ea64ee2465d52b4decd72de0657401a"; }; }; "colors-1.1.2" = { @@ -131,13 +131,13 @@ let sha1 = "0c2903ee5c54e63d65a96170764703550665a3de"; }; }; - "express-session-1.15.1" = { + "express-session-1.15.2" = { name = "express-session"; packageName = "express-session"; - version = "1.15.1"; + version = "1.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.15.1.tgz"; - sha1 = "9abba15971beea7ad98da5a4d25ed92ba4a2984e"; + url = "https://registry.npmjs.org/express-session/-/express-session-1.15.2.tgz"; + sha1 = "d98516443a4ccb8688e1725ae584c02daa4093d4"; }; }; "gm-1.23.0" = { @@ -149,13 +149,13 @@ let sha1 = "80a2fe9cbf131515024846444658461269f52661"; }; }; - "helmet-3.4.1" = { + "helmet-3.5.0" = { name = "helmet"; packageName = "helmet"; - version = "3.4.1"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/helmet/-/helmet-3.4.1.tgz"; - sha1 = "27d37629227f25a110f2a128bfe1b1028648a397"; + url = "https://registry.npmjs.org/helmet/-/helmet-3.5.0.tgz"; + sha1 = "e1d6de27d2e3317d3182e00d672df3d0e1e12539"; }; }; "jade-1.11.0" = { @@ -185,13 +185,13 @@ let sha1 = "40b402770c2bda23469096bee91ab675e3b1fc6e"; }; }; - "method-override-2.3.7" = { + "method-override-2.3.8" = { name = "method-override"; packageName = "method-override"; - version = "2.3.7"; + version = "2.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/method-override/-/method-override-2.3.7.tgz"; - sha1 = "8e1d47ac480fb0cd8777083f11c896901166b2e5"; + url = "https://registry.npmjs.org/method-override/-/method-override-2.3.8.tgz"; + sha1 = "178234bf4bab869f89df9444b06fc6147b44828c"; }; }; "mkdirp-0.5.1" = { @@ -374,13 +374,13 @@ let sha1 = "dd476b81b8200269ea0cc85f6b6decd05799bce9"; }; }; - "databank-lrucache-0.1.2" = { + "databank-lrucache-0.1.3" = { name = "databank-lrucache"; packageName = "databank-lrucache"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/databank-lrucache/-/databank-lrucache-0.1.2.tgz"; - sha1 = "846d3bbc3d908ea2880baf9a611d86a28697c640"; + url = "https://registry.npmjs.org/databank-lrucache/-/databank-lrucache-0.1.3.tgz"; + sha1 = "a68fbf6bb5f2e1dab81f5a410065484889a0eeef"; }; }; "bindings-1.2.1" = { @@ -428,13 +428,13 @@ let sha1 = "81a098f447e4bbc3ff3312a243521bc060ef5911"; }; }; - "moment-2.17.1" = { + "moment-2.18.1" = { name = "moment"; packageName = "moment"; - version = "2.17.1"; + version = "2.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz"; - sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82"; + url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz"; + sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"; }; }; "nan-2.5.1" = { @@ -896,13 +896,13 @@ let sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea"; }; }; - "compressible-2.0.9" = { + "compressible-2.0.10" = { name = "compressible"; packageName = "compressible"; - version = "2.0.9"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.9.tgz"; - sha1 = "6daab4e2b599c2770dd9e21e7a891b1c5a755425"; + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.10.tgz"; + sha1 = "feda1c7f7617912732b29bf8cf26252a20b9eecd"; }; }; "vary-1.0.1" = { @@ -914,13 +914,13 @@ let sha1 = "99e4981566a286118dfb2b817357df7993376d10"; }; }; - "mime-types-2.1.14" = { + "mime-types-2.1.15" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.14"; + version = "2.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz"; - sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz"; + sha1 = "a4ebf5064094569237b8cf70046776d09fc92aed"; }; }; "negotiator-0.5.3" = { @@ -932,13 +932,13 @@ let sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; }; }; - "mime-db-1.26.0" = { + "mime-db-1.27.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.26.0"; + version = "1.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz"; - sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz"; + sha1 = "820f572296bbd20ec25ed55e5b5de869e5436eb1"; }; }; "ms-0.7.1" = { @@ -950,22 +950,13 @@ let sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; }; }; - "csrf-3.0.5" = { + "csrf-3.0.6" = { name = "csrf"; packageName = "csrf"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/csrf/-/csrf-3.0.5.tgz"; - sha1 = "3c3aa86f395dd39f86d68fcf1734a2380f466112"; - }; - }; - "base64-url-1.3.3" = { - name = "base64-url"; - packageName = "base64-url"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.3.tgz"; - sha1 = "f8b6c537f09a4fc58c99cb86e0b0e9c61461a20f"; + url = "https://registry.npmjs.org/csrf/-/csrf-3.0.6.tgz"; + sha1 = "b61120ddceeafc91e76ed5313bb5c0b2667b710a"; }; }; "rndm-1.2.0" = { @@ -1202,13 +1193,13 @@ let sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; }; }; - "node-uuid-1.4.7" = { + "node-uuid-1.4.8" = { name = "node-uuid"; packageName = "node-uuid"; - version = "1.4.7"; + version = "1.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"; - sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"; + url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz"; + sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907"; }; }; "set-immediate-0.1.1" = { @@ -1391,13 +1382,13 @@ let sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; - "hosted-git-info-2.2.0" = { + "hosted-git-info-2.4.1" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.2.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.2.0.tgz"; - sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5"; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.1.tgz"; + sha1 = "4b0445e41c004a8bd1337773a4ff790ca40318c8"; }; }; "is-builtin-module-1.0.0" = { @@ -1850,13 +1841,13 @@ let sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"; }; }; - "debug-2.6.1" = { + "debug-2.6.3" = { name = "debug"; packageName = "debug"; - version = "2.6.1"; + version = "2.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz"; - sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351"; + url = "https://registry.npmjs.org/debug/-/debug-2.6.3.tgz"; + sha1 = "0f7eb8c30965ec08c72accfa0130c8b79984141d"; }; }; "array-parallel-0.1.3" = { @@ -1895,13 +1886,13 @@ let sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e"; }; }; - "which-1.2.12" = { + "which-1.2.14" = { name = "which"; packageName = "which"; - version = "1.2.12"; + version = "1.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.2.12.tgz"; - sha1 = "de67b5e450269f194909ef23ece4ebe416fa1192"; + url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz"; + sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5"; }; }; "pseudomap-1.0.2" = { @@ -1913,22 +1904,22 @@ let sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; }; }; - "yallist-2.0.0" = { + "yallist-2.1.2" = { name = "yallist"; packageName = "yallist"; - version = "2.0.0"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz"; - sha1 = "306c543835f09ee1a4cb23b7bce9ab341c91cdd4"; + url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; + sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; }; }; - "isexe-1.1.2" = { + "isexe-2.0.0" = { name = "isexe"; packageName = "isexe"; - version = "1.1.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz"; - sha1 = "36f3e22e60750920f5e7241a476a8c6a42275ad0"; + url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; }; }; "connect-3.6.0" = { @@ -1967,13 +1958,13 @@ let sha1 = "7bcad469ee7b96e91d12ceb3959c78235a9272e9"; }; }; - "helmet-csp-2.3.0" = { + "helmet-csp-2.4.0" = { name = "helmet-csp"; packageName = "helmet-csp"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.3.0.tgz"; - sha1 = "bc341939dfef5266cc817abcf53f079f61fe7e3f"; + url = "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.4.0.tgz"; + sha1 = "7e53a157167a0645aadd7177d12ae6c605c1842e"; }; }; "hide-powered-by-1.0.0" = { @@ -2039,6 +2030,15 @@ let sha1 = "898afb93869b24661cf9c52f9ee8db8ed0764dd9"; }; }; + "debug-2.6.1" = { + name = "debug"; + packageName = "debug"; + version = "2.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz"; + sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351"; + }; + }; "finalhandler-1.0.0" = { name = "finalhandler"; packageName = "finalhandler"; @@ -2156,13 +2156,13 @@ let sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7"; }; }; - "uglify-js-2.8.9" = { + "uglify-js-2.8.20" = { name = "uglify-js"; packageName = "uglify-js"; - version = "2.8.9"; + version = "2.8.20"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.9.tgz"; - sha1 = "01194b91cc0795214093c05594ef5ac1e0b2e900"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.20.tgz"; + sha1 = "be87100fbc18de3876ed606e9d24b4568311cecf"; }; }; "void-elements-2.0.1" = { @@ -2345,15 +2345,6 @@ let sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; }; }; - "uglify-to-browserify-1.0.2" = { - name = "uglify-to-browserify"; - packageName = "uglify-to-browserify"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; - sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; - }; - }; "yargs-3.10.0" = { name = "yargs"; packageName = "yargs"; @@ -2363,6 +2354,15 @@ let sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; }; }; + "uglify-to-browserify-1.0.2" = { + name = "uglify-to-browserify"; + packageName = "uglify-to-browserify"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; + sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; + }; + }; "camelcase-1.2.1" = { name = "camelcase"; packageName = "camelcase"; @@ -2462,13 +2462,13 @@ let sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; }; }; - "is-buffer-1.1.4" = { + "is-buffer-1.1.5" = { name = "is-buffer"; packageName = "is-buffer"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz"; - sha1 = "cfc86ccd5dc5a52fa80489111c6920c457e2d98b"; + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz"; + sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc"; }; }; "acorn-1.2.2" = { @@ -2543,13 +2543,13 @@ let sha1 = "9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"; }; }; - "request-2.80.0" = { + "request-2.81.0" = { name = "request"; packageName = "request"; - version = "2.80.0"; + version = "2.81.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.80.0.tgz"; - sha1 = "8cc162d76d79381cdefdd3505d76b80b60589bd0"; + url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; + sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; }; }; "sax-1.2.2" = { @@ -2840,13 +2840,22 @@ let sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; }; }; - "qs-6.3.2" = { + "qs-6.4.0" = { name = "qs"; packageName = "qs"; - version = "6.3.2"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz"; - sha1 = "e75bd5f6e268122a2a0e0bda630b2550c166502c"; + url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; + sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; + }; + }; + "safe-buffer-5.0.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"; + sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7"; }; }; "stringstream-0.0.5" = { @@ -2858,13 +2867,13 @@ let sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; }; }; - "tunnel-agent-0.4.3" = { + "tunnel-agent-0.6.0" = { name = "tunnel-agent"; packageName = "tunnel-agent"; - version = "0.4.3"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"; - sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; }; }; "delayed-stream-1.0.0" = { @@ -2885,13 +2894,13 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "ajv-4.11.4" = { + "ajv-4.11.5" = { name = "ajv"; packageName = "ajv"; - version = "4.11.4"; + version = "4.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.11.4.tgz"; - sha1 = "ebf3a55d4b132ea60ff5847ae85d2ef069960b45"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.11.5.tgz"; + sha1 = "b6ee74657b993a01dce44b7944d56f485828d5bd"; }; }; "har-schema-1.0.5" = { @@ -2975,13 +2984,13 @@ let sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; }; }; - "jsprim-1.3.1" = { + "jsprim-1.4.0" = { name = "jsprim"; packageName = "jsprim"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz"; - sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252"; + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz"; + sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918"; }; }; "sshpk-1.11.0" = { @@ -2993,6 +3002,15 @@ let sha1 = "2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77"; }; }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + }; "extsprintf-1.0.2" = { name = "extsprintf"; packageName = "extsprintf"; @@ -3029,15 +3047,6 @@ let sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; }; }; - "assert-plus-1.0.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; - }; - }; "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; @@ -3119,22 +3128,13 @@ let sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a"; }; }; - "debug-2.3.3" = { - name = "debug"; - packageName = "debug"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz"; - sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c"; - }; - }; - "vary-1.1.0" = { + "vary-1.1.1" = { name = "vary"; packageName = "vary"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz"; - sha1 = "e1e5affbbd16ae768dd2674394b9ad3022653140"; + url = "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz"; + sha1 = "67535ebb694c1d52257457984665323f587e8d37"; }; }; "minimist-0.0.8" = { @@ -3236,13 +3236,13 @@ let sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; }; }; - "readable-stream-2.2.3" = { + "readable-stream-2.2.6" = { name = "readable-stream"; packageName = "readable-stream"; - version = "2.2.3"; + version = "2.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.3.tgz"; - sha1 = "9cf49463985df016c8ae8813097a9293a9b33729"; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.6.tgz"; + sha1 = "8b43aed76e71483938d12a8d46c6cf1a00b1f816"; }; }; "dom-serializer-0.1.0" = { @@ -3587,13 +3587,13 @@ let sha1 = "ef063df1f1aaceb8507ce70f7de6cb32980e874b"; }; }; - "mongodb-2.2.24" = { + "mongodb-2.2.25" = { name = "mongodb"; packageName = "mongodb"; - version = "2.2.24"; + version = "2.2.25"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-2.2.24.tgz"; - sha1 = "80f40d6ec5bdec0ddecf0f9ce0144e794c46449a"; + url = "https://registry.npmjs.org/mongodb/-/mongodb-2.2.25.tgz"; + sha1 = "d3b25dad00eda2bdfcbc996210ba082ac686a6b6"; }; }; "setimmediate-1.0.5" = { @@ -3614,13 +3614,13 @@ let sha1 = "ec56233868032909207170c39448e24449dd1fc4"; }; }; - "mongodb-core-2.1.8" = { + "mongodb-core-2.1.9" = { name = "mongodb-core"; packageName = "mongodb-core"; - version = "2.1.8"; + version = "2.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.8.tgz"; - sha1 = "b33e0370d0a59d97b6cb1ec610527be9e95ca2c0"; + url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.9.tgz"; + sha1 = "85aa71ee4fb716196e06b787557bf139f801daf5"; }; }; "readable-stream-2.1.5" = { @@ -3677,15 +3677,6 @@ let sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6"; }; }; - "lru-cache-2.3.1" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz"; - sha1 = "b3adf6b3d856e954e2c390e6cef22081245a53d6"; - }; - }; }; args = { name = "pump.io"; @@ -3699,7 +3690,7 @@ let sources."nan-2.3.5" ]; }) - (sources."bunyan-1.8.8" // { + (sources."bunyan-1.8.9" // { dependencies = [ (sources."dtrace-provider-0.8.1" // { dependencies = [ @@ -3742,7 +3733,7 @@ let ]; }) sources."safe-json-stringify-1.0.4" - sources."moment-2.17.1" + sources."moment-2.18.1" ]; }) sources."colors-1.1.2" @@ -3774,17 +3765,17 @@ let dependencies = [ (sources."accepts-1.2.13" // { dependencies = [ - (sources."mime-types-2.1.14" // { + (sources."mime-types-2.1.15" // { dependencies = [ - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" ]; }) sources."negotiator-0.5.3" ]; }) - (sources."compressible-2.0.9" // { + (sources."compressible-2.0.10" // { dependencies = [ - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" ]; }) sources."vary-1.0.1" @@ -3798,9 +3789,8 @@ let sources."content-type-1.0.2" (sources."csurf-1.8.3" // { dependencies = [ - (sources."csrf-3.0.5" // { + (sources."csrf-3.0.6" // { dependencies = [ - sources."base64-url-1.3.3" sources."rndm-1.2.0" sources."tsscmp-1.0.5" (sources."uid-safe-2.1.4" // { @@ -3822,9 +3812,9 @@ let dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.14" // { + (sources."mime-types-2.1.15" // { dependencies = [ - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" ]; }) sources."negotiator-0.6.1" @@ -3908,9 +3898,9 @@ let }) sources."batch-0.5.3" sources."escape-html-1.0.3" - (sources."mime-types-2.1.14" // { + (sources."mime-types-2.1.15" // { dependencies = [ - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" ]; }) ]; @@ -3923,9 +3913,9 @@ let (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.14" // { + (sources."mime-types-2.1.15" // { dependencies = [ - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" ]; }) ]; @@ -3943,7 +3933,7 @@ let (sources."connect-databank-1.0.3" // { dependencies = [ sources."async-1.5.2" - sources."node-uuid-1.4.7" + sources."node-uuid-1.4.8" sources."set-immediate-0.1.1" ]; }) @@ -3967,9 +3957,9 @@ let (sources."type-is-1.6.14" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.14" // { + (sources."mime-types-2.1.15" // { dependencies = [ - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" ]; }) ]; @@ -4007,7 +3997,7 @@ let sources."minimist-1.2.0" (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.2.0" + sources."hosted-git-info-2.4.1" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -4178,12 +4168,12 @@ let sources."vary-1.0.1" ]; }) - (sources."express-session-1.15.1" // { + (sources."express-session-1.15.2" // { dependencies = [ sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."crc-3.4.4" - (sources."debug-2.6.1" // { + (sources."debug-2.6.3" // { dependencies = [ sources."ms-0.7.2" ]; @@ -4208,12 +4198,12 @@ let (sources."lru-cache-4.0.2" // { dependencies = [ sources."pseudomap-1.0.2" - sources."yallist-2.0.0" + sources."yallist-2.1.2" ]; }) - (sources."which-1.2.12" // { + (sources."which-1.2.14" // { dependencies = [ - sources."isexe-1.1.2" + sources."isexe-2.0.0" ]; }) ]; @@ -4225,7 +4215,7 @@ let }) ]; }) - (sources."helmet-3.4.1" // { + (sources."helmet-3.5.0" // { dependencies = [ (sources."connect-3.6.0" // { dependencies = [ @@ -4254,7 +4244,7 @@ let sources."dns-prefetch-control-0.1.0" sources."dont-sniff-mimetype-1.0.0" sources."frameguard-3.0.0" - (sources."helmet-csp-2.3.0" // { + (sources."helmet-csp-2.4.0" // { dependencies = [ sources."camelize-1.0.0" (sources."content-security-policy-builder-1.1.0" // { @@ -4342,10 +4332,9 @@ let }) ]; }) - (sources."uglify-js-2.8.9" // { + (sources."uglify-js-2.8.20" // { dependencies = [ sources."source-map-0.5.6" - sources."uglify-to-browserify-1.0.2" (sources."yargs-3.10.0" // { dependencies = [ sources."camelcase-1.2.1" @@ -4357,7 +4346,7 @@ let dependencies = [ (sources."kind-of-3.1.0" // { dependencies = [ - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" ]; }) sources."longest-1.0.1" @@ -4373,7 +4362,7 @@ let dependencies = [ (sources."kind-of-3.1.0" // { dependencies = [ - sources."is-buffer-1.1.4" + sources."is-buffer-1.1.5" ]; }) sources."longest-1.0.1" @@ -4389,6 +4378,7 @@ let sources."window-size-0.1.0" ]; }) + sources."uglify-to-browserify-1.0.2" ]; }) sources."void-elements-2.0.1" @@ -4436,7 +4426,7 @@ let }) sources."nwmatcher-1.3.9" sources."parse5-1.5.1" - (sources."request-2.80.0" // { + (sources."request-2.81.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.6.0" @@ -4455,7 +4445,7 @@ let }) (sources."har-validator-4.2.1" // { dependencies = [ - (sources."ajv-4.11.4" // { + (sources."ajv-4.11.5" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -4479,8 +4469,9 @@ let (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.1" // { + (sources."jsprim-1.4.0" // { dependencies = [ + sources."assert-plus-1.0.0" sources."extsprintf-1.0.2" sources."json-schema-0.2.3" sources."verror-1.3.6" @@ -4504,16 +4495,17 @@ let sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.14" // { + (sources."mime-types-2.1.15" // { dependencies = [ - sources."mime-db-1.26.0" + sources."mime-db-1.27.0" ]; }) sources."oauth-sign-0.8.2" sources."performance-now-0.2.0" - sources."qs-6.3.2" + sources."qs-6.4.0" + sources."safe-buffer-5.0.1" sources."stringstream-0.0.5" - sources."tunnel-agent-0.4.3" + sources."tunnel-agent-0.6.0" ]; }) sources."sax-1.2.2" @@ -4532,16 +4524,16 @@ let sources."xml-name-validator-2.0.1" ]; }) - (sources."method-override-2.3.7" // { + (sources."method-override-2.3.8" // { dependencies = [ - (sources."debug-2.3.3" // { + (sources."debug-2.6.3" // { dependencies = [ sources."ms-0.7.2" ]; }) sources."methods-1.1.2" sources."parseurl-1.3.1" - sources."vary-1.1.0" + sources."vary-1.1.1" ]; }) (sources."mkdirp-0.5.1" // { @@ -4605,7 +4597,7 @@ let }) sources."entities-1.1.1" sources."inherits-2.0.3" - (sources."readable-stream-2.2.3" // { + (sources."readable-stream-2.2.6" // { dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" @@ -4713,7 +4705,7 @@ let }) (sources."normalize-package-data-2.3.6" // { dependencies = [ - sources."hosted-git-info-2.2.0" + sources."hosted-git-info-2.4.1" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -4828,15 +4820,15 @@ let sources."setimmediate-1.0.5" ]; }) - (sources."debug-2.6.1" // { + (sources."debug-2.6.3" // { dependencies = [ sources."ms-0.7.2" ]; }) - (sources."mongodb-2.2.24" // { + (sources."mongodb-2.2.25" // { dependencies = [ sources."es6-promise-3.2.1" - (sources."mongodb-core-2.1.8" // { + (sources."mongodb-core-2.1.9" // { dependencies = [ sources."bson-1.0.4" (sources."require_optional-1.0.0" // { @@ -4869,11 +4861,16 @@ let sources."underscore-1.6.0" ]; }) - (sources."databank-lrucache-0.1.2" // { + (sources."databank-lrucache-0.1.3" // { dependencies = [ - sources."underscore-1.5.2" - sources."lru-cache-2.3.1" - sources."set-immediate-0.1.1" + sources."databank-1.0.1" + (sources."lru-cache-4.0.2" // { + dependencies = [ + sources."pseudomap-1.0.2" + sources."yallist-2.1.2" + ]; + }) + sources."setimmediate-1.0.5" ]; }) ]; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 49e71614bf9..a4de1ecda43 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1604,11 +1604,11 @@ let }) // {inherit inputproto xorgserver xproto ;}; xf86inputlibinput = (mkDerivation "xf86inputlibinput" { - name = "xf86-input-libinput-0.23.0"; + name = "xf86-input-libinput-0.25.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-libinput-0.23.0.tar.bz2; - sha256 = "1p596v3kbmjpdz3kz8z19bnd79l860f1pbwjvma7bz7qx3gynlqb"; + url = mirror://xorg/individual/driver/xf86-input-libinput-0.25.0.tar.bz2; + sha256 = "0vsmijamfzf6vcljrr0am2qcz33zl2l0lj2mzmbwgrm7ixjx2zxv"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1670,11 +1670,11 @@ let }) // {inherit ;}; xf86videoamdgpu = (mkDerivation "xf86videoamdgpu" { - name = "xf86-video-amdgpu-1.2.0"; + name = "xf86-video-amdgpu-1.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.2.0.tar.bz2; - sha256 = "13vcwxswhzq611ly890fcl11vkpai7gs303l7nx5azqjbyn1lnr7"; + url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.3.0.tar.bz2; + sha256 = "0w2f7xz44pym2k5kr76p983dwbc2f2p2jazpff999giqi4i0yqy1"; }; buildInputs = [pkgconfig fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1703,11 +1703,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoati = (mkDerivation "xf86videoati" { - name = "xf86-video-ati-7.8.0"; + name = "xf86-video-ati-7.9.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2; - sha256 = "1ynnm4v4261xmg94b7jam9hjyym4n2nqba23rv23v3wjfbkms7s0"; + url = mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2; + sha256 = "0xcq0lncb5p4sas5866qpkjyp1v8ksalw7m1gmqb3brhccp8gb9w"; }; buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1869,11 +1869,11 @@ let }) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;}; xf86videonouveau = (mkDerivation "xf86videonouveau" { - name = "xf86-video-nouveau-1.0.13"; + name = "xf86-video-nouveau-1.0.14"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.tar.bz2; - sha256 = "1js7vak68g2800f1cy5r41wl5x2j7dbmbd7zxypzfgcw2fx454kd"; + url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.14.tar.bz2; + sha256 = "1h9izq510m2pvg77d0y9krc0cvvbhp2y3xlrrz6id7y47jdzkpsd"; }; buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1891,11 +1891,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoopenchrome = (mkDerivation "xf86videoopenchrome" { - name = "xf86-video-openchrome-0.3.3"; + name = "xf86-video-openchrome-0.6.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-openchrome-0.3.3.tar.bz2; - sha256 = "1v8j4i1r268n4fc5gq54zg1x50j0rhw71f3lba7411mcblg2z7p4"; + url = mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2; + sha256 = "0x9gq3hw6k661k82ikd1y2kkk4dmgv310xr5q59dwn4k6z37aafs"; }; buildInputs = [pkgconfig fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; @@ -2364,11 +2364,11 @@ let }) // {inherit ;}; xorgserver = (mkDerivation "xorgserver" { - name = "xorg-server-1.19.2"; + name = "xorg-server-1.19.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.19.2.tar.bz2; - sha256 = "1fw4b2lf75nsqkiyhn95b1c2if1l3cw5a188a1szx1d8l7sbk2jg"; + url = mirror://xorg/individual/xserver/xorg-server-1.19.3.tar.bz2; + sha256 = "162s1v901djr57gxmmk4airk8hiwcz79dqyz72972x1lw1k82yk7"; }; buildInputs = [pkgconfig dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c7a4ff20a73..99c9ffa14c2 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -340,7 +340,6 @@ in xf86videoglide = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videoi128 = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videonewport = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; - xf86videoopenchrome = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videotga = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videov4l = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videovoodoo = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 4aeace9f0c2..ee85de75b40 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -122,16 +122,16 @@ mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-libinput-0.23.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-libinput-0.25.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 -mirror://xorg/individual/driver/xf86-video-amdgpu-1.2.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-amdgpu-1.3.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-nouveau-1.0.14.tar.bz2 mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2 @@ -148,7 +148,7 @@ mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2 -mirror://xorg/individual/driver/xf86-video-openchrome-0.3.3.tar.bz2 +mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-r128-6.10.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-rendition-4.2.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2 @@ -185,7 +185,7 @@ mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.19.1.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.19.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index f32e6d68452..3285456a348 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -19,12 +19,12 @@ let in stdenv.mkDerivation rec { - version = "0.9.10"; + version = "0.9.12"; name = "prosody-${version}"; src = fetchurl { url = "http://prosody.im/downloads/source/${name}.tar.gz"; - sha256 = "0bv6s5c0iizz015hh1lxlwlw1iwvisywajm2rcrbdfyrskzfwdj8"; + sha256 = "139yxqpinajl32ryrybvilh54ddb1q6s0ajjhlcs4a0rnwia6n8s"; }; communityModules = fetchhg { diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index 682123d924e..988b4f711cb 100644 --- a/pkgs/shells/bash/4.4.nix +++ b/pkgs/shells/bash/4.4.nix @@ -52,13 +52,6 @@ stdenv.mkDerivation rec { patchFlags = "-p0"; patches = upstreamPatches - ++ [ (fetchurl { - # https://security.gentoo.org/glsa/201701-02 - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-shells" - + "/bash/files/bash-4.4-popd-offset-overflow.patch" - + "?id=1bf1ceeb04a2f57e1e5e1636a8c288c4d0db6682"; - sha256 = "02n08lw5spvsc2b1bll0gr6mg4qxcg7pzfjkw7ji5w7bjcikccbm"; - }) ] ++ optional stdenv.isCygwin ./cygwin-bash-4.3.33-1.src.patch; crossAttrs = { diff --git a/pkgs/shells/bash/bash-4.4-patches.nix b/pkgs/shells/bash/bash-4.4-patches.nix index c3ef5470aeb..741fb675d61 100644 --- a/pkgs/shells/bash/bash-4.4-patches.nix +++ b/pkgs/shells/bash/bash-4.4-patches.nix @@ -6,4 +6,11 @@ patch: [ (patch "003" "1chqww2rj6g42b8s60q5zlzy0jzp684jkpsbrbfy1vzxja8mmpsi") (patch "004" "1cy8abf96hkrjhw921ndr0shlcnc52bg45rn6xri4v5clhq0l25d") (patch "005" "0a8515kyk4zsgmvlqvlganjfr7pq0j6kzpr4d6xx02kpbdr4n7i2") +(patch "006" "1f24wgqngmj2mrj9yibwvc2zvlmn5xi53mnw777g3l40c4m2x3ka") +(patch "007" "1bzdsnqaf05gdbqpsixhan8vygjxpcxlz1dd8d9f5jdznw3wq76y") +(patch "008" "1firw915mjm03hbbw9a70ch3cpgrgnvqjpllgdnn6csr8q04f546") +(patch "009" "0g1l56kvw61rpw7dqa9fcl9llkl693h73g631hrhxlm030ddssqb") +(patch "010" "01lfhrkdsdkdz8ypzapr614ras23x7ckjnr60aa5bzkaqprccrc4") +(patch "011" "038p7mhnq9m65g505hi3827jkf9f35nd1cy00w8mwafpyxp44mnx") +(patch "012" "0gh6lbb1rwpk44pvbamm6vzdfi50xnwkqd9v7s8cjwk3pz973hps") ] diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix index 25dec429ff0..ea1aa6ed26c 100644 --- a/pkgs/shells/oh-my-zsh/default.nix +++ b/pkgs/shells/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2017-02-27"; + version = "2017-03-30"; name = "oh-my-zsh-${version}"; src = fetchgit { url = "https://github.com/robbyrussell/oh-my-zsh"; - rev = "b908feebcfb0ca8a9a80360d177e716c24c317d6"; - sha256 = "0b7gir2llv5212nwh9arzva2p714s39qzgk385s9pmalhspfc6c1"; + rev = "66bae5a5deb7a053adfb05b38a93fe47295841eb"; + sha256 = "0rlk39shfh1mamif67smcw6wsc7p1kw64cvk9z3nvlysv6w02q1f"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/tools/X11/xkbset/default.nix b/pkgs/tools/X11/xkbset/default.nix new file mode 100644 index 00000000000..e6f6622f85a --- /dev/null +++ b/pkgs/tools/X11/xkbset/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, perl, libX11 }: + +stdenv.mkDerivation rec { + name = "xkbset-0.5"; + + src = fetchurl { + url = "http://faculty.missouri.edu/~stephen/software/xkbset/${name}.tar.gz"; + sha256 = "01c2579495b39e00d870f50225c441888dc88021e9ee3b693a842dd72554d172"; + }; + + buildInputs = [ perl libX11 ]; + + postPatch = '' + sed "s:^X11PREFIX=.*:X11PREFIX=$out:" -i Makefile + ''; + + preInstall = '' + mkdir -p $out/bin + mkdir -p $out/man/man1 + ''; + + postInstall = '' + rm -f $out/bin/xkbset-gui + ''; + + meta = with stdenv.lib; { + homepage = "http://faculty.missouri.edu/~stephen/software/#xkbset"; + description = "Program to help manage many of XKB features of X window"; + maintainers = with maintainers; [ drets ]; + platforms = platforms.linux; + license = licenses.bsd3; + }; +} diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 943707c0c5e..15feb30743b 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, python2Packages, pkgconfig , xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf -, ffmpeg, x264, libvpx, libwebp +, ffmpeg_3_2, x264, libvpx, libwebp , libfakeXinerama , gst_all_1, pulseaudioLight, gobjectIntrospection , pam }: @@ -11,11 +11,11 @@ with lib; let inherit (python2Packages) python cython buildPythonApplication; in buildPythonApplication rec { - name = "xpra-0.17.6"; + name = "xpra-2.0.1"; namePrefix = ""; src = fetchurl { url = "http://xpra.org/src/${name}.tar.xz"; - sha256 = "1z7v58m45g10icpv22qg4dipafcfsdqkxqz73z3rwsb6r0kdyrpj"; + sha256 = "11y2icy24mc337gvppp0ankyl3wxrprlifm7spixvsndyz056mb8"; }; buildInputs = [ @@ -28,7 +28,7 @@ in buildPythonApplication rec { pango cairo gdk_pixbuf atk gtk2 glib - ffmpeg libvpx x264 libwebp + ffmpeg_3_2 libvpx x264 libwebp gobjectIntrospection gst_all_1.gstreamer diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index acc440b34ed..6e6fbed2dbf 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -7,23 +7,23 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" || stden stdenv.mkDerivation rec { name = "google-cloud-sdk-${version}"; - version = "138.0.0"; + version = "148.0.1"; src = if stdenv.system == "i686-linux" then fetchurl { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz"; - sha256 = "1z2v4bg743qkdlmyyy0z2j5s0g10vbc1643gxrhyz491sk6sp616"; + sha256 = "17az8nah6s33c790kkqcpmcsc8cydhndmq7dblpwgizd86hg245g"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-darwin-x86_64.tar.gz"; - sha256 = "efbe2074da5a544c09b6bf87a8ca045dc429ac38dfcd5380561987769491d5ba"; + sha256 = "1p5076cqk02y8zc3pkdlmrgh3mx2w1pddb2r5c9h3krfcaim2yj8"; } else fetchurl { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz"; - sha256 = "1y64bx9vj6rrapffr7zwxbxxbqlddx91n82kr99mwv19n11hydyw"; + sha256 = "0fr07vcksy0vrg7inmyddz9jlbqx0yg933s45zzkpp3a0m5hz6ll"; }; buildInputs = [python27 makeWrapper]; diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/archivers/dar/default.nix index 83a73eb388f..d75b50bca1a 100644 --- a/pkgs/tools/archivers/dar/default.nix +++ b/pkgs/tools/archivers/dar/default.nix @@ -1,15 +1,17 @@ { stdenv, fetchurl, zlib, bzip2, openssl, attr, lzo, libgcrypt, e2fsprogs, gpgme, xz }: +with stdenv.lib; + stdenv.mkDerivation rec { - name = "dar-2.5.3"; + name = "dar-2.5.9"; src = fetchurl { url = "mirror://sourceforge/dar/${name}.tar.gz"; - sha256 = "0myakyfgv2mhazwvbbwwncn9j7c9b4g3szs0aqlclmp01naaqmj5"; + sha256 = "0bm91d82amh5h2sla2ngbpxd0l64alcdjhxz35bhj3cpz9562wv9"; }; buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ] - ++ stdenv.lib.optionals stdenv.isLinux [ attr e2fsprogs ]; + ++ optionals stdenv.isLinux [ attr e2fsprogs ]; configureFlags = [ "--disable-dar-static" ]; @@ -20,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://dar.linux.free.fr/; description = "Disk ARchiver, allows backing up files into indexed archives"; - maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.unix; + maintainers = [ maintainers.viric ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 145b81c95bc..3c841aa621f 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { description = "Compressor/archiver for creating and modifying zipfiles"; homepage = http://www.info-zip.org; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index b08bb0768f2..313167b1ae2 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -1,37 +1,43 @@ -{ stdenv, fetchurl, python2Packages, librsync, ncftp, gnupg, rsync, makeWrapper -}: +{ stdenv, fetchurl, python2Packages, librsync, ncftp, gnupg, rsync, makeWrapper }: -let - version = "0.7.07.1"; -in python2Packages.buildPythonApplication { +python2Packages.buildPythonApplication rec { name = "duplicity-${version}"; + version = "0.7.12"; src = fetchurl { - url = "http://code.launchpad.net/duplicity/0.7-series/${version}/+download/duplicity-${version}.tar.gz"; - sha256 = "594c6d0e723e56f8a7114d57811c613622d535cafdef4a3643a4d4c89c1904f8"; + url = "http://code.launchpad.net/duplicity/0.7-series/${version}/+download/${name}.tar.gz"; + sha256 = "1rhgrz2lm9vbfdp2raykrih1c6n2lw5jd572z4dsz488m52avjqi"; }; + buildInputs = [ librsync makeWrapper python2Packages.wrapPython ]; + propagatedBuildInputs = with python2Packages; [ + boto cffi cryptography ecdsa enum idna + ipaddress lockfile paramiko pyasn1 pycrypto six + ]; + checkInputs = with python2Packages; [ lockfile mock pexpect ]; + + # lots of tests are failing, although we get a little further now with the bits in preCheck + doCheck = false; + postInstall = '' wrapProgram $out/bin/duplicity \ --prefix PATH : "${stdenv.lib.makeBinPath [ gnupg ncftp rsync ]}" + + wrapPythonPrograms ''; - buildInputs = [ librsync makeWrapper ]; + preCheck = '' + patchShebangs testing - # Inputs for tests. These are added to buildInputs when doCheck = true - checkInputs = with python2Packages; [ lockfile mock pexpect ]; + substituteInPlace testing/__init__.py \ + --replace 'mkdir testfiles' 'mkdir -p testfiles' + ''; - # Many problematic tests - doCheck = false; - - propagatedBuildInputs = with python2Packages; [ boto cffi cryptography ecdsa enum idna - ipaddress lockfile paramiko pyasn1 pycrypto six ]; - - meta = { + meta = with stdenv.lib; { description = "Encrypted bandwidth-efficient backup using the rsync algorithm"; - homepage = "http://www.nongnu.org/duplicity"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric peti]; - platforms = stdenv.lib.platforms.unix; + homepage = http://www.nongnu.org/duplicity; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ viric peti ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/bluetooth/bluez-tools/default.nix b/pkgs/tools/bluetooth/bluez-tools/default.nix index 4640e3c4a61..47aaadc9ccf 100644 --- a/pkgs/tools/bluetooth/bluez-tools/default.nix +++ b/pkgs/tools/bluetooth/bluez-tools/default.nix @@ -1,23 +1,25 @@ -{ stdenv, autoconf, automake, glib, pkgconfig, readline, fetchgit }: +{ stdenv, autoreconfHook, readline +, fetchFromGitHub, glib, pkgconfig }: stdenv.mkDerivation rec { - date = "2015-09-10"; + date = "2016-12-12"; name = "bluez-tools-${date}"; - rev = "193ad6bb3db"; + rev = "97efd29"; - src = fetchgit { + src = fetchFromGitHub { inherit rev; - url = "https://github.com/khvzak/bluez-tools.git"; - sha256 = "0ylk10gfqlwmiz1k355axdhraixc9zym9f87xhag23934x64m8wa"; + owner = "khvzak"; + repo = "bluez-tools"; + sha256 = "08xp77sf5wnq5086halmyk3vla4bfls06q1zrqdcq36hw6d409i6"; }; - preConfigure = '' - ./autogen.sh - ''; - buildInputs = [ stdenv autoconf automake glib pkgconfig readline ]; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + + buildInputs = [ readline glib ]; meta = with stdenv.lib; { description = "Command line bluetooth manager for Bluez5"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; maintainers = [ maintainers.dasuxullebt ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix index 5737f1eca15..2f4b56ffcaf 100644 --- a/pkgs/tools/compression/advancecomp/default.nix +++ b/pkgs/tools/compression/advancecomp/default.nix @@ -1,31 +1,26 @@ -{stdenv, fetchurl, zlib}: -let - s = # Generated upstream information - rec { - baseName="advancecomp"; - version="1.19"; - name="${baseName}-${version}"; - url="http://prdownloads.sourceforge.net/advancemame/advancecomp-1.19.tar.gz?download"; - sha256="0irhmwcn9r4jc29442skqr1f3lafiaahxc3m3ybalmm37l6cb56m"; +{ stdenv, fetchFromGitHub +, autoreconfHook, zlib }: + +stdenv.mkDerivation rec { + name = "advancecomp-${version}"; + version = "1.23"; + + src = fetchFromGitHub { + owner = "amadvance"; + repo = "advancecomp"; + rev = "v${version}"; + sha256 = "1mrgmpjd9f7x16g847h1588mgryl26hlzfl40bc611259bb0bq7w"; }; - buildInputs = [ - zlib - ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; - src = fetchurl { - inherit (s) url sha256; - }; - meta = { - inherit (s) version; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ zlib ]; + + meta = with stdenv.lib; { description = ''A set of tools to optimize deflate-compressed files''; - license = stdenv.lib.licenses.gpl2 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - updateWalker = true; - homepage = "http://advancemame.sourceforge.net/comp-readme.html"; - downloadPage = "http://advancemame.sourceforge.net/comp-download.html"; + license = licenses.gpl2 ; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; + homepage = https://github.com/amadvance/advancecomp; + }; } diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index 92180216671..111d4125684 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ]; + # This breaks on Darwin because our cmake hook tries to make a build folder + # and the wonderful bazel BUILD file is already there (yay case-insensitivty?) + prePatch = "rm BUILD"; + meta = with stdenv.lib; { inherit (src.meta) homepage; diff --git a/pkgs/tools/compression/lzfse/default.nix b/pkgs/tools/compression/lzfse/default.nix index fca1a433ff3..0bf15580798 100644 --- a/pkgs/tools/compression/lzfse/default.nix +++ b/pkgs/tools/compression/lzfse/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lzfse-${version}"; - version = "2016-06-21"; + version = "2017-03-08"; src = fetchFromGitHub { owner = "lzfse"; repo = "lzfse"; - rev = "45912281e3945a09c6ebfa8c6629f6906a99fc29"; - sha256 = "1wbh3x874fjn548g1hw4bm7lkk60vlvy8ph0wsjkzcx8873hwj7h"; + rev = "88e2d27"; + sha256 = "1mfh6y6vpvxsdwmqmfbkqkwvxc0pz2dqqc72c6fk9sbsrxxaghd5"; }; makeFlags = [ "INSTALL_PREFIX=$(out)" ]; diff --git a/pkgs/tools/filesystems/mtools/UNUSED-darwin.patch b/pkgs/tools/filesystems/mtools/UNUSED-darwin.patch new file mode 100644 index 00000000000..46b790afd30 --- /dev/null +++ b/pkgs/tools/filesystems/mtools/UNUSED-darwin.patch @@ -0,0 +1,11 @@ +--- mtools/sysincludes.h.orig 2017-04-01 20:59:46.083196540 +0100 ++++ mtools/sysincludes.h 2017-04-01 20:59:12.855030456 +0100 +@@ -103,7 +103,7 @@ + # define PACKED __attribute__ ((packed)) + # if __GNUC__ == 2 && __GNUC_MINOR__ > 6 || __GNUC__ >= 3 + /* gcc 2.6.3 doesn't have "unused" */ /* mool */ +-# define UNUSED(x) x __attribute__ ((unused));x ++# define UNUSED(x) x + # define UNUSEDP __attribute__ ((unused)) + # else + # define UNUSED(x) x diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index 6b9631bfccf..ff311b9fae2 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -8,12 +8,19 @@ stdenv.mkDerivation rec { sha256 = "119gdfnsxc6hzicnsf718k0fxgy2q14pxn7557rc96aki20czsar"; }; + # Prevents errors such as "mainloop.c:89:15: error: expected ')'" + # Upstream issue https://lists.gnu.org/archive/html/info-mtools/2014-02/msg00000.html + patches = stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; + + # fails to find X on darwin + configureFlags = stdenv.lib.optional stdenv.isDarwin "--without-x"; + doCheck = true; meta = { homepage = http://www.gnu.org/software/mtools/; description = "Utilities to access MS-DOS disks"; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.darwin; maintainers = [ ]; }; } diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index 01d9b81d038..a5c858ecbae 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://www.tuxera.com/community/open-source-ntfs-3g/; description = "FUSE-based NTFS driver with full write support"; - maintainers = with maintainers; [ urkud dezgeg ]; + maintainers = with maintainers; [ dezgeg ]; platforms = platforms.linux; license = licenses.gpl2Plus; # and (lib)fuse-lite under LGPL2+ }; diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index bbaad516ebe..ccb20e9f1bd 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { name = "snapraid-${version}"; - version = "11.0"; + version = "11.1"; - src = fetchurl { - url = "https://github.com/amadvance/snapraid/releases/download/v${version}/snapraid-${version}.tar.gz"; - sha256 = "0wapbi8ph7qcyh1jwyrn2r5slzsznlxvg137r4l02xgaaf42p9rh"; + src = fetchFromGitHub { + owner = "amadvance"; + repo = "snapraid"; + rev = "v${version}"; + sha256 = "13v0gz22ng09gs87f7900z2sk2hg5543njl32rfn4cxxp0jncs3r"; }; doCheck = true; + buildInputs = [ autoreconfHook ]; + meta = { homepage = http://www.snapraid.it/; description = "A backup program for disk arrays"; diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index b8cdb64da87..66d3a110080 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { description = "Decoder for many camera raw picture formats"; license = stdenv.lib.licenses.free; platforms = with stdenv.lib.platforms; allBut cygwin; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/graphics/fast-neural-doodle/default.nix b/pkgs/tools/graphics/fast-neural-doodle/default.nix index 5769336693d..5d42482b309 100644 --- a/pkgs/tools/graphics/fast-neural-doodle/default.nix +++ b/pkgs/tools/graphics/fast-neural-doodle/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/tools/graphics/flam3/default.nix b/pkgs/tools/graphics/flam3/default.nix index f4e0faffb0e..e3c9cbf2e69 100644 --- a/pkgs/tools/graphics/flam3/default.nix +++ b/pkgs/tools/graphics/flam3/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cosmic recursive fractal flames"; homepage = http://flam3.com/; - maintainers = maintainers.nand0p; + maintainers = [ maintainers.nand0p ]; platforms = platforms.linux; license = licenses.cc-by-nc-sa-20; }; diff --git a/pkgs/tools/graphics/panomatic/default.nix b/pkgs/tools/graphics/panomatic/default.nix deleted file mode 100644 index f14c16775f8..00000000000 --- a/pkgs/tools/graphics/panomatic/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, boost, zlib}: - -stdenv.mkDerivation { - name = "panomatic-0.9.4"; - - src = fetchurl { - url = http://aorlinsk2.free.fr/panomatic/bin/panomatic-0.9.4-src.tar.bz2; - sha256 = "0vfkj3k3y8narwwijh996q2zzprjxbr2fhym15nm4fkq14yw4wwn"; - }; - - buildInputs = [ boost zlib ]; - - meta = { - homepage = http://aorlinsk2.free.fr/panomatic/; - description = "Tool that automates the creation of control points in Hugin"; - license = stdenv.lib.licenses.gpl2Plus; - }; -} diff --git a/pkgs/tools/graphics/qrencode/default.nix b/pkgs/tools/graphics/qrencode/default.nix index 936956cbd17..40f61253306 100644 --- a/pkgs/tools/graphics/qrencode/default.nix +++ b/pkgs/tools/graphics/qrencode/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { homepage = http://fukuchi.org/works/qrencode/; description = "QR code encoder"; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix index 50059e9477a..5d130d7ad80 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, pkgconfig -, anthy, ibus, glib, gobjectIntrospection, gtk3, python3, pygobject3 +, anthy, ibus, glib, gobjectIntrospection, gtk3, python3 }: stdenv.mkDerivation rec { @@ -15,15 +15,16 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ gebner ericsagnes ]; }; - configureFlags = "--with-anthy-zipcode=${anthy}/share/anthy/zipcode.t"; + configureFlags = [ "--with-anthy-zipcode=${anthy}/share/anthy/zipcode.t" ]; buildInputs = [ - anthy glib gobjectIntrospection gtk3 ibus python3 pygobject3 + anthy glib gobjectIntrospection gtk3 ibus python3 ]; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkgconfig python3.pkgs.wrapPython ]; postFixup = '' + wrapPythonPrograms substituteInPlace $out/share/ibus/component/anthy.xml --replace \$\{exec_prefix\} $out ''; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix index 1ada62580db..74253fa09fc 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, pkgconfig -, gtk3, ibus, libhangul, librsvg, python3, pygobject3 +, gtk3, ibus, libhangul, librsvg, python3 }: stdenv.mkDerivation rec { @@ -11,9 +11,11 @@ stdenv.mkDerivation rec { sha256 = "120p9w7za6hi521hz8q235fkl4i3p1qqr8nqm4a3kxr0pcq40bd2"; }; - buildInputs = [ gtk3 ibus libhangul python3 pygobject3 ]; + buildInputs = [ gtk3 ibus libhangul ]; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkgconfig python3.pkgs.wrapPython ]; + + postFixup = "wrapPythonPrograms"; meta = with stdenv.lib; { isIbusEngine = true; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix index 799d66aac9b..6293fa30d7a 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook , intltool, pkgconfig, sqlite, libpinyin, db -, ibus, glib, gtk3, python3, pygobject3 +, ibus, glib, gtk3, python3 }: stdenv.mkDerivation rec { @@ -15,12 +15,14 @@ stdenv.mkDerivation rec { }; buildInputs = [ ibus glib sqlite libpinyin python3 gtk3 db ]; - nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook intltool pkgconfig python3.pkgs.wrapPython ]; postAutoreconf = '' intltoolize ''; + postFixup = "wrapPythonPrograms"; + meta = with stdenv.lib; { isIbusEngine = true; description = "IBus interface to the libpinyin input method"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 2dbab712955..2d25e6bf430 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , autoreconfHook, pkgconfig -, ibus, m17n_lib, m17n_db, gettext, python3, pygobject3 +, ibus, m17n_lib, m17n_db, gettext, python3 }: stdenv.mkDerivation rec { @@ -16,10 +16,12 @@ stdenv.mkDerivation rec { buildInputs = [ ibus m17n_lib m17n_db gettext - python3 pygobject3 + python3 ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig python3.pkgs.wrapPython ]; + + postFixup = "wrapPythonPrograms"; meta = with stdenv.lib; { isIbusEngine = true; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index 644725c2910..aa346f45274 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -1,4 +1,4 @@ -{ clangStdenv, fetchFromGitHub, fetchsvn, gyp, which, ninja, python, pkgconfig, protobuf, ibus, gtk2, zinnia, qt4, libxcb, tegaki-zinnia-japanese }: +{ clangStdenv, fetchFromGitHub, fetchsvn, which, ninja, python2, pkgconfig, protobuf, ibus, gtk2, zinnia, qt4, libxcb, tegaki-zinnia-japanese }: let japanese_usage_dictionary = fetchsvn { @@ -19,7 +19,7 @@ in clangStdenv.mkDerivation rec { maintainers = with maintainers; [ gebner ericsagnes ]; }; - nativeBuildInputs = [ gyp which ninja python pkgconfig ]; + nativeBuildInputs = [ which ninja python2 python2.pkgs.gyp pkgconfig ]; buildInputs = [ protobuf ibus gtk2 zinnia qt4 libxcb ]; src = fetchFromGitHub { @@ -36,8 +36,8 @@ in clangStdenv.mkDerivation rec { configurePhase = '' export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 ibus_mozc_path=$out/lib/ibus-mozc/ibus-engine-mozc" - python src/build_mozc.py gyp --gypdir=${gyp}/bin --server_dir=$out/lib/mozc \ - python src/unix/fcitx/fcitx.gyp gyp --gypdir=${gyp}/bin + python src/build_mozc.py gyp --gypdir=${python2.pkgs.gyp}/bin --server_dir=$out/lib/mozc \ + python src/unix/fcitx/fcitx.gyp gyp --gypdir=${python2.pkgs.gyp}/bin ''; preBuildPhase = '' diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index c5090e5b949..8c842dbc841 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchFromGitHub , autoreconfHook, docbook2x, pkgconfig , gtk3, dconf, gobjectIntrospection -, ibus, python3, pygobject3 }: +, ibus, python3 }: stdenv.mkDerivation rec { name = "ibus-table-${version}"; - version = "1.9.14"; + version = "1.9.16"; src = fetchFromGitHub { owner = "kaio"; repo = "ibus-table"; rev = version; - sha256 = "1mkx03iqrq5yq57y7hjqcmxfh41dsjykyyl70d41dflcgp5q2nhw"; + sha256 = "1gkb6nsibk59kp404b394sg638jgah2a2b6ffq3gkacqg5j30wjb"; }; postPatch = '' @@ -29,16 +29,18 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - dconf gtk3 gobjectIntrospection ibus python3 pygobject3 + dconf gtk3 gobjectIntrospection ibus python3 ]; - nativeBuildInputs = [ autoreconfHook docbook2x pkgconfig ]; + nativeBuildInputs = [ autoreconfHook docbook2x pkgconfig python3.pkgs.wrapPython ]; postUnpack = '' substituteInPlace $sourceRoot/engine/Makefile.am \ --replace "docbook2man" "docbook2man --sgml" ''; + postFixup = "wrapPythonPrograms"; + meta = with stdenv.lib; { isIbusEngine = true; description = "An IBus framework for table-based input methods"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix index 161982ac618..1ea7ef4251f 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix @@ -15,6 +15,13 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with python3Packages; [ pyxdg python-Levenshtein ]; + nativeBuildInputs = [ python3Packages.wrapPython ]; + + postFixup = '' + buildPythonPath $out + patchPythonScript $out/share/ibus-uniemoji/uniemoji.py + ''; + makeFlags = [ "PREFIX=$(out)" "SYSCONFDIR=$(out)/etc" "PYTHON=${python3Packages.python.interpreter}" ]; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 58afb638b47..1654f57c8ed 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, makeWrapper +{ stdenv, fetchurl, wrapGAppsHook , intltool, isocodes, pkgconfig -, python3, pygobject3 +, python3 , gtk2, gtk3, atk, dconf, glib, json_glib , dbus, libnotify, gobjectIntrospection, wayland , nodePackages @@ -34,16 +34,20 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - python3 pygobject3 + python3 intltool isocodes pkgconfig gtk2 gtk3 dconf json_glib dbus libnotify gobjectIntrospection wayland ]; - propagatedBuildInputs = [ glib ]; + propagatedBuildInputs = [ glib python3.pkgs.pygobject3 ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ wrapGAppsHook python3.pkgs.wrapPython ]; + + outputs = [ "out" "dev" ]; + + enableParallelBuilding = true; preConfigure = '' # Fix hard-coded installation paths, so make does not try to overwrite our @@ -57,14 +61,9 @@ stdenv.mkDerivation rec { substituteInPlace data/dconf/Makefile.in --replace "dconf update" "echo" ''; - preFixup = '' - for f in "$out/bin"/*; do #*/ - wrapProgram "$f" \ - --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \ - --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" - done + postFixup = '' + buildPythonPath $out + patchPythonScript $out/share/ibus/setup/main.py ''; doInstallCheck = true; diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix index 710641281e5..02d65597f74 100644 --- a/pkgs/tools/misc/antimicro/default.nix +++ b/pkgs/tools/misc/antimicro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, pkgconfig, SDL2, qtbase, qttools, xorg, fetchFromGitHub }: +{ stdenv, cmake, pkgconfig, SDL2, qtbase, qttools, makeQtWrapper, xorg, fetchFromGitHub }: stdenv.mkDerivation rec { name = "antimicro-${version}"; @@ -12,9 +12,13 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cmake pkgconfig SDL2 qtbase qttools xorg.libXtst + cmake pkgconfig SDL2 qtbase qttools xorg.libXtst makeQtWrapper ]; + postInstall = '' + wrapQtProgram $out/bin/antimicro + ''; + meta = with stdenv.lib; { description = "GUI for mapping keyboard and mouse controls to a gamepad"; inherit (src.meta) homepage; diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index 05cc33f8bce..547cc289c3c 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -2,18 +2,19 @@ stdenv.mkDerivation rec { name = "clipster-unstable-${version}"; - version = "2017-02-17"; + version = "2017-02-27"; src = fetchFromGitHub { owner = "mrichar1"; repo = "clipster"; - rev = "8c4732d7c26ddec6faac295d3ddb2278c6ed5647"; - sha256 = "00ki3srdjh96ghan1z4zd8w5cahgvnpa8hccnxmn0im1xrgpkh3b"; + rev = "dfa75b52ee3a41fff7534aca165dc0e6a24a3680"; + sha256 = "0d7ak6wpvvgz7cwvfzy2shkfiw6gr8l703xyjpiayjbnr2s79k5j"; }; pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]); - buildInputs = [ pythonEnv gtk3 libwnck3 makeWrapper ]; + buildInputs = [ pythonEnv gtk3 libwnck3 ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' sed -i 's/python/python3/g' clipster @@ -46,6 +47,6 @@ stdenv.mkDerivation rec { license = licenses.agpl3; homepage = https://github.com/mrichar1/clipster; platforms = platforms.linux; - maintainers = [maintainers.magnetophon]; + maintainers = [ maintainers.magnetophon ]; }; } diff --git a/pkgs/tools/misc/convmv/default.nix b/pkgs/tools/misc/convmv/default.nix index 7db7ebf96d6..6a76906a805 100644 --- a/pkgs/tools/misc/convmv/default.nix +++ b/pkgs/tools/misc/convmv/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Converts filenames from one encoding to another"; platforms = platforms.linux ++ platforms.freebsd ++ platforms.cygwin; - maintainers = [ maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix index 98b91964e64..15701d3c429 100644 --- a/pkgs/tools/misc/cpulimit/default.nix +++ b/pkgs/tools/misc/cpulimit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cpulimit-${version}"; - version = "2.4"; + version = "2.5"; src = fetchurl { url = "mirror://sourceforge/limitcpu/${name}.tar.gz"; - sha256 = "1fr4rgi5vdbjxsn04j99g1qyr7n5169hrv6lp3lli030alvkfbm2"; + sha256 = "1w1l3r9ini78s8idxlzmgljpfgl1n4y4qhp3q2s8y6wq4bfx41lp"; }; buildFlags = with stdenv; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 6a9763666d3..4f0a9ba12c1 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -29,11 +29,13 @@ python3.pkgs.buildPythonApplication rec { # Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf # Also these libraries: python3-guestfs # FIXME: move xxd into a separate package so we don't have to pull in all of vim. - propagatedBuildInputs = (with python3.pkgs; [ debian libarchive-c python_magic tlsh rpm ]) ++ + buildInputs = map lib.getBin ([ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz colordiff ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]); + pythonPath = with python3.pkgs; [ debian libarchive-c python_magic tlsh rpm ]; + doCheck = false; # Calls 'mknod' in squashfs tests, which needs root postInstall = '' diff --git a/pkgs/tools/misc/dynamic-colors/default.nix b/pkgs/tools/misc/dynamic-colors/default.nix index b32f8f43146..e2f2f51ccfb 100644 --- a/pkgs/tools/misc/dynamic-colors/default.nix +++ b/pkgs/tools/misc/dynamic-colors/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "dynamic-colors-${version}"; - version = "0.2.1"; + version = "0.2.2.1"; src = fetchFromGitHub { - owner = "peterhoeg"; - repo = "dynamic-colors"; - rev = "v${version}"; - sha256 = "061lh4qjk4671hwzmj55n3gy5hsi4p3hb30hj5bg3s6glcsbjpr5"; + owner = "peterhoeg"; + repo = "dynamic-colors"; + rev = "v${version}"; + sha256 = "0qz76n5sspgpz6bz66jfkyr42da3skbpw9wbvxgm3ha343azfaiw"; }; dontBuild = true; @@ -17,24 +17,24 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p \ $out/bin \ - $out/share/colorschemes \ + $out/share/dynamic-colors/colorschemes \ $out/share/bash-completion/completions \ $out/share/zsh/site-packages install -m755 bin/dynamic-colors $out/bin/ install -m644 completions/dynamic-colors.bash $out/share/bash-completion/completions/dynamic-colors install -m644 completions/dynamic-colors.zsh $out/share/zsh/site-packages/_dynamic-colors - install -m644 colorschemes/* -t $out/share/colorschemes + install -m644 colorschemes/* -t $out/share/dynamic-colors/colorschemes - sed -e "s|/usr/share/dynamic-colors|$out/share|g" \ - -i $out/bin/dynamic-colors + substituteInPlace $out/bin/dynamic-colors \ + --replace /usr/share/dynamic-colors $out/share/dynamic-colors ''; - meta = { - homepage = https://github.com/peterhoeg/dynamic-colors; - license = stdenv.lib.licenses.mit; + meta = with stdenv.lib; { description = "Change terminal colors on the fly"; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.peterhoeg ]; + homepage = https://github.com/peterhoeg/dynamic-colors; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index d26eb8f45ae..c49f11a72a9 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -1,28 +1,55 @@ -{ stdenv, fetchFromGitHub, rustPlatform, openssl, cmake, zlib }: +{ stdenv, fetchFromGitHub, rustPlatform, openssl, cmake, perl, pkgconfig, zlib }: with rustPlatform; -buildRustPackage rec { - name = "exa-${version}"; - version = "2016-04-20"; +let + # check for updates + zoneinfo_compiled = fetchFromGitHub { + owner = "rust-datetime"; + repo = "zoneinfo-compiled"; + rev = "f56921ea5e9f7cf065b1480ff270a1757c1f742f"; + sha256 = "1xmw7c5f5n45lkxnyxp4llfv1bnqhc876w98165ccdbbiylfkw26"; + }; + cargoPatch = '' + # use non-git dependencies + patch -p1 <> $out/etc/black.list\n") blacklist} + ${lib.concatMapStrings (d: "echo ${d} >> $out/etc/white.list\n") whitelist} + install -Dm644 conf/hosts.head $out/etc/ + + for f in $out/bin/* $out/lib/* $out/etc/hostsblock.conf; do + substituteInPlace $f --replace "/dev/shm" "/tmp" + substituteInPlace $f --replace "/usr/lib/" "$out/lib/" + substituteInPlace $f --replace "/etc/hostsblock/" "$out/etc/" + sed --in-place --regexp-extended "s|([\` ])curl |\1${curl}/bin/curl |g" $f + substituteInPlace $f --replace grep ${gnugrep}/bin/grep + substituteInPlace $f --replace " sed " " ${gnused}/bin/sed " + sed --in-place --regexp-extended "s|([^_])unzip |\1${unzip}/bin/unzip |" $f + sed --in-place --regexp-extended "s|7za([^,])|${p7zip}/bin/7za\1|g" $f + done + + echo "postprocess(){ ${coreutils}/bin/true; }" >> $out/etc/hostsblock.conf + + mkdir -p $out/share/dbus-1/system-services + install -Dm644 systemd/hostsblock.service $out/share/dbus-1/system-services + install -Dm644 systemd/hostsblock.timer $out/share/dbus-1/system-services + ''; + + meta = with lib; { + description = "An ad- and malware-blocking script for Linux"; + website = http://gaenserich.github.io/hostsblock/; + license = licenses.gpl3; + maintainers = [ maintainers.nicknovitski ]; + platforms = platforms.unix; + }; + +} diff --git a/pkgs/tools/misc/kt/default.nix b/pkgs/tools/misc/kt/default.nix new file mode 100644 index 00000000000..738eceb20a0 --- /dev/null +++ b/pkgs/tools/misc/kt/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "kt-${version}"; + version = "11.1.0"; + + src = fetchFromGitHub { + owner = "fgeller"; + repo = "kt"; + rev = "v${version}"; + sha256 = "1ymygd3l5pfbnjmdjcrspj520v29hnv3bdgxpim38dpv3qj518vq"; + }; + + goPackagePath = "github.com/fgeller/kt"; + + meta = with stdenv.lib; { + description = "Kafka command line tool"; + homepage = https://github.com/fgeller/kt; + maintainers = with maintainers; [ utdemir ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/tools/misc/odroid-xu3-bootloader/default.nix b/pkgs/tools/misc/odroid-xu3-bootloader/default.nix new file mode 100644 index 00000000000..3cce28df4f3 --- /dev/null +++ b/pkgs/tools/misc/odroid-xu3-bootloader/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchFromGitHub, coreutils, ubootOdroidXU3 }: + +stdenv.mkDerivation { + name = "odroid-xu3-bootloader-2015-12-04"; + + src = fetchFromGitHub { + owner = "hardkernel"; + repo = "u-boot"; + rev = "fe2f831fd44a4071f58a42f260164544697aa666"; + sha256 = "1h5yvawzla0vqhkk98gxcwc824bhc936bh6j77qkyspvqcw761fr"; + }; + + buildCommand = '' + install -Dm644 -t $out/lib/sd_fuse-xu3 $src/sd_fuse/hardkernel_1mb_uboot/{bl2,tzsw}.* + install -Dm644 -t $out/lib/sd_fuse-xu3 $src/sd_fuse/hardkernel/bl1.* + ln -sf ${ubootOdroidXU3}/u-boot-dtb.bin $out/lib/sd_fuse-xu3/u-boot-dtb.bin + + install -Dm755 $src/sd_fuse/hardkernel_1mb_uboot/sd_fusing.1M.sh $out/bin/sd_fuse-xu3 + sed -i \ + -e '1i#!${stdenv.shell}' \ + -e '1iPATH=${lib.makeBinPath [ coreutils ]}:$PATH' \ + -e '/set -x/d' \ + -e 's,.\/sd_fusing\.sh,sd_fuse-xu3,g' \ + -e "s,\./,$out/lib/sd_fuse-xu3/,g" \ + $out/bin/sd_fuse-xu3 + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + license = licenses.unfreeRedistributableFirmware; + description = "Secure boot enabled boot loader for ODROID-XU{3,4}"; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index 9cd8c28c7f0..0865044eac6 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2 }: +{ stdenv, fetchFromGitHub, autoreconfHook +, gtk2, intltool, pkgconfig }: stdenv.mkDerivation rec { - name = "parcellite-1.1.9"; + name = "parcellite-${version}"; + version = "1.2.1"; - src = fetchurl { - url = "mirror://sourceforge/parcellite/${name}.tar.gz"; - sha256 = "1m0igxny8f8hlbwcbsr4vg08808sqwy05h61ia2bxsrf122rba6b"; + src = fetchFromGitHub { + owner = "rickyrockrat"; + repo = "parcellite"; + rev = version; + sha256 = "19q4x6x984s6gxk1wpzaxawgvly5vnihivrhmja2kcxhzqrnfhiy"; }; - buildInputs = [ pkgconfig intltool gtk2 ]; + nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; + buildInputs = [ gtk2 ]; - meta = { + meta = with stdenv.lib; { description = "Lightweight GTK+ clipboard manager"; - homepage = "http://parcellite.sourceforge.net"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; + homepage = https://github.com/rickyrockrat/parcellite; + license = licenses.gpl3Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index b16806139b4..bf5a158625c 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, skalibs, gcc }: +{ stdenv, fetchurl, skalibs, gcc }: with stdenv.lib; @@ -6,25 +6,26 @@ stdenv.mkDerivation rec { name = "s6-portable-utils-${version}"; version = "2.1.0.0"; - src = fetchFromGitHub { - owner = "skarnet"; - repo = "s6-portable-utils"; - rev = "v${version}"; - sha256 = "0k5pcwc45jw5l8ycz03wx2w4pds0wp4ll47d3i5i1j02i9v0rhc9"; + src = fetchurl { + url = "http://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz"; + sha256 = "0khw5ljmlghvl4hyrf4vd0hl5rrmsspchi8w4xgniwfip6vlbqfd"; }; dontDisableStatic = true; - nativeBuildInputs = [] - ++ optional stdenv.isDarwin gcc; - configureFlags = [ + "--enable-absolute-paths" "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" "--with-include=${skalibs}/include" "--with-lib=${skalibs}/lib" "--with-dynlib=${skalibs}/lib" - ]; - + ] + # On darwin, the target triplet from -dumpmachine includes version number, but + # skarnet.org software uses the triplet to test binary compatibility. + # Explicitly setting target ensures code can be compiled against a skalibs + # binary built on a different version of darwin. + # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph + ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); meta = { homepage = http://www.skarnet.org/software/s6-portable-utils/; diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index fc4a24ec355..f1a9c4b4640 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -16,8 +16,6 @@ in stdenv.mkDerivation rec { sha256 = "1vxczk22f58nbikvj47s2x1gzh6q4mbgwnf091p00h3b6nxppdgn"; }; - propagatedBuildInputs = [ pythonPackages.pycurl ]; - patches = [ ./detect_serverbindir.patch ]; buildInputs = @@ -27,7 +25,7 @@ in stdenv.mkDerivation rec { ]; pythonPath = with pythonPackages; - [ pycups pycurl dbus-python pygobject3 requests2 pycairo ]; + [ pycups pycurl dbus-python pygobject3 requests2 pycairo pythonPackages.pycurl ]; configureFlags = [ "--with-udev-rules" @@ -35,6 +33,8 @@ in stdenv.mkDerivation rec { "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; + stripDebugList = "bin lib etc/udev"; + postInstall = let giTypelibPath = stdenv.lib.makeSearchPath "lib/girepository-1.0" [ gdk_pixbuf.out gtk3.out pango.out atk.out libnotify.out ]; @@ -44,6 +44,7 @@ in stdenv.mkDerivation rec { --set GI_TYPELIB_PATH ${giTypelibPath} \ --set CUPS_DATADIR ${cups-filters}/share/cups" wrapPythonPrograms + # The program imports itself, so we need to move shell wrappers to a proper place. fixupWrapper() { mv "$out/share/system-config-printer/$2.py" \ diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 04b42f6d722..c254490555c 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { name = "tmuxp-${version}"; - version = "1.2.2"; + version = "1.2.7"; namePrefix = ""; src = fetchurl { url = "mirror://pypi/t/tmuxp/${name}.tar.gz"; - sha256 = "1g37pdxs0wmnskqm7qsqm0ygwpc1dxk1d7lrzpgs717zxaak8vln"; + sha256 = "19s17frgyjvyvmr16fs0gl5mnbaxbmdffmkckadwhd5mg0pz2i4s"; }; patchPhase = '' diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/tools/misc/usbmuxd/default.nix index accd3b8070a..fc8c40ea4e0 100644 --- a/pkgs/tools/misc/usbmuxd/default.nix +++ b/pkgs/tools/misc/usbmuxd/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { talking to your iPhone or iPod Touch over USB and coordinating access to its services by other applications.''; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix index d9f87a8d894..f312f4770b5 100644 --- a/pkgs/tools/misc/xfstests/default.nix +++ b/pkgs/tools/misc/xfstests/default.nix @@ -3,17 +3,18 @@ , time, utillinux, which, writeScript, xfsprogs }: stdenv.mkDerivation { - name = "xfstests-2016-08-26"; + name = "xfstests-2017-03-26"; src = fetchgit { url = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git"; - rev = "21eb9d303cff056753a3104602ff674d468af52e"; - sha256 = "175nfdjfakxij7cmajjv2ycsiv4hkmx7b94nsylqrg51drx3jkji"; + rev = "7400c10e503fed20fe2d9f8b03b2157eba4ff3b8"; + sha256 = "0m30mx8nv49ryijlkqffjmkw2g1xdxsrq868jh9crwh19055v7qp"; }; buildInputs = [ acl autoreconfHook attr gawk libaio libuuid libxfs openssl perl ]; hardeningDisable = [ "format" ]; + enableParallelBuilding = true; patchPhase = '' # Patch the destination directory @@ -22,6 +23,14 @@ stdenv.mkDerivation { # Don't canonicalize path to mkfs (in util-linux) - otherwise e.g. mkfs.ext4 isn't found sed -i common/config -e 's|^export MKFS_PROG=.*|export MKFS_PROG=mkfs|' + # Move the Linux-specific test output files to the correct place, or else it will + # try to move them at runtime. Also nuke all the irix crap. + for f in tests/*/*.out.linux; do + mv $f $(echo $f | sed -e 's/\.linux$//') + done + rm -f tests/*/*.out.irix + + # Fix up lots of impure paths for f in common/* tools/* tests/*/*; do sed -i $f -e 's|/bin/bash|${bash}/bin/bash|' sed -i $f -e 's|/bin/true|true|' @@ -80,7 +89,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Torture test suite for filesystems"; - homepage = "http://oss.sgi.com/cgi-bin/gitweb.cgi?p=xfs/cmds/xfstests.git"; + homepage = "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/"; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index aa92e66d98f..b9548a5bff5 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -14,11 +14,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2017.03.10"; + version = "2017.04.02"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0ccrwhgycz17xmsdsd0rsv7khhp1z7dnwp7fkxx7dxbivjf0h0a4"; + sha256 = "131z42aq2qnh394y4ykzm3mvsf62lia86y90as6acyg4v201lgk2"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix new file mode 100644 index 00000000000..820f193e5e2 --- /dev/null +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -0,0 +1,42 @@ +{ pythonPackages, fetchurl, lib, + yubikey-personalization, libu2f-host, libusb1 }: + +pythonPackages.buildPythonPackage rec { + name = "yubikey-manager-0.3.1"; + + srcs = fetchurl { + url = "https://developers.yubico.com/yubikey-manager/Releases/${name}.tar.gz"; + sha256 = "0vrhaqb8yc1qjq25k9dv8gmqxhbf6aa047i6dvz1lcraq6zwnq6g"; + }; + + propagatedBuildInputs = + with pythonPackages; + lib.optional (!pythonPackages.pythonAtLeast "3.4") enum34 ++ [ + click + cryptography + pyscard + pyusb + six + ] ++ [ + libu2f-host + libusb1 + yubikey-personalization + ]; + + makeWrapperArgs = [ + "--prefix LD_LIBRARY_PATH : ${libu2f-host}/lib:${libusb1}/lib:${yubikey-personalization}/lib" + ]; + + postInstall = '' + mkdir -p $out/etc/bash_completion.d + _YKMAN_COMPLETE=source $out/bin/ykman > $out/etc/bash_completion.d/ykman.sh ||true + ''; + + meta = with lib; { + homepage = https://developers.yubico.com/yubikey-manager; + description = "Command line tool for configuring any YubiKey over all USB transports."; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ benley ]; + }; +} diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index bb9316512ec..4f8daf38d46 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -28,8 +28,6 @@ stdenv.mkDerivation rec { sha256 = "1s1hyndva0yp62xy96pcp4anzrvw6cl0abjajim17sbmdp00fwhw"; }; - patches = [ ]; - outputs = [ "bin" "dev" "out" "man" "devdoc" ]; enableParallelBuilding = true; @@ -57,9 +55,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - # OS X does not have a default system bundle, so we assume cacerts is installed in the default nix-env profile - # This sucks. We should probably just include the latest cacerts in the darwin bootstrap. - "--with-ca-bundle=${if stdenv.isDarwin then "/nix/var/nix/profiles/default" else ""}/etc/ssl/certs/ca-${if stdenv.isDarwin then "bundle" else "certificates"}.crt" + "--with-ca-fallback" "--disable-manual" ( if sslSupport then "--with-ssl=${openssl.dev}" else "--without-ssl" ) ( if gnutlsSupport then "--with-gnutls=${gnutls.dev}" else "--without-gnutls" ) diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index ddef8a70012..10b7b47b3f4 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -20,6 +20,7 @@ let ipaddress backports_ssl_match_hostname docker_pycreds + uptime ]; # due to flake8 @@ -47,7 +48,7 @@ in stdenv.mkDerivation rec { pythonPackages.ntplib pythonPackages.simplejson pythonPackages.pyyaml - pythonPackages.pymongo + pythonPackages.pymongo_2_9_1 pythonPackages.python-etcd pythonPackages.consul docker_1_10 diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 3b7a68fb972..dda4452f644 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -1,4 +1,11 @@ -{ stdenv, pkgs, fetchurl, openssl, zlib }: +{ useLua ? !stdenv.isDarwin +, usePcre ? true +, stdenv, fetchurl +, openssl, zlib, lua5_3 ? null, pcre ? null +}: + +assert useLua -> lua5_3 != null; +assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; @@ -12,12 +19,29 @@ stdenv.mkDerivation rec { sha256 = "ebb31550a5261091034f1b6ac7f4a8b9d79a8ce2a3ddcd7be5b5eb355c35ba65"; }; - buildInputs = [ openssl zlib ]; + buildInputs = [ openssl zlib ] + ++ stdenv.lib.optional useLua lua5_3 + ++ stdenv.lib.optional usePcre pcre; # TODO: make it work on bsd as well - preConfigure = '' - export makeFlags="TARGET=${if stdenv.isSunOS then "solaris" else if stdenv.isLinux then "linux2628" else "generic"} PREFIX=$out USE_OPENSSL=yes USE_ZLIB=yes ${stdenv.lib.optionalString stdenv.isDarwin "CC=cc USE_KQUEUE=1"}" - ''; + makeFlags = [ + "PREFIX=\${out}" + ("TARGET=" + (if stdenv.isSunOS then "solaris" + else if stdenv.isLinux then "linux2628" + else if stdenv.isDarwin then "osx" + else "generic")) + ]; + buildFlags = [ + "USE_OPENSSL=yes" + "USE_ZLIB=yes" + ] ++ stdenv.lib.optionals usePcre [ + "USE_PCRE=yes" + "USE_PCRE_JIT=yes" + ] ++ stdenv.lib.optionals useLua [ + "USE_LUA=yes" + "LUA_LIB=${lua5_3}/lib" + "LUA_INC=${lua5_3}/include" + ] ++ stdenv.lib.optional stdenv.isDarwin "CC=cc"; meta = { description = "Reliable, high performance TCP/HTTP load balancer"; @@ -30,7 +54,7 @@ stdenv.mkDerivation rec { hardware. ''; homepage = http://haproxy.1wt.eu; - maintainers = [ stdenv.lib.maintainers.garbas ]; + maintainers = with stdenv.lib.maintainers; [ fuzzy-id garbas ]; platforms = with stdenv.lib.platforms; linux ++ darwin; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index b7527cf97ce..7f7d68fd575 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "1ky4ckv5p86xxgjkgxdi48c9q9h4pff2blilg03bxks8f8dxfy9f"; + sha256 = "1m97s3c1fvhq6ql3zr2a2ia2n06cl8jgf28gjn4k3xg8m7s984dz"; }; buildInputs = [ boost zlib openssl ]; diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix index 13f8cedc673..c0fd6c973cd 100644 --- a/pkgs/tools/networking/iperf/2.nix +++ b/pkgs/tools/networking/iperf/2.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "iperf-2.0.5"; + name = "iperf-2.0.9"; src = fetchurl { - url = "mirror://sourceforge/iperf/${name}.tar.gz"; - sha256 = "0nr6c81x55ihs7ly2dwq19v9i1n6wiyad1gacw3aikii0kzlwsv3"; + url = "mirror://sourceforge/iperf2/files/${name}.tar.gz"; + sha256 = "1gzh8dk2myqgxznxrryib4zsw23ffvx0s5j7sa780vk86lgr20nv"; }; hardeningDisable = [ "format" ]; meta = with stdenv.lib; { - homepage = "http://sourceforge.net/projects/iperf/"; + homepage = "http://sourceforge.net/projects/iperf/"; description = "Tool to measure IP bandwidth using UDP or TCP"; platforms = platforms.unix; - license = "as-is"; + license = licenses.mit; }; } diff --git a/pkgs/tools/networking/isync/unstable.nix b/pkgs/tools/networking/isync/unstable.nix index a20fa2fe737..4adcaf2b9da 100644 --- a/pkgs/tools/networking/isync/unstable.nix +++ b/pkgs/tools/networking/isync/unstable.nix @@ -2,13 +2,13 @@ , autoconf, automake }: stdenv.mkDerivation rec { - name = "isync-git-20161218"; - rev = "77acc268123b8233843ca9bc3dcf90669efde08f"; + name = "isync-git-20170329"; + rev = "1fdf793a3fb9f4704977ef49e0a490a83291ea4d"; src = fetchgit { url = "https://git.code.sf.net/p/isync/isync"; inherit rev; - sha256 = "0i21cgmgm8acvd7xwdk9pll3kl6cxj9s1hakqzbwks8j4ncygwkj"; + sha256 = "1m54jjww1b7a6rfw4wckzx6z1nd90psbb6cs38b9c015cs0vwaf5"; }; buildInputs = [ openssl pkgconfig db cyrus_sasl zlib autoconf automake ]; diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index 6e18e1dba1d..0e4842ec24d 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "keepalived-${version}"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "acassen"; repo = "keepalived"; rev = "v${version}"; - sha256 = "0vmflvr7j53dhpfawd1l2kkqw9prs2vl6r4a8rv5ilrrj3j0q989"; + sha256 = "0lbzbw5giddr4rrhppdpsswh88x86ywxrl01vm8z5am7acixn1zr"; }; buildInputs = [ diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 258a81570c0..303204c9c21 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "minio-client-${shortVersion}"; - shortVersion = "20160821"; - longVersion = "2016-08-21T03:02:49Z"; + shortVersion = "20170206"; + longVersion = "2017-02-06T20-16-19Z"; src = fetchurl { url = "https://github.com/minio/mc/archive/RELEASE.${lib.replaceStrings [":"] ["-"] longVersion}.tar.gz"; - sha256 = "1qnslwfspbvzawxrrym27agw79x8sgcafk7d0yakncjyg6vmdkka"; + sha256 = "0k66kr7x669jvydcxp3rpvg8p9knhmcihpnjiqynhqgrdy16mr1f"; }; buildInputs = [ go ]; diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index 9fe4b4421a7..dc4e246c02f 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = { description = "WWAN modem manager, part of NetworkManager"; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index cca111db67d..c596ea63f4d 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,16 +1,17 @@ { stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3 , libnotify, libsecret, polkit, isocodes, modemmanager, librsvg , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas -, makeWrapper, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook }: +, makeWrapper, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook, webkitgtk }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; + name = "${pname}-${major}.${minor}"; pname = "network-manager-applet"; - version = networkmanager.version; + major = "1.4"; + minor = "6"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${name}.tar.xz"; - sha256 = "09ijxicsqf39y6h8kwbfjyljfbqkkx4vrpyfn6gfg1h9mvp4cf39"; + url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz"; + sha256 = "0xpcdwqmnwiqqqsd5rx1gh5rvv5m2skj59bqxhccy1k2ikzgr9hh"; }; configureFlags = [ "--sysconfdir=/etc" ]; @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas polkit isocodes makeWrapper udev libgudev gnome3.gconf gnome3.libgnome_keyring - modemmanager jansson librsvg glib_networking gnome3.dconf + modemmanager jansson librsvg glib_networking gnome3.dconf webkitgtk ]; nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { homepage = http://projects.gnome.org/NetworkManager/; description = "NetworkManager control applet for GNOME"; license = licenses.gpl2; - maintainers = with maintainers; [ phreedom urkud rickynils ]; + maintainers = with maintainers; [ phreedom rickynils ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/network-manager/PppdPath.patch b/pkgs/tools/networking/network-manager/PppdPath.patch index 98c1308e4db..4850d93716d 100644 --- a/pkgs/tools/networking/network-manager/PppdPath.patch +++ b/pkgs/tools/networking/network-manager/PppdPath.patch @@ -1,8 +1,6 @@ -diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c -index 89a7add..ae99eb4 100644 ---- a/src/ppp-manager/nm-ppp-manager.c -+++ b/src/ppp-manager/nm-ppp-manager.c -@@ -843,7 +843,7 @@ create_pppd_cmd_line (NMPPPManager *self, +--- NetworkManager-1.6.2.org/src/ppp/nm-ppp-manager.c 2017-02-15 13:10:27.000000000 +0100 ++++ NetworkManager-1.6.2/./src/ppp/nm-ppp-manager.c 2017-04-03 11:45:39.891653216 +0200 +@@ -724,7 +724,7 @@ g_return_val_if_fail (setting != NULL, NULL); diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 1ad1e54e7fb..fd470143a3c 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -2,25 +2,34 @@ , systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, iptables , libgcrypt, dnsmasq, bluez5, readline , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup -, ethtool, gnused, coreutils, file, inetutils, kmod }: +, ethtool, iputils, gnused, coreutils, file, inetutils, kmod, jansson, libxslt +, python3Packages, docbook_xsl, fetchpatch }: stdenv.mkDerivation rec { name = "network-manager-${version}"; pname = "NetworkManager"; - major = "1.4"; - version = "${major}.4"; + major = "1.6"; + version = "${major}.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; - sha256 = "029k2f1arx1m5hppmr778i9yg34jj68nmji3i89qs06c33rpi4w2"; + sha256 = "1y96k82rav8if334jl500zc024d210c4pgprh94yqyz3rmanyaxj"; }; outputs = [ "out" "dev" ]; + postPatch = '' + patchShebangs ./tools + ''; + preConfigure = '' substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname substituteInPlace configure --replace /usr/bin/file ${file}/bin/file - substituteInPlace src/devices/nm-device.c --replace /usr/bin/ping ${inetutils}/bin/ping + substituteInPlace src/devices/nm-device.c \ + --replace /usr/bin/ping ${inetutils}/bin/ping \ + --replace /usr/bin/ping6 ${inetutils}/bin/ping + substituteInPlace src/devices/nm-arping-manager.c \ + --replace '("arping", NULL, NULL);' '("arping", "${inetutils}/bin/arping", NULL);' substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe ${kmod}/bin/modprobe substituteInPlace data/84-nm-drivers.rules \ --replace /bin/sh ${stdenv.shell} @@ -58,14 +67,21 @@ stdenv.mkDerivation rec { "--with-libsoup=yes" ]; - patches = [ ./PppdPath.patch ]; + patches = [ + ./PppdPath.patch + (fetchpatch { + sha256 = "1n90j5rwg97xkrhlldyr92filc2dmycl9pr0svky9hlcn9csk2z6"; + name = "null-dereference.patch"; + url = "https://github.com/NetworkManager/NetworkManager/commit/4e8eddd100bbc8429806a70620c90b72cfd29cb1.patch"; + }) + ]; buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp - bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup ]; + bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup jansson ]; - propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ]; + propagatedBuildInputs = [ dbus_glib gnutls libgcrypt python3Packages.pygobject3 ]; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkgconfig libxslt docbook_xsl ]; preInstall = '' installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" "runstatedir=$out/var/run" ) @@ -78,7 +94,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"' # rename to network-manager to be in style - mv $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service + mv $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service # systemd in NixOS doesn't use `systemctl enable`, so we need to establish # aliases ourselves. @@ -90,7 +106,7 @@ stdenv.mkDerivation rec { homepage = http://projects.gnome.org/NetworkManager/; description = "Network configuration and management tool"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ phreedom urkud rickynils domenkozar obadz ]; + maintainers = with maintainers; [ phreedom rickynils domenkozar obadz ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix index 591994ddccf..6a4f31e5e19 100644 --- a/pkgs/tools/networking/network-manager/l2tp.nix +++ b/pkgs/tools/networking/network-manager/l2tp.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-l2tp"; - version = networkmanager.version; + version = "1.2.4"; src = fetchFromGitHub { owner = "nm-l2tp"; repo = "network-manager-l2tp"; - rev = "c0cedda5e2a0ded695b497c361eaf577068520cb"; - sha256 = "01f39ghc37vw4n4i7whyikgqz8vzxf41q9fsv2gfw1g501cny1j2"; + rev = "${version}"; + sha256 = "1mvn0z1vl4j9drl3dsw2dv0pppqvj29d2m07487dzzi8cbxrqj36"; }; buildInputs = [ networkmanager ppp libsecret ] diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 64f4b9008b1..29f8e1ae257 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -8,13 +8,17 @@ let in stdenv.mkDerivation rec { - name = "ntp-4.2.8p9"; + name = "ntp-4.2.8p10"; src = fetchurl { url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz"; - sha256 = "0whbyf82lrczbri4adbsa4hg1ppfa6c7qcj7nhjwdfp1g1vjh95p"; + sha256 = "17xrk7gxrl3hgg0i73n8qm53knyh01lf0f3l1zx9x6r1cip3dlnx"; }; + # The hardcoded list of allowed system calls for seccomp is + # insufficient for NixOS, add more to make it work (issue #21136). + patches = [ ./seccomp.patch ]; + configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" @@ -32,10 +36,10 @@ stdenv.mkDerivation rec { rm -rf $out/share/doc ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.ntp.org/; description = "An implementation of the Network Time Protocol"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.eelco ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/ntp/seccomp.patch b/pkgs/tools/networking/ntp/seccomp.patch new file mode 100644 index 00000000000..28de2f01d07 --- /dev/null +++ b/pkgs/tools/networking/ntp/seccomp.patch @@ -0,0 +1,44 @@ +diff -urN ntp-4.2.8p10.orig/ntpd/ntpd.c ntp-4.2.8p10/ntpd/ntpd.c +--- ntp-4.2.8p10.orig/ntpd/ntpd.c 2017-04-02 20:21:17.371319663 +0200 ++++ ntp-4.2.8p10/ntpd/ntpd.c 2017-04-02 21:26:02.766178723 +0200 +@@ -1157,10 +1157,12 @@ + SCMP_SYS(close), + SCMP_SYS(connect), + SCMP_SYS(exit_group), ++ SCMP_SYS(fcntl), + SCMP_SYS(fstat), + SCMP_SYS(fsync), + SCMP_SYS(futex), + SCMP_SYS(getitimer), ++ SCMP_SYS(getpid), + SCMP_SYS(getsockname), + SCMP_SYS(ioctl), + SCMP_SYS(lseek), +@@ -1179,6 +1181,7 @@ + SCMP_SYS(sendto), + SCMP_SYS(setitimer), + SCMP_SYS(setsid), ++ SCMP_SYS(setsockopt), + SCMP_SYS(socket), + SCMP_SYS(stat), + SCMP_SYS(time), +@@ -1195,9 +1198,11 @@ + SCMP_SYS(clock_settime), + SCMP_SYS(close), + SCMP_SYS(exit_group), ++ SCMP_SYS(fcntl), + SCMP_SYS(fsync), + SCMP_SYS(futex), + SCMP_SYS(getitimer), ++ SCMP_SYS(getpid), + SCMP_SYS(madvise), + SCMP_SYS(mmap), + SCMP_SYS(mmap2), +@@ -1211,6 +1216,7 @@ + SCMP_SYS(select), + SCMP_SYS(setitimer), + SCMP_SYS(setsid), ++ SCMP_SYS(setsockopt), + SCMP_SYS(sigprocmask), + SCMP_SYS(sigreturn), + SCMP_SYS(socketcall), diff --git a/pkgs/tools/networking/pcapc/default.nix b/pkgs/tools/networking/pcapc/default.nix index 66028a973b3..552cda93bcc 100644 --- a/pkgs/tools/networking/pcapc/default.nix +++ b/pkgs/tools/networking/pcapc/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchFromGitHub, libpcap }: +{ stdenv, fetchFromGitHub, libpcap, cmake }: stdenv.mkDerivation rec { name = "pcapc-${version}"; - version = "2015-03-06"; + version = "1.0.0"; src = fetchFromGitHub { - sha256 = "02j45wmxy8qcji0giwx3364pbqb6849s8y0xfvzx40g98mssl027"; - rev = "9dddf52e65c8cff72c7c11758a951b31bf083436"; + sha256 = "137crs0bb7kh9a8p9g168yj2jrp0h3j3073nwh31jy4nk0g5hlfp"; + rev = "v${version}"; repo = "pcapc"; owner = "pfactum"; }; + nativeBuildInputs = [ cmake ]; buildInputs = [ libpcap ]; makeFlags = [ "PREFIX=$(out)" ]; @@ -19,12 +20,8 @@ stdenv.mkDerivation rec { doCheck = false; - postInstall = '' - install -Dm644 {.,$out/share/doc/pcapc}/README.md - ''; - meta = with stdenv.lib; { - inherit (src.meta) homepage; + homepage = "https://github.com/pfactum/pcapc"; description = "Compile libpcap filter expressions into BPF opcodes"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix index 8fcdb49b2b1..c2c41d92acb 100644 --- a/pkgs/tools/networking/pptp/default.nix +++ b/pkgs/tools/networking/pptp/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "PPTP client for Linux"; homepage = http://pptpclient.sourceforge.net/; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index a8bbe8b71ab..8ea134843c3 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -2,7 +2,7 @@ let - version = "2.0.0.7"; + version = "2.1.0.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6-dns"; rev = "refs/tags/v${version}"; - sha256 = "1f9a4bjpsqhs9aq0zam74mj6zn1ffaljgp98hqj9j83d2jlvqpv5"; + sha256 = "126ikznsw0hlk4mmf03yxzfnvcw823g5il1vfs3a5fa9q26xyc72"; }; dontDisableStatic = true; @@ -19,6 +19,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; configureFlags = [ + "--enable-absolute-paths" "--includedir=\${prefix}/include" "--libdir=\${prefix}/lib" "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" @@ -27,7 +28,7 @@ in stdenv.mkDerivation rec { "--with-dynlib=${skalibs}/lib" ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) - ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); + ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); meta = { homepage = http://www.skarnet.org/software/s6-dns/; diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index fa7994e8f8f..6574a02bb92 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -2,7 +2,7 @@ let - version = "2.1.0.4"; + version = "2.2.1.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6-networking"; rev = "refs/tags/v${version}"; - sha256 = "0rm0vpfshayhi5qwsvkgzdjmg43lvslp74h7lda964p72wr6gahg"; + sha256 = "0msfssd42pdwch0z8rhrm7hd4ps9d730az92vg0pnz769xs8kjx0"; }; dontDisableStatic = true; @@ -19,6 +19,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; configureFlags = [ + "--enable-absolute-paths" "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" "--with-include=${skalibs}/include" "--with-include=${execline}/include" @@ -33,7 +34,7 @@ in stdenv.mkDerivation rec { "--with-dynlib=${s6}/lib" "--with-dynlib=${s6Dns}/lib" ] - ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); + ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); meta = { homepage = http://www.skarnet.org/software/s6-networking/; diff --git a/pkgs/tools/networking/sitecopy/default.nix b/pkgs/tools/networking/sitecopy/default.nix deleted file mode 100644 index 5667744ef22..00000000000 --- a/pkgs/tools/networking/sitecopy/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, neon, zlib, openssl, autoreconfHook }: - -stdenv.mkDerivation rec { - name = "sitecopy-0.16.6"; - - src = fetchurl { - url = "http://www.manyfish.co.uk/sitecopy/${name}.tar.gz"; - sha256 = "1bsqfhfq83g1qambqf8i1ivvggz5d2byg94hmrpxqkg50yhdsvz0"; - }; - - patches = [ ./neon-29.patch ]; - - buildInputs = [ openssl neon zlib autoreconfHook ]; - - configureFlags= "--with-ssl=openssl"; -} diff --git a/pkgs/tools/networking/sitecopy/neon-29.patch b/pkgs/tools/networking/sitecopy/neon-29.patch deleted file mode 100644 index bddcbde95e1..00000000000 --- a/pkgs/tools/networking/sitecopy/neon-29.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ru sitecopy-0.16.6-orig/configure.in sitecopy-0.16.6/configure.in ---- sitecopy-0.16.6-orig/configure.in 2008-04-02 13:59:30.000000000 +0200 -+++ sitecopy-0.16.6/configure.in 2010-08-26 15:07:04.000000000 +0200 -@@ -112,8 +112,8 @@ - AC_LIBOBJ(lib/fnmatch) - fi - --# Support neon 0.24 through 0.28 --NE_REQUIRE_VERSIONS([0], [24 25 26 27 28]) -+# Support neon 0.24 through 0.29 -+#NE_REQUIRE_VERSIONS([0], [24 25 26 27 28 29]) - - dnl But we don't use zlib or ACL support - NEON_WITHOUT_ZLIB -Only in sitecopy-0.16.6/: configure.in~ diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix index ac23635441d..3be1d194d82 100644 --- a/pkgs/tools/networking/speedtest-cli/default.nix +++ b/pkgs/tools/networking/speedtest-cli/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { name = "speedtest-cli-${version}"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "sivel"; repo = "speedtest-cli"; rev = "v${version}"; - sha256 = "1p7lavw95w3as9b2b55i61mwxdr1b6jj40yly91f9j26ywr5dpkg"; + sha256 = "160m1liinbpbmjxi3cvdw5x3k9sb4j51ly92lynylpamcqcv8m83"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 7da47e339d0..5a9cf8f1f4b 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "strongswan-${version}"; - version = "5.5.1"; + version = "5.5.2"; src = fetchurl { url = "http://download.strongswan.org/${name}.tar.bz2"; - sha256 = "1drahhmwz1jg14rfh67cl231dlg2a9pra6jmipfxwyzpj4ck02vj"; + sha256 = "0slzrr5amn1rs9lrjca0fv5n1ya5jwlspfiqg9xzq1bghg56z5ys"; }; dontPatchELF = true; diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/tools/networking/ua/default.nix new file mode 100644 index 00000000000..3b5be589f33 --- /dev/null +++ b/pkgs/tools/networking/ua/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn +, pkgconfig +, glib, libxml2 +}: + +buildGoPackage rec { + name = "ua-unstable-${version}"; + version = "2017-02-24"; + rev = "325dab92c60e0f028e55060f0c288aa70905fb17"; + + goPackagePath = "github.com/sloonz/ua"; + + src = fetchgit { + inherit rev; + url = "https://github.com/sloonz/ua.git"; + sha256 = "0452qknc8km9495324g6b5ja3shvk8jl7aa9nrjhdylf09dp2nif"; + }; + + goDeps = ./deps.nix; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib libxml2 ]; + + meta = { + homepage = "https://github.com/sloonz/ua"; + license = stdenv.lib.licenses.isc; + shortDescription = "Universal Aggregator"; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + }; +} diff --git a/pkgs/tools/networking/ua/deps.nix b/pkgs/tools/networking/ua/deps.nix new file mode 100644 index 00000000000..e59b9f239a6 --- /dev/null +++ b/pkgs/tools/networking/ua/deps.nix @@ -0,0 +1,57 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 +[ + { + goPackagePath = "github.com/sloonz/cfeedparser"; + fetch = { + type = "git"; + url = "https://github.com/sloonz/cfeedparser"; + rev = "a220b181f09fa7fba347c7fa72168ed8a010907a"; + sha256 = "1dsdzflwbb0cw39bs37shggmswggb326sfdb5x25f4bpd19z6qp0"; + }; + } + { + goPackagePath = "github.com/sloonz/go-maildir"; + fetch = { + type = "git"; + url = "https://github.com/sloonz/go-maildir"; + rev = "4629e76d952bb24730bbe1b4c7bc628cd54babb6"; + sha256 = "0i9r7hhk0ih47pmc9ixhv17fa6gba3j7vk9g8j0di0pr0siha65f"; + }; + } + { + goPackagePath = "github.com/sloonz/go-mime-message"; + fetch = { + type = "git"; + url = "https://github.com/sloonz/go-mime-message"; + rev = "cf50e17d2410fee25cdb89485ab0d5996f2d3bfc"; + sha256 = "09r45w2qfl0rx785xpgcjv9bvdnwkz7fyr272rdi3krwr900fwxs"; + }; + } + { + goPackagePath = "github.com/sloonz/go-qprintable"; + fetch = { + type = "git"; + url = "https://github.com/sloonz/go-qprintable"; + rev = "775b3a4592d5bfc47b0ba398ec0d4dba018e5926"; + sha256 = "19r8ica7kd946brdh1zn4hkzgbciqsz42a2p1h7hgzpmld51kg43"; + }; + } + { + goPackagePath = "gopkg.in/redis.v3"; + fetch = { + type = "git"; + url = "https://github.com/go-redis/redis"; + rev = "b5e368500d0a508ef8f16e9c2d4025a8a46bcc29"; + sha256 = "1syhnm1csrlfh1jgd1v9bzf2pp9ljyg4ks3z6xx0nqd83xmyhdzh"; + }; + } + { + goPackagePath = "gopkg.in/bsm/ratelimit.v1"; + fetch = { + type = "git"; + url = "https://github.com/bsm/ratelimit"; + rev = "db14e161995a5177acef654cb0dd785e8ee8bc22"; + sha256 = "1ph6dsvgwrsli9akh6arwkvz78hkdb42lyqmgfckjcsar1a2fcsh"; + }; + } +] diff --git a/pkgs/tools/networking/wrk/default.nix b/pkgs/tools/networking/wrk/default.nix index c8315d0c3f5..226180196fd 100644 --- a/pkgs/tools/networking/wrk/default.nix +++ b/pkgs/tools/networking/wrk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, perl }: +{ stdenv, fetchFromGitHub, luajit, openssl, perl }: stdenv.mkDerivation rec { name = "wrk-${version}"; @@ -11,7 +11,16 @@ stdenv.mkDerivation rec { sha256 = "1qg6w8xz4pr227h1gxrbm6ylhqvspk95hvq2f9iakni7s56pkh1w"; }; - buildInputs = [ openssl perl ]; + buildInputs = [ luajit openssl perl ]; + + makeFlags = [ "WITH_LUAJIT=${luajit}" "WITH_OPENSSL=${openssl.dev}" "VER=${version}" ]; + + preBuild = '' + for f in src/*.h; do + substituteInPlace $f \ + --replace "#include $src/Makefile + ''; + + installPhase = '' + mkdir -p $out/bin + cp cde $out/bin + cp cde-exec $out/bin + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/pgbovine/CDE; + description = "A packaging tool for building portable packages"; + license = licenses.gpl3; + maintainers = [ maintainers.rlupton20 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/package-management/createrepo_c/default.nix b/pkgs/tools/package-management/createrepo_c/default.nix index ed46b2d302a..c2fd1293b79 100644 --- a/pkgs/tools/package-management/createrepo_c/default.nix +++ b/pkgs/tools/package-management/createrepo_c/default.nix @@ -11,18 +11,21 @@ stdenv.mkDerivation rec { sha256 = "1sqzdkj9vigkvxsjlih1i0gylv53na2yic5if9w1s2sgxhqqz5zv"; }; - # FIXME: ugh, there has to be a better way to do this... - prePatch = '' - substituteInPlace CMakeLists.txt \ - --replace 'execute_process(COMMAND ''${PKG_CONFIG_EXECUTABLE} --variable=completionsdir bash-completion OUTPUT_VARIABLE BASHCOMP_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)' \ - "set (BASHCOMP_DIR "$out/share/bash-completion/completions")" + patches = [ + ./fix-bash-completion-path.patch + ./fix-python-install-path.patch + ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace '@BASHCOMP_DIR@' "$out/share/bash-completion/completions" substituteInPlace src/python/CMakeLists.txt \ - --replace 'EXECUTE_PROCESS(COMMAND ''${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python2_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)' \ - "set (PYTHON_INSTALL_DIR "$out/${python2.sitePackages}")" + --replace "@PYTHON_INSTALL_PATH@" "$out/${python2.sitePackages}" ''; - buildInputs = [ cmake pkgconfig bzip2 expat glib curl libxml2 python2 rpm openssl sqlite file xz pcre bash-completion ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ bzip2 expat glib curl libxml2 python2 rpm openssl sqlite file xz pcre bash-completion ]; meta = with stdenv.lib; { description = "C implementation of createrepo"; diff --git a/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch b/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch new file mode 100644 index 00000000000..e184cc8facc --- /dev/null +++ b/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch @@ -0,0 +1,11 @@ +--- createrepo_c-0.10.0-src.orig/CMakeLists.txt 2017-03-19 11:01:02.703173617 +0100 ++++ createrepo_c-0.10.0-src/CMakeLists.txt 2017-03-19 11:02:38.617448248 +0100 +@@ -100,7 +100,7 @@ + + pkg_check_modules(BASHCOMP bash-completion) + if (BASHCOMP_FOUND) +- execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=completionsdir bash-completion OUTPUT_VARIABLE BASHCOMP_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) ++ SET(BASHCOMP_DIR "@BASHCOMP_DIR@") + message("Bash completion directory: ${BASHCOMP_DIR}") + INSTALL(FILES createrepo_c.bash DESTINATION ${BASHCOMP_DIR} RENAME createrepo_c) + INSTALL(CODE " diff --git a/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch b/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch new file mode 100644 index 00000000000..a247c6d9fe4 --- /dev/null +++ b/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch @@ -0,0 +1,11 @@ +--- createrepo_c-0.10.0-src.orig/src/python/CMakeLists.txt 2017-03-19 10:50:33.796342953 +0100 ++++ createrepo_c-0.10.0-src/src/python/CMakeLists.txt 2017-03-19 10:53:51.207580073 +0100 +@@ -19,7 +19,7 @@ + FIND_PACKAGE(PythonInterp 3.0 REQUIRED) + endif() + +-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) ++SET(PYTHON_INSTALL_DIR "@PYTHON_INSTALL_DIR@") + INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) + + MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index e755507356d..dbd6a352132 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz -, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp +, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl , storeDir ? "/nix/store" , stateDir ? "/nix/var" @@ -21,6 +21,7 @@ let buildInputs = [ curl openssl sqlite xz ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium + ++ lib.optional fromGit brotli # Since 1.12 ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && lib.versionAtLeast version "1.12pre") (aws-sdk-cpp.override { apis = ["s3"]; @@ -103,21 +104,21 @@ in rec { nix = nixStable; nixStable = common rec { - name = "nix-1.11.7"; + name = "nix-1.11.8"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "1a6fd2a23f5fde614c3937c0d51eff46d28dd30d245a66d34d59b15fd9bb8f2d"; + sha256 = "69e0f398affec2a14c47b46fec712906429c85312d5483be43e4c34da4f63f67"; }; }; nixUnstable = lib.lowPrio (common rec { name = "nix-1.12${suffix}"; - suffix = "pre5073_1cf4801"; + suffix = "pre5122_c60715e"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "1cf480110879ffc8aee94b4b75999da405b71d7c"; - sha256 = "1iwpddz0yni7cz2g9asj6nmrwhaai3rhfmkq954hph8nx02c3l02"; + rev = "c60715e937e3773bbb8a114fc9b9c6577f8c5cb5"; + sha256 = "0hkc4g7i3z06y3rsdxqzdnx5rz77jb8ij1j13bdskbvpp7vfm60p"; }; fromGit = true; }); diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix index d413475389f..ee4dab5ad64 100644 --- a/pkgs/tools/package-management/nixui/nixui.nix +++ b/pkgs/tools/package-management/nixui/nixui.nix @@ -1,8 +1,8 @@ -# This file has been generated by node2nix 1.1.1. Do not edit! +# This file has been generated by node2nix 1.2.0. Do not edit! {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/pkgs/tools/package-management/nixui/node-packages.nix index 74707ae015f..cdb2df80804 100644 --- a/pkgs/tools/package-management/nixui/node-packages.nix +++ b/pkgs/tools/package-management/nixui/node-packages.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.1.1. Do not edit! +# This file has been generated by node2nix 1.2.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 9d99af2e59a..3b636ab0e29 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -2,11 +2,11 @@ , autoreconfHook }: stdenv.mkDerivation rec { - version = "0.3.3"; + version = "0.3.4"; name = "opkg-${version}"; src = fetchurl { url = "http://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; - sha256 = "03nhz0ralc3cqsrwyc310n8kbk2m9im0m2r2za8lqphs29rrxnqr"; + sha256 = "1glkxjhsaaji172phd1gv8g0k0fs09pij6k01cl9namnac5r02vm"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/tools/security/fwknop/default.nix b/pkgs/tools/security/fwknop/default.nix new file mode 100644 index 00000000000..823bdbbffb5 --- /dev/null +++ b/pkgs/tools/security/fwknop/default.nix @@ -0,0 +1,66 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, lib +, libpcap, texinfo +, iptables +, gnupgSupport ? true, gnupg, gpgme # Increases dependencies! +, wgetSupport ? true, wget +, buildServer ? true +, buildClient ? true }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "fwknop"; + version = "2.6.9"; + + src = fetchFromGitHub { + owner = "mrash"; + repo = pname; + rev = version; + sha256 = "1509d1lzfmhavdwi65dwb0jaglpy8ciccgpcnhx9ks6s7irn923c"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libpcap texinfo ] + ++ stdenv.lib.optional gnupgSupport [ gnupg gpgme.dev ] + ++ stdenv.lib.optional wgetSupport [ wget ]; + + configureFlags = '' + --sysconfdir=/etc + --localstatedir=/run + --with-iptables=${iptables}/sbin/iptables + ${lib.optionalString (!buildServer) "--disable-server"} + ${lib.optionalString (!buildClient) "--disable-client"} + ${lib.optionalString gnupgSupport '' + --with-gpgme + --with-gpgme-prefix=${gpgme.dev} + --with-gpg=${gnupg} + ''} + ${lib.optionalString wgetSupport '' + --with-wget=${wget}/bin/wget + ''} + ''; + + # Temporary hack to copy the example configuration files into the nix-store, + # this'll probably be helpful until there's a NixOS module for that (feel free + # to ping me (@primeos) if you want to help). + preInstall = '' + substituteInPlace Makefile --replace\ + "sysconfdir = /etc"\ + "sysconfdir = $out/etc" + substituteInPlace server/Makefile --replace\ + "wknopddir = /etc/fwknop"\ + "wknopddir = $out/etc/fwknop" + ''; + + meta = with stdenv.lib; { + description = + "Single Packet Authorization (and Port Knocking) server/client"; + longDescription = '' + fwknop stands for the "FireWall KNock OPerator", and implements an + authorization scheme called Single Packet Authorization (SPA). + ''; + homepage = "https://www.cipherdyne.org/fwknop/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix index 0dbea652959..9c4f98a740b 100644 --- a/pkgs/tools/security/gnupg/1.nix +++ b/pkgs/tools/security/gnupg/1.nix @@ -12,10 +12,21 @@ stdenv.mkDerivation rec { doCheck = true; - meta = { - description = "Free implementation of the OpenPGP standard for encrypting and signing data"; - homepage = http://www.gnupg.org/; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + meta = with stdenv.lib; { + homepage = "https://gnupg.org"; + description = "Classic (1.4) release of the GNU Privacy Guard, a GPL OpenPGP implementation"; + license = licenses.gpl3Plus; + longDescription = '' + The GNU Privacy Guard is the GNU project's complete and free + implementation of the OpenPGP standard as defined by RFC4880. GnuPG + "classic" (1.4) is the old standalone version which is most suitable for + older or embedded platforms. GnuPG allows to encrypt and sign your data + and communication, features a versatile key management system as well as + access modules for all kind of public key directories. GnuPG, also known + as GPG, is a command line tool with features for easy integration with + other applications. A wealth of frontend applications and libraries are + available. + ''; + platforms = platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/tools/security/gnupg/1compat.nix b/pkgs/tools/security/gnupg/1compat.nix index 0fe294e5a11..da700fe9f22 100644 --- a/pkgs/tools/security/gnupg/1compat.nix +++ b/pkgs/tools/security/gnupg/1compat.nix @@ -1,7 +1,7 @@ { stdenv, gnupg, coreutils, writeScript }: stdenv.mkDerivation { - name = "gnupg1compat-0"; + name = "gnupg1compat-${gnupg.version}"; builder = writeScript "gnupg1compat-builder" '' # First symlink all top-level dirs @@ -18,7 +18,9 @@ stdenv.mkDerivation { ${coreutils}/bin/ln -s gpgv2 $out/bin/gpgv ''; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = gnupg.meta // { + description = gnupg.meta.description + + " with symbolic links for gpg and gpgv"; + priority = -1; }; } diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix index fd79419d82a..6b011a00eb7 100644 --- a/pkgs/tools/security/gnupg/20.nix +++ b/pkgs/tools/security/gnupg/20.nix @@ -44,24 +44,22 @@ stdenv.mkDerivation rec { doCheck = true; - meta = { - homepage = "http://gnupg.org/"; - description = "Free implementation of the OpenPGP standard for encrypting and signing data"; - license = stdenv.lib.licenses.gpl3Plus; - + meta = with stdenv.lib; { + homepage = "https://gnupg.org"; + description = "Stable (2.0) release of the GNU Privacy Guard, a GPL OpenPGP implementation"; + license = licenses.gpl3Plus; longDescription = '' - GnuPG is the GNU project's complete and free implementation of - the OpenPGP standard as defined by RFC4880. GnuPG allows to - encrypt and sign your data and communication, features a - versatile key management system as well as access modules for all - kind of public key directories. GnuPG, also known as GPG, is a - command line tool with features for easy integration with other - applications. A wealth of frontend applications and libraries - are available. Version 2 of GnuPG also provides support for - S/MIME. + The GNU Privacy Guard is the GNU project's complete and free + implementation of the OpenPGP standard as defined by RFC4880. GnuPG + "stable" (2.0) is the current stable version for general use. This is + what most users are still using. GnuPG allows to encrypt and sign your + data and communication, features a versatile key management system as well + as access modules for all kind of public key directories. GnuPG, also + known as GPG, is a command line tool with features for easy integration + with other applications. A wealth of frontend applications and libraries + are available. Version 2 of GnuPG also provides support for S/MIME. ''; - - maintainers = with stdenv.lib.maintainers; [ roconnor urkud ]; - platforms = stdenv.lib.platforms.all; + maintainers = with maintainers; [ roconnor ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index 0f021c6b4a1..230ace07823 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.1.19"; + version = "2.1.20"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1w4vccmb5l50lm4yrz9vkdj7whbfvzx543r55362kkj1aqgyvk26"; + sha256 = "03cnd6gz8f4lf69inskssw57idrswcdimhccdyglmrlv6rlrmkr4"; }; buildInputs = [ @@ -48,9 +48,20 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://gnupg.org; - description = "A complete and free implementation of the OpenPGP standard"; + homepage = "https://gnupg.org"; + description = "Modern (2.1) release of the GNU Privacy Guard, a GPL OpenPGP implementation"; license = licenses.gpl3Plus; + longDescription = '' + The GNU Privacy Guard is the GNU project's complete and free + implementation of the OpenPGP standard as defined by RFC4880. GnuPG + "modern" (2.1) is the latest development with a lot of new features. + GnuPG allows to encrypt and sign your data and communication, features a + versatile key management system as well as access modules for all kind of + public key directories. GnuPG, also known as GPG, is a command line tool + with features for easy integration with other applications. A wealth of + frontend applications and libraries are available. Version 2 of GnuPG + also provides support for S/MIME. + ''; maintainers = with maintainers; [ wkennington peti fpletz vrthra ]; platforms = platforms.all; }; diff --git a/pkgs/tools/security/polkit-gnome/default.nix b/pkgs/tools/security/polkit-gnome/default.nix index 38d47e742a2..e8709130015 100644 --- a/pkgs/tools/security/polkit-gnome/default.nix +++ b/pkgs/tools/security/polkit-gnome/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { homepage = http://hal.freedesktop.org/docs/PolicyKit/; description = "A dbus session bus service that is used to bring up authentication dialogs"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ urkud phreedom ]; + maintainers = with stdenv.lib.maintainers; [ phreedom ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix index ea6b7411c4e..7be136944c6 100644 --- a/pkgs/tools/security/signing-party/default.nix +++ b/pkgs/tools/security/signing-party/default.nix @@ -1,73 +1,223 @@ -{ stdenv, fetchurl, makeWrapper, autoconf, automake -, gnupg, perl, python, libmd, qprint, coreutils, gnused, glibc, gnupg1compat -, perlPackages }: +{ stdenv, fetchurl, autoconf, automake, makeWrapper +, python, perl, perlPackages +, libmd, gnupg1, which, getopt, libpaper, nettools, qprint +, sendmailPath ? "/run/wrappers/bin/sendmail" }: +let + # All runtime dependencies from the CPAN graph: + # https://widgets.stratopan.com/wheel?q=GnuPG-Interface-0.52&runtime=1&fs=1 + # TODO: XSLoader seems optional + GnuPGInterfaceRuntimeDependencies = with perlPackages; [ + strictures ClassMethodModifiers DataPerl DevelGlobalDestruction ExporterTiny + GnuPGInterface ListMoreUtils ModuleRuntime Moo MooXHandlesVia MooXlate + RoleTiny SubExporterProgressive SubQuote TypeTiny XSLoader + ]; +in stdenv.mkDerivation rec { + pname = "signing-party"; version = "2.5"; - basename = "signing-party"; - name = "${basename}-${version}"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://debian/pool/main/s/${basename}/${basename}_${version}.orig.tar.gz"; + url = "mirror://debian/pool/main/s/${pname}/${pname}_${version}.orig.tar.gz"; sha256 = "1y2bxk01qiwaqaily0s6zi10ssv7l35vksib6fxzyl76pp693nv2"; }; sourceRoot = "."; + # TODO: Get this patch upstream... patches = [ ./gpgwrap_makefile.patch ]; postPatch = '' - substituteInPlace gpg-mailkeys/gpg-mailkeys --replace "/usr/sbin/sendmail" "sendmail" + substituteInPlace gpg-mailkeys/gpg-mailkeys --replace \ + "/usr/sbin/sendmail" "${sendmailPath}" ''; + # One can use the following command to find all relevant Makefiles: + # grep -R '$(DESTDIR)/usr' | cut -d: -f1 | sort -u | grep -v 'debian/rules' preBuild = '' - substituteInPlace sig2dot/Makefile --replace "\$(DESTDIR)/usr" "$out" - substituteInPlace gpgsigs/Makefile --replace "\$(DESTDIR)/usr" "$out" - substituteInPlace keylookup/Makefile --replace "\$(DESTDIR)/usr" "$out" - substituteInPlace springgraph/Makefile --replace "\$(DESTDIR)/usr" "$out" - substituteInPlace keyanalyze/Makefile --replace "\$(DESTDIR)/usr" "$out" + substituteInPlace gpgsigs/Makefile --replace '$(DESTDIR)/usr' "$out" + substituteInPlace keyanalyze/Makefile --replace '$(DESTDIR)/usr' "$out" + substituteInPlace keylookup/Makefile --replace '$(DESTDIR)/usr' "$out" + substituteInPlace sig2dot/Makefile --replace '$(DESTDIR)/usr' "$out" + substituteInPlace springgraph/Makefile --replace '$(DESTDIR)/usr' "$out" ''; + # Perl is required for it's pod2man. + # Python and Perl are required for patching the script interpreter paths. nativeBuildInputs = [ autoconf automake makeWrapper ]; - buildInputs = [ gnupg perl python libmd ] ++ - (with perlPackages; [ GnuPGInterface TextTemplate MIMEtools NetIDNEncode MailTools ]); - - installFlags = [ "DESTDIR=\${out}" ]; + buildInputs = [ python perl perlPackages.GnuPGInterface libmd gnupg1 ]; postInstall = '' - install -m 755 \ - caff/caff caff/pgp-clean caff/pgp-fixkey \ - gpglist/gpglist \ - gpgparticipants/gpgparticipants \ - gpgparticipants/gpgparticipants-prefill \ - gpgsigs/gpgsigs \ - gpg-key2ps/gpg-key2ps \ - gpg-mailkeys/gpg-mailkeys \ - keyart/keyart \ - $out/bin + # Install all tools which aren't handled by 'make install'. + # TODO: Fix upstream...! - install -m 644 \ - caff/caff.1 caff/pgp-clean.1 caff/pgp-fixkey.1 \ - gpglist/gpglist.1 \ - gpgparticipants/gpgparticipants-prefill.1 \ - gpgparticipants/gpgparticipants.1 \ - gpgsigs/gpgsigs.1 \ - gpg-key2ps/gpg-key2ps.1 \ - gpg-mailkeys/gpg-mailkeys.1 \ - $out/share/man/man1 + # caff: CA - Fire and Forget signs and mails a key + install -D -m555 caff/caff $out/bin/caff; + install -D -m444 caff/caff.1 $out/share/man/man1/caff.1; - wrapProgram $out/bin/caff --prefix PERL5LIB ":" "$PERL5LIB" \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg1compat ]}" - wrapProgram $out/bin/gpg-mailkeys --prefix PATH ":" "${stdenv.lib.makeBinPath [ qprint coreutils gnused glibc gnupg1compat ]}" + # pgp-clean: removes all non-self signatures from key + install -D -m555 caff/pgp-clean $out/bin/pgp-clean; + install -D -m444 caff/pgp-clean.1 $out/share/man/man1/pgp-clean.1; + + # pgp-fixkey: removes broken packets from keys + install -D -m555 caff/pgp-fixkey $out/bin/pgp-fixkey; + install -D -m444 caff/pgp-fixkey.1 $out/share/man/man1/pgp-fixkey.1; + + # gpg-mailkeys: simply mail out a signed key to its owner + install -D -m555 gpg-mailkeys/gpg-mailkeys $out/bin/gpg-mailkeys; + install -D -m444 gpg-mailkeys/gpg-mailkeys.1 $out/share/man/man1/gpg-mailkeys.1; + + # gpg-key2ps: generate PostScript file with fingerprint paper slips + install -D -m555 gpg-key2ps/gpg-key2ps $out/bin/gpg-key2ps; + install -D -m444 gpg-key2ps/gpg-key2ps.1 $out/share/man/man1/gpg-key2ps.1; + + # gpgdir: recursive directory encryption tool + install -D -m555 gpgdir/gpgdir $out/bin/gpgdir; + install -D -m444 gpgdir/gpgdir.1 $out/share/man/man1/gpgdir.1; + + # gpglist: show who signed which of your UIDs + install -D -m555 gpglist/gpglist $out/bin/gpglist; + install -D -m444 gpglist/gpglist.1 $out/share/man/man1/gpglist.1; + + # gpgsigs: annotates list of GnuPG keys with already done signatures + # The manual page is not handled by 'make install' + install -D -m444 gpgsigs/gpgsigs.1 $out/share/man/man1/gpgsigs.1; + + # gpgparticipants: create list of party participants for the organiser + install -D -m555 gpgparticipants/gpgparticipants $out/bin/gpgparticipants; + install -D -m444 gpgparticipants/gpgparticipants.1 $out/share/man/man1/gpgparticipants.1; + install -D -m555 gpgparticipants/gpgparticipants-prefill $out/bin/gpgparticipants-prefill; + install -D -m444 gpgparticipants/gpgparticipants-prefill.1 $out/share/man/man1/gpgparticipants-prefill.1; + + # gpgwrap: a passphrase wrapper + install -D -m555 gpgwrap/bin/gpgwrap $out/bin/gpgwrap; + install -D -m444 gpgwrap/doc/gpgwrap.1 $out/share/man/man1/gpgwrap.1; + + # keyanalyze: minimum signing distance (MSD) analysis on keyrings + # Only the binaries are handled by 'make install' + install -D -m444 keyanalyze/keyanalyze.1 $out/share/man/man1/keyanalyze.1; + install -D -m444 keyanalyze/pgpring/pgpring.1 $out/share/man/man1/pgpring.1; + install -D -m444 keyanalyze/process_keys.1 $out/share/man/man1/process_keys.1; + + # keylookup: ncurses wrapper around gpg --search + # Handled by 'make install' + + # sig2dot: converts a list of GnuPG signatures to a .dot file + # Handled by 'make install' + + # springgraph: creates a graph from a .dot file + # Handled by 'make install' + + # keyart: creates a random ASCII art of a PGP key file + install -D -m555 keyart/keyart $out/bin/keyart; + install -D -m444 keyart/doc/keyart.1 $out/share/man/man1/keyart.1; + + # gpg-key2latex: generate LaTeX file with fingerprint paper slips + install -D -m555 gpg-key2latex/gpg-key2latex $out/bin/gpg-key2latex; + install -D -m444 gpg-key2latex/gpg-key2latex.1 $out/share/man/man1/gpg-key2latex.1; ''; - doCheck = false; # no tests + postFixup = '' + # Add the runtime dependencies for all programs (but mainly for the Perl + # scripts) - meta = { - description = "A collection for all kinds of pgp related things, including signing scripts, party preparation scripts etc"; - homepage = http://pgp-tools.alioth.debian.org; - platforms = gnupg.meta.platforms; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ fpletz ]; + wrapProgram $out/bin/caff --set PERL5LIB \ + ${with perlPackages; stdenv.lib.makePerlPath ([ + TextTemplate MIMEtools MailTools TimeDate NetIDNEncode ] + ++ GnuPGInterfaceRuntimeDependencies)} \ + --prefix PATH ":" \ + "${stdenv.lib.makeBinPath [ nettools gnupg1 ]}" + + wrapProgram $out/bin/gpg-key2latex --set PERL5LIB \ + ${stdenv.lib.makePerlPath GnuPGInterfaceRuntimeDependencies} \ + --prefix PATH ":" \ + "${stdenv.lib.makeBinPath [ gnupg1 libpaper ]}" + + wrapProgram $out/bin/gpg-key2ps --prefix PATH ":" \ + "${stdenv.lib.makeBinPath [ which gnupg1 libpaper ]}" + + wrapProgram $out/bin/gpg-mailkeys --prefix PATH ":" \ + "${stdenv.lib.makeBinPath [ gnupg1 qprint ]}" + + wrapProgram $out/bin/gpgdir --set PERL5LIB \ + ${with perlPackages; stdenv.lib.makePerlPath ([ + TermReadKey ] + ++ GnuPGInterfaceRuntimeDependencies)} \ + --prefix PATH ":" \ + "${stdenv.lib.makeBinPath [ gnupg1 ]}" + + wrapProgram $out/bin/gpglist --prefix PATH ":" \ + "${stdenv.lib.makeBinPath [ gnupg1 ]}" + + wrapProgram $out/bin/gpgparticipants --prefix PATH ":" \ + "${stdenv.lib.makeBinPath [ getopt gnupg1 ]}" + +# wrapProgram $out/bin/gpgparticipants-prefill + + wrapProgram $out/bin/gpgsigs --set PERL5LIB \ + ${stdenv.lib.makePerlPath GnuPGInterfaceRuntimeDependencies} \ + --prefix PATH ":" \ + "${stdenv.lib.makeBinPath [ gnupg1 ]}" + + wrapProgram $out/bin/gpgwrap --prefix PATH ":" \ + "${stdenv.lib.makeBinPath [ gnupg1 ]}" + +# wrapProgram $out/bin/keyanalyze --set PERL5LIB \ + + wrapProgram $out/bin/keyart --prefix PATH ":" \ + "${stdenv.lib.makeBinPath [ gnupg1 ]}" + + wrapProgram $out/bin/keylookup --prefix PATH ":" \ + "${stdenv.lib.makeBinPath [ gnupg1 ]}" + + wrapProgram $out/bin/pgp-clean --set PERL5LIB \ + ${stdenv.lib.makePerlPath GnuPGInterfaceRuntimeDependencies} \ + --prefix PATH ":" \ + "${stdenv.lib.makeBinPath [ gnupg1 ]}" + + wrapProgram $out/bin/pgp-fixkey --set PERL5LIB \ + ${stdenv.lib.makePerlPath GnuPGInterfaceRuntimeDependencies} \ + --prefix PATH ":" \ + "${stdenv.lib.makeBinPath [ gnupg1 ]}" + +# wrapProgram $out/bin/pgpring + +# wrapProgram $out/bin/process_keys + + # Upstream-Bug: Seems like sig2dot doesn't work with 2.1 (modern) anymore, + # please use 2.0 (stable) instead. +# wrapProgram $out/bin/sig2dot + + wrapProgram $out/bin/springgraph --set PERL5LIB \ + ${with perlPackages; stdenv.lib.makePerlPath [ GD ]} + ''; + + meta = with stdenv.lib; { + homepage = "https://pgp-tools.alioth.debian.org/"; + description = "A collection of several projects relating to OpenPGP"; + longDescription = '' + This is a collection of several projects relating to OpenPGP. + + * caff: CA - Fire and Forget signs and mails a key + * pgp-clean: removes all non-self signatures from key + * pgp-fixkey: removes broken packets from keys + * gpg-mailkeys: simply mail out a signed key to its owner + * gpg-key2ps: generate PostScript file with fingerprint paper slips + * gpgdir: recursive directory encryption tool + * gpglist: show who signed which of your UIDs + * gpgsigs: annotates list of GnuPG keys with already done signatures + * gpgparticipants: create list of party participants for the organiser + * gpgwrap: a passphrase wrapper + * keyanalyze: minimum signing distance (MSD) analysis on keyrings + * keylookup: ncurses wrapper around gpg --search + * sig2dot: converts a list of GnuPG signatures to a .dot file + * springgraph: creates a graph from a .dot file + * keyart: creates a random ASCII art of a PGP key file + * gpg-key2latex: generate LaTeX file with fingerprint paper slips + ''; + license = with licenses; [ bsd2 bsd3 gpl2 gpl2Plus gpl3Plus ]; + maintainers = with maintainers; [ fpletz primeos ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix deleted file mode 100644 index 80a92b4a932..00000000000 --- a/pkgs/tools/security/tor/torbrowser.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ stdenv, fetchurl, makeDesktopItem -, libXrender, libX11, libXext, libXt, alsaLib, dbus, dbus_glib, glib, gtk2 -, atk, pango, freetype, fontconfig, gdk_pixbuf, cairo, zlib -, gstreamer, gst-plugins-base, gst-plugins-good, gst-ffmpeg, gmp, ffmpeg -, libpulseaudio -, mediaSupport ? false -}: - -let - libPath = stdenv.lib.makeLibraryPath ([ - stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk2 atk pango freetype - fontconfig gdk_pixbuf cairo libXrender libX11 libXext libXt - ] ++ stdenv.lib.optionals mediaSupport [ - gstreamer gst-plugins-base gmp ffmpeg - libpulseaudio - ]); - - # Ignored if !mediaSupport - gstPlugins = [ gstreamer gst-plugins-base gst-plugins-good gst-ffmpeg ]; - - gstPluginsPath = stdenv.lib.concatMapStringsSep ":" (x: - "${x}/lib/gstreamer-0.10") gstPlugins; -in - -stdenv.mkDerivation rec { - name = "tor-browser-${version}"; - version = "6.5.1"; - - src = fetchurl { - url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz"; - sha256 = if stdenv.is64bit then - "1p2bgavvyzahqpjg9vp14c0s50rmha3v1hs1c8zvz6fj8fgrhn0i" else - "1zfghr01bhpn39wqaw7hyx7yap7xyla4m3mrgz2vi9a5qsyxmbcr"; - }; - - preferLocalBuild = true; - - desktopItem = makeDesktopItem { - name = "torbrowser"; - exec = "tor-browser"; - icon = "torbrowser"; - desktopName = "Tor Browser"; - genericName = "Tor Browser"; - comment = meta.description; - categories = "Network;WebBrowser;Security;"; - }; - - patchPhase = '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Browser/firefox - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Browser/TorBrowser/Tor/tor - - sed -e "s,./TorBrowser,$out/share/tor-browser/Browser/TorBrowser,g" -i Browser/TorBrowser/Data/Tor/torrc-defaults - ''; - - doCheck = true; - checkPhase = '' - echo "Checking firefox..." - LD_LIBRARY_PATH=${libPath} Browser/firefox --help 1> /dev/null - echo "Checking tor..." - LD_LIBRARY_PATH=${libPath}:Browser/TorBrowser/Tor Browser/TorBrowser/Tor/tor --help 1> /dev/null - ''; - - installPhase = '' - mkdir -p $out/share/tor-browser - mkdir -p $out/bin - cp -R * $out/share/tor-browser - - cat > "$out/bin/tor-browser" << EOF - #! ${stdenv.shell} - unset SESSION_MANAGER - export HOME="\$HOME/.torbrowser4" - if [ ! -d \$HOME ]; then - mkdir -p \$HOME && cp -R $out/share/tor-browser/Browser/TorBrowser/Data \$HOME/ && chmod -R +w \$HOME - echo "pref(\"extensions.torlauncher.tordatadir_path\", \"\$HOME/Data/Tor/\");" >> \ - ~/Data/Browser/profile.default/preferences/extension-overrides.js - echo "pref(\"extensions.torlauncher.torrc-defaults_path\", \"\$HOME/Data/Tor/torrc-defaults\");" >> \ - ~/Data/Browser/profile.default/preferences/extension-overrides.js - echo "pref(\"extensions.torlauncher.tor_path\", \"$out/share/tor-browser/Browser/TorBrowser/Tor/tor\");" >> \ - ~/Data/Browser/profile.default/preferences/extension-overrides.js - fi - export FONTCONFIG_PATH=\$HOME/Data/fontconfig - export LD_LIBRARY_PATH=${libPath}:$out/share/tor-browser/Browser/TorBrowser/Tor - ${stdenv.lib.optionalString mediaSupport '' - export GST_PLUGIN_SYSTEM_PATH=${gstPluginsPath} - ''} - exec $out/share/tor-browser/Browser/firefox --class "Tor Browser" -no-remote -profile ~/Data/Browser/profile.default "\$@" - EOF - chmod +x $out/bin/tor-browser - - mkdir -p $out/share/applications - cp $desktopItem/share/applications"/"* $out/share/applications - - mkdir -p $out/share/pixmaps - cp Browser/browser/icons/mozicon128.png $out/share/pixmaps/torbrowser.png - ''; - - meta = with stdenv.lib; { - description = "Tor Browser Bundle"; - homepage = https://www.torproject.org/; - platforms = platforms.linux; - maintainers = with maintainers; [ offline matejc doublec thoughtpolice joachifm ]; - }; -} diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix new file mode 100644 index 00000000000..55defd68090 --- /dev/null +++ b/pkgs/tools/security/vulnix/default.nix @@ -0,0 +1,42 @@ +{ stdenv, pythonPackages, fetchurl, callPackage, nix, }: + +let + external = callPackage ./requirements.nix { + inherit pythonPackages; + }; +in pythonPackages.buildPythonApplication rec{ + name = "${pname}-${version}"; + pname = "vulnix"; + version = "1.2.2"; + + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "1ia9plziwach0bxnlcd33q30kcsf8sv0nf2jc78gsmrqnxjabr12"; + }; + + buildInputs = with pythonPackages; [ flake8 pytest pytestcov ]; + + postPatch = '' + sed -i -e 's/==\([^=]\+\)/>=\1/g' setup.py + ''; + + propagatedBuildInputs = [ + nix + ] ++ (with pythonPackages; [ + click + colorama + lxml + pyyaml + requests2 + external.zodb + ]); + + checkPhase = "py.test"; + + meta = with stdenv.lib; { + description = "NixOS vulnerability scanner"; + homepage = https://github.com/flyingcircusio/vulnix; + license = licenses.bsd2; + maintainers = with maintainers; [ plumps ]; + }; +} diff --git a/pkgs/tools/security/vulnix/requirements.nix b/pkgs/tools/security/vulnix/requirements.nix new file mode 100644 index 00000000000..952dc1ce652 --- /dev/null +++ b/pkgs/tools/security/vulnix/requirements.nix @@ -0,0 +1,131 @@ +{ pythonPackages, fetchurl, stdenv }: + +rec { + BTrees = pythonPackages.buildPythonPackage { + name = "BTrees-4.3.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/24/76/cd6f225f2180c22af5cdb6656f51aec5fca45e45bdc4fa75c0a32f161a61/BTrees-4.3.1.tar.gz"; + sha256 = "2565b7d35260dfc6b1e2934470fd0a2f9326c58c535a2b4cb396289d1c195a95"; + }; + propagatedBuildInputs = [ + persistent + transaction + zope_interface + ] ++ (with pythonPackages; [ coverage ]); + + meta = with stdenv.lib; { + homepage = ""; + license = licenses.zpt21; + description = "Scalable persistent object containers"; + }; + }; + + ZConfig = pythonPackages.buildPythonPackage { + name = "ZConfig-3.1.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/52/b3/a96d62711a26d8cfbe546519975dc9ed54d2eb50b3238d2e6de045764796/ZConfig-3.1.0.tar.gz"; + sha256 = "c21fa3a073a56925a8098036d46717392994a92cffea1b3cda3176b70c0a842e"; + }; + meta = with stdenv.lib; { + homepage = ""; + license = licenses.zpt21; + description = "Structured Configuration Library"; + }; + }; + + zodb = pythonPackages.buildPythonPackage { + name = "ZODB-5.2.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/1e/47/2f17075ca94a4a537ebd8e195c458456ef49aa67355ec805e478b8ad1959/ZODB-5.2.0.tar.gz"; + sha256 = "11l495lyym2fpvalj18yvcqwnsp8gyp18sgv5v575k4s2035lz0x"; + }; + doCheck = false; + propagatedBuildInputs = [ + BTrees + persistent + transaction + ZConfig + zc.lockfile + zodbpickle + ] ++ (with pythonPackages; [ six wheel zope_interface ]); + meta = with stdenv.lib; { + homepage = ""; + license = licenses.zpt21; + description = "Zope Object Database: object database and persistence"; + }; + }; + + persistent = pythonPackages.buildPythonPackage { + name = "persistent-4.2.2"; + src = fetchurl { + url = "https://pypi.python.org/packages/3d/71/3302512282b606ec4d054e09be24c065915518903b29380b6573bff79c24/persistent-4.2.2.tar.gz"; + sha256 = "52ececc6dbba5ef572d3435189318b4dff07675bafa9620e32f785e147c6563c"; + }; + propagatedBuildInputs = [ + zope_interface + ] ++ (with pythonPackages; [ six wheel ]); + meta = with stdenv.lib; { + homepage = ""; + license = licenses.zpt21; + description = "Translucent persistent objects"; + }; + }; + + transaction = pythonPackages.buildPythonPackage { + name = "transaction-2.0.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/8c/af/3ffafe85bcc93ecb09459f3f2bd8fbe142e9ab34048f9e2774543b470cbd/transaction-2.0.3.tar.gz"; + sha256 = "67bfb81309ba9717edbb2ca2e5717c325b78beec0bf19f44e5b4b9410f82df7f"; + }; + propagatedBuildInputs = [ + zope_interface + ] ++ (with pythonPackages; [ six wheel ]); + meta = with stdenv.lib; { + homepage = ""; + license = licenses.zpt21; + description = "Transaction management for Python"; + }; + }; + + zc.lockfile = pythonPackages.buildPythonPackage { + name = "zc.lockfile-1.2.1"; + src = fetchurl { + url = "https://pypi.python.org/packages/bd/84/0299bbabbc9d3f84f718ba1039cc068030d3ad723c08f82a64337edf901e/zc.lockfile-1.2.1.tar.gz"; + sha256 = "11db91ada7f22fe8aae268d4bfdeae012c4fe655f66bbb315b00822ec00d043e"; + }; + meta = with stdenv.lib; { + homepage = ""; + license = licenses.zpt21; + description = "Basic inter-process locks"; + }; + }; + + zodbpickle = pythonPackages.buildPythonPackage { + name = "zodbpickle-0.6.0"; + src = fetchurl { + url = "https://pypi.python.org/packages/7a/fc/f6f437a5222b330735eaf8f1e67a6845bd1b600e9a9455e552d3c13c4902/zodbpickle-0.6.0.tar.gz"; + sha256 = "ea3248be966159e7791e3db0e35ea992b9235d52e7d39835438686741d196665"; + }; + doCheck = false; + + meta = with stdenv.lib; { + homepage = ""; + license = licenses.zpt21; + description = "Fork of Python 3 pickle module."; + }; + }; + + zope_interface = pythonPackages.buildPythonPackage { + name = "zope.interface-4.3.3"; + src = fetchurl { + url = "https://pypi.python.org/packages/44/af/cea1e18bc0d3be0e0824762d3236f0e61088eeed75287e7b854d65ec9916/zope.interface-4.3.3.tar.gz"; + sha256 = "8780ef68ca8c3fe1abb30c058a59015129d6e04a6b02c2e56b9c7de6078dfa88"; + }; + propagatedBuildInputs = [ ]; + meta = with stdenv.lib; { + homepage = ""; + license = licenses.zpt21; + description = "Interfaces for Python"; + }; + }; +} diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix index 63bb8c1f985..e3f74376614 100644 --- a/pkgs/tools/system/augeas/default.nix +++ b/pkgs/tools/system/augeas/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "augeas-${version}"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { url = "http://download.augeas.net/${name}.tar.gz"; - sha256 = "0qwpjz23z1x7dkf5k2y9f1cppryzhx4hpxprla6a4yvzs1smacdr"; + sha256 = "1iac5lwi1q10r343ii9v5p2fdplvh06yv9svsi8zz6cd2c2fjp2i"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ readline libxml2 ]; diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index 02c76798fd7..763d4406668 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -2,7 +2,7 @@ let - version = "0.0.2.1"; + version = "0.1.0.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6-rc"; rev = "refs/tags/v${version}"; - sha256 = "1gh72q1h1ds53yrzp481nvzaxkhhpm2kv59pfx4x564gxwdvq3a6"; + sha256 = "1izjss1vfmkrkbgpzxlh0krkd2zin9d77ykr6i08rhixz7c2am0r"; }; dontDisableStatic = true; @@ -19,6 +19,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; configureFlags = [ + "--enable-absolute-paths" "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" "--with-include=${skalibs}/include" "--with-include=${execline}/include" @@ -31,7 +32,7 @@ in stdenv.mkDerivation rec { "--with-dynlib=${s6}/lib" ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) - ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); + ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); meta = { homepage = http://skarnet.org/software/s6-rc/; diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix index 84e79442ffa..67acb8ac3dc 100644 --- a/pkgs/tools/system/s6/default.nix +++ b/pkgs/tools/system/s6/default.nix @@ -2,7 +2,7 @@ let - version = "2.2.4.3"; + version = "2.4.0.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6"; rev = "refs/tags/v${version}"; - sha256 = "1jlavi3q6wmcxdcwsy42qcgfkl0ag6hwcgmi4g67dvqs9nqjq2a3"; + sha256 = "0yf9apl05g1gxqwh01yd1iyg0xm50ywnlwp4szd08sg0srmvys16"; }; dontDisableStatic = true; @@ -19,6 +19,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; configureFlags = [ + "--enable-absolute-paths" "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" "--with-include=${skalibs}/include" "--with-include=${execline}/include" @@ -28,12 +29,7 @@ in stdenv.mkDerivation rec { "--with-dynlib=${execline}/lib" ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]) - ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); - - preBuild = '' - substituteInPlace "src/daemontools-extras/s6-log.c" \ - --replace '"execlineb"' '"${execline}/bin/execlineb"' - ''; + ++ (stdenv.lib.optional stdenv.isDarwin "--build=${stdenv.system}"); meta = { homepage = http://www.skarnet.org/software/s6/; diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/tools/system/sg3_utils/default.nix index e0f30b2db73..c1c4527d0a0 100644 --- a/pkgs/tools/system/sg3_utils/default.nix +++ b/pkgs/tools/system/sg3_utils/default.nix @@ -12,6 +12,6 @@ stdenv.mkDerivation rec { homepage = http://sg.danny.cz/sg/; description = "Utilities that send SCSI commands to devices"; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix index b9db2eba5cd..fb0309e7532 100644 --- a/pkgs/tools/text/catdoc/default.nix +++ b/pkgs/tools/text/catdoc/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "MS-Word/Excel/PowerPoint to text converter"; platforms = platforms.all; license = licenses.gpl2; - maintainers = with maintainers; [ urkud ndowens ]; + maintainers = with maintainers; [ ndowens ]; }; } diff --git a/pkgs/tools/text/ebook-tools/default.nix b/pkgs/tools/text/ebook-tools/default.nix index 2fafec02d81..da246832b93 100644 --- a/pkgs/tools/text/ebook-tools/default.nix +++ b/pkgs/tools/text/ebook-tools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ebook-tools.sourceforge.net"; description = "Tools and library for dealing with various ebook file formats"; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 6f2a2df82f8..666dae1db9b 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, getopt, lua, boost, pkgconfig }: +{ stdenv, fetchurl, getopt, lua, boost, pkgconfig, gcc }: + +with stdenv.lib; stdenv.mkDerivation rec { name = "highlight-${version}"; @@ -9,16 +11,23 @@ stdenv.mkDerivation rec { sha256 = "8a14b49f5e0c07daa9f40b4ce674baa00bb20061079473a5d386656f6d236d05"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin gcc ; buildInputs = [ getopt lua boost ]; - preConfigure = ''makeFlags="PREFIX=$out conf_dir=$out/etc/highlight/"''; + prePatch = stdenv.lib.optionalString stdenv.cc.isClang '' + substituteInPlace src/makefile \ + --replace 'CXX=g++' 'CXX=clang++' + ''; + + preConfigure = '' + makeFlags="PREFIX=$out conf_dir=$out/etc/highlight/" + ''; meta = with stdenv.lib; { description = "Source code highlighting tool"; homepage = "http://www.andre-simon.de/doku/highlight/en/highlight.php"; - platforms = platforms.linux; - maintainers = maintainers.ndowens; + platforms = platforms.unix; + maintainers = [ maintainers.ndowens ]; }; } diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index b53d619d837..4303fe82a45 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -16,7 +16,11 @@ let inherit rev; }; - preConfigure = "cd kdiff3"; + setSourceRoot = ''sourceRoot="$(echo */kdiff3/)"''; + + postPatch = '' + sed -re "s/(p\\[[^]]+] *== *)('([^']|\\\\')+')/\\1QChar(\\2)/g" -i src/diff.cpp + ''; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; @@ -26,7 +30,7 @@ let homepage = http://kdiff3.sourceforge.net/; license = licenses.gpl2Plus; description = "Compares and merges 2 or 3 files or directories"; - maintainers = with maintainers; [ viric urkud peterhoeg ]; + maintainers = with maintainers; [ viric peterhoeg ]; platforms = with platforms; linux; }; }; diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix index 8f22a9e7600..96c91def9ac 100644 --- a/pkgs/tools/text/numdiff/default.nix +++ b/pkgs/tools/text/numdiff/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.nongnu.org/numdiff/; license = licenses.gpl3Plus; - maintainers = with maintainers; [ bbenoist ndowens ]; + maintainers = with maintainers; [ ndowens ]; platforms = platforms.gnu; }; } diff --git a/pkgs/tools/text/odt2txt/default.nix b/pkgs/tools/text/odt2txt/default.nix index 85f0f24b387..42f80f29073 100644 --- a/pkgs/tools/text/odt2txt/default.nix +++ b/pkgs/tools/text/odt2txt/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = http://stosberg.net/odt2txt; platforms = stdenv.lib.platforms.all; lincense = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.urkud ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix new file mode 100644 index 00000000000..b9d5407c68d --- /dev/null +++ b/pkgs/tools/typesetting/htmldoc/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl + +, SystemConfiguration ? null, Foundation ? null +}: + +assert stdenv.isDarwin -> SystemConfiguration != null + && Foundation != null; + +stdenv.mkDerivation rec { + version = "1.8.29"; + name = "htmldoc-${version}"; + src = fetchurl { + url = "https://github.com/michaelrsweet/htmldoc/releases/download" + + "/release-${version}/htmldoc-${version}-source.tar.gz"; + sha256 = "15x0xdf487j4i4gfap5yr83airxnbp2v4lxaz79a4s3iirrq39p0"; + }; + buildInputs = with stdenv; + lib.optional isDarwin SystemConfiguration + ++ lib.optional isDarwin Foundation; + + meta = with stdenv.lib; { + description = "Converts HTML files to PostScript and PDF"; + homepage = https://michaelrsweet.github.io/htmldoc; + license = licenses.gpl2; + maintainers = with maintainers; [ viric shanemikel ]; + platforms = with platforms; linux ++ darwin; + + longDescription = '' + HTMLDOC is a program that reads HTML source files or web pages and + generates corresponding HTML, PostScript, or PDF files with an optional + table of contents. + ''; + }; +} diff --git a/pkgs/tools/typesetting/pdf2htmlEX/default.nix b/pkgs/tools/typesetting/pdf2htmlEX/default.nix index b214e986be9..a75e883b179 100644 --- a/pkgs/tools/typesetting/pdf2htmlEX/default.nix +++ b/pkgs/tools/typesetting/pdf2htmlEX/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig -, poppler, xlibs, pcre, python, glib, fontforge-gtk, cairo, pango, openjdk8 +, poppler, xlibs, pcre, python, glib, fontforge, cairo, pango, openjdk8 + }: stdenv.mkDerivation rec { @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { cairo pango (poppler.override { withData = true; }) - fontforge-gtk + fontforge openjdk8 ]; diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index 382219a0a3a..2c34a9aff32 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig +{ stdenv, darwin, fetchurl, makeWrapper, pkgconfig , harfbuzz, icu, lpeg, luaexpat, luazlib, luafilesystem , fontconfig, lua, libiconv }: @@ -26,7 +26,15 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [pkgconfig makeWrapper]; - buildInputs = [ harfbuzz icu lua lpeg luaexpat luazlib luafilesystem fontconfig libiconv ]; + buildInputs = [ harfbuzz icu lua lpeg luaexpat luazlib luafilesystem fontconfig libiconv ] + ++ optional stdenv.isDarwin darwin.apple_sdk.frameworks.AppKit + ; + + preConfigure = optionalString stdenv.isDarwin '' + sed -i -e 's|@import AppKit;|#import |' src/macfonts.m + ''; + + NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework AppKit"; LUA_PATH = luaPath; LUA_CPATH = luaCPath; @@ -49,8 +57,8 @@ stdenv.mkDerivation rec { technologies and borrowing some ideas from graphical systems such as InDesign. ''; - homepage = "http://www.sile-typesetter.org"; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.mit; + homepage = http://www.sile-typesetter.org; + platforms = platforms.unix; + license = licenses.mit; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index abfe951a33f..c783316c6d5 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -111,6 +111,7 @@ in buildEnv { -e "s,\$SELFAUTODIR,$out/share,g" \ -e "s,\$SELFAUTOPARENT,$out/share,g" \ -e "s,\$SELFAUTOGRANDPARENT,$out/share,g" \ + -e "/^mpost,/d" `# CVE-2016-10243` \ "$cnfOrig" > ./texmf.cnf patchCnfLua "./texmfcnf.lua" diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index 835cacf0098..b2eb5366618 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, fetchurl }: +{ stdenv, fetchurl, unzip, darwin }: stdenv.mkDerivation rec { name = "atomicparsley-${version}"; @@ -10,10 +10,13 @@ stdenv.mkDerivation rec { sha256 = "de83f219f95e6fe59099b277e3ced86f0430ad9468e845783092821dff15a72e"; }; - buildInputs = with pkgs; [ unzip ] - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; - patches = [ ./casts.patch ]; + patches = stdenv.lib.optional (!stdenv.cc.isClang) ./casts.patch; + + buildInputs = [ unzip ] + ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; + setSourceRoot = "sourceRoot=${product}-source-${version}"; + buildPhase = "bash build"; installPhase = "install -D AtomicParsley $out/bin/AtomicParsley"; diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 547700639bb..4eec47e9e75 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { ++ optionals gnutlsSupport [ gnutls nettle ] ++ optional opensslSupport openssl; + outputs = [ "out" "dev" ]; + meta = { description = "Toolkit for RTMP streams"; homepage = http://rtmpdump.mplayerhq.hu/; diff --git a/pkgs/tools/virtualization/nixos-container/default.nix b/pkgs/tools/virtualization/nixos-container/default.nix index 19394ea45d3..0763536533f 100644 --- a/pkgs/tools/virtualization/nixos-container/default.nix +++ b/pkgs/tools/virtualization/nixos-container/default.nix @@ -6,6 +6,8 @@ substituteAll { isExecutable = true; src = ./nixos-container.pl; perl = "${perl}/bin/perl -I${perlPackages.FileSlurp}/lib/perl5/site_perl"; + su = "${shadow.su}/bin/su"; + inherit utillinux; postInstall = '' t=$out/etc/bash_completion.d diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl index 65a9c3f5814..207177133a5 100755 --- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -8,9 +8,15 @@ use Fcntl ':flock'; use Getopt::Long qw(:config gnu_getopt); use Cwd 'abs_path'; +my $nsenter = "@utillinux@/bin/nsenter"; +my $su = "@su@"; + # Ensure a consistent umask. umask 0022; +# Ensure $NIXOS_CONFIG is not set. +$ENV{"NIXOS_CONFIG"} = ""; + # Parse the command line. sub showHelp { @@ -76,7 +82,7 @@ if ($action eq "list") { } my $containerName = $ARGV[1] or die "$0: no container name specified\n"; -$containerName =~ /^[a-zA-Z0-9\-]+$/ or die "$0: invalid container name\n"; +$containerName =~ /^[a-zA-Z0-9_-]+$/ or die "$0: invalid container name\n"; sub writeNixOSConfig { my ($nixosConfigFile) = @_; @@ -223,6 +229,22 @@ sub stopContainer { or die "$0: failed to stop container\n"; } +# Return the PID of the init process of the container. +sub getLeader { + my $s = `machinectl show "$containerName" -p Leader`; + chomp $s; + $s =~ /^Leader=(\d+)$/ or die "unable to get container's main PID\n"; + return int($1); +} + +# Run a command in the container. +sub runInContainer { + my @args = @_; + my $leader = getLeader; + exec($nsenter, "-t", $leader, "-m", "-u", "-i", "-n", "-p", "--", @args); + die "cannot run ‘nsenter’: $!\n"; +} + # Remove a directory while recursively unmounting all mounted filesystems within # that directory and unmounting/removing that directory afterwards as well. # @@ -248,7 +270,7 @@ if ($action eq "destroy") { safeRemoveTree($profileDir) if -e $profileDir; safeRemoveTree($gcRootsDir) if -e $gcRootsDir; - system("chattr", "-i", "$root/var/empty") if -e $root; + system("chattr", "-i", "$root/var/empty") if -e "$root/var/empty"; safeRemoveTree($root) if -e $root; unlink($confFile) or die; } @@ -297,14 +319,14 @@ elsif ($action eq "login") { } elsif ($action eq "root-login") { - exec("machinectl", "shell", $containerName, "/bin/sh", "-l"); + runInContainer("@su@", "root", "-l"); } elsif ($action eq "run") { shift @ARGV; shift @ARGV; # Escape command. my $s = join(' ', map { s/'/'\\''/g; "'$_'" } @ARGV); - exec("machinectl", "--quiet", "shell", $containerName, "/bin/sh", "-l", "-c", $s); + runInContainer("@su@", "root", "-l", "-c", "exec " . $s); } elsif ($action eq "show-ip") { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f790bbf29ed..9dca8e7e26c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -61,6 +61,7 @@ doNotDisplayTwice rec { gupnptools = gupnp-tools; # added 2015-12-19 gnustep-make = gnustep.make; # added 2016-7-6 htmlTidy = html-tidy; # added 2014-12-06 + iana_etc = iana-etc; # added 2017-03-08 inherit (haskell.compiler) jhc uhc; # 2015-05-15 inotifyTools = inotify-tools; joseki = apache-jena-fuseki; # added 2016-02-28 @@ -95,6 +96,7 @@ doNotDisplayTwice rec { nfsUtils = nfs-utils; # added 2014-12-06 opencl-icd = ocl-icd; # added 2017-01-20 owncloudclient = owncloud-client; # added 2016-08 + pgp-tools = signing-party; # added 2017-03-26 pidgin-with-plugins = pidgin; # added 2016-06 pidginlatexSF = pidginlatex; # added 2014-11-02 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 @@ -119,6 +121,7 @@ doNotDisplayTwice rec { speedtest_cli = speedtest-cli; # added 2015-02-17 sqliteInteractive = sqlite-interactive; # added 2014-12-06 sshfsFuse = sshfs-fuse; # added 2016-09 + surf-webkit2 = surf; # added 2017-04-02 system_config_printer = system-config-printer; # added 2016-01-03 telepathy_qt5 = libsForQt5.telepathy; # added 2015-12-19 tftp_hpa = tftp-hpa; # added 2015-04-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21f292dca76..26187bf7e55 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -170,6 +170,8 @@ with pkgs; inherit curl stdenv; }; + fetchRepoProject = callPackage ../build-support/fetchrepoproject { }; + # fetchurlBoot is used for curl and its dependencies in order to # prevent a cyclic dependency (curl depends on curl.tar.bz2, # curl.tar.bz2 depends on fetchurl, fetchurl depends on curl). It @@ -271,14 +273,16 @@ with pkgs; kdeDerivation = import ../build-support/kde/derivation.nix { inherit stdenv lib; }; - kdeWrapper = import ../build-support/kde/wrapper.nix { - inherit stdenv lib makeWrapper buildEnv; + kdeWrapper = callPackage ../build-support/kde/wrapper.nix { + inherit (gnome3) dconf; }; nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacsPackagesNg) inherit-local; }; pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; + setupSystemdUnits = callPackage ../build-support/setup-systemd-units.nix { }; + singularity-tools = callPackage ../build-support/singularity-tools { }; srcOnly = args: callPackage ../build-support/src-only args; @@ -321,7 +325,7 @@ with pkgs; findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh; wrapGAppsHook = makeSetupHook { - deps = [ makeWrapper ]; + deps = [ gnome3.dconf.lib gnome3.gtk makeWrapper ]; } ../build-support/setup-hooks/wrap-gapps-hook.sh; separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh; @@ -430,7 +434,7 @@ with pkgs; withGui = false; }; - apitrace = libsForQt55.callPackage ../applications/graphics/apitrace {}; + apitrace = libsForQt56.callPackage ../applications/graphics/apitrace {}; argus = callPackage ../tools/networking/argus {}; @@ -533,6 +537,8 @@ with pkgs; oracle-instantclient = callPackage ../development/libraries/oracle-instantclient { }; + kwakd = callPackage ../servers/kwakd { }; + kwm = callPackage ../os-specific/darwin/kwm { }; khd = callPackage ../os-specific/darwin/khd { @@ -572,7 +578,9 @@ with pkgs; atftp = callPackage ../tools/networking/atftp { }; - autogen = callPackage ../development/tools/misc/autogen { }; + autogen = callPackage ../development/tools/misc/autogen { + guile = guile_2_0; + }; autojump = callPackage ../tools/misc/autojump { }; @@ -732,6 +740,8 @@ with pkgs; catclock = callPackage ../applications/misc/catclock { }; + cde = callPackage ../tools/package-management/cde { }; + cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { }; cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { }; @@ -800,6 +810,8 @@ with pkgs; coturn = callPackage ../servers/coturn { }; + coursier = callPackage ../development/tools/coursier {}; + crunch = callPackage ../tools/security/crunch { }; crudini = callPackage ../tools/misc/crudini { }; @@ -898,6 +910,8 @@ with pkgs; fastJson = callPackage ../development/libraries/fastjson { }; + filebeat = callPackage ../misc/logging/filebeat { }; + filebench = callPackage ../tools/misc/filebench { }; fsmon = callPackage ../tools/misc/fsmon { }; @@ -940,10 +954,14 @@ with pkgs; gti = callPackage ../tools/misc/gti { }; + heartbeat = callPackage ../misc/logging/heartbeat { }; + heatseeker = callPackage ../tools/misc/heatseeker { }; hexio = callPackage ../development/tools/hexio { }; + hostsblock = callPackage ../tools/misc/hostsblock { }; + hr = callPackage ../applications/misc/hr { }; interlock = callPackage ../servers/interlock {}; @@ -956,6 +974,8 @@ with pkgs; languagetool = callPackage ../tools/text/languagetool { }; + loccount = callPackage ../development/tools/misc/loccount { }; + long-shebang = callPackage ../misc/long-shebang {}; iio-sensor-proxy = callPackage ../os-specific/linux/iio-sensor-proxy { }; @@ -964,6 +984,8 @@ with pkgs; meson = callPackage ../development/tools/build-managers/meson { }; + metricbeat = callPackage ../misc/logging/metricbeat { }; + mp3fs = callPackage ../tools/filesystems/mp3fs { }; mpdcron = callPackage ../tools/audio/mpdcron { }; @@ -1014,6 +1036,8 @@ with pkgs; mongodb-tools = callPackage ../tools/misc/mongodb-tools { }; + msr-tools = callPackage ../os-specific/linux/msr-tools { }; + mstflint = callPackage ../tools/misc/mstflint { }; mcelog = callPackage ../os-specific/linux/mcelog { @@ -1242,37 +1266,25 @@ with pkgs; m17n_lib = callPackage ../tools/inputmethods/m17n-lib { }; ibus = callPackage ../tools/inputmethods/ibus { - inherit (python3Packages) pygobject3; inherit (gnome3) dconf glib; }; ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { }; ibus-engines = recurseIntoAttrs { + anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { }; - anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { - inherit (python3Packages) pygobject3; - }; + hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { }; - hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { - inherit (python3Packages) pygobject3; - }; + libpinyin = callPackage ../tools/inputmethods/ibus-engines/ibus-libpinyin { }; - libpinyin = callPackage ../tools/inputmethods/ibus-engines/ibus-libpinyin { - inherit (python3Packages) pygobject3; - }; - - m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { - inherit (python3Packages) pygobject3; - }; + m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { }; mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { - inherit (pythonPackages) gyp; protobuf = protobuf.override { stdenv = clangStdenv; }; }; table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { - inherit (python3Packages) pygobject3; inherit (gnome3) dconf; }; @@ -1328,7 +1340,7 @@ with pkgs; convoy = callPackage ../tools/filesystems/convoy { }; - cool-retro-term = libsForQt55.callPackage ../applications/misc/cool-retro-term { }; + cool-retro-term = libsForQt56.callPackage ../applications/misc/cool-retro-term { }; coreutils = callPackage ../tools/misc/coreutils { aclSupport = stdenv.isLinux; @@ -1797,11 +1809,14 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }); fontforge-gtk = callPackage ../tools/misc/fontforge { + withSpiro = true; withGTK = true; gtk2 = gtk2-x11; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; + fontforge-fonttools = callPackage ../tools/misc/fontforge/fontforge-fonttools.nix {}; + fontmatrix = callPackage ../applications/graphics/fontmatrix {}; foremost = callPackage ../tools/system/foremost { }; @@ -1853,6 +1868,8 @@ with pkgs; fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { }; + fwknop = callPackage ../tools/security/fwknop { }; + exfat = callPackage ../tools/filesystems/exfat { }; dos2unix = callPackage ../tools/text/dos2unix { }; @@ -1943,6 +1960,7 @@ with pkgs; gitlab = callPackage ../applications/version-management/gitlab { }; gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { }; + gitlab-runner_1_11 = callPackage ../development/tools/continuous-integration/gitlab-runner/v1.nix { }; gitlab-shell = callPackage ../applications/version-management/gitlab-shell { }; @@ -2249,9 +2267,12 @@ with pkgs; hfsprogs = callPackage ../tools/filesystems/hfsprogs { }; - highlight = callPackage ../tools/text/highlight { + highlight = callPackage ../tools/text/highlight ({ lua = lua5; - }; + } // lib.optionalAttrs stdenv.isDarwin { + # doesn't build with clang_37 + inherit (llvmPackages_38) stdenv; + }); homesick = callPackage ../tools/misc/homesick { }; @@ -2405,6 +2426,8 @@ with pkgs; jaaa = callPackage ../applications/audio/jaaa { }; + jackett = callPackage ../servers/jackett { }; + jade = callPackage ../tools/text/sgml/jade { }; jd-gui = callPackage_i686 ../tools/security/jd-gui { }; @@ -3299,7 +3322,9 @@ with pkgs; owncloud90 owncloud91; - owncloud-client = callPackage ../applications/networking/owncloud-client { }; + owncloud-client = callPackage ../applications/networking/owncloud-client { + inherit (libsForQt5) qtkeychain; + }; p2pvc = callPackage ../applications/video/p2pvc {}; @@ -3309,6 +3334,8 @@ with pkgs; nix = nixUnstable; }; + packetbeat = callPackage ../misc/logging/packetbeat { }; + packetdrill = callPackage ../tools/networking/packetdrill { }; pakcs = callPackage ../development/compilers/pakcs {}; @@ -3320,8 +3347,6 @@ with pkgs; buildTools = drv.buildTools or [] ++ [haskellPackages.hsb2hs]; }); - panomatic = callPackage ../tools/graphics/panomatic { }; - pamtester = callPackage ../tools/security/pamtester { }; paper-gtk-theme = callPackage ../misc/themes/paper { }; @@ -3415,6 +3440,8 @@ with pkgs; inherit (pythonPackages) pillow; }; + pdfshuffler = callPackage ../applications/misc/pdfshuffler { }; + briss = callPackage ../tools/graphics/briss { }; brickd = callPackage ../servers/brickd { @@ -3633,6 +3660,8 @@ with pkgs; radamsa = callPackage ../tools/security/radamsa { }; + radarr = callPackage ../servers/radarr { }; + radvd = callPackage ../tools/networking/radvd { }; rambox = callPackage ../applications/networking/instant-messengers/rambox { }; @@ -3699,6 +3728,8 @@ with pkgs; renameutils = callPackage ../tools/misc/renameutils { }; + renderdoc = libsForQt5.callPackage ../applications/graphics/renderdoc { }; + replace = callPackage ../tools/text/replace { }; reckon = callPackage ../tools/text/reckon { }; @@ -3766,6 +3797,10 @@ with pkgs; rrdtool = callPackage ../tools/misc/rrdtool { }; + rss2email = callPackage ../applications/networking/feedreaders/rss2email { + pythonPackages = python3Packages; + }; + rsstail = callPackage ../applications/networking/feedreaders/rsstail { }; rtorrent = callPackage ../tools/networking/p2p/rtorrent { }; @@ -3864,13 +3899,15 @@ with pkgs; shellinabox = callPackage ../servers/shellinabox { }; + shrikhand = callPackage ../data/fonts/shrikhand { }; + sic = callPackage ../applications/networking/irc/sic { }; siege = callPackage ../tools/networking/siege {}; - sigil = libsForQt55.callPackage ../applications/editors/sigil { }; + sigil = libsForQt56.callPackage ../applications/editors/sigil { }; - # aka., gpg-tools + # aka., pgp-tools signing-party = callPackage ../tools/security/signing-party { }; silc_client = callPackage ../applications/networking/instant-messengers/silc-client { }; @@ -4051,8 +4088,6 @@ with pkgs; pythonPackages = python3Packages; }; - sitecopy = callPackage ../tools/networking/sitecopy { }; - stricat = callPackage ../tools/security/stricat { }; staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; }; @@ -4152,7 +4187,7 @@ with pkgs; tor-arm = callPackage ../tools/security/tor/tor-arm.nix { }; - torbrowser = callPackage ../tools/security/tor/torbrowser.nix { }; + torbrowser = callPackage ../applications/networking/browsers/torbrowser { }; touchegg = callPackage ../tools/inputmethods/touchegg { }; @@ -4219,6 +4254,8 @@ with pkgs; u9fs = callPackage ../servers/u9fs { }; + ua = callPackage ../tools/networking/ua { }; + ucl = callPackage ../development/libraries/ucl { }; ucspi-tcp = callPackage ../tools/networking/ucspi-tcp { }; @@ -4370,6 +4407,10 @@ with pkgs; html-xml-utils = callPackage ../tools/text/xml/html-xml-utils { }; + htmldoc = callPackage ../tools/typesetting/htmldoc { + inherit (darwin.apple_sdk.frameworks) SystemConfiguration Foundation; + }; + rcm = callPackage ../tools/misc/rcm {}; tftp-hpa = callPackage ../tools/networking/tftp-hpa {}; @@ -4387,8 +4428,6 @@ with pkgs; time = callPackage ../tools/misc/time { }; - tkabber = callPackage ../applications/networking/instant-messengers/tkabber { }; - qfsm = callPackage ../applications/science/electronics/qfsm { }; tkgate = callPackage ../applications/science/electronics/tkgate/1.x.nix { }; @@ -4497,6 +4536,10 @@ with pkgs; python = python27; }; + veracrypt = callPackage ../applications/misc/veracrypt { + wxGUI = true; + }; + vlan = callPackage ../tools/networking/vlan { }; vmtouch = callPackage ../tools/misc/vmtouch { }; @@ -5035,10 +5078,7 @@ with pkgs; isl = if !stdenv.isDarwin then isl_0_14 else null; })); - gfortran = if !stdenv.isDarwin then gfortran5 - else callPackage ../development/compilers/gcc/gfortran-darwin.nix { - inherit (darwin) Libsystem; - }; + gfortran = gfortran5; gfortran48 = wrapCC (gcc48.cc.override { name = "gfortran"; @@ -5297,7 +5337,7 @@ with pkgs; jre = jre8; jre_headless = jre8_headless; - openshot-qt = callPackage ../applications/video/openshot-qt { }; + openshot-qt = libsForQt56.callPackage ../applications/video/openshot-qt { }; oraclejdk = pkgs.jdkdistro true false; @@ -5369,6 +5409,7 @@ with pkgs; lld = llvmPackages_4.lld; lldb = llvmPackages.lldb; + lldb_4 = llvmPackages_4.lldb; llvm = llvmPackages.llvm; @@ -5480,6 +5521,10 @@ with pkgs; ocaml-top = callPackage ../development/tools/ocaml/ocaml-top { }; + ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { + ocamlPackages = ocamlPackages_4_03; + }; + opa = callPackage ../development/compilers/opa { nodejs = nodejs-4_x; ocamlPackages = ocamlPackages_4_02; @@ -5504,7 +5549,9 @@ with pkgs; }; rust = rustStable; - rustStable = callPackage ../development/compilers/rust {}; + rustStable = callPackage ../development/compilers/rust { + inherit (llvmPackages_39) llvm; + }; rustBeta = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/beta.nix {})); rustNightly = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/nightly.nix { rustPlatform = recurseIntoAttrs (makeRustPlatform rustBeta); @@ -5582,6 +5629,8 @@ with pkgs; metaBuildEnv = callPackage ../development/compilers/meta-environment/meta-build-env { }; + swift = callPackage ../development/compilers/swift { }; + swiProlog = callPackage ../development/compilers/swi-prolog { }; tbb = callPackage ../development/libraries/tbb { }; @@ -5786,9 +5835,12 @@ with pkgs; guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { }; - guile_2_0 = callPackage ../development/interpreters/guile { }; + # Needed for autogen + guile_2_0 = callPackage ../development/interpreters/guile/2.0.nix { }; - guile = guile_2_0; + guile_2_2 = callPackage ../development/interpreters/guile { }; + + guile = guile_2_2; hadoop = callPackage ../applications/networking/cluster/hadoop { }; @@ -6035,17 +6087,17 @@ with pkgs; inherit (callPackage ../development/interpreters/ruby {}) ruby_2_0_0 ruby_2_1_10 - ruby_2_2_5 - ruby_2_3_3 - ruby_2_4_0; + ruby_2_2_7 + ruby_2_3_4 + ruby_2_4_1; # Ruby aliases ruby = ruby_2_3; ruby_2_0 = ruby_2_0_0; ruby_2_1 = ruby_2_1_10; - ruby_2_2 = ruby_2_2_5; - ruby_2_3 = ruby_2_3_3; - ruby_2_4 = ruby_2_4_0; + ruby_2_2 = ruby_2_2_7; + ruby_2_3 = ruby_2_3_4; + ruby_2_4 = ruby_2_4_1; scsh = callPackage ../development/interpreters/scsh { }; @@ -6054,7 +6106,7 @@ with pkgs; self = callPackage_i686 ../development/interpreters/self { }; spark = spark_21; - spark_16 = callPackage ../applications/networking/cluster/spark { version = "1.6.0"; }; + spark_16 = callPackage ../applications/networking/cluster/spark { version = "1.6.3"; }; spark_21 = callPackage ../applications/networking/cluster/spark { version = "2.1.0"; }; spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; @@ -6066,7 +6118,7 @@ with pkgs; ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; - supercollider = callPackage ../development/interpreters/supercollider { + supercollider = libsForQt56.callPackage ../development/interpreters/supercollider { fftw = fftwSinglePrec; }; @@ -6174,6 +6226,8 @@ with pkgs; apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; }; apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; }; + kt = callPackage ../tools/misc/kt {}; + asn2quickder = callPackage ../development/tools/asn2quickder {}; astyle = callPackage ../development/tools/misc/astyle { }; @@ -6473,9 +6527,7 @@ with pkgs; ocaml = ocaml_4_02; }; - framac = callPackage ../development/tools/analysis/frama-c { - coq = coq_8_4; - }; + framac = callPackage ../development/tools/analysis/frama-c { }; frame = callPackage ../development/libraries/frame { }; @@ -6794,7 +6846,6 @@ with pkgs; scons = callPackage ../development/tools/build-managers/scons { }; sbt = callPackage ../development/tools/build-managers/sbt { }; - sbt_0_12_4 = callPackage ../development/tools/build-managers/sbt/0.12.4.nix { }; simpleBuildTool = sbt; shards = callPackage ../development/tools/build-managers/shards { }; @@ -6910,6 +6961,8 @@ with pkgs; valkyrie = callPackage ../development/tools/analysis/valkyrie { }; + qcachegrind = libsForQt56.callPackage ../development/tools/analysis/qcachegrind {}; + verasco = ocaml-ng.ocamlPackages_4_02.verasco.override { coq = coq_8_4; }; @@ -6918,6 +6971,10 @@ with pkgs; vultr = callPackage ../development/tools/vultr { }; + vulnix = callPackage ../tools/security/vulnix { + pythonPackages = python3Packages; + }; + xc3sprog = callPackage ../development/tools/misc/xc3sprog { }; xcbuild = callPackage ../development/tools/xcbuild/wrapper.nix { @@ -6939,7 +6996,7 @@ with pkgs; ycmd = callPackage ../development/tools/misc/ycmd { inherit (darwin.apple_sdk.frameworks) Cocoa; - llvmPackages = llvmPackages_39; + llvmPackages = llvmPackages_4; python = python2; }; @@ -7181,6 +7238,8 @@ with pkgs; cracklib = callPackage ../development/libraries/cracklib { }; + cre2 = callPackage ../development/libraries/cre2 { }; + cryptopp = callPackage ../development/libraries/crypto++ { }; curlcpp = callPackage ../development/libraries/curlcpp { }; @@ -7248,6 +7307,8 @@ with pkgs; dlib = callPackage ../development/libraries/dlib { }; + docopt_cpp = callPackage ../development/libraries/docopt_cpp { }; + dotconf = callPackage ../development/libraries/dotconf { }; dssi = callPackage ../development/libraries/dssi {}; @@ -7267,8 +7328,6 @@ with pkgs; enet = callPackage ../development/libraries/enet { }; - enginepkcs11 = callPackage ../development/libraries/enginepkcs11 { }; - epoxy = callPackage ../development/libraries/epoxy {}; esdl = callPackage ../development/libraries/esdl { }; @@ -7289,6 +7348,8 @@ with pkgs; inherit (pkgs.gnome2) gtkglext; }; + far2l = callPackage ../applications/misc/far2l { }; + farbfeld = callPackage ../development/libraries/farbfeld { }; farsight2 = callPackage ../development/libraries/farsight2 { }; @@ -7389,6 +7450,8 @@ with pkgs; fontconfig = callPackage ../development/libraries/fontconfig { }; + fontconfig-penultimate = callPackage ../data/fonts/fontconfig-penultimate {}; + fontconfig-ultimate = callPackage ../development/libraries/fontconfig-ultimate {}; folly = callPackage ../development/libraries/folly { }; @@ -7661,9 +7724,7 @@ with pkgs; gpac = callPackage ../applications/video/gpac { }; - gpgme = callPackage ../development/libraries/gpgme { - gnupg1 = gnupg1orig; - }; + gpgme = callPackage ../development/libraries/gpgme { }; pgpdump = callPackage ../tools/security/pgpdump { }; @@ -8027,10 +8088,16 @@ with pkgs; libb2 = callPackage ../development/libraries/libb2 { }; + libbap = callPackage ../development/libraries/libbap { + inherit (ocamlPackages_4_02) bap ocaml findlib ctypes; + }; + libbluedevil = callPackage ../development/libraries/libbluedevil { }; libbdplus = callPackage ../development/libraries/libbdplus { }; + libblocksruntime = callPackage ../development/libraries/libblocksruntime { }; + libbluray = callPackage ../development/libraries/libbluray { }; libbs2b = callPackage ../development/libraries/audio/libbs2b { }; @@ -8682,6 +8749,8 @@ with pkgs; libsoup = callPackage ../development/libraries/libsoup { }; + libspiro = callPackage ../development/libraries/libspiro {}; + libssh = callPackage ../development/libraries/libssh { }; libssh2 = callPackage ../development/libraries/libssh2 { }; @@ -8790,10 +8859,7 @@ with pkgs; }; libv4l = lowPrio (v4l_utils.override { - alsaLib = null; - libX11 = null; - qt4 = null; - qt5 = null; + withUtils = false; }); libva = callPackage ../development/libraries/libva { }; @@ -8898,6 +8964,8 @@ with pkgs; lirc = callPackage ../development/libraries/lirc { }; + liquid-dsp = callPackage ../development/libraries/liquid-dsp { }; + liquidfun = callPackage ../development/libraries/liquidfun { }; live555 = callPackage ../development/libraries/live555 { }; @@ -8956,6 +9024,7 @@ with pkgs; mesa_drivers = mesaDarwinOr ( let mo = mesa_noglu.override { grsecEnabled = config.grsecurity or false; + enableTextureFloats = true; }; in mo.drivers ); @@ -9070,9 +9139,7 @@ with pkgs; }; libnghttp2 = nghttp2.lib; - nix-plugins = callPackage ../development/libraries/nix-plugins { - nix = pkgs.nixUnstable; - }; + nix-plugins = callPackage ../development/libraries/nix-plugins {}; nlohmann_json = callPackage ../development/libraries/nlohmann_json { }; @@ -9186,7 +9253,6 @@ with pkgs; wolfssl = callPackage ../development/libraries/wolfssl { }; openssl = openssl_1_0_2; - openssl-steam = openssl_1_0_2-steam; inherit (callPackages ../development/libraries/openssl { fetchurl = fetchurlBoot; @@ -9196,8 +9262,7 @@ with pkgs; }; }) openssl_1_0_2 - openssl_1_1_0 - openssl_1_0_2-steam; + openssl_1_1_0; openssl-chacha = callPackage ../development/libraries/openssl/chacha.nix { cryptodevHeaders = linuxPackages.cryptodev.override { @@ -9268,6 +9333,8 @@ with pkgs; pocketsphinx = callPackage ../development/libraries/pocketsphinx { }; + poco = callPackage ../development/libraries/poco { }; + podofo = callPackage ../development/libraries/podofo { lua5 = lua5_1; }; poker-eval = callPackage ../development/libraries/poker-eval { }; @@ -9375,25 +9442,11 @@ with pkgs; developerBuild = true; }); - qt55 = recurseIntoAttrs (import ../development/libraries/qt-5/5.5 { - inherit newScope; - inherit stdenv fetchurl makeSetupHook makeWrapper; - bison = bison2; # error: too few arguments to function 'int yylex(... - cups = if stdenv.isLinux then cups else null; - harfbuzz = harfbuzz-icu; - mesa = mesa_noglu; - inherit perl; - inherit (gnome2) libgnomeui GConf gnome_vfs; - inherit (gst_all_1) gstreamer gst-plugins-base; - }); - - libsForQt55 = recurseIntoAttrs (lib.makeScope qt55.newScope mkLibsForQt5); - qt56 = recurseIntoAttrs (import ../development/libraries/qt-5/5.6 { inherit newScope; inherit stdenv fetchurl makeSetupHook makeWrapper; bison = bison2; # error: too few arguments to function 'int yylex(... - cups = if stdenv.isLinux then cups else null; + inherit cups; harfbuzz = harfbuzz-icu; mesa = mesa_noglu; inherit perl; @@ -9402,28 +9455,16 @@ with pkgs; libsForQt56 = recurseIntoAttrs (lib.makeScope qt56.newScope mkLibsForQt5); - qt57 = recurseIntoAttrs (import ../development/libraries/qt-5/5.7 { - inherit newScope; - inherit stdenv fetchurl makeSetupHook makeWrapper; - bison = bison2; # error: too few arguments to function 'int yylex(... - cups = if stdenv.isLinux then cups else null; - harfbuzz = harfbuzz-icu; - mesa = mesa_noglu; - inherit perl; - inherit (gst_all_1) gstreamer gst-plugins-base; - }); - - libsForQt57 = recurseIntoAttrs (lib.makeScope qt57.newScope mkLibsForQt5); - qt58 = recurseIntoAttrs (import ../development/libraries/qt-5/5.8 { inherit newScope; inherit stdenv fetchurl makeSetupHook makeWrapper; bison = bison2; # error: too few arguments to function 'int yylex(... - cups = if stdenv.isLinux then cups else null; + inherit cups; harfbuzz = harfbuzz-icu; mesa = mesa_noglu; inherit perl; inherit (gst_all_1) gstreamer gst-plugins-base; + inherit (gnome3) gtk3 dconf; }); libsForQt58 = recurseIntoAttrs (lib.makeScope qt58.newScope mkLibsForQt5); @@ -9482,6 +9523,10 @@ with pkgs; libktorrent = callPackage ../development/libraries/libktorrent { }; + libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { }; + + libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { }; + mlt = callPackage ../development/libraries/mlt/qt-5.nix { ffmpeg = ffmpeg_2; }; @@ -9838,8 +9883,6 @@ with pkgs; tclap = callPackage ../development/libraries/tclap {}; - tclgpg = callPackage ../development/libraries/tclgpg { }; - tcllib = callPackage ../development/libraries/tcllib { }; tcltls = callPackage ../development/libraries/tcltls { }; @@ -10165,6 +10208,8 @@ with pkgs; yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool { }; + yubikey-manager = callPackage ../tools/misc/yubikey-manager { }; + yubikey-neo-manager = callPackage ../tools/misc/yubikey-neo-manager { }; yubikey-personalization = callPackage ../tools/misc/yubikey-personalization { @@ -10267,8 +10312,6 @@ with pkgs; javaCup = callPackage ../development/libraries/java/cup { }; - jclasslib = callPackage ../development/tools/java/jclasslib { }; - jdom = callPackage ../development/libraries/java/jdom { }; jflex = callPackage ../development/libraries/java/jflex { }; @@ -10342,6 +10385,15 @@ with pkgs; texLive = null; }; + # QuickLisp minimal version + asdf_2_26 = callPackage ../development/lisp-modules/asdf/2.26.nix { + texLive = null; + }; + # Currently most popular + asdf_3_1 = callPackage ../development/lisp-modules/asdf/3.1.nix { + texLive = null; + }; + clwrapperFunction = callPackage ../development/lisp-modules/clwrapper; wrapLisp = lisp: clwrapperFunction { inherit lisp; }; @@ -10350,10 +10402,17 @@ with pkgs; inherit clwrapper; }; - lispPackagesClisp = lispPackagesFor (wrapLisp clisp); - lispPackagesSBCL = lispPackagesFor (wrapLisp sbcl); - lispPackages = recurseIntoAttrs lispPackagesSBCL; + lispPackages = recurseIntoAttrs (quicklispPackages_asdf_3_1 // + lispPackagesFor ((wrapLisp sbcl).override { asdf = asdf_3_1; })); + quicklispPackagesFor = clwrapper: callPackage ../development/lisp-modules/quicklisp-to-nix.nix { + inherit clwrapper; + }; + quicklispPackagesClisp = quicklispPackagesFor (wrapLisp clisp); + quicklispPackagesSBCL = quicklispPackagesFor (wrapLisp sbcl); + quicklispPackages = quicklispPackagesSBCL; + quicklispPackages_asdf_3_1 = quicklispPackagesFor + ((wrapLisp sbcl).override { asdf = asdf_3_1; }); ### DEVELOPMENT / PERL MODULES @@ -10504,7 +10563,7 @@ with pkgs; spidermonkey = spidermonkey_1_8_5; python = python27; sphinx = python27Packages.sphinx; - erlang = erlangR16; + erlang = erlangR17; }; couchdb2 = callPackage ../servers/http/couchdb/2.0.0.nix { @@ -10660,7 +10719,9 @@ with pkgs; neard = callPackage ../servers/neard { }; - nginx = callPackage ../servers/http/nginx/stable.nix { + nginx = nginxStable; + + nginxStable = callPackage ../servers/http/nginx/stable.nix { # We don't use `with` statement here on purpose! # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ]; @@ -10764,7 +10825,9 @@ with pkgs; mongodb248 = callPackage ../servers/nosql/mongodb/2.4.8.nix { }; - riak = callPackage ../servers/nosql/riak/2.2.0.nix { }; + riak = callPackage ../servers/nosql/riak/2.2.0.nix { + erlang = erlang_basho_R16B02; + }; riak-cs = callPackage ../servers/nosql/riak-cs/2.1.1.nix { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; @@ -11069,7 +11132,7 @@ with pkgs; xwayland = callPackage ../servers/x11/xorg/xwayland.nix { }; - yaws = callPackage ../servers/http/yaws { erlang = erlangR17; }; + yaws = callPackage ../servers/http/yaws { }; zabbix = recurseIntoAttrs (callPackages ../servers/monitoring/zabbix {}); @@ -11179,7 +11242,6 @@ with pkgs; crda = callPackage ../os-specific/linux/crda { }; darwin = let - cmdline = callPackage ../os-specific/darwin/command-line-tools {}; apple-source-releases = callPackage ../os-specific/darwin/apple-source-releases { }; in apple-source-releases // rec { cctools_cross = callPackage (forcedNativePackages.callPackage ../os-specific/darwin/cctools/port.nix {}).cross { @@ -11212,7 +11274,6 @@ with pkgs; xcode = callPackage ../os-specific/darwin/xcode {}; - osx_sdk = callPackage ../os-specific/darwin/osx-sdk {}; osx_private_sdk = callPackage ../os-specific/darwin/osx-private-sdk {}; security_tool = (newScope (darwin.apple_sdk.frameworks // darwin)) ../os-specific/darwin/security-tool { @@ -11221,9 +11282,6 @@ with pkgs; binutils = callPackage ../os-specific/darwin/binutils { inherit cctools; }; - cmdline_sdk = cmdline.sdk; - cmdline_tools = cmdline.tools; - apple_sdk = callPackage ../os-specific/darwin/apple-sdk {}; libobjc = apple-source-releases.objc4; @@ -11455,6 +11513,7 @@ with pkgs; linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.p9_fixes kernelPatches.packet_fix_race_condition_CVE_2016_8655 kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074 ] @@ -11475,6 +11534,7 @@ with pkgs; linux_3_10 = callPackage ../os-specific/linux/kernel/linux-3.10.nix { kernelPatches = with kernelPatches; [ bridge_stp_helper + p9_fixes lguest_entry-linkage packet_fix_race_condition_CVE_2016_8655 DCCP_double_free_vulnerability_CVE-2017-6074 @@ -11486,32 +11546,10 @@ with pkgs; ]; }; - linux_3_12 = callPackage ../os-specific/linux/kernel/linux-3.12.nix { - kernelPatches = with kernelPatches; - [ bridge_stp_helper - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - - linux_4_1 = callPackage ../os-specific/linux/kernel/linux-4.1.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074 - ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.p9_fixes kernelPatches.cpu-cgroup-v2."4.4" ] ++ lib.optionals ((platform.kernelArch or null) == "mips") @@ -11524,6 +11562,7 @@ with pkgs; linux_4_9 = callPackage ../os-specific/linux/kernel/linux-4.9.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.p9_fixes # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md # when adding a new linux version # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking @@ -11540,6 +11579,7 @@ with pkgs; linux_4_10 = callPackage ../os-specific/linux/kernel/linux-4.10.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.p9_fixes # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md # when adding a new linux version # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking @@ -11556,6 +11596,7 @@ with pkgs; linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper + kernelPatches.p9_fixes kernelPatches.modinst_arg_list_too_long ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu @@ -11736,8 +11777,6 @@ with pkgs; linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp; linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi; linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10); - linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12); - linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1); linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_10); @@ -11912,6 +11951,8 @@ with pkgs; nss_ldap = callPackage ../os-specific/linux/nss_ldap { }; + odroid-xu3-bootloader = callPackage ../tools/misc/odroid-xu3-bootloader { }; + pagemon = callPackage ../os-specific/linux/pagemon { }; pam = callPackage ../os-specific/linux/pam { }; @@ -12002,6 +12043,8 @@ with pkgs; rt5677-firmware = callPackage ../os-specific/linux/firmware/rt5677 { }; + rtl8192su-firmware = callPackage ../os-specific/linux/firmware/rtl8192su-firmware { }; + rtl8723bs-firmware = callPackage ../os-specific/linux/firmware/rtl8723bs-firmware { }; rtlwifi_new-firmware = callPackage ../os-specific/linux/firmware/rtlwifi_new-firmware { }; @@ -12108,6 +12151,7 @@ with pkgs; ubootBananaPi ubootBeagleboneBlack ubootJetsonTK1 + ubootOdroidXU3 ubootPcduino3Nano ubootRaspberryPi ubootRaspberryPi2 @@ -12164,9 +12208,7 @@ with pkgs; systemd = null; }); - v4l_utils = callPackage ../os-specific/linux/v4l-utils { - qt5 = null; - }; + v4l_utils = qt5.callPackage ../os-specific/linux/v4l-utils { }; vndr = callPackage ../development/tools/vndr { }; @@ -12268,6 +12310,8 @@ with pkgs; aurulent-sans = callPackage ../data/fonts/aurulent-sans { }; + babelstone-han = callPackage ../data/fonts/babelstone-han { }; + baekmuk-ttf = callPackage ../data/fonts/baekmuk-ttf { }; bakoma_ttf = callPackage ../data/fonts/bakoma-ttf { }; @@ -12553,7 +12597,7 @@ with pkgs; inherit (callPackages ../data/fonts/gdouros { }) symbola aegyptus akkadian anatolian maya unidings musica analecta; - iana_etc = callPackage ../data/misc/iana-etc { }; + iana-etc = callPackage ../data/misc/iana-etc { }; poppler_data = callPackage ../data/misc/poppler-data { }; @@ -12592,6 +12636,11 @@ with pkgs; source-han-sans-korean = sourceHanSansPackages.korean; source-han-sans-simplified-chinese = sourceHanSansPackages.simplified-chinese; source-han-sans-traditional-chinese = sourceHanSansPackages.traditional-chinese; + sourceHanSerifPackages = callPackage ../data/fonts/source-han-serif { }; + source-han-serif-japanese = sourceHanSerifPackages.japanese; + source-han-serif-korean = sourceHanSerifPackages.korean; + source-han-serif-simplified-chinese = sourceHanSerifPackages.simplified-chinese; + source-han-serif-traditional-chinese = sourceHanSerifPackages.traditional-chinese; inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom; @@ -12645,11 +12694,17 @@ with pkgs; xlsx2csv = pythonPackages.xlsx2csv; + xorg-rgb = callPackage ../data/misc/xorg-rgb {}; + zeal = libsForQt5.callPackage ../data/documentation/zeal { }; ### APPLICATIONS + "2bwm" = callPackage ../applications/window-managers/2bwm { + patches = config."2bwm".patches or []; + }; + a2jmidid = callPackage ../applications/audio/a2jmidid { }; aacgain = callPackage ../applications/audio/aacgain { }; @@ -12872,6 +12927,8 @@ with pkgs; guile = guile_1_8; }; + bevelbar = callPackage ../applications/window-managers/bevelbar { }; + bibletime = callPackage ../applications/misc/bibletime { }; bitkeeper = callPackage ../applications/version-management/bitkeeper { @@ -13075,7 +13132,7 @@ with pkgs; cutecom = callPackage ../tools/misc/cutecom { }; cutegram = - let callpkg = libsForQt55.callPackage; + let callpkg = libsForQt56.callPackage; in callpkg ../applications/networking/instant-messengers/telegram/cutegram rec { libqtelegram-aseman-edition = callpkg ../applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition { }; telegram-qml = callpkg ../applications/networking/instant-messengers/telegram/telegram-qml { @@ -13152,7 +13209,13 @@ with pkgs; dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) { }; - docker = callPackage ../applications/virtualization/docker { }; + inherit (callPackage ../applications/virtualization/docker { }) + docker_17_03 + docker_17_04; + + docker = docker_17_03; + docker-edge = docker_17_04; + docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { }; docker-gc = callPackage ../applications/virtualization/docker/gc.nix { }; @@ -13242,19 +13305,15 @@ with pkgs; withGTK3 = false; })); - emacs24Macport_24_5 = lowPrio (callPackage ../applications/editors/emacs/macport-24.5.nix { + emacsMacport = emacs25Macport; + emacs25Macport = callPackage ../applications/editors/emacs/macport.nix { inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit ImageCaptureCore GSS ImageIO; - }); - emacs24Macport = self.emacs24Macport_24_5; + }; - emacs25Macport_25_1 = lowPrio (callPackage ../applications/editors/emacs/macport-25.1.nix { - inherit (darwin.apple_sdk.frameworks) - AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit - ImageCaptureCore GSS ImageIO; - }); - emacs25Macport = self.emacs25Macport_25_1; + # for backwards compatibility + emacs25Macport_25_1 = emacs25Macport; emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec { inherit emacs; @@ -13493,7 +13552,7 @@ with pkgs; fbreader = callPackage ../applications/misc/fbreader { }; - fdr = qt57.callPackage ../applications/science/programming/fdr { }; + fdr = libsForQt56.callPackage ../applications/science/programming/fdr { }; fehlstart = callPackage ../applications/misc/fehlstart { }; @@ -13558,7 +13617,7 @@ with pkgs; gnuradio-osmosdr = callPackage ../applications/misc/gnuradio-osmosdr { }; - goldendict = libsForQt55.callPackage ../applications/misc/goldendict { }; + goldendict = libsForQt56.callPackage ../applications/misc/goldendict { }; inherit (ocamlPackages) google-drive-ocamlfuse; @@ -13719,10 +13778,6 @@ with pkgs; ffmpeg = ffmpeg_1; }; - freicoin = callPackage ../applications/misc/freicoin { - boost = boost155; - }; - fte = callPackage ../applications/editors/fte { }; game-music-emu = callPackage ../applications/audio/game-music-emu { }; @@ -13886,6 +13941,8 @@ with pkgs; gmpc = callPackage ../applications/audio/gmpc {}; + gmtp = callPackage ../applications/misc/gmtp {}; + gnome-mpv = callPackage ../applications/video/gnome-mpv { }; gollum = callPackage ../applications/misc/gollum { }; @@ -13968,10 +14025,6 @@ with pkgs; ht = callPackage ../applications/editors/ht { }; - htmldoc = callPackage ../applications/misc/htmldoc { - fltk = fltk13; - }; - hugin = callPackage ../applications/graphics/hugin { }; hugo = callPackage ../applications/misc/hugo { }; @@ -14396,12 +14449,13 @@ with pkgs; lrzsz = callPackage ../tools/misc/lrzsz { }; - luminanceHDR = libsForQt55.callPackage ../applications/graphics/luminance-hdr { }; + luminanceHDR = libsForQt56.callPackage ../applications/graphics/luminance-hdr { }; lxdvdrip = callPackage ../applications/video/lxdvdrip { }; handbrake = callPackage ../applications/video/handbrake { - ffmpeg = ffmpeg_2; + # TODO: remove when 3.2 becomes default + ffmpeg = ffmpeg_3_2; }; lilyterm = callPackage ../applications/misc/lilyterm { @@ -14420,7 +14474,7 @@ with pkgs; lynx = callPackage ../applications/networking/browsers/lynx { }; - lyx = libsForQt57.callPackage ../applications/misc/lyx { }; + lyx = libsForQt56.callPackage ../applications/misc/lyx { }; mail-notification = callPackage ../desktops/gnome-2/desktop/mail-notification {}; @@ -14500,6 +14554,8 @@ with pkgs; mimms = callPackage ../applications/audio/mimms {}; + meh = callPackage ../applications/graphics/meh {}; + mirage = callPackage ../applications/graphics/mirage { }; mixxx = callPackage ../applications/audio/mixxx { @@ -14638,7 +14694,7 @@ with pkgs; avahi = avahi.override { withLibdnssdCompat = true; }; - qt5 = qt55; # Mumble doesn't work with newer Qt versions. + qt5 = qt56; # Mumble doesn't work with Qt > 5.5 jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; pulseSupport = config.pulseaudio or false; @@ -14655,7 +14711,7 @@ with pkgs; if stdenv.isDarwin then callPackage ../applications/audio/musescore/darwin.nix { } else - libsForQt55.callPackage ../applications/audio/musescore { }; + libsForQt56.callPackage ../applications/audio/musescore { }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt { @@ -14693,6 +14749,8 @@ with pkgs; pig = callPackage ../applications/networking/cluster/pig { }; + pijul = callPackage ../applications/version-management/pijul {}; + planner = callPackage ../applications/office/planner { }; playonlinux = callPackage ../applications/misc/playonlinux { @@ -14707,7 +14765,7 @@ with pkgs; smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; - smtube = libsForQt55.callPackage ../applications/video/smtube {}; + smtube = libsForQt56.callPackage ../applications/video/smtube {}; sudolikeaboss = callPackage ../tools/security/sudolikeaboss { }; @@ -14780,9 +14838,9 @@ with pkgs; nedit = callPackage ../applications/editors/nedit { }; - notepadqq = callPackage ../applications/editors/notepadqq { - qtbase = qt55; - }; + nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { }; + + notepadqq = libsForQt56.callPackage ../applications/editors/notepadqq { }; notmuch = callPackage ../applications/networking/mailreaders/notmuch { }; @@ -14829,8 +14887,6 @@ with pkgs; omxplayer = callPackage ../applications/video/omxplayer { }; - oneteam = callPackage ../applications/networking/instant-messengers/oneteam { }; - openbox = callPackage ../applications/window-managers/openbox { }; openbox-menu = callPackage ../applications/misc/openbox-menu { }; @@ -14861,7 +14917,10 @@ with pkgs; osmo = callPackage ../applications/office/osmo { }; - palemoon = callPackage ../applications/networking/browsers/palemoon { }; + palemoon = callPackage ../applications/networking/browsers/palemoon { + # https://forum.palemoon.org/viewtopic.php?f=57&t=15296#p111146 + stdenv = overrideCC stdenv gcc49; + }; pamix = callPackage ../applications/audio/pamix { }; @@ -15031,6 +15090,8 @@ with pkgs; psi = kde4.callPackage ../applications/networking/instant-messengers/psi { }; + psi-plus = callPackage ../applications/networking/instant-messengers/psi-plus { }; + psol = callPackage ../development/libraries/psol/default.nix { }; pstree = callPackage ../applications/misc/pstree { }; @@ -15067,7 +15128,7 @@ with pkgs; qgis = callPackage ../applications/gis/qgis {}; - qgroundcontrol = libsForQt55.callPackage ../applications/science/robotics/qgroundcontrol { }; + qgroundcontrol = libsForQt56.callPackage ../applications/science/robotics/qgroundcontrol { }; qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { }; @@ -15160,7 +15221,7 @@ with pkgs; demo = false; }; - rapcad = libsForQt55.callPackage ../applications/graphics/rapcad { boost = boost159; }; + rapcad = libsForQt56.callPackage ../applications/graphics/rapcad { boost = boost159; }; rapidsvn = callPackage ../applications/version-management/rapidsvn { }; @@ -15202,7 +15263,7 @@ with pkgs; retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix { }); - ricochet = libsForQt55.callPackage ../applications/networking/instant-messengers/ricochet { }; + ricochet = libsForQt56.callPackage ../applications/networking/instant-messengers/ricochet { }; ripser = callPackage ../applications/science/math/ripser { }; @@ -15421,6 +15482,13 @@ with pkgs; themes = []; # extra themes, etc. }; + sddmPlasma5 = sddm.override { + themes = [ + plasma5.plasma-workspace + pkgs.breeze-icons + ]; + }; + skrooge = libsForQt5.callPackage ../applications/office/skrooge {}; slim = callPackage ../applications/display-managers/slim { @@ -15481,6 +15549,8 @@ with pkgs; stalonetray = callPackage ../applications/window-managers/stalonetray {}; + inherit (ocamlPackages_4_03) stog; + stp = callPackage ../applications/science/logic/stp {}; stumpwm = callPackage ../applications/window-managers/stumpwm { @@ -15517,11 +15587,7 @@ with pkgs; subunit = callPackage ../development/libraries/subunit { }; - surf = callPackage ../applications/networking/browsers/surf { - webkit = webkitgtk2; - }; - - surf-webkit2 = callPackage ../applications/networking/browsers/surf/webkit2.nix { }; + surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; }; swh_lv2 = callPackage ../applications/audio/swh-lv2 { }; @@ -15560,7 +15626,7 @@ with pkgs; gconf = gnome2.GConf; }; - teamspeak_client = libsForQt55.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; + teamspeak_client = libsForQt56.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; taskjuggler = callPackage ../applications/misc/taskjuggler { ruby = ruby_2_0; }; @@ -15573,7 +15639,7 @@ with pkgs; taskserver = callPackage ../servers/misc/taskserver { }; - tdesktop = qt56.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { + tdesktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/tdesktop { inherit (pythonPackages) gyp; }; @@ -15587,8 +15653,6 @@ with pkgs; telepathy_mission_control = callPackage ../applications/networking/instant-messengers/telepathy/mission-control { }; - telepathy_rakia = callPackage ../applications/networking/instant-messengers/telepathy/rakia { }; - telepathy_salut = callPackage ../applications/networking/instant-messengers/telepathy/salut {}; telepathy_idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {}; @@ -15684,12 +15748,13 @@ with pkgs; tree = callPackage ../tools/system/tree {}; + treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK30; }; + trezor-bridge = callPackage ../applications/networking/browsers/mozilla-plugins/trezor { }; tribler = callPackage ../applications/networking/p2p/tribler { }; - # We need QtWebkit which was deprecated in Qt 5.6 although it can still be build - trojita = with qt55; callPackage ../applications/networking/mailreaders/trojita { }; + trojita = libsForQt56.callPackage ../applications/networking/mailreaders/trojita { }; tsearch_extras = callPackage ../servers/sql/postgresql/tsearch_extras { }; @@ -15874,6 +15939,8 @@ with pkgs; vnstat = callPackage ../applications/networking/vnstat { }; + vogl = qt56.callPackage ../development/tools/vogl { }; + volnoti = callPackage ../applications/misc/volnoti { }; vorbis-tools = callPackage ../applications/audio/vorbis-tools { }; @@ -15907,6 +15974,8 @@ with pkgs; imlib2 = imlib2-nox; }; + way-cooler = callPackage ../applications/window-managers/way-cooler {}; + wayv = callPackage ../tools/X11/wayv {}; weechat = callPackage ../applications/networking/irc/weechat { @@ -16032,6 +16101,8 @@ with pkgs; ); }; + wtftw = callPackage ../applications/window-managers/wtftw {}; + wxhexeditor = callPackage ../applications/editors/wxhexeditor { }; wxcam = callPackage ../applications/video/wxcam { @@ -16125,6 +16196,8 @@ with pkgs; xen-slim = xenPackages.xen_4_5-slim; xen-light = xenPackages.xen_4_5-light; + xkbset = callPackage ../tools/X11/xkbset { }; + win-spice = callPackage ../applications/virtualization/driver/win-spice { }; win-virtio = callPackage ../applications/virtualization/driver/win-virtio { }; win-qemu = callPackage ../applications/virtualization/driver/win-qemu { }; @@ -16492,6 +16565,8 @@ with pkgs; garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; }; + gargoyle = callPackage ../games/gargoyle { }; + gav = callPackage ../games/gav { }; gcs = callPackage ../games/gcs { }; @@ -17011,6 +17086,8 @@ with pkgs; redshift-plasma-applet = libsForQt5.callPackage ../applications/misc/redshift-plasma-applet { }; + latte-dock = libsForQt5.callPackage ../applications/misc/latte-dock { }; + orion = callPackage ../misc/themes/orion {}; albatross = callPackage ../misc/themes/albatross { }; @@ -17472,7 +17549,9 @@ with pkgs; caneda = callPackage ../applications/science/electronics/caneda { }; - geda = callPackage ../applications/science/electronics/geda { }; + geda = callPackage ../applications/science/electronics/geda { + guile = guile_2_0; + }; gerbv = callPackage ../applications/science/electronics/gerbv { }; @@ -17563,7 +17642,7 @@ with pkgs; yacas = callPackage ../applications/science/math/yacas { }; - speedcrunch = libsForQt5.callPackage ../applications/science/math/speedcrunch { }; + speedcrunch = libsForQt56.callPackage ../applications/science/math/speedcrunch { }; ### SCIENCE / MISC @@ -17585,7 +17664,8 @@ with pkgs; gravit = callPackage ../applications/science/astronomy/gravit { }; - golly = callPackage ../applications/science/misc/golly { }; + golly = callPackage ../applications/science/misc/golly { wxGTK = wxGTK30; }; + golly-beta = callPackage ../applications/science/misc/golly/beta.nix { wxGTK = wxGTK30; }; megam = callPackage ../applications/science/misc/megam { }; @@ -17693,8 +17773,14 @@ with pkgs; cups-dymo = callPackage ../misc/cups/drivers/dymo {}; + cups-toshiba-estudio = callPackage ../misc/cups/drivers/estudio {}; + crashplan = callPackage ../applications/backup/crashplan { }; + colort = callPackage ../applications/misc/colort { }; + + terminal-parrot = callPackage ../applications/misc/terminal-parrot { }; + e17gtk = callPackage ../misc/themes/e17gtk { }; epson-escpr = callPackage ../misc/drivers/epson-escpr { }; @@ -17933,7 +18019,7 @@ with pkgs; pcre = pcre-cpp; }); - redis-desktop-manager = libsForQt55.callPackage ../applications/misc/redis-desktop-manager { }; + redis-desktop-manager = libsForQt56.callPackage ../applications/misc/redis-desktop-manager { }; robomongo = libsForQt5.callPackage ../applications/misc/robomongo { }; @@ -18065,11 +18151,11 @@ with pkgs; inherit (callPackage ../applications/networking/cluster/terraform {}) terraform_0_8_5 terraform_0_8_8 - terraform_0_9_0; + terraform_0_9_2; terraform_0_8 = terraform_0_8_8; - terraform_0_9 = terraform_0_9_0; - terraform = terraform_0_8; + terraform_0_9 = terraform_0_9_2; + terraform = terraform_0_9; terragrunt = callPackage ../applications/networking/cluster/terragrunt { terraform = terraform_0_8; @@ -18313,6 +18399,8 @@ with pkgs; mg = callPackage ../applications/editors/mg { }; + mpvc = callPackage ../applications/misc/mpvc { }; + aucdtect = callPackage ../tools/audio/aucdtect { }; togglesg-download = callPackage ../tools/misc/togglesg-download { }; @@ -18341,12 +18429,12 @@ with pkgs; zuki-themes = callPackage ../misc/themes/zuki { }; - zoom-us = libsForQt55.callPackage ../applications/networking/instant-messengers/zoom-us {}; - tora = libsForQt5.callPackage ../development/tools/tora {}; xulrunner = firefox-unwrapped; + xrq = callPackage ../applications/misc/xrq { }; + nitrokey-app = callPackage ../tools/security/nitrokey-app { }; fpm2 = callPackage ../tools/security/fpm2 { }; @@ -18356,4 +18444,6 @@ with pkgs; hy = callPackage ../development/interpreters/hy {}; ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; }; + + messenger-for-desktop = callPackage ../applications/networking/instant-messengers/messenger-for-desktop {}; } diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index bad483f0237..2f21d2a5d74 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -8,6 +8,7 @@ let # These are attributes in compiler and packages that don't support integer-s "ghc6104" "ghc6123" "ghc704" + "ghc763" "ghcjs" "ghcjsHEAD" "ghcCross" @@ -166,11 +167,13 @@ in rec { }; ghcjs = callPackage ../development/haskell-modules { ghc = compiler.ghcjs; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; + packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; }; ghcjsHEAD = callPackage ../development/haskell-modules { ghc = compiler.ghcjsHEAD; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; + packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; }; ghcHaLVM240 = callPackage ../development/haskell-modules { ghc = compiler.ghcHaLVM240; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index ea3a849c7ac..71aef7544dd 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -293,7 +293,7 @@ let maintainers = [ maintainers.koral ]; }; }; - + luastdlib = buildLuaPackage { name = "stdlib"; @@ -468,18 +468,20 @@ let vicious = stdenv.mkDerivation rec { name = "vicious-${version}"; - version = "2.1.3"; + version = "2.2.0"; - src = fetchzip { - url = "http://git.sysphere.org/vicious/snapshot/vicious-${version}.tar.xz"; - sha256 = "1c901siza5vpcbkgx99g1vkqiki5qgkzx2brnj4wrpbsbfzq0bcq"; + src = fetchFromGitHub { + owner = "Mic92"; + repo = "vicious"; + rev = "v${version}"; + sha256 = "0dhy0vklrhqrnmxb9pyqbfvkwwy86lwysk93pzg1j1zwprx366fj"; }; meta = with stdenv.lib; { description = "Vicious widgets for window managers"; - homepage = http://git.sysphere.org/vicious/; + homepage = https://github.com/Mic92/vicious; license = licenses.gpl2; - maintainers = with maintainers; [ makefu ]; + maintainers = with maintainers; [ makefu mic92 ]; platforms = platforms.linux; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f46aa3a251c..cf2b676a5d4 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -36,8 +36,6 @@ let async_shell = callPackage ../development/ocaml-modules/async_shell { }; - async_ssl = callPackage ../development/ocaml-modules/async_ssl { }; - async_unix_p4 = callPackage ../development/ocaml-modules/async_unix { }; async_p4 = @@ -49,17 +47,18 @@ let atdgen = callPackage ../development/ocaml-modules/atdgen { }; + base = callPackage ../development/ocaml-modules/base { }; + base64 = callPackage ../development/ocaml-modules/base64 { }; + bap = callPackage ../development/ocaml-modules/bap { }; + + bitstring = callPackage ../development/ocaml-modules/bitstring { }; + bolt = callPackage ../development/ocaml-modules/bolt { }; bos = callPackage ../development/ocaml-modules/bos { }; - bitstring = - if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/bitstring { } - else callPackage ../development/ocaml-modules/bitstring/2.0.4.nix { }; - camlidl = callPackage ../development/tools/ocaml/camlidl { }; camlp4 = @@ -206,6 +205,8 @@ let herelib = callPackage ../development/ocaml-modules/herelib { }; + higlo = callPackage ../development/ocaml-modules/higlo { }; + io-page = callPackage ../development/ocaml-modules/io-page { }; ipaddr_p4 = callPackage ../development/ocaml-modules/ipaddr/2.6.1.nix { }; @@ -233,6 +234,8 @@ let hex = callPackage ../development/ocaml-modules/hex { }; + inifiles = callPackage ../development/ocaml-modules/inifiles { }; + jingoo = callPackage ../development/ocaml-modules/jingoo { batteries = ocaml_batteries; pcre = ocaml_pcre; @@ -372,6 +375,8 @@ let ocaml_text = callPackage ../development/ocaml-modules/ocaml-text { }; + ocf = callPackage ../development/ocaml-modules/ocf { }; + ocpBuild = callPackage ../development/tools/ocaml/ocp-build { }; ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { }; @@ -384,6 +389,8 @@ let ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { }; + ocsigen-start = callPackage ../development/ocaml-modules/ocsigen-start { }; + ocsigen-toolkit = callPackage ../development/ocaml-modules/ocsigen-toolkit { }; ojquery = callPackage ../development/ocaml-modules/ojquery { }; @@ -510,6 +517,10 @@ let sqlite3EZ = callPackage ../development/ocaml-modules/sqlite3EZ { }; + stdio = callPackage ../development/ocaml-modules/stdio { }; + + stog = callPackage ../applications/misc/stog { }; + stringext = callPackage ../development/ocaml-modules/stringext { }; topkg = callPackage ../development/ocaml-modules/topkg { }; @@ -550,6 +561,8 @@ let xml-light = callPackage ../development/ocaml-modules/xml-light { }; + xtmpl = callPackage ../development/ocaml-modules/xtmpl { }; + yojson = callPackage ../development/ocaml-modules/yojson { }; zarith = callPackage ../development/ocaml-modules/zarith { }; @@ -565,6 +578,10 @@ let buildOcamlJane = callPackage ../development/ocaml-modules/janestreet/buildOcamlJane.nix {}; + ocaml-compiler-libs = callPackage ../development/ocaml-modules/janestreet/ocaml-compiler-libs.nix {}; + + ppx_ast = callPackage ../development/ocaml-modules/janestreet/ppx_ast.nix {}; + ppx_core = if lib.versionOlder "4.03" ocaml.version then callPackage ../development/ocaml-modules/janestreet/ppx_core-113_33_01.nix {} @@ -672,6 +689,8 @@ let then callPackage ../development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix {} else callPackage ../development/ocaml-modules/janestreet/ppx-jane.nix {}; + ppx_traverse_builtins = callPackage ../development/ocaml-modules/janestreet/ppx_traverse_builtins.nix {}; + # Core sublibs typerep = @@ -756,6 +775,8 @@ let then callPackage ../development/ocaml-modules/janestreet/async.nix {} else async_p4; + async_ssl = callPackage ../development/ocaml-modules/janestreet/async_ssl.nix { }; + # Apps / from all-packages wyrd = callPackage ../tools/misc/wyrd { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 72b80afebbb..f0414b1b1ae 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9966,10 +9966,10 @@ let self = _self // overrides; _self = with self; { }; OpenGL = buildPerlPackage rec { - name = "OpenGL-0.6703"; + name = "OpenGL-0.70"; src = fetchurl { url = "mirror://cpan/authors/id/C/CH/CHM/${name}.tar.gz"; - sha256 = "0k2k8zg84qj1ry77i9dvmfdfpg13s6117wy5bc4nvnzv37qcvy32"; + sha256 = "1q3lz168q081iwl9jg21fbzhp9la79gav9mv6nmh2jab83s2l3mj"; }; buildInputs = with pkgs; [ mesa mesa_glu freeglut xorg.libX11 xorg.libXi xorg.libXmu xorg.libXext xdummy ]; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index e07930a94db..221427e0851 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -235,11 +235,11 @@ let composer = pkgs.stdenv.mkDerivation rec { name = "composer-${version}"; - version = "1.3.2"; + version = "1.4.1"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "0s85zglzwx5i0hw9zlpwy1385jink1g1lhdwhv59zdjblcd7ckva"; + sha256 = "1g2wsnjcx1ysbw1ps2xwyhgcl8kl3yfzxgwcnh5rigjk6k67glmb"; }; phases = [ "installPhase" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 84149b0de26..22a3f56a6d4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -175,6 +175,10 @@ in { # packages defined elsewhere + bap = callPackage ../development/python-modules/bap { + bap = pkgs.ocamlPackages_4_02.bap; + }; + blivet = callPackage ../development/python-modules/blivet { }; breathe = callPackage ../development/python-modules/breathe { }; @@ -466,15 +470,19 @@ in { }; altair = buildPythonPackage rec { - name = "altair-1.0.0"; + name = "altair-1.2.0"; src = pkgs.fetchurl { url = "mirror://pypi/a/altair/${name}.tar.gz"; - sha256 = "024drhmiw8w3dl7dbal0pvnlfd3sv4n1rqywv2jb488b3fzm704r"; + sha256 = "05c47dm20p7m0017p2h38il721rxag1q0457dj7whp0k8rc7qd1n"; }; + buildInputs = [ self.pytest ]; + checkPhase = '' + export LANG=en_US.UTF-8 + py.test altair --doctest-modules + ''; propagatedBuildInputs = with self; [ vega pandas ipython traitlets ]; - meta = { description = "A declarative statistical visualization library for Python."; homepage = https://github.com/altair-viz/altair; @@ -491,6 +499,7 @@ in { sha256 = "08k92afnk0bivm07h1l5nh26xl2rfp7qn03aq17q1hr3fs5r6cdm"; }; + buildInputs = [ self.pytest ]; propagatedBuildInputs = with self; [ jupyter_core pandas ]; meta = { @@ -816,19 +825,23 @@ in { python-gnupg = buildPythonPackage rec { name = "python-gnupg-${version}"; - version = "0.3.8"; + version = "0.4.0"; src = pkgs.fetchurl { url = "mirror://pypi/p/python-gnupg/${name}.tar.gz"; - sha256 = "0nkbs9c8f30lra7ca39kg91x8cyxn0jb61vih4qky839gpbwwwiq"; + sha256 = "1yd88acafs9nwk6gzpbxjzpx0zd04qrvc6hmwhj1i89ghm2g7ap6"; }; + propagatedBuildInputs = [ pkgs.gnupg1 ]; + # Let's make the library default to our gpg binary patchPhase = '' substituteInPlace gnupg.py \ --replace "gpgbinary='gpg'" "gpgbinary='${pkgs.gnupg1}/bin/gpg'" ''; + doCheck = false; + meta = { description = "A wrapper for the Gnu Privacy Guard"; homepage = "https://pypi.python.org/pypi/python-gnupg"; @@ -3837,11 +3850,11 @@ in { }; click = buildPythonPackage rec { - name = "click-6.6"; + name = "click-6.7"; src = pkgs.fetchurl { url = "mirror://pypi/c/click/${name}.tar.gz"; - sha256 = "1sggipyz52crrybwbr9xvwxd4aqigvplf53k9w3ygxmzivd1jsnc"; + sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi"; }; buildInputs = with self; [ pytest ]; @@ -5755,11 +5768,11 @@ in { libtmux = buildPythonPackage rec { name = "libtmux-${version}"; - version = "0.6.0"; + version = "0.6.4"; src = pkgs.fetchurl { url = "mirror://pypi/l/libtmux/${name}.tar.gz"; - sha256 = "117savw47c2givq9vxr5m02nyxmsk34l2ihxyy5axlaiqyxyf20s"; + sha256 = "0kmw7x8cxb2hj2mzibmg9nxaijhsm1kcm0vdihn99fhm5kw1phh5"; }; buildInputs = with self; [ pytest_29 ]; @@ -7035,9 +7048,10 @@ in { buildInputs = with self; [ fudge_9 nose ]; }; - fedora_cert = mkPythonDerivation rec { + fedora_cert = buildPythonPackage rec { name = "fedora-cert-0.5.9.2"; meta.maintainers = with maintainers; [ mornfall ]; + format = "other"; src = pkgs.fetchurl { url = "https://fedorahosted.org/releases/f/e/fedora-packager/fedora-packager-0.5.9.2.tar.bz2"; @@ -8949,6 +8963,7 @@ in { }; }; + podcastparser = callPackage ../development/python-modules/podcastparser { }; poppler-qt4 = buildPythonPackage rec { name = "poppler-qt4-${version}"; @@ -10314,36 +10329,8 @@ in { django = self.django_1_10; - django_1_10 = buildPythonPackage rec { - name = "Django-${version}"; - version = "1.10.5"; - disabled = pythonOlder "2.7"; - - src = pkgs.fetchurl { - url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz"; - sha256 = "12szjsmnfhh2yr54sfynyjr8vl0q9gb6qak3ayqcifcinrs97f0d"; - }; - - patches = [ - (pkgs.substituteAll { - src = ../development/python-modules/django/1.10-gis-libs.template.patch; - geos = pkgs.geos; - gdal = self.gdal; - }) - ]; - - # patch only $out/bin to avoid problems with starter templates (see #3134) - postFixup = '' - wrapPythonProgramsIn $out/bin "$out $pythonPath" - ''; - - # too complicated to setup - doCheck = false; - - meta = { - description = "A high-level Python Web framework"; - homepage = https://www.djangoproject.com/; - }; + django_1_10 = callPackage ../development/python-modules/django/1_10.nix { + gdal = self.gdal; }; django_1_9 = buildPythonPackage rec { @@ -13915,6 +13902,10 @@ in { clblas = pkgs.clblas-cuda; }; + libnacl = callPackage ../development/python-modules/libnacl/default.nix { + inherit (pkgs) libsodium; + }; + libplist = if isPy3k then throw "libplist not supported for interpreter ${python.executable}" else (pkgs.libplist.override{python2Packages=self; }).py; @@ -19021,6 +19012,8 @@ in { }; }; + pylibmc = callPackage ../development/python-modules/pylibmc {}; + pymetar = buildPythonPackage rec { name = "${pname}-${version}"; pname = "pymetar"; @@ -20074,7 +20067,7 @@ in { sha256 = "0v5w66ir3siimfzg3kc8hfrrilwwnbxq5bvipmrpyxar0kw715vf"; }; - propagatedBuildInputs = with self; [ pkgs.curl pkgs.openssl.out ]; + buildInputs = with self; [ pkgs.curl pkgs.openssl.out ]; # error: invalid command 'test' doCheck = false; @@ -21803,8 +21796,9 @@ in { }; - pysvn = mkPythonDerivation rec { + pysvn = buildPythonPackage rec { name = "pysvn-1.8.0"; + format = "other"; src = pkgs.fetchurl { url = "http://pysvn.barrys-emacs.org/source_kits/${name}.tar.gz"; @@ -21959,9 +21953,10 @@ in { }); - pywebkitgtk = mkPythonDerivation rec { + pywebkitgtk = buildPythonPackage rec { name = "pywebkitgtk-${version}"; version = "1.1.8"; + format = "other"; src = pkgs.fetchurl { url = "http://pywebkitgtk.googlecode.com/files/${name}.tar.bz2"; @@ -22294,10 +22289,11 @@ in { qscintilla = if isPy3k || isPyPy then throw "qscintilla-${pkgs.qscintilla.version} not supported for interpreter ${python.executable}" - else mkPythonDerivation rec { + else buildPythonPackage rec { # TODO: Qt5 support name = "qscintilla-${version}"; version = pkgs.qscintilla.version; + format = "other"; src = pkgs.qscintilla.src; @@ -24602,6 +24598,25 @@ in { }; }; + sockjs-tornado = buildPythonPackage rec { + name = "sockjs-tornado-${version}"; + version = "1.0.3"; + + src = pkgs.fetchurl { + url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz"; + sha256 = "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd"; + }; + + propagatedBuildInputs = with self; [ tornado ]; + + meta = { + homepage = "http://github.com/mrjoes/sockjs-tornado/"; + description = "SockJS python server implementation on top of Tornado framework"; + license = licenses.mit; + maintainers = with maintainers; [ abbradar ]; + }; + }; + sorl_thumbnail = buildPythonPackage rec { name = "sorl-thumbnail-11.12"; @@ -24743,6 +24758,8 @@ in { doCheck = false; }; + hieroglyph = callPackage ../development/python-modules/hieroglyph { }; + sphinx_rtd_theme = buildPythonPackage (rec { name = "sphinx_rtd_theme-0.1.9"; @@ -25827,9 +25844,10 @@ in { # Python package. tkinter = let py = python.override{x11Support=true;}; - in mkPythonDerivation rec { + in buildPythonPackage rec { name = "tkinter-${python.version}"; src = py; + format = "other"; disabled = isPy26 || isPyPy; @@ -26610,6 +26628,23 @@ in { }; }; + uptime = buildPythonPackage rec { + name = "uptime-${version}"; + version = "3.0.1"; + + src = pkgs.fetchurl { + url = "mirror://pypi/u/uptime/${name}.tar.gz"; + sha256 = "0wr9jkixprlywz0plyn5p42a5fd31aiwvjrxdvj7r02vfxa04c3w"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/Cairnarvon/uptime; + description = "Cross-platform way to retrieve system uptime and boot time"; + license = licenses.bsd2; + maintainers = with maintainers; [ rob ]; + }; + }; + urlgrabber = buildPythonPackage rec { name = "urlgrabber-3.9.1"; disabled = isPy3k; @@ -27524,25 +27559,7 @@ EOF }; }; - - BTrees = self.buildPythonPackage rec { - name = "BTrees-4.1.4"; - - propagatedBuildInputs = with self; [ persistent zope_interface transaction ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/B/BTrees/${name}.tar.gz"; - sha256 = "1avvhkd7rvp3rzhw20v6ank8a8m9a1lmh99c4gjjsa1ry0zsri3y"; - }; - - patches = [ ../development/python-modules/btrees-py35.patch ]; - - meta = { - description = "Scalable persistent components"; - homepage = http://packages.python.org/BTrees; - }; - }; - + BTrees = callPackage ../development/python-modules/btrees {}; persistent = self.buildPythonPackage rec { name = "persistent-4.0.8"; @@ -28451,11 +28468,11 @@ EOF websocket_client = buildPythonPackage rec { - name = "websocket_client-0.32.0"; + name = "websocket_client-0.40.0"; src = pkgs.fetchurl { url = "mirror://pypi/w/websocket-client/${name}.tar.gz"; - sha256 = "cb3ab95617ed2098d24723e3ad04ed06c4fde661400b96daa1859af965bfe040"; + sha256 = "1yz67wdjijrvwpx0a0f6wdfy8ajsvr9xbj5514ld452fqnh19b20"; }; propagatedBuildInputs = with self; [ six backports_ssl_match_hostname unittest2 argparse ]; @@ -29030,14 +29047,14 @@ EOF Logbook = buildPythonPackage rec { name = "Logbook-${version}"; - version = "0.11.3"; + version = "1.0.0"; src = pkgs.fetchurl { url = "mirror://pypi/L/Logbook/${name}.tar.gz"; - sha256 = "0bchn00jj0y4dmrmqsm29ffcx37g79jcxjihadmgz2aj0z6dbsrc"; + sha256 = "0whqbx5p0zkf7gmb5ssnsnhm4kn4drd4x7fbhdi8dnxklqajbnl7"; }; - buildInputs = [ self.pytest ]; + buildInputs = [ self.pytest ] ++ optionals (!isPy3k) [ self.mock ]; checkPhase = '' find tests -name \*.pyc -delete @@ -29052,13 +29069,13 @@ EOF }; libvirt = let - version = "3.0.0"; + version = "3.1.0"; in assert version == pkgs.libvirt.version; pkgs.stdenv.mkDerivation rec { name = "libvirt-python-${version}"; src = pkgs.fetchurl { url = "http://libvirt.org/sources/python/${name}.tar.gz"; - sha256 = "1ha4bqf029si1lla1z7ca786w571fh3wfs4h7zaglfk4gb2w39wl"; + sha256 = "06524dhm27fjfnmr5bqdxlmm1g9ixvzaaq572hgyy5dqwfn64spk"; }; buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ]; @@ -29093,7 +29110,8 @@ EOF --replace 'lxml==3.7.1' 'lxml' \ --replace 'pyopenssl==16.2.0' 'pyopenssl' \ --replace 'requests[socks]==2.12.4' 'requests[socks]' \ - --replace 'pygments==2.1.3' 'pygments>=2.1,<3.0' + --replace 'pygments==2.1.3' 'pygments>=2.1,<3.0' \ + --replace 'python-dateutil==2.5.3' 'python-dateutil>=2.5,<3.0' ''; propagatedBuildInputs = with self; [ @@ -30689,12 +30707,11 @@ EOF propagatedBuildInputs = with self; [ scipy ]; buildInputs = with self; [ nose ]; - # Cannot be installed with Python 2.x, most likely due to the patch below. - disabled = !isPy3k; - postPatch = '' cd python-package + sed "s/CURRENT_DIR = os.path.dirname(__file__)/CURRENT_DIR = os.path.abspath(os.path.dirname(__file__))/g" -i setup.py + sed "/^LIB_PATH.*/a LIB_PATH = [os.path.relpath(LIB_PATH[0], CURRENT_DIR)]" -i setup.py cat <xgboost/libpath.py def find_lib_path(): return ["${pkgs.xgboost}/lib/libxgboost.so"] diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 86fbb0bf1b8..b12eda6f150 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -68,7 +68,7 @@ with import ./release-lib.nix { inherit supportedSystems; }; hdparm = linux; hello = all; host = linux; - iana_etc = linux; + iana-etc = linux; icewm = linux; idutils = all; inetutils = linux; @@ -157,7 +157,7 @@ with import ./release-lib.nix { inherit supportedSystems; }; time = linux; tinycc = linux; udev = linux; - unrar = linux; + unar = linux; unzip = all; upstart = linux; usbutils = linux; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 3a9a304a72d..b5207879a5e 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -41,23 +41,18 @@ let jobs.lib-tests jobs.stdenv.x86_64-linux jobs.stdenv.i686-linux - jobs.stdenv.aarch64-linux jobs.stdenv.x86_64-darwin jobs.linux.x86_64-linux jobs.linux.i686-linux - jobs.linux.aarch64-linux jobs.python.x86_64-linux jobs.python.i686-linux - jobs.python.aarch64-linux jobs.python.x86_64-darwin jobs.python3.x86_64-linux jobs.python3.i686-linux - jobs.python3.aarch64-linux jobs.python3.x86_64-darwin # Many developers use nix-repl jobs.nix-repl.x86_64-linux jobs.nix-repl.i686-linux - jobs.nix-repl.aarch64-linux jobs.nix-repl.x86_64-darwin # Needed by travis-ci to test PRs jobs.nox.i686-linux @@ -66,7 +61,6 @@ let # Ensure that X11/GTK+ are in order. jobs.thunderbird.x86_64-linux jobs.thunderbird.i686-linux - jobs.thunderbird.aarch64-linux # Ensure that basic stuff works on darwin jobs.git.x86_64-darwin jobs.mysql.x86_64-darwin diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 1659208f76f..1bebf222ac5 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,9 +7,9 @@ { runCommand, fetchFromGitHub, git }: let - version = "2017-03-13"; - rev = "e5b7b45fa4e1168715a1132a65ad89fbc1d5ed82"; - sha256 = "1glwd7b5ckiw2nzc28djyarml21cqdajc1jn03vzf4sl58bvahyb"; + version = "2017-04-03"; + rev = "24cb86b25f4d4758b775e78c03673378ed28120d"; + sha256 = "07nzdrrghbpikh0mgvi1mv66mxisd47lcwk6v3szbsy5pgj6dxnq"; src = fetchFromGitHub { inherit rev; @@ -44,7 +44,7 @@ runCommand "rustRegistry-${version}-${builtins.substring 0 7 rev}" { inherit src $git config --local user.email "example@example.com" $git config --local user.name "example" $git add . - $git commit -m 'Rust registry commit' + $git commit --quiet -m 'Rust registry commit' touch $out/touch . "$out/.cargo-index-lock" ''